diff --git a/Manifest b/Manifest
index 63169e80677e..3c2f69e86094 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29627 BLAKE2B 4f8a5bc4bc279244c5c475b9b78974c1b97f075af717b0adf6d893b0886bf3a71180cbc2df742126e37ed2116549ffe2e251a3ede5270dcd3918a5334f9a4135 SHA512 0344e22fc832c33bd8af3711c5ff32e554af59a51a82fe25c3c7eb449bcbc6102fe1049df3a76d21d77d9d790ec01132f81402c9a83adbd7c70c421e3be40745
-TIMESTAMP 2022-01-10T07:39:23Z
+MANIFEST Manifest.files.gz 29656 BLAKE2B ba9029911c5ffc9e68c3ba2ed176ede795a1f087075e0f22164333f121554a8fdf9be136be3417ed780dfcc840bf68f89c6a1870ae54e64b1481d5c31ade6fde SHA512 c6596923e4d2c814cf355ca4f442c36b2d81cfb34668a3218a961b369ac304393361363e759f00f04f1f2003b7a71062a86c41e4a92f4c31ab93cd9d29a5d43f
+TIMESTAMP 2022-01-11T05:39:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHb4qtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGApfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA9Fg//dXlCqw5Sc6Q0WJmi3gJrjZBvr2od4cDcwfXzPFzRNwfSkRl6eSTiJNyS
-Hbb9mrvZmXsdWUTwmWGOKPEQWhnfTdPRSfPtTg8aWhFW1I9p/p+/607XkokFLZib
-GBc6njo2FeT/EfWO6ZVh2f4kYSZsa9+CxNaW/FJqzC00o4Tt7RfTnjrWX99gbzYx
-ih70iFD7OYps5tNV71sP+gUtBBjxLUN2L4nqvBMu4uLydDQHRCm6TXhAkakBpuTy
-aM7q9VreKpIZnwYc0zYuWI0p2MyHDppO/5skcdFGumiWvjoLhAB1NwJ74UEPlgd5
-Wx7Hc+uLW0Jvcci2f3mMQR+hTDSc7xxR20PnpMJbLzwNP2BCncrxulQ9NgQ+V4Dx
-gQS7+JGbsA8fbqJg/zqoRsWDLMuf4wDvWw3/9hMy+pnK44I7aszSXGaAUJa9D8Zf
-00bVwNb9bWePY0KvL5l/57ymTKMemyIRkI+/DSi9yCPDzpEOWcvVZG1HjVLsyG+E
-5qjNVFGLlHXbJNW7Aw/M2VwEweFaObAAvX1k0hWNhFToWv6F9atFkbiAH77CbN1I
-QsxF4zF90weKJZwTYMJ+NyQYTMNiSkXf/Ehzob/9y6RyXB3xkdwVJdjuA6eFu9uN
-TDEqmf8aVmE/rMoMBcw9QvndVUfXT5yi89BRniCVn6FsapOigkc=
-=zi3i
+klAFkhAAnSac0cUEQOSqzDdhc5GvS6KqTQNi6Vg6t8lbTspVD/iWB/QfyPgrZRkm
+8CEPDOkZEY4v/imsYk6N0ueun5yWfDZ3GpztOqvZO862rNCK+eZG/Ak88yA57d9P
+LnQd8nT0ZM5UCBmU0iHD3ZNG1sGYKyi1uBUg0ZQleyaP3EeRJ+pQcwSt+Vnz2F2G
+8yxCY4ok/aPo0NcpWKO/dpnywvK4H9jfkCha+jOsogvC6FDv4ITaFJEGDY5WUJvF
+bJC19+Tf7gDz3Ziay2jm+njvVB0EE4+tT7fWTQehoOC8dYwYiUXh3Dacii4GWs5d
+hRdyVwuakUp+cOO3lZKgLtB0t5z/4pzo0D9zYAm5YM6D3HbNVakOSuxUXi90Ld+C
+nQZOlcv/Kqq+heDHdg9844ASOiWOUl+pUdOOi20UpZrIQ1Z/66w53ZVMmOhN6urD
+Erujq0DNgL02J03KxsbMMcpklsVCMj9nLaUw0OcVBB2MBQZHAcr9oSPuc9MbXLcC
+ISlnGeoEhGfqkpVvsXlBFrgSO2T4PrZZNm3dG0lNrQBSf1N9ziGGltCqgwp9Dya/
+x03dGEajZGI+oy72Uxx0EINvUJ7TV8iU0W55GjodFKDk9+Y6vNyV5fV/cUuRjabt
+g05ImMLeKDv+4AWYIrbVQZO+lv9HCeQtk9Z0oaEwwWRHhMtlung=
+=exsT
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index bc4a3892db28..5125353e470a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index acf4ae625f3f..2cf8c4302aa4 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
deleted file mode 100644
index 658d4f8edd69..000000000000
--- a/app-arch/fastjar/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
-DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r3.ebuild 507 BLAKE2B c893be4cba7a5c7926606d16b25044704064a6cb04387623199ff9020a3e260af39349667eb764fa53c06951d9c9b6bf83ca5945ecef016e066c51e9da1557c4 SHA512 9f40b1a6f9917e80462895e3772f293f5150607c110ed6b6860b8fc9475385ee7756b9064a28ffa64572bb78b551f9badb89d1e371d5715f3679e40db49669a4
-MISC metadata.xml 479 BLAKE2B 6d131ee719d4f588bf1b7e0928435aad880d51004205603b24802470d845c5d9c01c856266cb001612c81b896655c44c1e5536f405bde9093cb054e028d788c0 SHA512 721436fd78a8278ff8fba2aa2c2c1f2588ee6c9270b4c1a06aefde40bedfa678a69b1cecb1a3ba3c1ad740e1e56b22d920944247c532af5cdd1897265c906317
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
deleted file mode 100644
index 77a5df7acc1a..000000000000
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A jar program written in C"
-HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="
-	${DEPEND}
-	!<=dev-java/kaffe-1.1.7-r5" # bug 188542
-
-PATCHES=(
-	# bug 325557
-	"${FILESDIR}"/0.98-traversal.patch
-)
diff --git a/app-arch/fastjar/files/0.98-traversal.patch b/app-arch/fastjar/files/0.98-traversal.patch
deleted file mode 100644
index 511f4c6cd838..000000000000
--- a/app-arch/fastjar/files/0.98-traversal.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- fastjar-0.98.orig/jartool.c
-+++ fastjar-0.98/jartool.c
-@@ -790,6 +790,7 @@
- 		   progname, jarfile);
- 	  return 1;
- 	}
-+      ze->filename[len] = '\0';
-       len = UNPACK_UB4(header, CEN_EFLEN);
-       len += UNPACK_UB4(header, CEN_COMLEN);
-       if (lseek (fd, len, SEEK_CUR) == -1)
-@@ -1257,7 +1258,7 @@
-       exit_on_error("write");
- 
-   /* write the file name to the zip file */
--  if (1 == write(jfd, fname, file_name_length))
-+  if (-1 == write(jfd, fname, file_name_length))
-     exit_on_error("write");
- 
-   if(verbose){
-@@ -1730,7 +1731,17 @@
-       struct stat sbuf;
-       int depth = 0;
- 
--      tmp_buff = malloc(sizeof(char) * strlen((const char *)filename));
-+      if(*filename == '/'){
-+	fprintf(stderr, "Absolute path names are not allowed.\n");
-+	exit(EXIT_FAILURE);
-+      }
-+
-+      tmp_buff = malloc(strlen((const char *)filename));
-+
-+      if(tmp_buff == NULL) {
-+	fprintf(stderr, "Out of memory.\n");
-+	exit(EXIT_FAILURE);
-+      }
- 
-       for(;;){
-         const ub1 *idx = (const unsigned char *)strchr((const char *)start, '/');
-@@ -1738,25 +1749,28 @@
-         if(idx == NULL)
-           break;
-         else if(idx == start){
-+	  tmp_buff[idx - filename] = '/';
-           start++;
-           continue;
-         }
--        start = idx + 1;
- 
--        strncpy(tmp_buff, (const char *)filename, (idx - filename));
--        tmp_buff[(idx - filename)] = '\0';
-+	memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start));
-+	tmp_buff[idx - filename] = '\0';
- 
- #ifdef DEBUG    
-         printf("checking the existance of %s\n", tmp_buff);
- #endif
--	if(strcmp(tmp_buff, "..") == 0){
-+	if(idx - start == 2 && memcmp(start, "..", 2) == 0){
- 	  --depth;
- 	  if (depth < 0){
- 	    fprintf(stderr, "Traversal to parent directories during unpacking!\n");
- 	    exit(EXIT_FAILURE);
- 	  }
--	} else if (strcmp(tmp_buff, ".") != 0)
-+	} else if (idx - start != 1 || *start != '.')
- 	  ++depth;
-+
-+        start = idx + 1;
-+
-         if(stat(tmp_buff, &sbuf) < 0){
-           if(errno != ENOENT)
-             exit_on_error("stat");
-@@ -1765,6 +1779,7 @@
- #ifdef DEBUG    
-           printf("Directory exists\n");
- #endif
-+	  tmp_buff[idx - filename] = '/';
-           continue;
-         }else {
-           fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n",
-@@ -1781,10 +1796,11 @@
-         if(verbose && handle)
-           printf("%10s: %s/\n", "created", tmp_buff);
- 
-+	tmp_buff[idx - filename] = '/';
-       }
- 
-       /* only a directory */
--      if(strlen((const char *)start) == 0)
-+      if(*start == '\0')
-         dir = TRUE;
- 
- #ifdef DEBUG    
-@@ -1792,7 +1808,7 @@
- #endif
- 
-       /* If the entry was just a directory, don't write to file, etc */
--      if(strlen((const char *)start) == 0)
-+      if(*start == '\0')
-         f_fd = -1;
- 
-       free(tmp_buff);
-@@ -1876,7 +1892,8 @@
-       exit(EXIT_FAILURE);
-     }
- 
--    close(f_fd);
-+    if (f_fd != -1)
-+      close(f_fd);
- 
-     if(verbose && dir == FALSE && handle)
-       printf("%10s: %s\n",
diff --git a/app-arch/fastjar/metadata.xml b/app-arch/fastjar/metadata.xml
deleted file mode 100644
index a0a927b71617..000000000000
--- a/app-arch/fastjar/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
-		Fastjar is a version of Sun's 'jar' utility, written entirely in C,
-		and therefore quite a bit faster. Fastjar can be up to 100x faster
-		than the stock 'jar' program running without a JIT.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index b86f164966bb..57834a2d79f3 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/containers-storage/Manifest b/app-containers/containers-storage/Manifest
index d1ec2631f695..8a45ddc4a165 100644
--- a/app-containers/containers-storage/Manifest
+++ b/app-containers/containers-storage/Manifest
@@ -1,5 +1,3 @@
-DIST containers-storage-1.30.0.tar.gz 3642657 BLAKE2B daab9412702822fd6be64b8a4ac88875cdc12688b919dba955a7551bb2b56af87d55bd66c02401d2c329fdcb4db466c7b5acb9e53075028fef1248e0a62c6f37 SHA512 47e256d49fbd1d507e2d8bfa45cb0c840212478594ef8551c0ebb86f4f0e70ad7ed2be6727f52768afbb55c0e912bf32c23620e508b65ed4f3edc9e1f95837a2
 DIST containers-storage-1.37.0.tar.gz 3557198 BLAKE2B ebe5c8e562149a9d007ac87d7fc615d29ad7decbfd6b1b8d919b14684a6341575d8f65080a808ba52674664d187a18bb47e88f10e1a02a2975898862873dadf9 SHA512 3a65a50946e1eed1c79ea77b65feb1c6c8cf58a0b7b81932acb8891b6daa25e007582eb7f70ef7e7f2a6d8262be5db7757ead2fe079e47c99114b47917d81084
-EBUILD containers-storage-1.30.0.ebuild 1460 BLAKE2B 384a8e1e2097ec8c18398a563494941821b75a889bdc23addb0912ba58ef9298ff3d5751bacd9db8d0a8154ee8911d4f2c4677cb80dce4e14c03ca3e5f207ae3 SHA512 8a54ea2230607cb424698397133443747cd6b1a687381f300083b618c621708165b53714a1a29bde52faa450b7384f6ba70d35c2bc381d715b07a4ff75bea9c9
 EBUILD containers-storage-1.37.0.ebuild 1460 BLAKE2B 384a8e1e2097ec8c18398a563494941821b75a889bdc23addb0912ba58ef9298ff3d5751bacd9db8d0a8154ee8911d4f2c4677cb80dce4e14c03ca3e5f207ae3 SHA512 8a54ea2230607cb424698397133443747cd6b1a687381f300083b618c621708165b53714a1a29bde52faa450b7384f6ba70d35c2bc381d715b07a4ff75bea9c9
 MISC metadata.xml 604 BLAKE2B b132c7cf2a280a6c5fee5b37eb644c5644890b845a92165551a5466caf2fbfa07f7b63b1a387fee62467a7df4218e1e4c563fe70fc40209a4f2eae5b9c714b57 SHA512 21725a1c25a5912b26a56f1970b968ca686f55a27888e4a2948ea6d7a6b8f3d70f528e875d8d2271963ebebb6fee11c51f218045296dac21a1b86ba9b5481b28
diff --git a/app-containers/containers-storage/containers-storage-1.30.0.ebuild b/app-containers/containers-storage/containers-storage-1.30.0.ebuild
deleted file mode 100644
index a55dd8c3f0fb..000000000000
--- a/app-containers/containers-storage/containers-storage-1.30.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-SRC_URI="https://github.com/containers/storage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RDEPEND="
-	btrfs? ( sys-fs/btrfs-progs )
-	device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
-	dev-go/go-md2man
-	test? (
-		sys-fs/btrfs-progs
-		sys-fs/lvm2
-		sys-apps/util-linux
-	)"
-RESTRICT="test"
-
-S=${WORKDIR}/${P#containers-}
-
-src_prepare() {
-	default
-
-	sed -e 's|: install\.tools|:|' -i Makefile || die
-
-	[[ -f hack/btrfs_tag.sh ]] || die
-	use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
-		"hack/btrfs_tag.sh" || die; }
-
-	[[ -f hack/libdm_tag.sh ]] || die
-	use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
-		"hack/libdm_tag.sh" || die; }
-}
-
-src_compile() {
-	export -n GOCACHE GOPATH XDG_CACHE_HOME #678856
-	emake GOMD2MAN=go-md2man FFJSON= containers-storage docs
-}
-
-src_install() {
-	dobin "${PN}"
-	while read -r -d ''; do
-		mv "${REPLY}" "${REPLY%.1}" || die
-	done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
-	find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
-	env -u GOFLAGS unshare -m emake local-test-unit || die
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index bbfc918d3361..174c56c73a47 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 0d78e6828785..826c9bfe9670 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -2,5 +2,5 @@ AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa2242
 DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
 DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
 EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
-EBUILD ccid-1.4.36.ebuild 1552 BLAKE2B e595eaa1744b6e57b543507a29af3529c42a21899b82e4bcc36d26fc0b6ef04fa51c8a1f5af9cd93494cf8bca133714e0e513bf5832a01f20340831ab533205d SHA512 d02bf4e6d95eaf7d07eac814dc3c6bae87a6bc4d6e3ca394ce6d51d3e3c1ae2a01e73307347fcc78783b8de2d118407cadc1a840428d3ab4f50b3a835f4c5b7f
+EBUILD ccid-1.4.36.ebuild 1559 BLAKE2B 6b86ca4567944315a7657d089d24ad5fd43d57bc07ec57df76be6c76429af1b6d49d14fceb5a7ca03d91df56a53c43c6583e6ac1f7fa014ba0733f36a2a8b393 SHA512 35f30a6ee169905978a247f8c82b7ab2e26b27f004c6077137cc083efd5098cf44ebb3a39e1582abbb25d9024783eddf91ab2e072d5f5e87364ab8e7ac6a3d89
 MISC metadata.xml 490 BLAKE2B 4a9aeacde8629b331bfef0fd1f73b4709d182f90a53e43325a26191b7e1523ded2ddc001117b93fb24ce90014f16c927c591fbf720d3ba4210661f56ca4bf130 SHA512 f10c0f7a189353eb3160ad777412c9cfd49ba287a5923cffde6d112cde6a6f8f67268d590f611870ff55a61971df7426a7d4b761a404269228fe3ef785ddaf51
diff --git a/app-crypt/ccid/ccid-1.4.36.ebuild b/app-crypt/ccid/ccid-1.4.36.ebuild
index fb17ec0a07ed..b77236eb75b6 100644
--- a/app-crypt/ccid/ccid-1.4.36.ebuild
+++ b/app-crypt/ccid/ccid-1.4.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index d5de2d7271bc..21e5008d83c3 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -17,5 +17,5 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
 EBUILD mit-krb5-1.19.2-r1.ebuild 4249 BLAKE2B 1d9ccacfafa601471e041a20144b213fe695cb5fc2a3574fd3dad4073e28b646a043384aa4aa9de93c5ab4fc549ca3c379c1dfa99023114ce5d2d1233da6aceb SHA512 dc1bc87a3503c07f9a3313102542a20203e22e35d954c67cd548b3b4c1b6094db79a5f58da03517d98b8bdebaf9d01412c8f494added5c6bba983f3ae0891ee7
-EBUILD mit-krb5-1.19.2-r2.ebuild 4292 BLAKE2B ad4d0466f922140a357d9ff0464f491244a26304684ad217fc21501d2c5b2b8e7af8216f28cf1157e9e7b9074b11509cc8ca0b94200bef4fabc510fa1bcaa218 SHA512 3876f3592ede2e6ed2b228f83efc5f5e8d83868fa3fb8b59879eb64b4d0f3ec4de5f8f9007406490415bcef9fac827a5af62dee371d694e4452eb73423ea1407
+EBUILD mit-krb5-1.19.2-r2.ebuild 4291 BLAKE2B dc8f08f5b77c5917f51e1ed064311b10e912641bfdeb6dcdfc937dd94c43a168b492d3ec272ac4eb73018e41faf6e95d03e173c0de448fcf975fd9a42780e745 SHA512 ecb531fc16b57ddff16ae32377b85231c57231b385c07bc6709181ec117364f749ce5b862eb5692b56315d97a49eaac4b50b50a3692d6b3554ed842d8ef07fa8
 MISC metadata.xml 824 BLAKE2B 7f8486768dd9da718f2514da9a9b6928a89c43d26fd73f4be651438a4b02cd7a1db7839c580ca4f0812387e77cd002fa3caba86163ec2ecc1c2cdbcd1ffa4270 SHA512 0c075a303679455bd7f288b9345855bb38aa59da73e93f31b697688062399713dae64b39c775f4c74fa1f46fc1c3567732217ddcac7588bf3ae77c3e20e64144
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
index 30bfa625b205..5598ad9bed53 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # some tests requires network access
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 304fdf4dd451..3e2eba5e6045 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,5 @@
 DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
 EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
-EBUILD yubikey-manager-4.0.7.ebuild 999 BLAKE2B 4ea2ee3ceaa252f70e8a2fc66ddc3a87b6c020b6d003566a57954cd79b7a04c1e15a1b9b7a0b1e9c9b8ca8c62b3e12bf3147ae1b7c2c5291a9cc5629890670e0 SHA512 fb3bb6e50ea4458159b71674dd36abd346747d8e60322da1254a43a5d7a93c6d4a6a52a5445612eefd1d77dbc4423850e4f0f6db53b554d4197087e14cf79f74
+EBUILD yubikey-manager-4.0.7.ebuild 1006 BLAKE2B 364336b23b74f0db1e9423917a68a8b3941c6a2aa8d47aa1eee43b218243b3ffa6fb022e2db31d0f9f6b02072344e083b555b07b2611f0c75392cb1b0f010b74 SHA512 8fcb0743e3c150b37e3c8c7c27be0b228ba8c3392521041c173b486d2894effbd87aae1bf45d988082b9b76d8a252d21a4ac7dec6d44f02f08423a012fe1e2b6
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
index 7c59d2ee9fc8..8d71a30afada 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 RESTRICT="test" # Tests require non-existing package makefun
 
 # app-crypt/ccid required for
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index b5f19260d570..4f46b05e0ab8 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 54445b09606d..7c6176b8f178 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,7 +1,7 @@
-AUX 50ebuild-mode-gentoo-1.51.el 1209 BLAKE2B 06da1836a37ec6eccddcac50e999e5e19336f0d9da06813e2d2467a5799a79c848b5363fe1c7725801d6302310b37fa92c80373de0810a8330a50c2157e37839 SHA512 23022e1f532f0b3a1c14f855113b29529501ab84f685471179454fda7ce6494d9744204ee02cb729d402921469ecdc9addaabc43a6f4aec378b55f0b6f599718
 AUX 50ebuild-mode-gentoo-1.52.el 1419 BLAKE2B e5242bd136609761e103acb6d7fea200b6f762b115b86f9ce64aeef7403327c79802ed5ca26127c3b83fba78fced025333aa7a6e4e796f2a1d58d1a7d3c5e6dc SHA512 d6169cb25438da932888a7104089471392afd6f5a95acc0fe96647aa4482054e91041bf77bdd694e700dcc51155aee9165fc98b21e8e9859a2235ea4c8a8e4af
+AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
 DIST ebuild-mode-1.53.tar.xz 35920 BLAKE2B ee932441e23ba4b876e98feb9ff9dfea2e395296846e14f776ac10f4c5bab6b711161b4c890b0d8f2ccb5749db5bced3f693aa172e3ae92af506fee26fb5750a SHA512 8fcc28139c0cace21159a0b5026573f401f65b4501ff888f9818d8f5a506a7bc1f8d8a133f775619efc9e16e2172d6b5daba539b4e38b1a378c0b35395263ef9
 DIST ebuild-mode-1.54.tar.xz 35768 BLAKE2B 8cfba7230eb61bcdede498c696aedd7c64d01e5a1e7a22ad0edf793fbf6970bddd818d431e717bcc0b5ea07d35b525468131df260206db912f36341947b98d08 SHA512 7e67f3875beb42bc94fe522364212a02ea93e11aa1a64512283ab783c5a41097076b29a3ecf72b4369180253efd26fd3a223d617909953b2c7626f5cbc2aaba1
 EBUILD ebuild-mode-1.53.ebuild 729 BLAKE2B cc851471e66575177f4216249b09291adb0ba6f5ae739cc4b4621df2a5fc39bb903c67c5f25a8d6fdfe617b65a4386a5afab1e6bca8e565997bfd07ad3a28b64 SHA512 0b95e084c2972001c79ba3fdd9d9852be104a0a5065619de6ce4e0d0894a88e99914c361a789e8fd3fc56fe01a76580b5cc16a54ed1d175fb6064e41ad5e9313
-EBUILD ebuild-mode-1.54.ebuild 736 BLAKE2B b241e8af5d898ea544bf28cf7fe3904917a26b480ffc9591e3a7b3cc7d4f53aa6f6901aee704cc9d4856b9e55631b22aebddb777ab04863b777c104407c998d6 SHA512 5832a9f2bd3f0c0bf88e83dc836200a4323671a3737f019950d7ed673b77d176312ca3983828762968da1e2f6493518cc93297545ff5d384af9f52010950a9e7
+EBUILD ebuild-mode-1.54-r1.ebuild 736 BLAKE2B 71e62344d03621defdb9be57b0f1da6a4db3e1d84c0d6ef9118273fa5025c5cdb999ed4e509c4d0f8d551fc8a58d9bbaf891e5e61bdb7a64e177fc7314a24d20 SHA512 73dee87d1887bf399a87d22022aa80b6cac9697e5a537b9e953555d4aa3ec84f0d5f74ebcd03be59ceb0e07df22ee2298214f1826d9f0129c4f3708a5d9d6b64
 MISC metadata.xml 427 BLAKE2B 2c0846e1ff38584a4101b645f7242526d43c4b6e2eaa202f7d063de531fca4bcecefbdd81278caf3b9e6fe1492277d4c2aa33104eae3ce99f7c4b30c5709946e SHA512 5f4d98e87b3e28bfeb13476382ad46673cb5896bfaa994b856350609ffe9fce1bf31ff8e63702689f5d0a7e07c2e50c1a8b22b09559d77606321981e63e79467
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
similarity index 90%
rename from app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild
rename to app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
index c972bf6d3080..54add5db8bed 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,6 @@ BDEPEND="sys-apps/texinfo"
 
 DOCS="ChangeLog keyword-generation.sh"
 ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.52.el"
+SITEFILE="50${PN}-gentoo-1.54.el"
 DOC_CONTENTS="Some optional features may require installation of additional
 	packages, like dev-python/docutils-glep for glep."
diff --git a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
similarity index 80%
rename from app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
rename to app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
index e4bbe683dd62..06ae54410391 100644
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.51.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
@@ -1,6 +1,9 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'ebuild-mode "ebuild-mode"
   "Major mode for Portage .ebuild and .eclass files." t)
+(autoload 'ebuild-repo-mode "ebuild-mode"
+  "Minor mode for files in an ebuild repository." t)
+(autoload 'ebuild-repo-mode-maybe-enable "ebuild-mode")
 (autoload 'devbook-mode "devbook-mode"
   "Major mode for editing the Gentoo Devmanual." t)
 (autoload 'gentoo-newsitem-mode "gentoo-newsitem-mode"
@@ -19,6 +22,9 @@
 \\|license\\|properties\\|accept_\\(keywords\\|restrict\\)\\)\
 \\|\\(package\\.\\)?use.\\(stable\\.\\)?\\(force\\|mask\\)\\)\\'"
 	       . conf-space-mode))
+(add-to-list 'auto-mode-alist
+			 '("/make\\.\\(conf\\|defaults\\)\\'" . conf-unix-mode))
 (add-to-list 'interpreter-mode-alist '("openrc-run" . sh-mode))
 (add-to-list 'interpreter-mode-alist '("runscript" . sh-mode))
+(add-hook 'find-file-hook #'ebuild-repo-mode-maybe-enable)
 (modify-coding-system-alist 'file "\\.\\(ebuild\\|eclass\\)\\'" 'utf-8)
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 53c9478eca0c..8e03a37c89fd 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 3b832d592fe1..a85b93f0219f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -3,9 +3,6 @@ AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b836765
 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b733fca29c4f4cb06cad732d72f64c330d95fbcdcf12b174b92b7fa5b713bf833065e5014f8aed1eec22c0a1 SHA512 5d22c6c4085dd0bf58752e21af9addd6a1a670a60f172b488d1ccfb1b9356ce9808a3b9337dd1bd2aa9e06735a3c7a465bc11ae3871cc4294ec609729b2e09c7
-AUX qemu-6.1.0-automagic-libbpf.patch 887 BLAKE2B 9c74ea440dbd958368ae41b4d39cf869fa34f70493c7e79d5be31309d343cb35b8061c9d99f3b5e7bfcf99f4cc590d9b4854b12f109a8dd247922d7a07aa68bf SHA512 76fcb4d280cd0c7f7610b55154d987501597b823f286110e0ae756ae6bb541193423f942ce6d4f8fefdc42d1727b8689142dd50f186689427afef18adb5f62b5
-AUX qemu-6.1.0-data-corruption.patch 4758 BLAKE2B b05ad66a0f3c1ef18ec33a602181053563e4459cf29f41b34bf27df4c443afacfe217c5e909870471ae887c0fd43ba453083b0d1b615fc265bca448bc26f1379 SHA512 19bb220b5860d8d99b8211e54616f34335c4ebcf573252f5f704deef312f840f6b847278067d07b31ebf5c4a044b67c647fab5137d6ad7f2dc2d2a7f0e901714
-AUX qemu-6.1.0-fix-unix-socket-copy.patch 3117 BLAKE2B d39d64013b4820d6c075a2aa8dd88b1355599fed641e3a5aaef726d49268ab88046e0cb55bf0c0c6f71b7fc4bf08d42e17b2a374aeb9c24498ccd9d609e71121 SHA512 091369dadeac2546fbdb9c1b71380f43fc927e4b17306505e47bbe022ac8b9087e0fd902667a1adf2808a7581135da1cefbbb89cad2275f6192d77b260fc442b
 AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b5346f7c90cbb7768ce5639b1d1d1204933024241b7349573cc94ebca7a85ebaf051a9fb9dab8ea7d87d843ef9 SHA512 fcbf02a38401dbc7612130bb993dbec72468c926f729cd32e822b39fefe446ed8fd0906d6ffd4557181df753a84d77182fa713a5939300f193008532be88ada4
 AUX qemu-6.2.0-user-SLIC-crash.patch 6998 BLAKE2B ae8bcd4d729f9a60e9c2680f7c04fe6dc9d644f8f17d4b63628c59d52b0ca2ba8ac31aa49efc57c28259bb368e796faeb37928ef69d5255b889a4c9149506736 SHA512 1ce190cd3cd56f1a1567e26ecd785fa8d66c15bbc3e091d5fbf200ced7b074f8e5cd8fd8e19a2b35a1f6c5f9617bba131ee2b197f44cc5d6551247e9ae252716
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
diff --git a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
deleted file mode 100644
index d067650dc8fa..000000000000
--- a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03
-Author: Paolo Bonzini <pbonzini@redhat.com>
-Date:   Tue Sep 7 12:45:12 2021 +0200
-
-    ebpf: only include in system emulators
-    
-    eBPF files are being included in user emulators, which is useless and
-    also breaks compilation because ebpf/trace-events is only processed
-    if a system emulator is included in the build.
-    
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-    Signed-off-by: Jason Wang <jasowang@redhat.com>
-
-diff --git a/ebpf/meson.build b/ebpf/meson.build
-index 9cd0635370..2dd0fd8948 100644
---- a/ebpf/meson.build
-+++ b/ebpf/meson.build
-@@ -1 +1 @@
--common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
-+softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
diff --git a/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch b/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch
deleted file mode 100644
index 25c788426a9c..000000000000
--- a/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-commit cc071629539dc1f303175a7e2d4ab854c0a8b20f
-Author: Paolo Bonzini <pbonzini@redhat.com>
-Date:   Thu Sep 23 09:04:36 2021 -0400
-
-    block: introduce max_hw_iov for use in scsi-generic
-    
-    Linux limits the size of iovecs to 1024 (UIO_MAXIOV in the kernel
-    sources, IOV_MAX in POSIX).  Because of this, on some host adapters
-    requests with many iovecs are rejected with -EINVAL by the
-    io_submit() or readv()/writev() system calls.
-    
-    In fact, the same limit applies to SG_IO as well.  To fix both the
-    EINVAL and the possible performance issues from using fewer iovecs
-    than allowed by Linux (some HBAs have max_segments as low as 128),
-    introduce a separate entry in BlockLimits to hold the max_segments
-    value from sysfs.  This new limit is used only for SG_IO and clamped
-    to bs->bl.max_iov anyway, just like max_hw_transfer is clamped to
-    bs->bl.max_transfer.
-    
-    Reported-by: Halil Pasic <pasic@linux.ibm.com>
-    Cc: Hanna Reitz <hreitz@redhat.com>
-    Cc: Kevin Wolf <kwolf@redhat.com>
-    Cc: qemu-block@nongnu.org
-    Cc: qemu-stable@nongnu.org
-    Fixes: 18473467d5 ("file-posix: try BLKSECTGET on block devices too, do not round to power of 2", 2021-06-25)
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-    Message-Id: <20210923130436.1187591-1-pbonzini@redhat.com>
-    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-
-diff --git a/block/block-backend.c b/block/block-backend.c
-index 6140d133e2..ba2b5ebb10 100644
---- a/block/block-backend.c
-+++ b/block/block-backend.c
-@@ -1986,6 +1986,12 @@ uint32_t blk_get_max_transfer(BlockBackend *blk)
-     return ROUND_DOWN(max, blk_get_request_alignment(blk));
- }
- 
-+int blk_get_max_hw_iov(BlockBackend *blk)
-+{
-+    return MIN_NON_ZERO(blk->root->bs->bl.max_hw_iov,
-+                        blk->root->bs->bl.max_iov);
-+}
-+
- int blk_get_max_iov(BlockBackend *blk)
- {
-     return blk->root->bs->bl.max_iov;
-diff --git a/block/file-posix.c b/block/file-posix.c
-index c62e42743d..53be0bdc1b 100644
---- a/block/file-posix.c
-+++ b/block/file-posix.c
-@@ -1273,7 +1273,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
- 
-         ret = hdev_get_max_segments(s->fd, &st);
-         if (ret > 0) {
--            bs->bl.max_iov = ret;
-+            bs->bl.max_hw_iov = ret;
-         }
-     }
- }
-diff --git a/block/io.c b/block/io.c
-index 18d345a87a..bb0a254def 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -136,6 +136,7 @@ static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src)
-     dst->min_mem_alignment = MAX(dst->min_mem_alignment,
-                                  src->min_mem_alignment);
-     dst->max_iov = MIN_NON_ZERO(dst->max_iov, src->max_iov);
-+    dst->max_hw_iov = MIN_NON_ZERO(dst->max_hw_iov, src->max_hw_iov);
- }
- 
- typedef struct BdrvRefreshLimitsState {
-diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
-index 665baf900e..0306ccc7b1 100644
---- a/hw/scsi/scsi-generic.c
-+++ b/hw/scsi/scsi-generic.c
-@@ -180,7 +180,7 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len)
-         page = r->req.cmd.buf[2];
-         if (page == 0xb0) {
-             uint64_t max_transfer = blk_get_max_hw_transfer(s->conf.blk);
--            uint32_t max_iov = blk_get_max_iov(s->conf.blk);
-+            uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk);
- 
-             assert(max_transfer);
-             max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size)
-diff --git a/include/block/block_int.h b/include/block/block_int.h
-index ffe86068d4..f4c75e8ba9 100644
---- a/include/block/block_int.h
-+++ b/include/block/block_int.h
-@@ -718,6 +718,13 @@ typedef struct BlockLimits {
-      */
-     uint64_t max_hw_transfer;
- 
-+    /* Maximal number of scatter/gather elements allowed by the hardware.
-+     * Applies whenever transfers to the device bypass the kernel I/O
-+     * scheduler, for example with SG_IO.  If larger than max_iov
-+     * or if zero, blk_get_max_hw_iov will fall back to max_iov.
-+     */
-+    int max_hw_iov;
-+
-     /* memory alignment, in bytes so that no bounce buffer is needed */
-     size_t min_mem_alignment;
- 
-diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
-index 29d4fdbf63..82bae55161 100644
---- a/include/sysemu/block-backend.h
-+++ b/include/sysemu/block-backend.h
-@@ -211,6 +211,7 @@ uint32_t blk_get_request_alignment(BlockBackend *blk);
- uint32_t blk_get_max_transfer(BlockBackend *blk);
- uint64_t blk_get_max_hw_transfer(BlockBackend *blk);
- int blk_get_max_iov(BlockBackend *blk);
-+int blk_get_max_hw_iov(BlockBackend *blk);
- void blk_set_guest_block_size(BlockBackend *blk, int align);
- void *blk_try_blockalign(BlockBackend *blk, size_t size);
- void *blk_blockalign(BlockBackend *blk, size_t size);
diff --git a/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch b/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch
deleted file mode 100644
index 7701b26b4f9a..000000000000
--- a/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 118d527f2e4baec5fe8060b22a6212468b8e4d3f
-Author: Michael Tokarev <mjt@tls.msk.ru>
-Date:   Wed Sep 1 16:16:24 2021 +0300
-
-    qemu-sockets: fix unix socket path copy (again)
-    
-    Commit 4cfd970ec188558daa6214f26203fe553fb1e01f added an
-    assert which ensures the path within an address of a unix
-    socket returned from the kernel is at least one byte and
-    does not exceed sun_path buffer. Both of this constraints
-    are wrong:
-    
-    A unix socket can be unnamed, in this case the path is
-    completely empty (not even \0)
-    
-    And some implementations (notable linux) can add extra
-    trailing byte (\0) _after_ the sun_path buffer if we
-    passed buffer larger than it (and we do).
-    
-    So remove the assertion (since it causes real-life breakage)
-    but at the same time fix the usage of sun_path. Namely,
-    we should not access sun_path[0] if kernel did not return
-    it at all (this is the case for unnamed sockets),
-    and use the returned salen when copyig actual path as an
-    upper constraint for the amount of bytes to copy - this
-    will ensure we wont exceed the information provided by
-    the kernel, regardless whenever there is a trailing \0
-    or not. This also helps with unnamed sockets.
-    
-    Note the case of abstract socket, the sun_path is actually
-    a blob and can contain \0 characters, - it should not be
-    passed to g_strndup and the like, it should be accessed by
-    memcpy-like functions.
-    
-    Fixes: 4cfd970ec188558daa6214f26203fe553fb1e01f
-    Fixes: http://bugs.debian.org/993145
-    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-    Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-    CC: qemu-stable@nongnu.org
-
-diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
-index f2f3676d1f..c5043999e9 100644
---- a/util/qemu-sockets.c
-+++ b/util/qemu-sockets.c
-@@ -1345,25 +1345,22 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa,
-     SocketAddress *addr;
-     struct sockaddr_un *su = (struct sockaddr_un *)sa;
- 
--    assert(salen >= sizeof(su->sun_family) + 1 &&
--           salen <= sizeof(struct sockaddr_un));
--
-     addr = g_new0(SocketAddress, 1);
-     addr->type = SOCKET_ADDRESS_TYPE_UNIX;
-+    salen -= offsetof(struct sockaddr_un, sun_path);
- #ifdef CONFIG_LINUX
--    if (!su->sun_path[0]) {
-+    if (salen > 0 && !su->sun_path[0]) {
-         /* Linux abstract socket */
--        addr->u.q_unix.path = g_strndup(su->sun_path + 1,
--                                        salen - sizeof(su->sun_family) - 1);
-+        addr->u.q_unix.path = g_strndup(su->sun_path + 1, salen - 1);
-         addr->u.q_unix.has_abstract = true;
-         addr->u.q_unix.abstract = true;
-         addr->u.q_unix.has_tight = true;
--        addr->u.q_unix.tight = salen < sizeof(*su);
-+        addr->u.q_unix.tight = salen < sizeof(su->sun_path);
-         return addr;
-     }
- #endif
- 
--    addr->u.q_unix.path = g_strndup(su->sun_path, sizeof(su->sun_path));
-+    addr->u.q_unix.path = g_strndup(su->sun_path, salen);
-     return addr;
- }
- #endif /* WIN32 */
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5aa56c5a2ea8..6bf81129d7a5 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index 532866d09f31..9e4b36733177 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1,3 +1,5 @@
 DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
+DIST ddccontrol-db-20210812.tar.gz 100719 BLAKE2B aecc9e9bf432905652e69b17b274daa07222d8f766048f29493eb0e50e07331fb5434258faad277ce21dec6475b192b4575eb1ebbd117edd25d333091ba33c8c SHA512 5bf64d69e1dd4324ce498909313b5c32a4af18d101e1536c40845f9a440f353e0ecb36d26441733c68de05be7e52dcea983325d70f4d542df85b5462ad193cb7
 EBUILD ddccontrol-db-20190826_p20200613.ebuild 820 BLAKE2B c976f2ec2a274ddb6340e71e8b1ce7c173c1519ffabde33419039369df59ab711e8c08c6da3ced31865902c2a3dcd26e3cb71e2b8be7dd96370fb9dbd9a4aabe SHA512 596d054cdb7d711c5bd0f5738e50d18aae8f03e47159b6079fa50d27076f357b350dee04d191c1e60bcda7a17ace753d7e28da9b0248cf53d18e9f344f9ad178
+EBUILD ddccontrol-db-20210812.ebuild 600 BLAKE2B c56facd5748032e4e1bdc1d53668b3cec6df1cdd8f08c9add9b1ef27441d1a03fa1ef3d7727e092ea40119317a89845747a904394c54c8960785428b6dff65a0 SHA512 b95245cd6f64a5df64c6599b14ed4b530729a77925740037607118b0a8377f9f1df7586cd6e77cebfd83a6c3526b49f53b911a86c0dd003612dd5486009cf257
 MISC metadata.xml 319 BLAKE2B a9f063aefd3004d8157559423ac0ff4b74a155e97d7663db1e9b4599cb9f98c41c185fa2e48e7342b7e2b8e90fcf9c3077e0fa201a95961a5e5975cead80938c SHA512 9f4fe27a2cdf12ce882449c566ab4ce4a5bd22afbd9794ef8aa6e01d0b15082b54783b31e1ebf92f59fad550b3d59ba6fb1d2263ec22b901a526bf80fec8cc95
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
new file mode 100644
index 000000000000..2a5c6087bcc6
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+BDEPEND="
+	dev-util/intltool
+	dev-perl/XML-Parser
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	touch db/options.xml.h ABOUT-NLS config.rpath || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 21f233ab142b..487b9e632353 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1,3 +1,5 @@
 DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
+DIST ddccontrol-0.6.0.tar.gz 180376 BLAKE2B d844f03ae4843a710a3a7143b1270656202c261b5e412822c49c2096c150052ddb6747b62f7c1d2404cffeb13af5ed604be915061b3fd339c8dcf66473bbd791 SHA512 49e857e8ef8f2ba87dc51056b9511ce55f3e6471222cd9171a324e2ee179b8c96a8f4d90c63bb379260ccc8e1d9653964f90748d6589d298ff2bbe6982efd3e2
 EBUILD ddccontrol-0.4.4_p20200630.ebuild 1967 BLAKE2B 81f65ef049bc913f50764801f7ce5bed9cee26e20662d221fb9e061abf5c2e92ccd551b79544e6f23a807b22a6e9eac0951e6346a74471369bc868b5d188b894 SHA512 844751b33f72dabf73ad999cadd9ee40c727c0e17fa0b35a0dddc2a93a9a5ed97c50e3ca3f0f98b889276481cc5cd73c4f257544b9c1c9e7a2d159131127af58
+EBUILD ddccontrol-0.6.0.ebuild 1894 BLAKE2B 2e54c658446e131fd40ea3c9b8ddc7202bfb56ada50bf090e894fd057f93142ec8ae4bcea05ff94e576f1fab869c4f759984caeb41bbdd433c215895a611d795 SHA512 e9c9ca3ee4a37b6608ec1046f54b7f2e25c1284f3bbf6ab02829a45bb3c16d4230c510536215eb77742e510e23d6462d12688e4c0c98edf9fb77053301f03b09
 MISC metadata.xml 418 BLAKE2B 0c4f8c520b2ba661bfa763de83a97fe7c1dba5826633e42f03efebdbf9c96b5989ff59068111c9d278017b3942abbff0577217d7c2180c005fc0bc725c50d8b4 SHA512 54b3ebae0357cf2f3e2d81bb493dac58b7c23fe2b0be237128d94a9dcc2ec36c7d782b2cf0979cf15a3c9fee22cf9a4ccd5c30a4798a5c55826d9b2813abc67f
diff --git a/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild b/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
new file mode 100644
index 000000000000..fe92023703fc
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Control monitor parameters, like brightness, contrast, RGB color levels via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+
+RDEPEND="app-misc/ddccontrol-db
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	app-arch/xz-utils
+	gtk? (
+		dev-libs/atk
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/harfbuzz:=
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/pango
+	)
+	pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-perl/XML-Parser
+	dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-kernel/linux-headers
+	doc? (
+		>=app-text/docbook-xsl-stylesheets-1.65.1
+		app-text/htmltidy
+		>=dev-libs/libxslt-1.1.6
+	)
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	# ppc/ppc64 do not have inb/outb/ioperm
+	# they also do not have (sys|asm)/io.h
+	if ! use amd64 && ! use x86 ; then
+		local card
+		for card in sis intel810 ; do
+			sed -r -i \
+				-e "/${card}.Po/d" \
+				-e "s~${card}[^[:space:]]*~ ~g" \
+				src/ddcpci/Makefile.{am,ini} || die
+		done
+		sed -i \
+			-e '/sis_/d' \
+			-e '/i810_/d' \
+			src/ddcpci/main.c || die
+	fi
+
+	default
+
+	## Save for a rainy day or future patching
+	touch config.rpath ABOUT-NLS
+	eautoreconf
+	intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+	# amdadl broken, bug #527268
+	econf \
+		--htmldir='$(datarootdir)'/doc/${PF}/html \
+		--disable-gnome-applet \
+		--disable-amdadl \
+		$(use_enable doc) \
+		$(use_enable gtk gnome) \
+		$(use_enable nls) \
+		$(use_enable pci ddcpci) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddcui/Manifest b/app-misc/ddcui/Manifest
index 434d03eb65d2..3a14d80e295a 100644
--- a/app-misc/ddcui/Manifest
+++ b/app-misc/ddcui/Manifest
@@ -1,3 +1,5 @@
 DIST ddcui-0.1.2.tar.gz 126766 BLAKE2B 85317b68bbd7e3e5b780ad2ba45888049f9ca70695ccfeb5d0acc2f2c8db11ee97438aa53240671f908caffd45b12a488593cd82b41c8e1acbad38f97d560ab4 SHA512 008033f23cf1dccb69b503b2f8950518e771bd4892b2df912186712859e6e66f724019beb5941d49452ae9a6080ce2730a1e11ec201931a31b3ab4735c03c724
-EBUILD ddcui-0.1.2.ebuild 853 BLAKE2B cb1bc97b03de0b47447d9e21c034f91d4ff7b7f4da9054e3b9bd37718ea40dbad70b1a105996a38ab020d24d7dea619f3fe51cdbe5b90fb526eb81f9598dd3ea SHA512 6e078a7c97b4723b22d2de3c11f2006a572b609295c5e04dd62e7c798fbd65fa8a4112b09854d7735668dd41c6c8dfc698964c11ab3ba3fd1045baf321b597d5
+DIST ddcui-0.2.0.tar.gz 598886 BLAKE2B d44e7b2226ca815c3d468a69f805b4be6359b447095e2688f98a5bde106d348dc2cbc80c31fc1de47f1bf0ebc7db4fae63e3e4f1501c10a6a7bb0c06718ad3cd SHA512 0509b2adae1b4a5c9cac3f3d598327085f183ada0fa8ef2ae85c1220704bdc50583fdc370f809b52d62eaeeae6a30146d63435ef2134a6467360eb6f90e64191
+EBUILD ddcui-0.1.2-r1.ebuild 857 BLAKE2B 9e23bdf51975d181868ebe665b11945c095f9ac01897570c87cafd6d5f1ae27b2b17a0b1e52f53e9a9a55f7e43c68b00305faa8ff00d578cf15151c9b6b6393b SHA512 d950e915c882bab1f00d4137e96297c3f6f36dd5de6222348b28228b455bfa18d342f41c7ac107c5068960616a478b23ea8d3fcdd84f209eda14649af460e413
+EBUILD ddcui-0.2.0.ebuild 759 BLAKE2B 27a28bbcc19098f2d46dbb18cad5b915f1a2a2d68a646b6432168a80e791f8f39044f0795b5248851c4b4393b46f40951c045f976e8fd963610333c97ba4f541 SHA512 68b3a9b773adc8df9652b8be937190a4c42383d28a8b2f758a03387957f95370b8e7d74f468d5be88a76e1f4fd462d2781825ce86831e73d76f9ac4131603066
 MISC metadata.xml 507 BLAKE2B 4f458118ad0f48137ac6b50871d7bc07f3b4416cbb82b264edd00726a6b9655d9ce986618da3c53a8e8855054a1e1e68045353589fdde1541c17e3f4b2e29828 SHA512 6a5c378319fc110e1338f4f6aeb5ce41c76ac521e95311c8b368b5357a2fd362038b21e46ff59dafc2cd8b0baeb55b7530b64c9f4f25513eb3eb66e528fd1e28
diff --git a/app-misc/ddcui/ddcui-0.1.2.ebuild b/app-misc/ddcui/ddcui-0.1.2-r1.ebuild
similarity index 92%
rename from app-misc/ddcui/ddcui-0.1.2.ebuild
rename to app-misc/ddcui/ddcui-0.1.2-r1.ebuild
index 4319b120f3d9..dd9daddef09b 100644
--- a/app-misc/ddcui/ddcui-0.1.2.ebuild
+++ b/app-misc/ddcui/ddcui-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="
 	dev-libs/glib
-	>=app-misc/ddcutil-0.9.9
+	>=app-misc/ddcutil-0.9.9:0/3
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
diff --git a/app-misc/ddcui/ddcui-0.2.0.ebuild b/app-misc/ddcui/ddcui-0.2.0.ebuild
new file mode 100644
index 000000000000..ec7f3ec348e4
--- /dev/null
+++ b/app-misc/ddcui/ddcui-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Graphical user interface for ddcutil - control monitor settings"
+HOMEPAGE="https://www.ddcutil.com/ddcui_main/"
+SRC_URI="https://github.com/rockowitz/ddcui/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# seg fault on launch
+# https://github.com/rockowitz/ddcui/issues/34
+KEYWORDS=""
+LICENSE="GPL-2+"
+SLOT="0"
+
+DEPEND="
+	dev-libs/glib
+	>=app-misc/ddcutil-1.2.0:0/4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# move docs to correct dir
+	sed -i -e "s%share/doc/ddcui%share/doc/${PF}%g" CMakeLists.txt || die
+	cmake_src_prepare
+}
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index d6dc9909f54b..5a4cbfe96a23 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,3 +1,5 @@
 DIST ddcutil-0.9.9.tar.gz 725207 BLAKE2B ad7b0b35ad4c2dae21da066e4194209579d774ded10f2dc0d8d7d3d94e70d5893c3d1f772b86ea01be510cfb8d51a657178228d028ca34ab20d344e86e0581d2 SHA512 f7b2b961c6b76ef59f336290b494cdd331556848de881d57e5240075d50733030df4c47131070f1276907d712a45f60dad6bebaa052a66621b8b5517ff293c21
-EBUILD ddcutil-0.9.9-r2.ebuild 3279 BLAKE2B 9e385198f193e3cc89feb3842e2256c25d987419a79609e51b6c1ec537a2605a26ddb2a5aa4651a81ee56bb797fcd6df2373197b2a4c46c86c1206af840106c2 SHA512 b80442c629dda9777c4c2ac77d57634da430a9945774f0dec55a31daa85a4db69049b7afbdd556db543db79e8f7cca55dd4a90c9b8e7f65da91f889689332dbc
+DIST ddcutil-1.2.1.tar.gz 801196 BLAKE2B f2db3c6a88b735ec96b03e401aea21a6dcc3ee7e6fb6c30854dacc8868adf9854f63b02153ad6627ce602d7deb51073142f910631b5c2ce86c15414a53644f7a SHA512 f80c45ed47a059c71ddf7dc56e8daf9b666120960d1911175d390f95ab9691a62cffb7ce4555ddc418e3e9cfe7a575a70778c35809cdea598d7610dac915ccbc
+EBUILD ddcutil-0.9.9-r3.ebuild 3281 BLAKE2B fa1f2dcf4f43dc5b746b3f3e3f0b3bac994f1d6be2bf5a2938f975a196c142b5c41723590566824d7887bc6067300c2e0a913e377c18002e579a73ff5bc3b889 SHA512 f0d0e919847bb907566fdc63e6639a265422b1332153b759ad456d9fb15e4360f5bbe72e67d53734372f4b6ef539bdaff9e38dd73b1fdf831be77ef45586878a
+EBUILD ddcutil-1.2.1.ebuild 2746 BLAKE2B 9f43f5583e77a0472b6210aa822c38d8285884234d0ae309c444a12ac4cc427fb44500cf1fe1190c1f8c3b8050843d918656f4444a3d8fc9430a35a076e2a0cf SHA512 ef8e04cedff182c67de5906eedea0eccb8f213d57903c82b385c10a218a261f4c2e1bbd5018ad6d4e72e9bd2101dfd6c5ab185c12d0f4ff78d7c126844a6732b
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
similarity index 98%
rename from app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
rename to app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
index c7b8c46d25c6..53bf5448e893 100644
--- a/app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Program for querying and changing monitor settings"
 HOMEPAGE="http://www.ddcutil.com/"
 SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-SLOT="0"
+SLOT="0/3"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
diff --git a/app-misc/ddcutil/ddcutil-1.2.1.ebuild b/app-misc/ddcutil/ddcutil-1.2.1.ebuild
new file mode 100644
index 000000000000..91a57f143aeb
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-1.2.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info udev
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="https://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0/4"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="drm introspection usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-apps/i2c-tools
+	virtual/udev
+	drm? ( x11-libs/libdrm )
+	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
+	usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils
+	)
+	user-permissions? (
+		acct-group/i2c
+		usb-monitor? ( acct-group/video )
+	)
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		$(use_enable introspection)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddcutil.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+	fi
+}
diff --git a/app-misc/fmawk/Manifest b/app-misc/fmawk/Manifest
index 924b86411b60..d0e59ab4bd76 100644
--- a/app-misc/fmawk/Manifest
+++ b/app-misc/fmawk/Manifest
@@ -1,4 +1,6 @@
 DIST fmawk-1.2.tar.gz 23399 BLAKE2B f4c20c8f1569a6715710a5cef02a767152694ef7e216c9fe707c7ac57c20dd012189db14777d47a980008255c7f51b5c165cdf086c41835a7ce550b758a8f350 SHA512 86d56e1cc893c385a0bb338957a9ef698c0edef4587e6d3a21aa316fd996fa3b1416220e5c235d613876a3d19650e8e7a20bf991a4ce67ce9759a362d2aaac30
-EBUILD fmawk-1.2.ebuild 850 BLAKE2B 0c6584dbd70262c35e3a222d9d5903ab36058dc2328a9f5f90c470372f53476763500fded2b88c9143fbc75f487c95e751ce99f3bd6c8882c2704695114e39f3 SHA512 4623d9646449ea2ce4008b57b97d72d849ba25fedaf2ccbda99903113ad6ea6915f744082488e36465bb9211659f4152d390ed6302d1b433c1c3bdfc251d9ca4
-EBUILD fmawk-9999.ebuild 802 BLAKE2B 84f180c464d968452f9309242fa389548c1f48b316695494b2b6701d9721aa5568e22ce20c12e994ce1df6ffa2796e2855b46749efc2d50b0f6f4ef1f7c3b8a4 SHA512 c48247f94508f53520f0b0f065ac09ab2337255c3134d3f24faad1347802d1cb8cf9adbffa982345a11b0c4150701be062f28f686ee065ea8c9858834d6bdaf3
+DIST fmawk-1.3.tar.gz 25628 BLAKE2B e9b591941c5dbfa96414cc494b91eebfc19e9153cad7066afe216a6e1a177de5c3f3e04f09fec62bbd0adf0b3330bfc9471fcecc23b568e966e8185b7a298c39 SHA512 b1ca40c71b219cd59009c96692e1297cec75d2a61b28c330e4b80b55bde6dc6dfb071fec9dc4ae4f3e8aa7be7bbb51d444687f9500c82dba440388d41369e157
+EBUILD fmawk-1.2.ebuild 850 BLAKE2B 935055d95cf1d50f4de12b90694c1a7feee03dd50ac7750f1176a19544853d3b15063d96e71b5e759dac89b0359f79173bb28037cf87185fe85d0cf957d74d01 SHA512 e252e456465b9b9de87d1279c7e8694df049fb64df1716775d24df3cd66883b8fcd6a4fd9165eaae799b5c5b946af730ad135128d50afb730e2013673e4af3ca
+EBUILD fmawk-1.3.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
+EBUILD fmawk-9999.ebuild 802 BLAKE2B 960a8bf0a581b67b13d90de1c38ee9696993f05ff686561cde41a1107482b6ec16a33b6232eb607485af5ef29acceb8ed6ed4d52d8eeaa2e24fedd12d4e2374a SHA512 99aaaf6307c049e9f13743c44db2b31c71186399e28d1fbc3d5b7a04d3d88eda3d28a1b03497012f3125c477d5f60b1eb649223eb45ea98fe8e06d219089ad18
 MISC metadata.xml 689 BLAKE2B 91a0995c189c1ac4fd6852d1f49746faa8405c57476f6d6e3ea0aff99f36be3305e99b89185e102cb7ee1022bcee4c2645ff69a657ab7dd6ceed3f5dca4e2108 SHA512 893f05e792b8db41364c4a2accade8199f1f569bc521e2c078dbf2dc26f9f6d4b047d2208ed12c36f9b1e1d2a2e0ead9a3ecedd88d23f9d7eaf341d00aab41ff
diff --git a/app-misc/fmawk/fmawk-1.2.ebuild b/app-misc/fmawk/fmawk-1.2.ebuild
index 2247b8c0dff1..dac7c8432767 100644
--- a/app-misc/fmawk/fmawk-1.2.ebuild
+++ b/app-misc/fmawk/fmawk-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/fmawk/fmawk-1.3.ebuild b/app-misc/fmawk/fmawk-1.3.ebuild
new file mode 100644
index 000000000000..188ad7e91e82
--- /dev/null
+++ b/app-misc/fmawk/fmawk-1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="File manager written in awk"
+HOMEPAGE="https://github.com/huijunchen9260/fm.awk/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/huijunchen9260/fm.awk.git"
+else
+	SRC_URI="https://github.com/huijunchen9260/fm.awk/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/fm.awk-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="virtual/awk"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "PDFs preview" app-text/poppler
+	optfeature "images preview" media-gfx/chafa
+	optfeature "videos preview" media-video/ffmpegthumbnailer
+}
diff --git a/app-misc/fmawk/fmawk-9999.ebuild b/app-misc/fmawk/fmawk-9999.ebuild
index 9500af6a4ee7..188ad7e91e82 100644
--- a/app-misc/fmawk/fmawk-9999.ebuild
+++ b/app-misc/fmawk/fmawk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index 316c279e3444..0587f03e03b0 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,5 +1,5 @@
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
-EBUILD neofetch-7.1.0-r1.ebuild 1152 BLAKE2B b6f1dffe6170bd6da9f0406bb023b4633b90db41dc5d19d255eedea868ea5df9ed65c418932f54b03e4b9738b26da8683e2e83084ac6ad3bec926541ee6bdea6 SHA512 483f3c77a121fb1b538faec852a2d12edf43188d8e33c249ea708cac8dc1b1e4deabe0435ffbaf763c15292744a763ac7761f1f95a5af5a3c8c948d9b8d6ad82
+EBUILD neofetch-7.1.0-r1.ebuild 1157 BLAKE2B 51a9132dcdc1ec6d7b00723cc125cc30030fab0f4fa2307a4ef7d4c3bd22b720b7f0fd24e9e63f6076f2a1ab0b43992f76d1de8a8802e27b09d6c171ac173c34 SHA512 15ddd0ef83cdfb7df72677f66e4ec8b67955afd042ef4649bc40192aae8d404475c6612c97ccb4949c44cb1393c14dcaf277489c781d23cc3e87b336b6d2c540
 EBUILD neofetch-7.1.0.ebuild 937 BLAKE2B 72424ef48458c2c4c0a70900f42f597ebaf0ec659b3fadc9e860262b336d066786b078412c363394c674250d52fcb2ab267c665d2778b98cea96a1baf759134c SHA512 568336106a81b75f35e657c7f494e6b1b7683dbba29085bc28c0e7b441d288c5a013ba3c6ebd1ad62b3862ec8ad835b6fcea07eb0dcd590b907c38f4427d79aa
 EBUILD neofetch-9999.ebuild 1147 BLAKE2B 12a4fe99b0c45f980d0452a4b96288a8543beb03f94eb81195dd11a1b87129506f7d9bf5a6a54380d4b6289988e7f2098680804924fb9cf32a7386fe1e6efaa7 SHA512 753c3e6ebae6688c78246d2276dfadd37baeb004763e5d9d26cd04dcafa1b77f48304456df92e3ca78eefb0d419bde969eb438d1bd2d80674ed5d8504bb3a7ed
 MISC metadata.xml 863 BLAKE2B 3a4dbfbeea790e95fafbe9b47169bd43c127be69f21ffb2c0752ad2003304ef7628f0c95388288cf00b5d567b83626ac15cb015a8fd9c4c6cacc1137410a7887 SHA512 593a76d4beb607cf64a5dfeec978d7c6be6ad2a1dc36aefa44c2e18724d09c76133d3bab0fc5692f2bd997c86156337142b5115e7d34d4da59f91e69f44d4f30
diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
index ea69aef4419f..45db1f433387 100644
--- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit optfeature prefix
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/solaar/Manifest b/app-misc/solaar/Manifest
index c21192ff371c..8545d09e1771 100644
--- a/app-misc/solaar/Manifest
+++ b/app-misc/solaar/Manifest
@@ -1,6 +1,8 @@
 DIST solaar-1.0.5.tar.gz 920452 BLAKE2B 44aa0f9abd63629a5a4e737c14e468922c4aa501341717d595f045c5f40369ade6ff296120931557f1e8f04b99aa4f690454aa8f6bceaa526f370f93b312f6d6 SHA512 28603c30f0e9f2f0fe2549722062548031c69a0d9c98f732fdd8fbb51ed1d55ef033262113b2f88044a68f8b26c8c51fb0b45d4f4689fb3619e143d159618c47
 DIST solaar-1.0.7.tar.gz 1265664 BLAKE2B 6bb221d603dc74bf21ac44ca6611d817889285c8711c565b7393b875a934bf9125fc366569c1f677d657463484f2ec5fa077703f311ef2aec74e9f6813a5f1d7 SHA512 24b6b861f90d5747f150afb38b32041885b61cbf7df7794d780b311aef50d334347d5c5c722a0a7d5de3f91b96228e90e2a61dc108054452f46750a04340df83
+DIST solaar-1.1.1.tar.gz 1418025 BLAKE2B c6fd053002727a372bf9672fc22c0acc123f814003c14172f7d13e59b82ab42ecee9b71a09289b2d234874850e0921debaa069506a07d8957f52a2e9953a47f4 SHA512 c4da0c5521724c00afbc54ee9d10a4709246bb6f57635637b77e5944293b285a055b7df623e7e2a810a0764021813929e0f4fa7f21d4afc39abd516416a2bf25
 EBUILD solaar-1.0.5-r2.ebuild 1776 BLAKE2B 3413685b7eae0f5030f11f6944b36750f53eb2eaf4432c0e505390a3c695141006df4b4a8ddb66a8dae63940e42cf55f63cb0c5662ef4ea2dbdf9f556de2a5f9 SHA512 b153a3897b8e3bb0f442c7f08530c3e676631197c9367b0f6a8575287a83be285796e28854101ef9012910d8b27ab09809f3fae2d890a3f5302e9eaaf8ce4663
 EBUILD solaar-1.0.7.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
+EBUILD solaar-1.1.1.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 EBUILD solaar-9999.ebuild 1778 BLAKE2B 5b0e5eff7da81d9047095e9f349ceb44a268873f4d971accf763355bc45567aa96d479e867da73d9d2b31291b71d7c70f670d025b3d8007c7d9d293686d55dfa SHA512 59e307e1f0b714e1cdb98a0835fb13a500faceb34ef28bde9da88a15b3056c851a672cdcf19a093f8f17380f5b74bba71134fd215bc87fefb16881560552c6f3
 MISC metadata.xml 302 BLAKE2B 55938561021d105894875ec5158bd1a744c91039744ff789bffed4ab483eebe73450a9cd62cb4a97c984213fa2f1e8799f8b0d97bd6202e826e4609434086f5e SHA512 3bff70d27a9934d48f848cf0131e01415e13426ea705ef7721a9b59e29ff7bf32718d015de9e4a4f89f23405a8f372f038d2f0c3485cf9a7939a33ebda9d1681
diff --git a/app-misc/solaar/solaar-1.1.1.ebuild b/app-misc/solaar/solaar-1.1.1.ebuild
new file mode 100644
index 000000000000..cad0500253bc
--- /dev/null
+++ b/app-misc/solaar/solaar-1.1.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit linux-info udev xdg distutils-r1
+
+DESCRIPTION="Linux Device Manager for Logitech Unifying Receivers and Paired Devices"
+HOMEPAGE="https://pwr-solaar.github.io/Solaar/"
+if [[ ${PV} =~ 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/pwr-Solaar/Solaar"
+else
+	SRC_URI="https://github.com/pwr-Solaar/Solaar/archive/${PV/_rc/rc}.tar.gz -> ${P/_rc/rc}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/Solaar-${PV/_rc/rc}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc appindicator libnotify"
+
+RDEPEND="
+	acct-group/plugdev
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-xlib[${PYTHON_USEDEP}]
+		>=dev-python/pyudev-0.13[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+
+	')
+	x11-libs/gtk+:3[introspection]
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	libnotify? ( x11-libs/libnotify[introspection] )"
+# libappindicator & libnotify are entirely optional and detected at runtime
+
+CONFIG_CHECK="~HID_LOGITECH_DJ ~HIDRAW"
+
+python_prepare_all() {
+	# don't autostart (bug #494608)
+	sed -i \
+		-e '/yield autostart_path/d' \
+		setup.py || die
+
+	sed -i -r \
+		-e '/yield.*udev.*rules.d/{s,/etc,/lib,g}' \
+		setup.py || die
+
+	# grant plugdev group rw access
+	sed -i 's/#MODE=/MODE=/' rules.d/42-logitech-unify-permissions.rules || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dodoc docs/devices.md
+	if use doc; then
+		dodoc -r docs/*
+	else
+		newdoc docs/index.md README.md
+	fi
+	udev_dorules "${S}"/rules.d/42-logitech-unify-permissions.rules
+}
diff --git a/app-misc/tty-clock/Manifest b/app-misc/tty-clock/Manifest
index 8845adda61e1..17b5ab2dc10f 100644
--- a/app-misc/tty-clock/Manifest
+++ b/app-misc/tty-clock/Manifest
@@ -1,3 +1,3 @@
 DIST tty-clock-2.3.tar.gz 7764 BLAKE2B 16e764c6321407ba1a4545de6f7aeb5b1b1f3e0d94d2e05ef9a95a20bc178b11962518a946aa292f35be0a293d12e3739353d2da80358e86d4bf9c29983a81d6 SHA512 ff3cfd5c6312377128b33c7e8c2138627b996d1b17730d8a8fdf55e95f2020e591e69317459aab8383d178f3cb71af046b84eeb81cabfa9b09a27008c5f4b626
-EBUILD tty-clock-2.3.ebuild 815 BLAKE2B 50b570f75652e4155e2583d86c86cab25adee8c53f2fdf5fcc46c322f98eef508419913708d5b9c6671b80961a7655143cfeb51fb93e7537f1b1c638f8a2a0e6 SHA512 101a9f0e9a145eba6549643e01c0c4e9c42fba2ed9af8292ba8c9032d7fa819248c933333eef6bf2cc0bda507cdb9b918889aa5ea0c3faa0fe63f21c5f3dc30a
+EBUILD tty-clock-2.3.ebuild 822 BLAKE2B 9eed608a364f9a14af27b704c11b536073c92817f8ee9b8ea8dc77925cfdaa6c3b6a21c5bbf1f51c81a70eba63c684186c6df0b0ab07f1def252435a72f6cf27 SHA512 beae1c0082aa6ad8c4ab21e3283652d05d7662a3259ddcd396a01938036b75068e9fd984681a17e6593b0487d2cab7331c9460252f248d1a42cb5b3ed1671a09
 MISC metadata.xml 397 BLAKE2B dd4f4373146118d21274cc8e25e9e4ba51c4ea161635e4e73af2e80117022841439d2ade6d59f73e4abc34f6cbac27fcafe2f8067549f1b1bdd324fa12882881 SHA512 816707d2f7ae1ebf9315e84bb1271e1eeccdd8dc80f059993eefb37dd079106ea33b9ae00ba3fff48de5d9eac9b302dc39a88fa4102f8246a7e14fe2bf202fb3
diff --git a/app-misc/tty-clock/tty-clock-2.3.ebuild b/app-misc/tty-clock/tty-clock-2.3.ebuild
index 4118f7d9021e..15ecda1954e4 100644
--- a/app-misc/tty-clock/tty-clock-2.3.ebuild
+++ b/app-misc/tty-clock/tty-clock-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xorg62/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ad0d5b11ebce..e4c7a2be68b7 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 870f781e7eb1..072ee696c744 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -7,6 +7,6 @@ DIST nlohmann_json-testdata-3.0.0.tar.gz 112348454 BLAKE2B f0a47b41805bf1426f612
 EBUILD nlohmann_json-3.10.0.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.2.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
 EBUILD nlohmann_json-3.10.4.ebuild 1575 BLAKE2B 2592033fc56a3bf6456c7e02201998848e9ee524468f56825f3f79e5da82e26ee9538f20d22c2806c20510b9d66a9adbc64b06c80241a306d6be513a3a9396a3 SHA512 369dfa0c652739360b7e36c098b186e6d1c47b5713edec7e9d980928b5265a5d1bab9e90ebd6eec095b81fdc42db3b888e0e3c5fb0432f2bc58894ea786d6904
-EBUILD nlohmann_json-3.10.5.ebuild 1547 BLAKE2B 7b2c8e09f100b545b66189c68cadf33ad62fb9a6e853be52b8f2907a6f6b729c1e29a5dc383e41f8551fdd78aec206f4ea1cb336c51423927b6f8e0799a26513 SHA512 5f355b39cec2f86ef234d69300b1522e16d76d9976c87e1e9c091d7aacccfb0770d3b920ff621c268c8c20ce9e5bc36a060b800c0abc827410bed713af3d6351
+EBUILD nlohmann_json-3.10.5.ebuild 1707 BLAKE2B 9da7b49fd416886d6a394315f53bcd5eb770c551661f8d5555af920ddd181db794a10e038eb46e78225097d9be5ba5df38af6cd911aba17d356170823504b42a SHA512 bc597ffe28c6d8d1f7cb0c616d4679d4ac749e9f30a2c28950c7aa06871766d7c528801d43b31805c0534081398326e1ee7d199d47d7f451c0409c0d91938481
 EBUILD nlohmann_json-3.9.1.ebuild 1564 BLAKE2B 5a5b4e28ec5a79e1f263a7a79b28ff000cfe8b62d56e1d1a6c29ab3fc11deff72e443dba409dc68b431b1e85f86a521f6b2383c8fdda66b6cb656178d2e49c47 SHA512 5cbf13fff01f5e1da5d594e86a3c2c22b135785579391c2d4d6067d95572a9fd0109b5580ae67ebadba745e4a1c8a06f789efdb0c17df0babb6161bbc7beda9c
 MISC metadata.xml 338 BLAKE2B c5eb95ba7048308eab4753ea01c015781ce85db42d2e50f8ed9e3f7fb6945cfb8b90f5b3216799ad53137ceef6eae4636eea482e86206b19589ddf2e42caaaa1 SHA512 4198102ff79678a8e9be9146fc97991b1b205be3d34ebaece3dcab46a36ee5af904f463fcd0dc2a88fb362aa7a81e8d713af7b55db594a7069efc0276c94ff49
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
index 0ac3b7c9dd07..8bc260638ed9 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
@@ -3,6 +3,11 @@
 
 EAPI=8
 
+#DOCS_BUILDER="mkdocs"
+# Needs unpackaged plantuml-markdown too
+# ... but plantuml (Python bindings anyway) need network access to generate bits at runtime.
+#DOCS_DEPEND="dev-python/mkdocs-material-extensions dev-python/mkdocs-minify-plugin"
+#DOCS_DIR="doc/mkdocs"
 inherit cmake
 
 # Check https://github.com/nlohmann/json/blob/develop/cmake/download_test_data.cmake to find test archive version
@@ -17,13 +22,11 @@ S="${WORKDIR}/json-${PV}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc test"
+IUSE="test"
 # Need to report failing tests upstream
 # Tests only just added, large test suite, majority pass
 RESTRICT="test"
 
-BDEPEND="doc? ( app-doc/doxygen )"
-
 DOCS=( ChangeLog.md README.md )
 
 src_configure() {
@@ -41,11 +44,6 @@ src_configure() {
 
 src_compile() {
 	cmake_src_compile
-
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( doc/html/. )
-	fi
 }
 
 src_test() {
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
index e81a54c0853a..d7e29b7edfdf 100644
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@@ -1,7 +1,9 @@
 DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08c54d892e3cdd05180e2ab032a61faa72c39281fab649bcd08591c5d7ace9ea65b25f76ce17d6f4d96f38900b6a SHA512 5e4826d64c0178527b4df73e901d2fdf5661d41777e189f5e2d4b26577e42689efaccf5a28502246c6b3926571ccd5876cb23d33267b44ace7ee164322c14667
+DIST pangomm-2.46.2.tar.xz 674892 BLAKE2B ac86ef1a229dca29eeb41d3751128bed56d182cecfc6655a478b5a7473d10782fe98cdfee4db6f5afbfe9fb8adbf0e646004aa69c4c4058191078c7b5716434b SHA512 79cad137ec9f22e57a177332df6c6e735aa3baf81df36fc706e81e7a89f23ce3179337507388f65a0d0a74733990dc3547c50243a4559dfd0bb065b1828c0474
 DIST pangomm-2.48.1.tar.xz 675452 BLAKE2B bb012fc5cb66d5cb98f522e3706fdd35bcc5692fcd942f86ee1e20116590ceca26874c5a58bd3f8fac4f154700dfb37ea060747a6c3069e67adf83ba551e7abc SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4
 DIST pangomm-2.50.0.tar.xz 753592 BLAKE2B 0db7d43fe2d23e4cfc2b083a4d832c7875c63a261c6b10c62898bf428351ea7d8d05136a46f9498cdb78c51a0223ca988cbc3481041b997dc5d6a9f16f02ec91 SHA512 844850db93b8c4dab19dd364e674ee3d61b2fcb8e020ab3d314f240065ee17aeceea21e9ddc438a7d09d56410e3f82147a57425f76bb01e26d82872934269477
-EBUILD pangomm-2.42.2-r1.ebuild 902 BLAKE2B f6007d42a4d7a3c96e629b55f48205302a210b3d148ff8f339da365783fef7be0293176742842c8d6ef1e6a982ffc25aca613156d3b9bfa4e487c64a8df1362f SHA512 b1c007e95ea89531a548bf0dbf41c4680cc5c29bae46d078cdcdf90d8957a1e774f7be0d6cdb04cad3c7d95c0ee2c3db115fd3182d17a5eed406ab12e6c6fffa
-EBUILD pangomm-2.48.1.ebuild 913 BLAKE2B 522a1085d98102885f01e29c1569319efb35e451767384ce628ccba8b534276f52d989f2e7d7abee77bb28dc911463f5fb0ddaed30a58f83f7f2cf0411b4c9f9 SHA512 669e597784bc7fa94cc4a6b3dcbe606f7232df4aa652fdf3106a16615644940a7bea66b9833cb9dd7ce542a88b93d2740593fa224b2b2603253d6460417b3912
-EBUILD pangomm-2.50.0.ebuild 915 BLAKE2B 21462900f08c9ff26a70237d382e4fac25908866a97e886b62f5802445d7b800813dd5027e38d8578f8d1339fb3810d124012af06198bde53aa77fde62b49f05 SHA512 2f19a6f0f7126dc91f8602dc18bf662658f6c49b935c454025dd2a604c0bb9ffa9229ed6f2774acf8781923836bfc5a042cbf875f02773ba0f1e4f0b23d43102
+EBUILD pangomm-2.42.2-r1.ebuild 928 BLAKE2B 5dd00f655f213c97922e7153c2736b37f8592763304395b7c579079184ab93a15783f9804efaf165c131f1224bc6ba1a353bd6fd439fbef737caa92a240d53e4 SHA512 4c1f9c4c012d8336374808e738b44e7199a4b5ee3fb79b2346355041ff709bdc9d9cf6454936791d5935f3424c45fe9649c9fc4dcd5df32e01f2134e8a8a2c99
+EBUILD pangomm-2.46.2.ebuild 936 BLAKE2B cc03e12faadd011a6b752b021bc12e816cdd64755c78ec26392b22294f6ac151e3be1b5b01beacfed71a52b6a75b8ef0b1b62e8d2f92af6636a5eb90239a203b SHA512 e70b8e74b45435bcc4f36158d55bde06e6cede02bcaaaa4bff8ab34531fea8c8409cbfee8102f5a137acb1a66fc0d1f18a1a26182445be2e4223b0dd53ab72d3
+EBUILD pangomm-2.48.1.ebuild 939 BLAKE2B 46c0e4c819741a8024e198e9d7db7b8ccedfd94254e7988aa9c574c13d499d651a47b10e2329c14b2352f181a5e05b4664db82d73154dda6bbb45bc660492c21 SHA512 f7a20677df58520b041ae054ddcc39953e578453fbbe97c2a4b8a0455510fe30cc3cbf0d93a985d0f843f6bc4d698434eb7c6982f4d3f128f7066c8988e4bb86
+EBUILD pangomm-2.50.0.ebuild 941 BLAKE2B 19c335bae50ef054e92bd1662c30296a77ff27f173d57c11193d83f16e18c8ebd5f66e1aa04d188df16a399b8a58aa5a4cf07e94b1d27d841258d839fa20c373 SHA512 037fe7147732d5a73c296c3833f362eded545cda2820c0099273afca3f1db8d203c334bedf2250327c0835637faf2a7d6679cc9e3bd50d4c7ed01a61c318e7e9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
index f647a9f7e6e0..83431f4aa4cd 100644
--- a/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-cpp/pangomm/pangomm-2.46.2.ebuild b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
new file mode 100644
index 000000000000..9bb444efdde0
--- /dev/null
+++ b/dev-cpp/pangomm/pangomm-2.46.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org meson-multilib python-any-r1
+
+DESCRIPTION="C++ interface for pango"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="1.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+DEPEND="
+	>=dev-cpp/cairomm-1.2.2:0[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.48.0:2[doc?,${MULTILIB_USEDEP}]
+	dev-libs/libsigc++:2[doc?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.45.1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	${PYTHON_DEPS}
+"
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dmaintainer-mode=false
+		$(meson_native_use_bool doc build-documentation)
+	)
+	meson_src_configure
+}
diff --git a/dev-cpp/pangomm/pangomm-2.48.1.ebuild b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
index 40e232496a17..b03b7ff634f9 100644
--- a/dev-cpp/pangomm/pangomm-2.48.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.1.ebuild
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-cpp/pangomm/pangomm-2.50.0.ebuild b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
index ff1f9a59e9ed..7cbee5d0f71b 100644
--- a/dev-cpp/pangomm/pangomm-2.50.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,7 @@ BDEPEND="
 
 multilib_src_configure() {
 	local emesonargs=(
+		-Dmaintainer-mode=false
 		$(meson_native_use_bool doc build-documentation)
 	)
 	meson_src_configure
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 357aa36874c3..9a7a138bba28 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest
index ccd947d82cb0..ef3fd67a553c 100644
--- a/dev-db/lmdb/Manifest
+++ b/dev-db/lmdb/Manifest
@@ -1,5 +1,4 @@
-AUX lmdb-fix-cursor-delete.patch 1156 BLAKE2B d329c79e29b035c4011975e1581eeb0cbc013e35e14d818d967bfe0e55554972cee3a0571dc612e162a246e76fc0c839f28b44c1783dd725548610e5948d2ebb SHA512 fd7a7c92ba0a3deff51f1caa36851f7dab2529297dab0eded392297c5d32cdfa5fb585dee6947bfaeae88d2840fa23ac58fae1412dcd328cea787ff6ec443cf9
 AUX lmdb.pc 295 BLAKE2B 29c1cc5a70eb3d7f5c9dc4b1646644045514929428f164894ece93a4fabf33ca464e1f116c8a803b499aabf28b6dec372b50c46a2fa4fc1eb65105208759f4ba SHA512 d0749849a0ca0593fbff0b4f8db7143177c588e342978bdb8331238761379f5d5bf686190e39506ff6b0abf6f9d668c96480da685c56d7ed44e7756f92f4e057
 DIST openldap-LMDB_0.9.29.tar.gz 144545 BLAKE2B b7e55e4fa03e878a95b8f7c583684727a81d51a3acf2ec064d8fe26475bf9ffe4dddf16c2bccbda901b94b7c8d57f41fa63f7c09bcab46401bd000958a5b87b3 SHA512 b41ba5b139375d23617a79f4d322399df55745c5a4a63159ddbe0f1ded4707f0eb7f71acf3d1a4928f8fcab30a7b5db17e3e165441a61ec1dbd29f8d9efa65d1
-EBUILD lmdb-0.9.29.ebuild 2365 BLAKE2B c866c7d85d39d8a4a99baf2d36bef664225527c182280cfc36e187e0b2aa2d040744f795d2e9a5b32fd51a656b8fb03a5c327ff3f3221b06a1d44b36c945be4b SHA512 b0328350ff390b7f7560dbc1aa4febd8088fd99ca709d11a526359d7090c3896066a23cca842af2af21419580a9cf95e91045b172247512ecee6c87a5de6524a
+EBUILD lmdb-0.9.29.ebuild 2371 BLAKE2B 1e5280ca791e42d2c1a6082ebe5386062648b2a367e86b55a5e928ee1d00aaaa8e2d994ad9378ab07dea2ff13de0ca4e144849697b35c2b357a383c4b64ceea9 SHA512 b8e7bef24717bf65feb225faf993ad0bd631c674fcc1391b7f9f5deaf504c60653f32321f1a98b20a56ef7f7572a408eed6a106cc47d1e66897595d2531f592b
 MISC metadata.xml 433 BLAKE2B cf3186fe7876aa15283c1d2154469b7f8451e99b3a36637e67820703a576fa1297ac7804ef7df660aaa63a44b1c18a3d2298dac12159a3b3268526e10d7bdaf9 SHA512 f526eb14df23a1b9e92bec0b643e8dc993ad489e8776641aa330d1db878dcf4fb1b7dbb8b62e0c88a4ea484a393e5b396902abb2d035b8a311555e1e69fe387a
diff --git a/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
deleted file mode 100644
index fd76be1bb796..000000000000
--- a/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 40585b483976d9062e6c971df285f911512ecd5e Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Tue, 9 Feb 2021 23:38:06 +0000
-Subject: [PATCH] ITS#9461 refix ITS#9376
-
-Was setting C_DEL flag gratuitously
----
- libraries/liblmdb/mdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
-index 621cbcfa..e6cae8ed 100644
---- a/mdb.c
-+++ b/mdb.c
-@@ -8527,10 +8527,10 @@ mdb_cursor_del0(MDB_cursor *mc)
- 					}
- 					m3->mc_xcursor->mx_cursor.mc_flags |= C_DEL;
- 				}
--				m3->mc_flags |= C_DEL;
- 			}
- 		}
- 	}
-+	m3->mc_flags |= C_DEL;
- 
- fail:
- 	if (rc)
-From f9c5b46651c4ecd699643c4d90bb3ab7725a6167 Mon Sep 17 00:00:00 2001
-From: Howard Chu <hyc@openldap.org>
-Date: Thu, 11 Feb 2021 11:34:57 +0000
-Subject: [PATCH] ITS#9461 fix typo
-
----
- libraries/liblmdb/mdb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
-index e6cae8ed..4062664b 100644
---- a/mdb.c
-+++ b/mdb.c
-@@ -8530,7 +8530,7 @@ mdb_cursor_del0(MDB_cursor *mc)
- 			}
- 		}
- 	}
--	m3->mc_flags |= C_DEL;
-+	mc->mc_flags |= C_DEL;
- 
- fail:
- 	if (rc)
diff --git a/dev-db/lmdb/lmdb-0.9.29.ebuild b/dev-db/lmdb/lmdb-0.9.29.ebuild
index b4031a6ac0a5..b9a701dc0da6 100644
--- a/dev-db/lmdb/lmdb-0.9.29.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
 
 LICENSE="OPENLDAP"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest
index 1ce2d2c44232..349cad68b467 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -12,5 +12,5 @@ EBUILD mysql-connector-c-8.0.23-r1.ebuild 2986 BLAKE2B a7f75b2115e7e4f8caf06ba5a
 EBUILD mysql-connector-c-8.0.25-r1.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
 EBUILD mysql-connector-c-8.0.25.ebuild 3064 BLAKE2B 3a10106d3e3beb7bb048ea830d7fa18738b9ca36fbcc0a257cdfebbdc52c986f6ce7b9f806412595690fad2d5e9cd643427326639c492ff83b404c6ac4117e59 SHA512 cd80c6d89e5a8b000025237ae45854700a0565be784cc6d10f9d38ede2be73ea3303404420701de859db9533652c7fe7762e3197df8e9bc14256f4ecf4b493b0
 EBUILD mysql-connector-c-8.0.26.ebuild 3138 BLAKE2B ec501d87b6bc3a3d1a68ab741607aff5dc2ff27fc12b537fae7d47f5b65c57880e301006a1363b7d6e4e52d51ed918fedbe0ffda9e77207b048c014c2352f883 SHA512 4840eff53fa2c43762e35ba5d638c5f8702522e2084a1a7c52432a7f340e9f2c44b087b3f029b1c7b61f70c6a6e5ed4d9af84261057be47728140b8dc5a9e2d1
-EBUILD mysql-connector-c-8.0.27.ebuild 3222 BLAKE2B 6d3f85bc40e5fa8843c13e854c0e30f21ba55717655d8381c26ea704b1afe091f7a159b6ed7068562393eb523a2fa46a6253198749781172d820b42de00efceb SHA512 7dfae5f108d9c6f478b8319ece94bc33d5bd07ae3d90e3dd038f32a2964ed67080c983c87c4848af72da3f7230e0094dbd00d6aa389dc43f4c323ac3bb7735bd
+EBUILD mysql-connector-c-8.0.27.ebuild 3221 BLAKE2B 5fe3664c8c8c414b1a5dd815b7324ba30653c10dedd18771f5f135c0b87ef43a2c1d0782d46477fedbd71380bfedf64e3c90d607fd54e6497f069d5a7c0fcd0c SHA512 8c947998c48c6703581c19dbbfaf64a0fbf1e29fb842557cad7fafac3ccc9abaa2638bfb99252e5074093a035f2b9645bce3653a9cd8f9be28e9665bb275fe35
 MISC metadata.xml 240 BLAKE2B cc93ae4da8408b221c296e092d9db6ae3879754ade669d81c1218d53a5f007c6b7717bda6f92dbb0af38ff9b5e45f44e91503b12d3603d9955ec7d5a2a67399b SHA512 0f41c32ce3d736e061302252f14913d7425bc97e19d0c2f3b80c50637ab3521aa6cfc67f82e5f70f91174cddb36bb5622837dc18fd9db3bf75eb860359aade27
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
index d15743a0a393..e34d6f7cf9d3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 	S="${WORKDIR}/mysql-${PV}"
 fi
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 0fd2901b48d8..96bff0b4ef05 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index e47e1b9d293d..4b3b4a462a55 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,4 +1,3 @@
-AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
 DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268
 EBUILD ant-ivy-2.5.0.ebuild 8495 BLAKE2B a78606e6844fe8c7c584695aec2f8c4d1a2d5a7d60fbba7e4e097a2715be9d1ec5cea5d282a0b95c3ae4fb0a06f5aea9768111c48d0d8e17f283c27db9efdc77 SHA512 95b72255d71bbb6e0d773f5d519f19ed8bcaaff2f907052f28d3cd7f7cd848e550c5b8d4c39537c61df14d5d51895f4dead1f4c9707c4629f45ad4970e1974e5
 MISC metadata.xml 853 BLAKE2B deb1f7bed1e2828ff976d7a325fdd193fd099d911849bb53320e2093dd9030056b71858ad24bad3308570bf8ef6cf9c4a1d542ce47417683d484327de3a76d0c SHA512 960bc190397b3b2264dbd62b6487c383d11bbe73460ba76791d720fe4f78713158917b45b7e437707ef63dd87c0863caa333b0a9089b66b521792748a52085a1
diff --git a/dev-java/ant-ivy/files/1.4.1-javadoc.patch b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
deleted file mode 100644
index 4a0b47d8a714..000000000000
--- a/dev-java/ant-ivy/files/1.4.1-javadoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur ivy-1.4.1.old/build.xml ivy-1.4.1/build.xml
---- ivy-1.4.1.old/build.xml	2007-09-04 02:44:23.000000000 +0300
-+++ ivy-1.4.1/build.xml	2007-09-04 02:44:53.000000000 +0300
-@@ -245,9 +245,7 @@
- 	</target>
- 	
- 	<target name="javadoc">
--		<javadoc destdir="${javadoc.build.dir}">
--			<fileset dir="${src.dir}"/>
--		</javadoc>
-+		<javadoc destdir="${javadoc.build.dir}" sourcepath="${src.dir}" />
- 	</target>
- 
- 	<target name="get-dxml" description="download dxml doc file from web site">
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index b82229f7057d..9e8e05088005 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
 AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
 AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
 DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2698 BLAKE2B 3e2b237106053f6c4b6c0233db52cbf52047da922a735326002a7aa5c34d200e8ffca1ae55af96c61653952c512092984f4495521ca9ce1f384b0da43bb7fe03 SHA512 fcb46d75d6c93320198f28ac6878348a7459c1704bf3c4cbbab484ce04c7b1286b99ea2f876ff566942fabe2d5b005c89b3aa8910adc33f6c5a86ae3c48c808c
+EBUILD bsf-2.4.0-r2.ebuild 2703 BLAKE2B 21733021922b517a7de471aa3688899d169e3accffe5859cfa16d08844f2ef0c91ad658e7b1439d2ea95a5dab9f83f0ada0db63b865beb351286274ac1269ad0 SHA512 52c57333a2bc951dcc37de9d0ef113b671f0e52a9e9c2d4cd459b9cc0f54e241adcb51b6a4196c3331d855665fb3537afcf9e88a5672fee72101ba8c9eac4d2d
 MISC metadata.xml 904 BLAKE2B 6e791ca9562cd211b97a13c79701155efa8b58be87f9af9c076017da0ca9f406a2ccc673eefb1d56db9cb2b9481fc77b01e9f762a98bd858199883ac06fde17e SHA512 36cd9c82eaa80842fae4c0f51ca63611d6a2b7a5724d755d0651edf069a67dcad3ce13789ca07cf2be353efb1c8b3a04e367be548925e29507155235749af66b
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index 44f085f30322..a6d049b54c10 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://commons.apache.org/bsf/"
 SRC_URI="mirror://apache/jakarta/bsf/source/${PN}-src-${PV}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="2.3"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # If you add new ones, add them to ant-apache-bsf too for use dependencies
 IUSE="javascript python tcl"
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index c643668cb4ec..612f9ab8361c 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,3 +1,3 @@
 DIST bsh-2.0b6.tar.gz 1720334 BLAKE2B 7ade7d35ac66dad8c79dd2cb541c8851b321601bc6239f4d82e6b37269fdefc5cfa5efd1198f58030bb9dcc4712b42c1ca07071f0b042a59ebdbc4168e472fb0 SHA512 3d4458153f5e2a3b30d9afd79f0fe28862effa8e490fd1649d435c03bf90b060c255949a49780afee95069da4e8e8d2e4e2c5d979908370a525b3ca9a396458c
-EBUILD bsh-2.0_beta6-r1.ebuild 1309 BLAKE2B 0200601f12be8d68adc3f52b45ee6eb2fdadd0a8090e26e3f622e88beef2ccfc2a5c4a282834c73d707cc1b2a892790034cb9bbf43b52d6764cdc3508ad5e6b1 SHA512 c11a495b297f05a44a7551e11e0284a354a1795af5d6e3c1a0040b6d7b892e0049a97aae268e9f49d758bd76e4ba0cb0786fa4c11f1d32c79ff401e2aa5c9e86
+EBUILD bsh-2.0_beta6-r1.ebuild 1314 BLAKE2B 38c49242b1adc9b755ce5e38552f4a30b1297dd514a1032e7a2c0565e544e4b9f44a3b98f451f4313ec50f1648ea245778aa8fc51c4aebff3e228c208481b8f6 SHA512 dd44c684e999fc5fce6e7bcf390b932067795f0addc7c3c37ddba193d910cc5cade97dc8f317e34845263eed392681578325b3dcbf459944390cd9e42076c710
 MISC metadata.xml 331 BLAKE2B faccf5565dc11dfae5b8874e970f2d055f49319264c1c2d11a685659cd5c0dacbd2f915c8e45d376e8b210dac6221e172909f62be63030e4e257157feface3bb SHA512 bce4790cca3f4c4c883c1befc7d2dcabb1456dd88fef57cd2ffb25f45f9505f921a428c830d17c0ca92f876d921d56684bf7bce3bbe277c33ddd19fb03118381
diff --git a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
index e0000a5f8a81..11fad8fe7e6b 100644
--- a/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND="
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index eb22c6f2af35..a4be70e049b0 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -5,5 +5,5 @@ DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219
 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
 EBUILD dom4j-1.6.1-r8.ebuild 1907 BLAKE2B c2802e3270130c27a14cbcd02dfb9228f73e29f39f9866521af5f870396e43a0745836c2279f16b8f4452bed47f2529ac9cb488aa7fe982602affd9ef5fc2f00 SHA512 843e5b3a520ab7ed50fe1ec926b34d5ef114c2dd5d3d7813f12fbd00c018ba791f98294aa300b8042bd6659c31e2e25ee407710c0f9e8a36f79eba7a4e3c603f
 EBUILD dom4j-1.6.1-r9.ebuild 1900 BLAKE2B 314238d8a36167053c0b148c429206b042b5fa14929edd7c92741131596fc24f39e668d165abcb26ea3b5b14363777f725a30893e2395ee57564a875b6cc2306 SHA512 30dab95cdb84bae7a4873be00f1d37f8f412a31f19748a02370071a94407c7d0de1dcdcaaee67aad7d1e024db24218b88d206d373e781b5d2e18154dab051cb1
-EBUILD dom4j-2.1.3.ebuild 2245 BLAKE2B aa4c05813def4d1d4bd051427c2fe9518e619abed07a8078df3b07519f6f1fa61a8987c02e89c9952e58a80568046fd26312d741d1e336bdc9dc1342c57cfc72 SHA512 a9d3be0f1cdbfca6995ad9682f9c0372c29427bb34383a8c15e8b7da829c554913930cdf03a60e312a04835649334247b592f744c8ac652d0df35287573b59f6
+EBUILD dom4j-2.1.3.ebuild 2250 BLAKE2B e49e599471e8bb71cdf607dcde2d8899a55f9a5ba3b1f7a3b2a51562c0379c77a31bea78e15f3d933b2a89a6044270ff0681606f0cd5ef6193460b3d8d28d874 SHA512 fd60f6eab2ce00a1b66a08ee3f20ddb1e490c1fd15bfe15b23eccd914eac01dc31916eaf81fa19854fb3fe116dbd57ec46cac1accd6ba908951bdc4c10bde19d
 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 9cf6e22f8633..69be8c48e9fc 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
 
 LICENSE="dom4j"
 SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="jaxen"
 
 CDEPEND="
diff --git a/dev-java/jakarta-activation-api/Manifest b/dev-java/jakarta-activation-api/Manifest
index b40ccfc27af4..54b8af4f724a 100644
--- a/dev-java/jakarta-activation-api/Manifest
+++ b/dev-java/jakarta-activation-api/Manifest
@@ -3,5 +3,5 @@ DIST jakarta-activation-2.1.0.tar.gz 118833 BLAKE2B ad4b23405b412eb31ffe6fa9ebb6
 DIST jakarta-activation-api-1.2.2.tar.gz 123283 BLAKE2B 2d205b0a042790f931d20b30f422690eb4f7b51ffa3e8eb2af0eb1fabbcd3fa9e469e9b68384bd95278c319f97911795473cbc81282b516f30148488da729f4d SHA512 a9062eadf260621e0a10695e63082d010567665bc749f76be43381c0f313d61fdb8ab04b9b2765e7da740277cd0335e9f555dd7a1cd89b7eedf88f6e557427c4
 EBUILD jakarta-activation-api-1.2.2.ebuild 1590 BLAKE2B ba56e982f02880249e8a1cd29da6b83d3e8cf0d6ed78675da877cca54067f70f0d1e5655c2e83b759db7968740bffaea1ed124ff2ff1f8ff82533a4af68f19aa SHA512 a762af840f87fbb91659e96aad528f0fb2b3163f8579ec154a1c997ad9f5569d751cbf38653396cbd84d47e7f89e7df8f0b4ddb32a11dbc98ed6eca293d360ec
 EBUILD jakarta-activation-api-2.0.1-r1.ebuild 1554 BLAKE2B 1a21f77cfb5bf7a881a459e4f2bc5fe7674e924579c585cf37dd3432eb04840072209f6475fe0299c31125e6be3d1ac20e303030ed78a568535167ac4c3d8012 SHA512 0253f8930c4b1a6c7308e5a8d61dddcff04abcf62477889a1c97d259f23b2d0fa8525ef92e9f0552233a7c3fc9b0cfdbf06c807b83b9e6f2b37302fe3a4ec528
-EBUILD jakarta-activation-api-2.1.0.ebuild 1066 BLAKE2B 907d27532becffb23593908da6fd85e03923de18d032c13c8f62ca4976f39fac181bea5b36a5de0785d3f8f61be9dfb3a09fb31b8b7cc8e62afaddc7d855a380 SHA512 6617679916c43dc48681214dff8289f237b7f9cfd3aa49b1254bbc908d68c57cd0165b19691a89565d6344b29917f2d7983dafefc9a199e8eab01aa513e8e5a2
+EBUILD jakarta-activation-api-2.1.0.ebuild 1062 BLAKE2B 09c650e668080f9fa97a80ef94667b20d7db41ab097245f676e2f3863d5d2f97a54d2536ec1681b9251c23942fa374e902b29e8ac2ab7675f8f11efac2e8a660 SHA512 500afa3a79e46e13a9a62b3ff7cc24f1306b4cf608016210c6f30f272edd38ba2da1033399cf62371418160d51940cac65f1d55926e6c39433b44f7ea82f8beb
 MISC metadata.xml 362 BLAKE2B bfda62be71a4c85153713dd7e8546ce32c783612d2810046280cb9bdb86f3e2187000254c12b040bdb9fd91ac29a7dd910a9d99022fae851402944eebb428b8f SHA512 61b83467d9f5636bbd8c1e4bd4a553de3e36173db5c572d1d499c41615c7a3ffc83a2d8db1e6ee1551602534deba745edfc0394659b61f4dd3c252d84c196c06
diff --git a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
index 5677cb497fbf..b7c470c56a1e 100644
--- a/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
+++ b/dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/eclipse-ee4j/jaf/archive/refs/tags/${PV}.tar.gz -> j
 
 LICENSE="EPL-1.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/jnr-netdb/Manifest b/dev-java/jnr-netdb/Manifest
index c7469767f175..25701e3af5ad 100644
--- a/dev-java/jnr-netdb/Manifest
+++ b/dev-java/jnr-netdb/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-netdb_maven-build.xml 9637 BLAKE2B 0ee947467fc1c8e07d2b98fb29a70de5244e4a92895018f8eb4860413a2c96ab6d5599f1eb39a45f4c43a09e1d6d0c7c1737416f7afbd205d397da17a257d3e5 SHA512 befe514fd332f5eb6495404b0f0d8edc428be34a1745b16dd2a20d2b859d251670e549036099884a810e3b5da0c6a4d311b6b0691409cae1b6c14d20ee763d24
 DIST jnr-netdb-1.1.4.tar.gz 648347 BLAKE2B 08953f93fe4a6146dfc77c463e07a8b9f6e784ffc26165d7409a623756733a7598b4d0a3fa55302b5f9b01c870cee3062f310c74e20f6a8a11ff1b41d38a0d7a SHA512 949a744b1d443cde564a2582baf7b4323c721417f32a45fd7413f791823cac5877bef62ed0d3079345631b908a581a1acf83dd00a926f87ebbd8e61d38a20195
-EBUILD jnr-netdb-1.1.4-r1.ebuild 1145 BLAKE2B ded7e835a1ae0763beb9acfa31e8ef93ae50e961e60a71ed72ad47a79956f32e1edec5ab8ff414700a43444695c34bb83394f8a0e0f3a4be4d4cfdaccd57111f SHA512 554c04ac2e66a4a498e4e7c12391639213c6c5a34a9c21b6aa08c8e84732134da0d20381a94526acc9e17b1b962177e25ec32d253aadeae81c7b4265425b3754
+EBUILD jnr-netdb-1.1.4-r1.ebuild 1150 BLAKE2B 6b00dfe46c10602181bfeebd86b05cc1b0846f4c56703585c2e815be7d10cce09f3b8ded293f5cb9438164b846db13db993b9cc04a63b697f46b2a8f435f060a SHA512 af5c04260d6bcf0aac9e4f236c3b2a5bab0dbb457f12abee4c5f009c8545ba7104b6c8561daa6ac885c6b84527e43faa042791a2099f6fb0fabc8fa50fc8ac10
 MISC metadata.xml 662 BLAKE2B 64087950d504c3f16ef8466aaae35c567e2fdb1547346e99e537dd9ac1535c4ad209af80425993dce4a52287ad9960dfac6dbc923faa66e5ebc3328b9ccaae70 SHA512 458c722c132eb5b69a970dffe25ab6bc3e71f7d9fc77639d5b46dcb37aff851a2cffed0a62fdce6ce2192fb3da52d6781597367fb95d1fd794935a4e469b86f6
diff --git a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
index d4570936987a..2a7af0818eb5 100644
--- a/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+++ b/dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 COMMON_DEP="
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest
index 9c37f69146b6..29451d3945c3 100644
--- a/dev-java/jnr-posix/Manifest
+++ b/dev-java/jnr-posix/Manifest
@@ -1,4 +1,4 @@
 AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e
 DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1
-EBUILD jnr-posix-3.0.10-r1.ebuild 1290 BLAKE2B 086170dad7dc6fc3d913f16a62b4f5e5fff5d9b8bbe5ba699fbf0ac4d05cc33989d115a0b50259ffa759b373b463b4311fd87fe65cb9573610568fcdb52ca0e5 SHA512 8ecbfe33063041a813cb1977d3347fa7023ffef74e61f3eefe24be1652d8e9f9909ee67d63641fb5dc94a10fddfce40c5e11f1aca11441137da7a69f89f6e4a9
+EBUILD jnr-posix-3.0.10-r1.ebuild 1295 BLAKE2B f9ad7d57774afd7dfba2f22a774d2539332e474a85ffb0f601ba734127fb99644ea1e1912f245707d9b5d5e432d46d241d175f4fde7e9b168dc2f74b21aa52f8 SHA512 1ac23f843d6a1d3c5520fa464f6284573403e8b361eddb29647a81a938cc22e602508c1f04dc2a887042f99f0b0f8d21c1c4776c3dc14fcc25b306cfee296494
 MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4
diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
index 287e02e6d650..8e1f57eabfc9 100644
--- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+++ b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
 SLOT="3.0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 CDEPEND="dev-java/jnr-constants:0
 	dev-java/jnr-ffi:2"
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 91ce455ae8d2..148116b8d670 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,5 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r4.ebuild 4292 BLAKE2B eed667f0e6c069444978bc4ba013b321f11ce9e73cab284c1ac95d1cbed5dc66358ebce85382703ab2ce7b8752ac4976e01861f1f245dec55d013780d616ce13 SHA512 c5b73640dc31a4b72d2ff54213921747770bdff7a9ce35969c5bfa000ccafe62480b53ae2fb1c6d3089764fac77d652f023ad889922a90af372113349e64bba8
+EBUILD jython-2.7.0-r4.ebuild 4297 BLAKE2B 2768ee00e19d2abc02ca775bd412ba4b9edc7a8bd26fed94e81f37367616869df00e31c74a4fd2231692ac2662b2b2e86e16f3a5de5ef7435c625252682519b7 SHA512 875eca9986b398f79ff2f650cbbd7757ebbe0a60091e11608338d6932dfc8dfbdea443ea4b7768dcab58a3df8ebfd83565c95b742f5f604beff284321a194af3
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r4.ebuild b/dev-java/jython/jython-2.7.0-r4.ebuild
index 06257d2dd02c..5abd3a99bb64 100644
--- a/dev-java/jython/jython-2.7.0-r4.ebuild
+++ b/dev-java/jython/jython-2.7.0-r4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_P
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 4026c1d9f7d7..c2f70d24a234 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-buffer-4.0.36-r1.ebuild 2402 BLAKE2B f8e76e272db087a57200572e2f17d586988be34856b355e296e02d392b0bee594e9ae91a491c16c4808f0686149b987a1eeff9b60c8d65bd3e160fde31c4540e SHA512 a4b621f0d5d5390b3a414cd2d31df1f59e33dd773a7bace78287548ab651478a39ddae2c697df1699e266844a4a846e0c5fe7b59661530966fe87859abce64fd
+EBUILD netty-buffer-4.0.36-r1.ebuild 2407 BLAKE2B 07c5964301e29d90c755e2c89146f3717fd6ad3d7f8a589637b643478fc16552121047a37abc24f8e3a7f2b492c166d6e8c72449ffa59c85e0191b9ba286fe0c SHA512 ae9862f62ca1ef0c9630da502b27c97e751af7948d7288c64be458fcb9650a5e68bef83c0b701b4d64dbd6d8ac4de6ce3ecb46dfeba1515949f3e211ed7f96a6
 EBUILD netty-buffer-4.0.36.ebuild 1269 BLAKE2B 909d89bf881f11adde18514d4596cd5e76a2fe07f4bb850ef57ead6c7ef74b3ce85f9bff67ade45e795b1b607ece8bcb912ba4f5090827c630d6cb917c30b595 SHA512 2b0f7dc60868f8d6a0b0181b58602efbb2b56c6862808a82ccfcae9a4a10a2a4647ecea17405a8eb0c01add98369fd7a6441a3124aa38afd367e1e5d7e8887cf
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
index 008acc23fada..f69a3ee3a00d 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/netty/netty/archive/refs/tags/netty-${PV}.Final.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 # Common dependencies
 # POM: pom.xml
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index fcb6f435246f..49164d6e19cc 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,4 +1,4 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-common-4.0.36-r1.ebuild 1983 BLAKE2B ae0ae050a9a955247ff4f269bcbe9141d6de1400725aae106109cff5cdc98450cbd3721586fe5dda972b030ad0004c1edca3928d53b264f2d8b629010efe7780 SHA512 87903e87630ec96c46594e969405b95ed495238172682ecb0299d56ae084d8f0a03e0bc09c0ecbec4c1b4c85e516b53fd35ff21d9474b8bf558ae17fbb3a2c42
+EBUILD netty-common-4.0.36-r1.ebuild 1986 BLAKE2B 4fc44f6a29a0e5dd67ad87711df880d7a1f313821e72e7a0bf1e251b6ede4ab58aef656971dd884d31c8cfb7fa148a840bf0df66d3944a72c006c82ce0aba696 SHA512 3a9ad76d5972a295b16b83a8ed8ffedc79cf0143837d69b6132f073f9ff4e85ed9b72c0718fbb6e98a3fa2e766fcdecd0a2465d4f762dddeae903a881eb5f535
 EBUILD netty-common-4.0.36.ebuild 1604 BLAKE2B 1fd6224706f910a51e93b64603e2866912893b0083bdcb1ac4a4171a5bf2e12b772663120c8aa80e167478f3c40c5d76ba44609f2760e31e33463e6e169e2626 SHA512 ac48ea4c6910645f0db1831f41f49ed7ed304ce26267c3311fede9d70b3694f55438d2cd207a48aade49148d7412afde4eb79529c971ac7a4552da9f4f344742
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
index 064d971361f7..2dd3d32159e4 100644
--- a/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 # Same test failures as before the revbump still occur. See https://bugs.gentoo.org/827221
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 078be393beb6..186a3c82bc3a 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,3 +1,3 @@
 DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-transport-4.0.36.ebuild 1723 BLAKE2B 6dfc802c227911e4e39eff9de476e819f1375f7f10be4cd7b4e1dc7ebcdf1401b0053e82b98da14c2a3179f19972a803cb2e81fa26996fcc156f40d968e4d545 SHA512 dd641a60a42809a3d1671e7c244cdf0fbcfc227cfdb635f8572c288404765a99540d2ff12e52286221a5097c2ffa4170f0e93ffcdc65e3910ebeb5a8da5081bd
+EBUILD netty-transport-4.0.36.ebuild 1728 BLAKE2B 91fac677251c251c8ab028cf33f7be732aa23cf803327a133dbf0e259404bfb07cb21814d9584151ffb95224b01cb5581dbb15ed1d190cad94d44eac26e641fc SHA512 e2e91bd50ebdae0ca49583cc32fa401bbf91293aa0b6f7598d5fbd22256b9e1ca3f35baa50d8fed47fabede0a53ee357d9e49a3db72459977bf239bb653bdbfa
 MISC metadata.xml 323 BLAKE2B de4c9f6ab6a8f2e4243cb7ea8d3e96a08e9a99b579d7996601094ca1bba95c4331fec32c42c4fa42defb8de1f5ed3bf9e52cc3ac3ca9e6a0bec6a55c3edf3d3a SHA512 99c3bb74ad41a72119dbccfaf446e9d13fd1002204188c363531a68e4434fb01a9f2ab0158ad359cea6163f3791759e8fa5b7b2c8cb7268212776d912840b89a
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 508745f154f5..7939e8969570 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,7 +14,7 @@ HOMEPAGE="https://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/testng/Manifest b/dev-java/testng/Manifest
index 81147d3aef15..86130cde2844 100644
--- a/dev-java/testng/Manifest
+++ b/dev-java/testng/Manifest
@@ -1,3 +1,3 @@
 DIST testng-6.9.10.tar.gz 6271781 BLAKE2B 5b77f4b1d9bfdca6749a1d33f465a30bcd9ab9dd9fc37abf8148301c24d6bf287224d9886c0f681deac54e12f9460139ce2a2058b3d160c05cf8fcb9f7808373 SHA512 ed9ad1ced20904ab261d2a233f3fa43ee1ea31778e992cdd27459811b256a6998d8385dd01ff72821133208a1fbd72aa3599a4b8bc0eb4d7b696d34593f9567e
-EBUILD testng-6.9.10.ebuild 1762 BLAKE2B f4436fd42eb5fef15913748c55b2b485cc6b490631f79e17036aade2663d048507d337144012f8ec802468198e646a70cc19078c109c98bac33d1993a64c9e5e SHA512 f7f4a6ffa7039aba759c4050d0555de96f693e4b3af11e2a6a302da4e11e500654e9907014a54d9fcf8881ca17ee7c7518085219832e87148e88bd2c8382444b
+EBUILD testng-6.9.10.ebuild 1767 BLAKE2B 1669906b5f329a3be9f79e923cd4cf14e387ca2c6ceae961db89f4f3fd5b06fd67ed6222ee47710d9b68fc4c2dd77a0f92026f9305ea1d5815380ade542e3573 SHA512 ed934c76af7cace171fb6c7717a09703faca5c6ee1ba9a2a0b2a6c1e12d91b40da209e53e06608662111495dd530e7022bf4aa9c343b75c31d445d5d85026e61
 MISC metadata.xml 315 BLAKE2B f3779acd8d9bdbe1e65e6fd147aafd16773a99db420ea47fffa6f8501e0160341cafc9f46d72a860de2bffe572c721177f9c5afdd320b991784ad8e6935c7674 SHA512 108fd9d1659bcd11c414264f52f42b60a7287962aad427f7773971fffbbf9b7d97cefb9a39b64c8d12e00d04cb1188d36031a2d7c94aa57929503299636c6616
diff --git a/dev-java/testng/testng-6.9.10.ebuild b/dev-java/testng/testng-6.9.10.ebuild
index 2811d9a49c6b..c644e8005e27 100644
--- a/dev-java/testng/testng-6.9.10.ebuild
+++ b/dev-java/testng/testng-6.9.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ DESCRIPTION="Testing framework inspired by JUnit and NUnit with new features"
 HOMEPAGE="https://testng.org/"
 SRC_URI="https://github.com/cbeust/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="test" # Occasionally fail or run *REALLY* slowly.
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1a8f93e64e07..1333d8f0fbd3 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cl/Manifest b/dev-libs/cl/Manifest
index 310b8c36dd90..6b06b02328b7 100644
--- a/dev-libs/cl/Manifest
+++ b/dev-libs/cl/Manifest
@@ -1,5 +1,5 @@
 DIST cl-1.2.3.tar.gz 137921 BLAKE2B 66e79e60d9e5b16b7ff15ecfbccb928ce293a39ad72b403d885c676cd5eed0d1a08e7359a5f38bdfe22db485aacc314c0956585a04fdf3d2d6c10903b352172e SHA512 aaa19700b1b54921ea8194e1b7fcb2dbb11f22c32108fd99d0cd9796c7524a49653dcc97c8c8b34f7739d0b972cbbc3cf61b929e342429b524b11df93e434863
 DIST cl-1.2.4.tar.gz 142258 BLAKE2B 28d72842c092ceb81722769136e2282fdf7062f630eae0fb2097f4b2ae0690e41bb96d3fd947186d90b88a68982f5af03bf0cf0f6375304f6a1d05395f018701 SHA512 f7a7f24abf6c374b42f9aa809984c818ac2514d013ff224b3392b2b5df1ba75f2b393ad0bcd822c4118dd0034ed4e815f83041f0b2350ba71def1b33b42e8801
 EBUILD cl-1.2.3.ebuild 625 BLAKE2B 43da93f762d3491bc93bec09b1cf0ede5f928ec2d7a4cbd66b8148ee0c9111031c83120f7ae27efc8a254729c94c448e581b02a571b4c2682bb9ad557d4febd8 SHA512 4bda84343d75ea607da0b5b21532573f671acad422739c5ce08010e4f5b275ef8fc056754f225d5f8943a236ba3d02cd268f0b2331e67b70cdd0a0d9e592bb88
-EBUILD cl-1.2.4-r1.ebuild 633 BLAKE2B cd57e70edcba88c0ea600ce46c7028c0d703435f0dae942a27482796bd62dc5d9c49bfc29218b9b74d6028149e36b5cecedc03118156159a3e3fde5127df3315 SHA512 5ac81487e7a98b66afe8b1d8d1bb34114eac0e06943b0ddec3d024962930d95a3f749ac2e8985d889fbb6425ab35d71c2ec658f72098cd24170d44dfd2140b54
+EBUILD cl-1.2.4-r1.ebuild 631 BLAKE2B 5be5e4478e8ce77e1fb85b9913f0ec371d2e8ad3bb7ec4cf947d3ec2e86bd2dca89ca2e2dd5301b79db836d5b895e819093e23cc5130eddfbb681a67215229eb SHA512 86adc65258f96f133870496742d557b7d5e937572f5f65cba2efe36f7079d2d0438a9c5785b41c8c76554220eca94299134b2afc1ac55cf67a0bd84116dbe3b2
 MISC metadata.xml 243 BLAKE2B 98d944f206eaca5c6181b4ab23118637693b1c29cbbcddb66ccbf2277bffabd56329d978f401d2c911bc4c2bb9af9861c955a9532fa74017c00a1dee0980ce85 SHA512 8526dd024c32c289fe5a96ad71279f71f13da9b14aefb45cae54e7a56d2bb84d7fb92693d9818047d583c7d47c8543bfe6bda28792da0832e487f1cfc9aa535c
diff --git a/dev-libs/cl/cl-1.2.4-r1.ebuild b/dev-libs/cl/cl-1.2.4-r1.ebuild
index 0d5f068102db..c2faafa84d9b 100644
--- a/dev-libs/cl/cl-1.2.4-r1.ebuild
+++ b/dev-libs/cl/cl-1.2.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tonyrog/cl/archive/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-lang/erlang-16
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index cbc28362a4c7..eb65d73f1c18 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -1,5 +1,7 @@
+DIST libgusb-0.3.10.tar.xz 42972 BLAKE2B 4c49aa15cbbbb56d5ee5b896adb3e34b45332cd846933fd3aa86a645e7d897418d0e7a30d9972980e6527f1e60fc6e579f5df119708a12b3e504ff695c94d922 SHA512 66bd7c292cb9df2799b02acd48dc4b07794e7339ea1bd6473ea512dfec1b8e7e58abbd40f16a2a4805240cc8df4aec050335edb4f4178ad12ac5275438b8ae59
 DIST libgusb-0.3.7.tar.xz 41844 BLAKE2B e0829430a7c4c9372ebc061ca8245ecd6b30f0922e4e37ae41f7f65055e7339b5a3a882c5526ea5e5663be3b7c1ad71fee7da5cffb501d63bd1cda2b618fd40d SHA512 65a35be62bff689621f418abf045f62f946c67488dd021d363ab252b9b3a2380898ec763b374f7da50901945eda666fdcae7cbfda7e143544175d7ade3ebc20d
 DIST libgusb-0.3.9.tar.xz 42708 BLAKE2B 6d73f3dba891dc7594c2df02198bb1632c8e7ccea2b60f5071c87ae1111b6e2cfed4f9b912f58f788f199c5ee075db156a4d7326aa9b5e6448581c2acd1af469 SHA512 4a4545d9e8ccadf2c66ef891936a30b2b73b7b471a9b0e945da21fd2b55efc3a8d12cfd5127dfcbca0ba24f565b25f8edd7a276b70a6615eb4b2201791745c6c
+EBUILD libgusb-0.3.10.ebuild 1519 BLAKE2B 41ad01720c407eaf9fc9e6a7d11d646103457289231280568733be44a89de05ace36554255ebbad0f517b1e6e6ca6687f717ae57904658889c122af365519d22 SHA512 443e57694504ae04e6b51030b599b9f840518dd11d0e6ede6195e5b831ab7d8833803012af118e2b4c2b0f662d85c7dab68f3077a3f4ff0aeb0cb9e4fa751d7c
 EBUILD libgusb-0.3.7-r1.ebuild 1513 BLAKE2B 6a36977eae498f15a9292723c26624d8bbc12ad07907cf98b7a3c95ea6348e68bdbbeb81ec2744c678e9f1ffee81443805af39367526a7dd4d660da913cab730 SHA512 361111fe47bc09d5a715a98561e70e5f9e99adc617753142282236920d0a9e5805b2e5d2a647c3c5f6ab4b340be75102c0cb5310cdd38f14951e5ad2c0fadcde
 EBUILD libgusb-0.3.9.ebuild 1519 BLAKE2B 17d730f541318e98fd2cec90d47b7bc876a8fc7f5ca36440039e57832ee65731315011bc1a92e06b5d7c83e57b83e9d689adc8de688ea445e5240016e1f661d8 SHA512 2e3b4978f64e4b4573646273d985bc231b61bcc11b28bdaab2fd0e45132f5c5a3d5912408ced16865d918443e03e3b89327b43d03667bcda19af5d8a556d0e08
 MISC metadata.xml 344 BLAKE2B bd362d7e89ba2d88c2f220ab47593b4ae25bc4ca486bdafda16448407213d7558d7ea807c489e5aafbb8ec83a40e8e339c8ba20d3bfc3957da33a7e7711c6898 SHA512 93166c6dd4d764901c87fc567ab1c67add1c654b7ea1f3326e7144d5c14789bdee2a1e37874f8b6158136e03363372bf1d972f49f96095b0e3e568af89c4af34
diff --git a/dev-libs/libgusb/libgusb-0.3.10.ebuild b/dev-libs/libgusb/libgusb-0.3.10.ebuild
new file mode 100644
index 000000000000..7953a2c05123
--- /dev/null
+++ b/dev-libs/libgusb/libgusb-0.3.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="GObject wrapper for libusb"
+HOMEPAGE="https://github.com/hughsie/libgusb"
+SRC_URI="https://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection static-libs test +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2[${MULTILIB_USEDEP}]
+	virtual/libusb:1[udev,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sys-apps/hwdata
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.4
+		dev-util/gtk-doc
+	)
+	vala? ( $(vala_depend) )
+	virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_use test tests)
+		$(meson_native_use_bool vala vapi)
+		-Dusb_ids="${EPREFIX}"/usr/share/hwdata/usb.ids
+		$(meson_native_use_bool gtk-doc docs)
+		$(meson_native_use_bool introspection)
+
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/starpu/Manifest b/dev-libs/starpu/Manifest
index 13eabac4c17c..8a90c940d940 100644
--- a/dev-libs/starpu/Manifest
+++ b/dev-libs/starpu/Manifest
@@ -3,5 +3,5 @@ DIST starpu-1.3.8.tar.gz 12895856 BLAKE2B f04096b03d5c035fb9cc6c193a482bfe9cd348
 DIST starpu-1.3.9.tar.gz 12961635 BLAKE2B a6eede7c369cacaba5b7330bd6a003f624f58972432d43619aeaf47c1e9e16da871a18c24f8f511f002cb7667c247c13562b4fed2348e2af4f8e402418e1801d SHA512 7150fc11828e8f9ede036af782ff0f89946d9aaed341771436eb8cbb91be7b0faccb6280a5c3bd63800d1a73ec8518a45a02d9f3e137007751cf1c5979678295
 EBUILD starpu-1.2.6-r1.ebuild 2238 BLAKE2B c2a106da7a1e6888a24d09f0a9aedb4bd54b1048cfef51a1c41610cb828c93afe18d7a9f5da602632776f546d34b31098bc1aef36331dbbd6848f868801bc48c SHA512 a53f1d9418e7f20f5d39a5671ad3c9254d1611eddb482e9ed547df5ba2d6542962acdb4b336563a50891a01bfab5431e943a62e0185a7b5b6c67526ae6a29e90
 EBUILD starpu-1.3.8.ebuild 2714 BLAKE2B 566fac6d80e57eb1cf3d3bd9561f299df6def4a57a0985f91d7942b3425ebc3c7156f363e4be49038298d4888586789cabce2bee48adf7860ecc1e7f009318c6 SHA512 ca3d3e98f826392182325a3ff2c26ba5c877f4b02bdbc402cf5bab4856e0cbd6432fb42b97e5b297a15cc8d395c72133ab814fd5370ad6ba896a78d1009812e3
-EBUILD starpu-1.3.9.ebuild 2715 BLAKE2B 505c58edb46a59dec868d4a22e5ff270abb7bd6814c2468694f6b4749e66b11e6b301041dcbe710b46657925b77c215663a9964ae24d6b3b8cdffa29ac24a7d1 SHA512 fc249e2979652410cf03ff2f5057b8ed72a47d7e63d91b4776ec9f7dda4feb8b74954cfe329dd08b7e42776188721f55a63b938a4191a894fa986bc4e86a1127
+EBUILD starpu-1.3.9.ebuild 2721 BLAKE2B d0f9aa20ef267a088ec9d771b8758fbb0b08f9aa070c1ab0107645c84459178bfa093efb3e5b4290ddd0a2c9a23e23862e1e029880f2006beac4642760dcc330 SHA512 7b5d647b4a6fac538b558a9167376acf21232cfe7da522f414f056d7be52b5de39e85c699e8fb5eddbc4c04c62306fd92ede5bf02cdd8abb8cc753a62f76cc3d
 MISC metadata.xml 988 BLAKE2B bfede0842fa1b62f1d0d75100b4efdbaf79940933ef579d9f52344df20a9b235a9e2f77739f488cb1906a89349d470738636d17dd4e2083235c7a1cfb2b55afe SHA512 5755a2d92298f299a164b60d40040edac8eb6ac86205e214cc89bbd7a0c71aa097315a9a107b358a9e9238d7ebfbf57ef33168a368ec4a2cec970636b42e7838
diff --git a/dev-libs/starpu/starpu-1.3.9.ebuild b/dev-libs/starpu/starpu-1.3.9.ebuild
index ac7d92d4b067..c829323b7573 100644
--- a/dev-libs/starpu/starpu-1.3.9.ebuild
+++ b/dev-libs/starpu/starpu-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://files.inria.fr/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="
 	blas cuda doc examples fftw fortran hdf5 mpi opencl opengl
diff --git a/dev-libs/uthash/Manifest b/dev-libs/uthash/Manifest
index 43c8d9991fe8..be63b2b655e9 100644
--- a/dev-libs/uthash/Manifest
+++ b/dev-libs/uthash/Manifest
@@ -1,4 +1,4 @@
 AUX uthash-2.1.0-cflags.patch 228 BLAKE2B 2f6e1ee3b9bcac275c40470567ff1c044f727546d7c1c62f72c6d85a38c477c7a439d1924188f046ac263f21153f5499a1aa29aa0b9061b0e683f101951f1b53 SHA512 046e619a75a8ef28c7c18d078ffba1653971536a287ded36b22c6700358351fd95b2709318ed05d68e81edc13a8f7abdb03d0c5616a01817752fec45605215c1
 DIST uthash-2.3.0.tar.gz 191291 BLAKE2B 473e263df9f3555c9ef41c2b39cf2ed33a4624ce7325bbe52db805ac741b8383e64f84a9e249f96faf40e0b94fa4a7fc6c0e83bebe8b3677a90cdca82a4e3f51 SHA512 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294
-EBUILD uthash-2.3.0.ebuild 675 BLAKE2B 9013878b8498ca948eeac87173c7c6b71359cd8ff2d6833d7853fee7d195d4644f03f1a97c5da5f994f3e819d51ece3e2ef0dbba8ead56fb373e213874188bd5 SHA512 0c8f59e175f27a73cb993a0cf3315f9cec5a7f9efeb802717939674f7905a6dc47e7f4b12eb1964419cb3f62890dbff8e366bf1541a061de7fc9a004fb5535cd
+EBUILD uthash-2.3.0.ebuild 682 BLAKE2B efa59e549fd23a68f9c7378d5ee403702660be1d2109bc52cca542952a67d9ee8638119be99178998671de130c63bd8ca583a8917f3ff18e3f63db873421e7e1 SHA512 bd8fce2fc9fd0296fec3313442bb2714ff4b95759786a61398ab9636d31c6cc1b53333a7ac48b6d401676213d5eb8fb53e96ebfc6b891c828f395b95a67a77cc
 MISC metadata.xml 333 BLAKE2B 3c81a1a696bb53654558b17bb88f9b1c7c5086a07ec61148924b4ce062846233d5642304cb770b51d823de1d1bf86de538009d66099302d0a3a62e25b1db172c SHA512 bb882dac43b09c488ee541c90b05e8a4c62aa8700d3b85c3c491a2e5bb918b7b6032a018ed5a23f6e5c093c8e2b32bae8c7416119f12243e7a1700e83febc900
diff --git a/dev-libs/uthash/uthash-2.3.0.ebuild b/dev-libs/uthash/uthash-2.3.0.ebuild
index f9db43ac9176..41f2591d79e4 100644
--- a/dev-libs/uthash/uthash-2.3.0.ebuild
+++ b/dev-libs/uthash/uthash-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/troydhanson/uthash/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index b0debb2c2b53..aabb046b9d02 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index a95ee037b572..1d485438fa96 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -2,5 +2,5 @@ AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
 EBUILD ocamlbuild-0.11.0.ebuild 1297 BLAKE2B 06c06922091b5e8232a0010f7d774742d6315b7df1d5fd935e2dc5159681baf8ae50721eea8054aad79a51cd4b99dfd6d8a0c986954b8d4944203a1596c43dd6 SHA512 7a89f83eb743590bd909e807f499077291960322cb21292601f1886c9ee67df531a86082a3aa9d820b7d1958e214dc04021bc5cab97c3f973742198984539532
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1334 BLAKE2B 82ddd5980e27fd9828c9c1b8ab4d99150ed7adb8495764f8e408066c25cfd0ca7244daaa16ffdc080171b7048ee875acf48fff5636ca4d5d32655764e2de8e99 SHA512 2208f9cdb7cfb6cdaf3704ba5c98c9d4cb2f14d7e511910b4a52f39f5474af32593348c34b3a19a84d5839df177812adf4bc29b1a2e705a0187d5c255e01e70f
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1368 BLAKE2B 2d0f582e343aba4ab1b0796a94ea06f93e0d50baf0a7dc02d7cd45d923fef9f5bbab656da54f9c5ec8c46e0e963c1c7624d9ccb3ffdabe54ec90994f1a0d3b2a SHA512 3640fd2a3a8b7316633ee40032f2dfbbb3c6f7ea63835dfe34cae624f724bcf0d487b7af6cbd90b6483983212ebe8ad3e3d02d89b6c6e9bbbc7b927ed405dd10
 MISC metadata.xml 419 BLAKE2B 10c584b700f9726f803ad4a72bb6f2c3216c8550a0e373ffe03b950bf61ef04fb9eb955dcf839065eedba0917546c914f6fb8ad147e6c762898dbcd1124ce03f SHA512 b9f22d5c890c578e527e9394a79c901932c2abc148270954d43744030e39e55e3276c7ee28057353bde3301de347570aa3bdd06b758ac57e6e6ed24497a81c98
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index ba6c5777b382..2e56df10a32b 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -12,6 +12,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( ocamlopt )"
 
 RDEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
 DEPEND="${RDEPEND}
diff --git a/dev-ml/opam-client/Manifest b/dev-ml/opam-client/Manifest
index bae3d66fffa8..a4a59856dbe7 100644
--- a/dev-ml/opam-client/Manifest
+++ b/dev-ml/opam-client/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-client-2.0.10.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
 EBUILD opam-client-2.0.8-r1.ebuild 953 BLAKE2B 624189392e8593d9d03020c3c7e92cce3b5ecf774f30a8b14130f37f43d56222588edaf33df1f20bb51541f748d13a8aac0065bca1b3c3bbe0268ae746a41339 SHA512 a21de850b2e3c33366017b871474909584e52ded599322fd1290dd7d3b221d53a66bbbdb01a80e2937be98b1bd6229b2edc4132c0cb7c1b353977a009f37414b
 EBUILD opam-client-2.0.8.ebuild 820 BLAKE2B 7c899f93e3c1f5f52ea56506976ae5deeed672887983777c67624e5caf535aff241bb1e1615e4545cd5e2c194a92b7dc8348d4530ec2a0233836f3a4cb4913b3 SHA512 e7d1d9b430710f102c8b7df90befc6cbc915e8b92b8702f03d2903a6944e3c6eeb85288169add272bca90df197ecac0a856080fd1323e644d135e45a824ce370
-EBUILD opam-client-2.0.9.ebuild 959 BLAKE2B 0c49373bc78678c7fc11fc5cb9d33a5495d83dc5d5de67e7219f1dba81fc448b9038a41ed01bfd05f33a48a0d70f9edf1f10bc87e5c2958863f7b4c90dc47a6d SHA512 5cc5ceeaa8b0c3c3a1ae5897a49b7d1643652010c2aa610a6a0cf4c4c18101e26c2c4bc65e0de858ba5e472ba411d76261af8f3dac506a30d205480a115ba491
+EBUILD opam-client-2.0.9.ebuild 956 BLAKE2B b33407c6ca291813a3e336cf56f632951f6239599e56f8b2e99ff1d1bfad6209b19fd632a8f1404ec8a33877c9cab3e4a5c463f2a7a3244566069b876758b206 SHA512 7f365e50fa810b4305e37bb33d821bfdb65a8877c2ad841bdcc4a437a609a0101fde881c572bdc5bb6c8727f669e129eb83f7a7cada71184ca25b6cc7c8ff714
 EBUILD opam-client-2.1.0.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
 EBUILD opam-client-2.1.1.ebuild 945 BLAKE2B e8932dd197dfd2ef3122a879898610f38c39417ed60bc23d54a65fdc013229056da482bdca95f11cbb7d3366e45b654edc5c91f203e10a72602e75b3a1341ea2 SHA512 8ef8778daaccdc3311caaca0602318292d6e02acb587b8d538f0b8c1349addb5c1a1ab6088a9442f6700102c284c998965503ce60219f07d7261aa7fec6b7b38
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-client/opam-client-2.0.9.ebuild b/dev-ml/opam-client/opam-client-2.0.9.ebuild
index 4b52fb7e1ef9..13de606bd2cf 100644
--- a/dev-ml/opam-client/opam-client-2.0.9.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index c2885f23d42c..a93928d34363 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/Manifest
@@ -6,7 +6,7 @@ DIST opam-2.1.0.tar.gz 825966 BLAKE2B 42ab8ad2825e4e167618ece7bd2ce77ff055d58403
 DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80add977a0e677df026225b5cd737409717026cfbc95388094a0434eb9ff865043c1781eba228f1499c9ab996 SHA512 fb46bc8f12e49c2da95c5f8669f55fb93710ee826827538852c3091ec2c714c082137373fa9e1ad3f53f107b1fae6c2abd0b6e5f84f7756bd3b38e57978f080e
 EBUILD opam-core-2.0.10.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.0.8-r1.ebuild 880 BLAKE2B 4cdae8b13b22234fc9628ba3816a5382940201bb6a416766dc0ed1bc096f79fa5ed3d4601547eb83a9655c183a5aa52703e5dc6b068558e0ab83492782c95f6a SHA512 9097d88ac2615449b25a39dde43ae0b61b67bada0f14b2e51071dee777e23b81c7db2872e814e06f44a625bc1d9dcbff27edac87b002f3496ce996dba37696a1
-EBUILD opam-core-2.0.9.ebuild 886 BLAKE2B 46d8727976c104e28523732be20be6b7befde9a3becf3be12e41fde5ff0b6e93d9dfd01cb1536245bb86a8ba2d8864f08fdb4bfb4de54523851fc6fd43366398 SHA512 be4693a07a8c5d52150a175e20ca22f2e441c782ed94dfab55d6df7fa3be78cf699cb6e66a9f9a548c33706a8fdad74047c9c109b90000a4c85fbbd74e3f0d7e
+EBUILD opam-core-2.0.9.ebuild 883 BLAKE2B a09fd2baeb801eebde392942b950ef35a3b69c1b1efe456b6a011fe8e9ada74433da8c195fc1d9bac985799c74588dd7d6291d14d50d0e2783bb70ec59b8d10c SHA512 5cc99fbd875bfebddc74a7fcfda8c0bf297bbe0468ed0a00bb2a82463e11f43887b71f6cccf536df079a736bbd3976992af0d8411ecfa2cc35f683d155d14df7
 EBUILD opam-core-2.1.0.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 EBUILD opam-core-2.1.1.ebuild 1008 BLAKE2B 7237cf6ac3134cd86239a99187b97026fa608046b17f78d9b2fbd066b94b7d4f4c9e2361e02dcdb53fe89a750905a868a6ad0c894dc85ddd760e881f2cc2a2be SHA512 713968464097a18b57deea518fba9136b39c7155e068854eb32fc712af19155d143d01415a99dbaf896079e6dfe9ad2613e290b600ffd650cca5bd2a4755c08f
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-core/opam-core-2.0.9.ebuild b/dev-ml/opam-core/opam-core-2.0.9.ebuild
index 63cab62e8277..70bf7ecfcf6a 100644
--- a/dev-ml/opam-core/opam-core-2.0.9.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 452d3ab05f6e..27c42753cb31 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-format-2.0.10.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
 EBUILD opam-format-2.0.8-r2.ebuild 839 BLAKE2B 9bd5bc8b71da0ecb840f1f5cb14f78052d4d0f1ce8a2beeafa8f7afac25dc1840f48dfb84087fc964d0e72ea8748c48a3df250eb3d29e7197ef949c532faadf2 SHA512 8f78d05582ada892d34954cca1265737a83932bda148890c2ce954a8909cac035f9c5c6c73ec693e7edc193750ee28e5664c26b4d4097fee194a54b7c351cf96
 EBUILD opam-format-2.0.8-r3.ebuild 978 BLAKE2B 0479608ccf96e920397e6796cf472dfe4203f21385ff2ab6d17ad26ec20b136a2e6cdd1bb9b9384a13137427d65721305145d0bc3703d5226b2bd415dc3f4f5e SHA512 81d9f62c38fbd96d2bd80d3863a2ffffca64f303e1d73b0521078c0ff3848424581801e263a95eadc6366ef7d00639b7b28698605c4dd5f230aac3d6ac2d48db
-EBUILD opam-format-2.0.9.ebuild 984 BLAKE2B 2d0ac08a3955b84ada2dfdcbca6c6fa86e23ef3f5a6c268d8fd775a48d50b6fdf4c6e29d24468ab28ff0c64eb07da59b9dae1ea0673482401230b4171662fabd SHA512 3c0a3534f139b29de193c253c58d8e2693945121af29dfb92a3c69f2e81685187efc5cb610c3208b88ee4b5333681dc70dfaf081e4fb304f9b290c0d52d50e29
+EBUILD opam-format-2.0.9.ebuild 981 BLAKE2B db8e142a7a9ccde231e38849c85e777861bc5e731a51f67d9becbc5594cd48dac5682a08a1602499a886f03c34a748d1f7d8485623da9eddbbe4659aaeec7431 SHA512 d3f8a8b1cf4d2c5bf776486462c92eb47adf248ef11ae69288cf9b72fb6dc94288b22f459103bef20d4ad3c364b5670eb7a4ad2e9bc11a753db80a505b089c1e
 EBUILD opam-format-2.1.0.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
 EBUILD opam-format-2.1.1.ebuild 970 BLAKE2B 7463ddab831f848e84822238445c88bbfedfc2264f837f585416285ce3fb92945963a4c881329948bf416820779f5d18c51526833a086588ab35c45e4f7b90ae SHA512 2f02b5fec36acb49976bc479c6489335a02266cca8552e8e32bb1105ed50d5b0de6031f6db58fc29768a876f79d2caff63098445b427e1e2b6b972bfe0478f64
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-format/opam-format-2.0.9.ebuild b/dev-ml/opam-format/opam-format-2.0.9.ebuild
index ace83b9a6ae8..55a297265d4e 100644
--- a/dev-ml/opam-format/opam-format-2.0.9.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 773adc5199b6..8571aa433277 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -9,7 +9,7 @@ EBUILD opam-installer-2.0.10.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527c
 EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 EBUILD opam-installer-2.0.8-r2.ebuild 1014 BLAKE2B d5152345b50b7475a4f19f8e34bce269a8329e85ad7ca86f89373cc20f5ffc6e5e233c8ccf5247797fb86880a8bfd37005941e753b2bf6a06d3a7194462da18b SHA512 4d91c847eca096f95654cffa6c26701e1c4e65c1bf0e28c3eba3b01da9170071449a7e335954da270764581b4bc7a7dc1b0210d50e254bd22c9eeeef22f0223d
 EBUILD opam-installer-2.0.8-r3.ebuild 1187 BLAKE2B d18cdb65a28ed6043ad63c818ad7dfe9552f4d128353438ce9d6bcc2af16ccd89b5b6b6432ea46eee3216eac401f6c97df56067d95ce994ae8b8d93ca52d4a59 SHA512 bb8f6fa1251c10097d06443b866d139372fd2da2b0cbd5057c673d1507d451d13ca60677e0be7b92e546149d6843a27275159ec1a23d5a5fe785937e24e4ba4e
-EBUILD opam-installer-2.0.9.ebuild 1193 BLAKE2B 2146bb8d98820a6baeffb5ee098527ca75529e4fa8302efac24e455526242db224707dced11a2bad732da18db02e680d979518fb156e28974c4dac4ca833c909 SHA512 3572227ee5a0c0b89d4ed201da95d831056d5227673a5015bb4139fd08b2b5ff0e73a22c0e2e14fec989b18303222abf38ae7d78c7b7385f8e45c4420c9db299
+EBUILD opam-installer-2.0.9.ebuild 1190 BLAKE2B 351f95956654fdd146e6867b7e7fb4c1be31bcaef38354204191d2aba97439bafe52c00937b46aaf8050d3e7e5e4beeb643af141fe86196cf3a72849e2b4ab72 SHA512 2c25257707efc5604fee50cbb2094266f5fa1547f1f0b5b90d1316c7e2e75244031d9fdf2389c615d9a31eaffbeb321d0ce6b8f068e449f8c3b70730769ee8d2
 EBUILD opam-installer-2.1.0.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 EBUILD opam-installer-2.1.1.ebuild 1025 BLAKE2B 4fcb445ca539b14a30c79788fbd7350eaf242fb8dace406f043d4db4adaf8bec51a1d72c3134dfab25e615501f5ea8c2e751ee1e00502b4adbeb22ac9048b97b SHA512 f237e7f35d2567d8bba39f9a281706a8060cfb2680be1ecad78094ace4ac14a4be5d65b5715c2f213b39335df7ddbb27f1b54c8da21864474624def819f5abcf
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
index a2b88905a299..affb837429ae 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 
 # Cherry-picked from https://deb.debian.org/debian/pool/main/o/opam/opam_2.0.8-1.debian.tar.xz
 PATCHES=( "${FILESDIR}/debian-Port-to-Dose3-6.0.1.patch" )
diff --git a/dev-ml/opam-repository/Manifest b/dev-ml/opam-repository/Manifest
index eb78f66fbcd5..520703c0d539 100644
--- a/dev-ml/opam-repository/Manifest
+++ b/dev-ml/opam-repository/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-repository-2.0.10.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
 EBUILD opam-repository-2.0.8-r1.ebuild 915 BLAKE2B d4be9123a2e53a35e33d698fc8ba3b15b609609065515607170aa8f4a2c245cf6d83006e533b914165c65991618fddeb37c822b49516cdef9261dbcf6a692d09 SHA512 f861fa6d9bf66a8d393ecb9cd39fd81b65b3b0ba051c26e4863e1fea4563a403a605f171eb14d6b1bc1b4c83c6bf5726f05b189f5bf83391b3da26fcf4b513e7
 EBUILD opam-repository-2.0.8.ebuild 776 BLAKE2B 4d63d9ee36f06e82b59510c92c3d5923a17ecb9626427681358d340780e98e1490b1e87366120f9c5429f75a1943aa47aeffbed9a50abed72cd3e76fe12c816a SHA512 1bbfe111bc3e9682205f549dcb7b298ccebd92e268ebb585aa68f98255b87b01ac2aa25535e04d0220b16fd6955dfdfa1d4fc0f17d9a60ab361348e92942a7b6
-EBUILD opam-repository-2.0.9.ebuild 921 BLAKE2B 1e39fbd674834241eb5eb27768cbe829951cfd15d17811b92134d4f3b97ec2fcdc8a2bf86e5eaee696e175ca1ca23d5f73f2752e53754b73ba8147cb7d044d9f SHA512 071d1c33e57180cbb182eb05e7b044862bc5af3736a904a15e029488cb017cb85249b936d4e2c4f739818d996c02791dc50eeddfac2f43aaac4e3c1e8883a4ac
+EBUILD opam-repository-2.0.9.ebuild 918 BLAKE2B 7870c7311ac6a5c92d61ebaaf59f43dbc61cfc8cb08fe229aa77960fda2da3ffed3668d4c5e15c1b8b10e3a2e0db605f388a41941b92ba453c9fdcf627d26143 SHA512 6946c46198588d705afb8c57e9959bd86ca5cd69aab434f9807b98e3c92fc86fe9727ea39a586eb68294c2675396de05ced816e0c99d512cad52d4a1cee0df51
 EBUILD opam-repository-2.1.0.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 EBUILD opam-repository-2.1.1.ebuild 907 BLAKE2B a5ea29777911bbdd1f19661edc4bad8e104ab69f937aa0bed110fcf25383d2c204aa72531f4e2e6e0737d0f93d0acaaef4598f073e3bc682b2ca9d49e5d5c536 SHA512 07b96a5df895d6420e37af1ca2d73dc020feeb034e361e048dc0f607ac95ddb53d3b57833621295c4f527794e101c9431398af6934e7bfe2660cbe5b08ebcd8d
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
index 77365ae1bced..166395456fac 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index fc5db4ee80c1..45adb0bf7e7d 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-solver-2.0.10.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
 EBUILD opam-solver-2.0.8-r1.ebuild 985 BLAKE2B b215b32656aa0f54599cbdfde1f462ee3ae3eedf66fba8e8f34703a03775f9c1337169a6b4d4444f1a64e254a5cdbb4377baeabbd484793c40a6a79950090221 SHA512 43c266184cece4831e1c0cf3378b3e47c02d1aab9e8421630f5f1fa8fb5d3d2671d0979d3c9c5dc9cca22217616c7cd635a88a8d470325b2b933a7cd83e288a5
 EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
-EBUILD opam-solver-2.0.9.ebuild 991 BLAKE2B b3b86e67c53021a8da65d5ab28a3f4d7129c288755e59a3f127c3c6c20cd6c2eeb96bef19c6a700fc43616c58e357e276558020545954eedbaa80c9f4670cc25 SHA512 34917ade63f11472c468b91e290f2a929df49b56d0096e827076f7c05df8867644df6fcdcdc4884e7493eb5c636103e3a282a46501cba2b0cca6b62460bd452f
+EBUILD opam-solver-2.0.9.ebuild 988 BLAKE2B 59a618a9a08591a754ca34e13db442254e25b984bcd93b75c6e58c9dcbe8a6ad8de87584027402e0bdc0593c80fca640a5b5517aeb411d9a9712f4d1d568ad02 SHA512 64e320ccc1a84391da003ccff83b214a12fe5b18405e61a82bb6f01b0504e79d960d95b5d4d094fd927914912fee50e2bb33b2bfe3dd886c892f77aa9dd76aad
 EBUILD opam-solver-2.1.0.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 EBUILD opam-solver-2.1.1.ebuild 977 BLAKE2B 9b13e4b2e12320e53e0d4e2ea0df78e0dc83b1b02b97c97ef0eafa9b66bf0bd00c1dc125f5380b2e2f5e0053fd20f49ac0c74248b67abc5650a608d6d59189c0 SHA512 3c5e0ac05b7fdc3f63df240814a562d9a0b83a398442ad965cf5058124d1a5eef58ba39952e55b028acb9094f9bec00040519af430c14dfa68c0e8961ea3ab49
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
index aa993e87c76c..1926ca0aebab 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-state/Manifest b/dev-ml/opam-state/Manifest
index f09dc8b1cdb4..0a224eb050fb 100644
--- a/dev-ml/opam-state/Manifest
+++ b/dev-ml/opam-state/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-state-2.0.10.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
 EBUILD opam-state-2.0.8-r1.ebuild 892 BLAKE2B aeafe2814aae5386ffcfece6c5a8ee56ee17fa61962135aa164e5253185b84e0c2f4a4e271e6fe6920f3ae3205c849c83b48834a6e6a60c364ea9eb0cf4f7629 SHA512 4c52036d0b0bec5b508f92a7e3d2772ae4d975d69d1acfbe2b850535d7d27d7f2404241fe655d03d641eab838f079bd42137a02426baa4d6ca81f11e005196bb
 EBUILD opam-state-2.0.8.ebuild 759 BLAKE2B dfbb268b17a66de025f6bf66d76fa7da257cd88646aa6faebe2b35f882d2b5cea6a896f16f640db633d70d0f50054251e6e3e7be3a8c4e5fceae1595bbddaeca SHA512 dcffb7e14d61ab1c584bfe249b03c53d000ccbef2c9f9c60e879b9de94c803df425802675abd27c1e91590b7ea493623ae9c8a03753fe08798ca1483196eaa8c
-EBUILD opam-state-2.0.9.ebuild 898 BLAKE2B 19479c7ced8afbbf74644e642a026385a4104bc22e6c231a63fc14292a486d66442de41adb764f718d213a6dfede2d0c7f286f428b35b90335869ee743b66e8e SHA512 cbe5c717e72d38a6c482abb47a0ab25f9f77801266312c7e971165a17c8203e1630a9548010106e52bd3cc2275f7e29b6bf11eb2c1a0f121684fa0c0f636c4ba
+EBUILD opam-state-2.0.9.ebuild 895 BLAKE2B f24a6577952df3e8d0535b2abed2d2be94dd76aa722666f796c7fd54cad81506c1e37db4bb979b2e52c810b85306a48fff7bac9bac4b45254102e7341f384e85 SHA512 631a8c3b3e3ee5c69a6037aec624a273b56529594bcf79580b07721e84d31349e11c7b6ebc3b494c1bf82a8b363e1df7660c3b04a968b03a98a920e865ac268d
 EBUILD opam-state-2.1.0.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 EBUILD opam-state-2.1.1.ebuild 884 BLAKE2B ba2f2c0c46f36a7da0d2717cc10e548994947482efd9e7de2a3758f956b074384be391db9b6f204c3217e3e0b66314df71edf07222c05e8d81f5d3d6bb3d1a49 SHA512 b550a358e9ac408057271648f7433c96d04d5b8a0d1854ba953b1c37202e97d2132847f4637b1990ef2f3c50afa3b9685a265d9ab8412c738a6ea5abbc2466e4
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam-state/opam-state-2.0.9.ebuild b/dev-ml/opam-state/opam-state-2.0.9.ebuild
index cf9ab72c819e..7778c92fc1ae 100644
--- a/dev-ml/opam-state/opam-state-2.0.9.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam/Manifest b/dev-ml/opam/Manifest
index 08030cabbf2d..ff37b22e96ba 100644
--- a/dev-ml/opam/Manifest
+++ b/dev-ml/opam/Manifest
@@ -8,7 +8,7 @@ DIST opam-2.1.1.tar.gz 818555 BLAKE2B 0f3e94c723774c38a5ad553f58fa796836eb8ef80a
 EBUILD opam-2.0.10.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
 EBUILD opam-2.0.8-r1.ebuild 818 BLAKE2B 2cdef3169d4c660daa501a449c0f204ae3bd12e8bd1a66cb4bde94ea4e523457fe952a61330cecbd1a59d14754d0e167efe453589387f9fe666b7804caa370f4 SHA512 7ebd4e81e160649198b792911d5f16bd4a7c001b60b2b4db3b8509caeb0d537c4114618d25b1ffbbd66c96f32373a7824b6530587ad8f9f4d1249de9400cf7d2
 EBUILD opam-2.0.8-r2.ebuild 957 BLAKE2B 70c77656cc85045f056848f07ab5d914b1564f1cc4505a8ffcc01b93262c52b56d0d3a1e87ca4a8be6f496a1b15bce17d795262aa4cc3985a318aea65ba1b7fd SHA512 f7745c7df1bb6c862bd54cc57376df0046279d3961e22cab77ee0b43239e15471d8c6b28dff44ced28c4c18b1eeac4a7aa656c6e1ee6a8d3869fc24e30a457fc
-EBUILD opam-2.0.9.ebuild 963 BLAKE2B 3ba5f51f310eaa23515c561525215b2e21ce836d77aae765829a30b79c440d4910870171176e5460a8c6075e1c0f9e3bf699d5f9eefb2a80757a13ad18b5f6c1 SHA512 3b3e82b207f16807d1e266b5e1284622c5a8c58aad21dcd56664f053a84c4cae3029286c8ddf5c0082be13b8ba6bb43d6f7775d475be9c01b0002ea566a43e95
+EBUILD opam-2.0.9.ebuild 960 BLAKE2B a0274325cdaca812f37263433eabaa41f584e37dc790e88bf4b15334576b996f83484230492adaea74b6805b272e8e194fdee8feec7719e287cef96506270e16 SHA512 a5474bdac9243fc3fc13aca0481d8b0e40f60ef72a848e2124d9b326d7b0f5f8fb642e43cf2d2eb3bf6e8aa6be95ae0b90bdab7b57b3255c19eaeffce2764c3c
 EBUILD opam-2.1.0.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 EBUILD opam-2.1.1.ebuild 949 BLAKE2B c3db9b32322ae6acb0dc76e22fd67eea01d2e03016b6bf8aa41223065dd18d5f00eeeb26b57f45d83f9836fe8da960db4177f244ea6b032b80f6353843125914 SHA512 0189369c5a3daf3f596cac822437c6edf71fa0c6a7257ef78f5ceb16a293902962d44cb51462550302b36aa64a94f2bf5a96905ef532296244f8c82931befe0e
 MISC metadata.xml 413 BLAKE2B cbdd94927312b95f2b5f76489f341f658974be49f704b81a4524879bbe780dcc5d9505b863b87da002cd98b8bb1e13967b047095dbe1eac589acd3145b66fc6c SHA512 afe675cebc52bba018a89d8f04b5c993ae8306f8d18ae2175be4c372f3219c63606b34bbb45c7daaab53be8eb7747fb7e86417bd29bbed2753458f564f3078da
diff --git a/dev-ml/opam/opam-2.0.9.ebuild b/dev-ml/opam/opam-2.0.9.ebuild
index e882aefd038f..f5a8f125e8db 100644
--- a/dev-ml/opam/opam-2.0.9.ebuild
+++ b/dev-ml/opam/opam-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild b/dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild
index b0e817a3a44f..56d0efc5dd5c 100644
--- a/dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild
+++ b/dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Client library for fastcgi protocol"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-IO
diff --git a/dev-perl/FCGI-Client/Manifest b/dev-perl/FCGI-Client/Manifest
index 91e6a263a019..cc1af69d9a6a 100644
--- a/dev-perl/FCGI-Client/Manifest
+++ b/dev-perl/FCGI-Client/Manifest
@@ -1,3 +1,3 @@
 DIST FCGI-Client-0.09.tar.gz 19488 BLAKE2B d387efd93ce8a8d1ddfad1393d72e29d550800a40271c998f9eed5b689638e2766a5ea990a318c75057ecff91489e9ff305164d8f5d2b78c7cc6ebd23ea5a65e SHA512 962166f10cd79f99a67a94002b4cff7324fced3aca6448cd485d07c489e6fbb25a090b964622aa178a20c8f930f916c5aac10525392ace45cfcb908733675079
-EBUILD FCGI-Client-0.90.0.ebuild 440 BLAKE2B 815d6418ce3a66ff52a5b133ed3d8e128e766993f74c52af9b5dec5008541dbf2c2d209a9ec4c2d7793c124896e5c39a2415c71a9bde25cf82ea845fb3cb2a3d SHA512 b6cda01b34093a0457328ac9ca1483abe99e633229da4ebd106f391369ce3702c061d1b3c47c0f34aa0a39dc154fd4b0fc7c4b24b8b5072f16687e020818d332
+EBUILD FCGI-Client-0.90.0.ebuild 446 BLAKE2B 820a20fb5236cb75be5c46d402699544b7346ff4785f18be6bbfee4789a39416113f39ed06e9f6f5532d8c339fcb6a617fcfac041ee28b8ffab2447d22e540b3 SHA512 1c51a9d420f5ecee2c9b418292fdcd4099c9b03fa2d4785fe8f03b193dee1bbea3c7fd7a3da805658fc81cd30e4d639afee534da4c913f1af4f612b837dbd900
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/FCGI/FCGI-0.820.0.ebuild b/dev-perl/FCGI/FCGI-0.820.0.ebuild
index 582b2eff7254..55b3a3aea189 100644
--- a/dev-perl/FCGI/FCGI-0.820.0.ebuild
+++ b/dev-perl/FCGI/FCGI-0.820.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ DESCRIPTION="Fast CGI module"
 
 LICENSE="FastCGI"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 RDEPEND="
 	virtual/perl-XSLoader
diff --git a/dev-perl/FCGI/Manifest b/dev-perl/FCGI/Manifest
index 5da5017520e5..74bae93eb589 100644
--- a/dev-perl/FCGI/Manifest
+++ b/dev-perl/FCGI/Manifest
@@ -1,5 +1,5 @@
 DIST FCGI-0.79.tar.gz 93884 BLAKE2B 6dc9fe5155acad50e41880daa78c60757c426c98659178218b3abbba694291a010d3cce1b7e37f50ea3231b094d1e9e780c0e78ad69617784c1b9ccab9172639 SHA512 18bb654b1d779881211e90c37144479fc2767dac71cdeb45099c67e1f2650f1aeae90d8646415b62a9b1dcc7595653b14c9f89b711416ebc6a31342bacd72c90
 DIST FCGI-0.82.tar.gz 96823 BLAKE2B 2d028751c91708183b355d4ce123ded4b0fd987f97b3ed140e52f3cdee83607ba19bdacf17b23137a3ae83524b0516873c0ea8ed326eb89888e9a71f93adabab SHA512 dd962678b4c2012298c9b34cd85ffbacbdfc269b3a25cad7a77aadf1545c2ccab63ea14b44ffff727d51520f62a9ddd943deaff80a442888efd1a2caadb53334
 EBUILD FCGI-0.790.0.ebuild 596 BLAKE2B adc5ef53e0870fca6c70c15b67803c21fca8f80a14d7b966b4eafd82ea8677d37305d20c8993a2209d8009935d002e0438e83d47734303270b5150d9a7da29e3 SHA512 129230f1c1745b6c49c727958a4a805c454acf40b84d7bb745056ce59dd06a43ba30b59acaebe83e1491a6f5433166fff966253203b32e510cc4a568c3cb53a6
-EBUILD FCGI-0.820.0.ebuild 489 BLAKE2B fa3c0a30b141d76b33d802f8147fe386deb25b0b8d129ffd0fb5369379ffec3880a7c39012db906d347ce477c33e1682d8a1ee221d5f36b51cdaea06fd16a09f SHA512 059544a1357f411f20424341cf20d9b71f57aea2e7d2e45b96af8900dc8ccf06f521384351286015ca271c6af2797bd884c390284916f7988c7316b6a78fb174
+EBUILD FCGI-0.820.0.ebuild 495 BLAKE2B 6e784e4133ed0fe981391ff772c5c7bcfd644cbc3ede8574eb7870bdd84eb60d376ce43eef6ed659401e0433fa3e5dc444651cfeab38bbce17067a8439b21460 SHA512 65601f9a273a8dfa7e2ace5329539543d2aa69b7c1c26df79c5bab4bc424dbc9552210857d77d179d4b3390eb406b50d4ae37c876cdd477f0ca87bf573e8c2c7
 MISC metadata.xml 439 BLAKE2B aab5989dada427b54ba51491f0ce88a83227ecce50fdfab722d5e86ab684e2bbb4dc2aeb5cf12a4b8f1780d009cb09f2d7e8e0acb83ff62be4c9d78e99f704b5 SHA512 ec4d5954f2816f822d32f1508eedef31f7323d2ef841afce6651d78febff84fb5f29423d221a4e9bfa36339e7f788edb40627033f2b522124a62151d094f4d4c
diff --git a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild
index 4da4a0361b86..5117071e5291 100644
--- a/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild
+++ b/dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Object Oriented Authentication-Results Headers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	virtual/perl-Carp
diff --git a/dev-perl/Mail-AuthenticationResults/Manifest b/dev-perl/Mail-AuthenticationResults/Manifest
index 8ceadba88c59..9d17272b12ee 100644
--- a/dev-perl/Mail-AuthenticationResults/Manifest
+++ b/dev-perl/Mail-AuthenticationResults/Manifest
@@ -1,5 +1,5 @@
 DIST Mail-AuthenticationResults-2.20210112.tar.gz 30919 BLAKE2B a75feb4f72a5ea0415bda1aa1bb39b4a0bf9979a3863458649cb07e9cfe2e8ad258984aee8a4b7fa18924b46a188b27eaf56fe2c8ca1503d86c6c908e5c0910f SHA512 2168e8761947008670840ac1b534e2c374399120197d907b8d5c654bcb00baa5f7075caffa00a06eac5628a7583d96aeb9f077a1103266ad774aaff05f8f0130
 DIST Mail-AuthenticationResults-2.20210915.tar.gz 31535 BLAKE2B 9f459fc7a9b16ece0ef2eb7d216f82ebc93556bea642dd9f15949e759df430f7a80a408bb4ea1477bb4ddad931cbbf890577fa1a018b7d441d9b290b90a35418 SHA512 c1f1149853fd2a30116f70f126bc9822f4d085b030c5e09aec273792888c67ae141dff8c9c2368d21d692b3ca409bab89fef44d6ba0a40c9fe34b845568c570b
 EBUILD Mail-AuthenticationResults-2.202.101.120.ebuild 493 BLAKE2B 944bffedce029d8efc2325c287fbcf45f0b431ca5e2bbfe212774e21a2a15e3677d42ac224cfe05c45084c6d24ea0593610dc525fe2a164dd7c9e3a0af6a165b SHA512 6021732b881635c862fb4e5b1218bf644c86f8ae77c79ff8bb41e08218e420c2f4f7a54aac691d3f0108989b7a75fd1e2b0aa69e4e563aa834c838c7cf72b2c0
-EBUILD Mail-AuthenticationResults-2.202.109.150-r1.ebuild 521 BLAKE2B 36bcd77106e8a69856628cf6410375fccc7bec457a808039d87ec05857572a794e4fdfb9b343eba2629421972b1fa131b18601eea86490a55b644c81108484fe SHA512 c17a4d7d98febf595fa2d4d96738bda7774f88a142ead0e9c858f2f3183e4cf23eedcdaa144731675c8c860030ffd2188fe3683d8b629e44dae4074bd5b4cb7f
+EBUILD Mail-AuthenticationResults-2.202.109.150-r1.ebuild 519 BLAKE2B 514845c2653fa650ee039cbbce9fde29d22c188a4651fa8317fb80394c9acf97c8b9c014851745d2c64459a16abcd5829134f7d60281b180b077720123530e8f SHA512 ab1ddeb953ac1f7d21c11ea7da9d1e2f3b90ce0767f54b71e69dd2fd60bf03a862d36c6c0a93a5675bcc676d20f4aebf242eedcb351936f00565465bbdc195f9
 MISC metadata.xml 258 BLAKE2B 27875c94f7bc66379335a8c7aa58972855f92cf88390cc368e1fe86ef5af4f370e66725b314e99486428cdd9330b341a6821ed5d3eb19af1950326f252b3eb18 SHA512 496cdc360ed68aacbf268bcd9d904ec27e855e4f70a4c76f4fd99b29d8abc5a41f598144dfa550c8982b6cc57e900aad69a97e32ad363af83e06b50afcb54080
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 676c9088b7b9..912c49e920c6 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/GitPython/GitPython-3.1.26.ebuild b/dev-python/GitPython/GitPython-3.1.26.ebuild
new file mode 100644
index 000000000000..12f116358c54
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.26.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.9
+SMMAP_P=smmap-5.0.0
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# upstream reverted the changes needing py3.10's typing module
+	# but did not update the dep
+	sed -i -e '/typing-extensions/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 09ecc1892caa..d0a2bb2304a3 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,10 +2,13 @@ DIST GitPython-3.1.24.gitbundle 9658020 BLAKE2B 4ac2c1a238de1d6e5be9f2d65ec486a1
 DIST GitPython-3.1.24.tar.gz 191249 BLAKE2B b60f5186aea33434d77b63997e5e9dc277b49a97934bfe250795af9c0ed92d00c478dd4475a00faa2f5867882f81161dcd21ed46c86883a48b8397266b5318de SHA512 af2aa85574287827e5d2b78f7a19776be57518aa0b8af7a3fb92bef0d97c6a27b3272ed39adf2080b39cd5a9eb114164de7a2a9bbf73cfe1fe2647e0b053b092
 DIST GitPython-3.1.25.gitbundle 9683858 BLAKE2B 64dc43f6602f797830c6bf44d85ee0b5f870ca7f52626cc6f6f3e9e3a01faf3ad1fcb276e4f583eac9ff9add74fb7ea967e8df614f93434e56ef7b57963540c0 SHA512 2f1d6f839e80b2c70e892af48511403ffc229e8d61cf0faa6680d9b011363ceb2f0da750028f831d3099c2cdce16c375ef60ec94cc2f831e93f54e7728a78f12
 DIST GitPython-3.1.25.tar.gz 191824 BLAKE2B 95185d0e45cfefd4c74c98d9319aacbd678f942e87569beaf87052c4090947ab58a508f5248998d23952277ccae93effdaab2dc0647fd07964971fdc7f2ac9d7 SHA512 f5b29f2374c63d122e697fca8bc65d2db03f43eb21c70a903fdb3bb1667ab647cff9ad6b473213a47d124775fb7424b5abff7b8d76bf2748ac848dd4aebdd04a
+DIST GitPython-3.1.26.gitbundle 9711896 BLAKE2B 31c06bc713cabe11f0a1cb5fe0a94dbca628cc047de3ac29d83eb97370ebe112aae813ab93717618d4382f13a63bd9cc79709e493c99f77c7d0a2a505181e869 SHA512 99ea5bf310e5edb36f02b44b07729041c683bd1eea1b7af278d6a89147a0761c04aa6eeafbd488b1c84935d00ebf47e7c6230984a8caaccdeccd8c3878b094e4
+DIST GitPython-3.1.26.tar.gz 191901 BLAKE2B 365defa1947719273319bbf8b035710b6bfcecae19d5a8f452d4667b4227f1a5bce4238ff9377b2ac97eee27de97410b19882072b5b6673ec6a75638bd9c8751 SHA512 dcaa14b5bafb6d41c0d5afd57494146b309bcd9a7c65ed4ce56f71fc6e2399640147fac7319dd91b8ea4ae1ca38d02885d5a4b64eccb043c4b8a4347e27a1ecb
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST gitdb-4.0.9.gitbundle 1461448 BLAKE2B dad9efdc4e9711361c851f4745df2e3fa3b2360ab58cffea971a854429cf3e11862a267efb5afa3d9ff7668dc6d1bb7f11aa033172238bea61a6252d0488b746 SHA512 eb71e6dd380e67a96a9dcd50a3a3c82aab8c7f85b1ca4258a92202a5e4cb5a1535363599c94ab26884b4cd755ce30694c1b193a95e5cd5199b5d4e2cf8e72818
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
 EBUILD GitPython-3.1.24-r1.ebuild 2162 BLAKE2B 1279f12c0f2ead67e929735fc1b9309c34aa70d494bf885488b740a4de95c8cde571afe150f6b811936e0dc13e84df1a5fb41c8d38e20c75dc9440c2da7e93b5 SHA512 2166128c96a50089c3f4f3634e7561cd6e5c67e2fbc03dbd01587c03a8d1848b219c310b4936416da86b637bc975bbfd6ae67ee444f0cb8547b203ca1e4b5e32
 EBUILD GitPython-3.1.25.ebuild 2170 BLAKE2B 9fa3e1ce424291ff9fd5b0cadf5930fecd204eac21e2867c60da951440e078220bca8373500b06d54ce913c18e7c6edee1da7fee2054686fe2c65b3e4d637dfa SHA512 5642267ae8c2170c240ef435c6d075ce0541b11a76b34c21a89ce16bb6bb9ba027177f6d5178754fa28884b9a3bf3306888dfe9fcdeede50341914d64d915f57
+EBUILD GitPython-3.1.26.ebuild 2170 BLAKE2B 9fa3e1ce424291ff9fd5b0cadf5930fecd204eac21e2867c60da951440e078220bca8373500b06d54ce913c18e7c6edee1da7fee2054686fe2c65b3e4d637dfa SHA512 5642267ae8c2170c240ef435c6d075ce0541b11a76b34c21a89ce16bb6bb9ba027177f6d5178754fa28884b9a3bf3306888dfe9fcdeede50341914d64d915f57
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d3e6d5a4ad1f..0f392d090139 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/argon2-cffi-bindings/Manifest b/dev-python/argon2-cffi-bindings/Manifest
index 9d729d9826ae..c5829dbbeefe 100644
--- a/dev-python/argon2-cffi-bindings/Manifest
+++ b/dev-python/argon2-cffi-bindings/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-bindings-21.2.0.tar.gz 1779911 BLAKE2B 3e2e2252e37678661502ca15425196b91a7952d0bb5c7ae4ed35132e9085fbbe5d817c9c1bdec7d94eb583ab6baf9d1e1e454a24415bde1408287c5606745fb9 SHA512 71d023ae96073ed78599e4f4e42f8efcc985cc329adeea00b14b54eaac1e6a545e6ad9b7f4cfdc60a4e9c396f95053c0ccb6f6f67d92f70265f91315fff4a390
-EBUILD argon2-cffi-bindings-21.2.0.ebuild 882 BLAKE2B 3332084dbd7178ce50f202027f2048272b9caf8c0608e77f1eba2ae7c55d11eb50e65f8dead90fc3a6cdb102362d3a6feff292c805537d82d07747de37d24497 SHA512 959008cdb511197549355f75222f1e512e4a5fddcef48dac61e19099a2cb4c7affc5fc799fa2d0e11fea5fb163a70cddfcc4e8985dce8e56fa722c01f0bdabb9
+EBUILD argon2-cffi-bindings-21.2.0.ebuild 879 BLAKE2B ea5112438aa3f8539fa20ae859cf5375d9ffbd203cee233cec0109b961335beae0d873c5164cb002988f462deb3be74d2f6f36d6bef9332823bdc94e4b0fc1fe SHA512 e5d2dc02c421f924f10ebe88c65155463355ed45284f9d6b05ac4ef42b0babbecae90d84f6b29183f7c2f81d2babc93615aa9108afe885da0e98d78486f35a66
 MISC metadata.xml 684 BLAKE2B 80c3275f178c9972fe804e6965b62bda1caa24a3b4b66e985b372e6d587a6715821acedd63a06de10ac23b560bafe3b3c78a4fa78fcffabe55056b7429d74640 SHA512 e299e8d3f84c3d2c52508f182ba56ee350bd3b6d700c1fbe1fc87a13bf36a1b24b61b3f77e6f93c64e16312b306899460eb2cfcab0f972211ad6cc1791cecc39
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
index 101e4d4c7d5f..786cb64d2281 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="app-crypt/argon2:="
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index aaca75ae59a0..f58cbcfc7a5e 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -2,7 +2,7 @@ DIST argon2-cffi-21.1.0.tar.gz 1807800 BLAKE2B 47b1e785b7eb173b671a44e9212af76a5
 DIST argon2-cffi-21.2.0.tar.gz 42399 BLAKE2B d2f1a7e7caf776239f343f5e5f2cd1fcd78f0dbdfc28814e3299df18e5c97a81cafa37bf10733614fe32ddc8d19fa5c5721285e8b96b9172eaf2322a5bb9e529 SHA512 40cdd18106d959bf58f20a35ea84ac3c3859d28ed6cfa28ee81655c12038b4e0f28bfe2d8ee9b96cd6009dfcebe0ef6aa4eb7fa9cd81cad0b32911ca723a8bdd
 DIST argon2-cffi-21.3.0.tar.gz 38446 BLAKE2B e0464f501efcdfbf33d93e0c1c6dbc519ad6aee06c0b8692417156de608f6c6acf947f86b866c064601fe994087677e51d954ae2c1225cbbbba3534cf70c6296 SHA512 6cb2a075f3bb7040ee7f552d082bfa2f3df0854649d9c84fdfdb42bb4bee2133b8a35a20be2b3c887931efda12fbbb00815d8d88170b7e20b3ca19c86f97057e
 EBUILD argon2-cffi-21.1.0-r1.ebuild 763 BLAKE2B 25fa5be24583bc6cba16ff5b60c305b7b358d23fd849ed8b006e704dd9d5f09098bd51d22516b32d0527e6fa5a388e24450599a71b6238b6a59f670b8537157d SHA512 db9f3fb5464f2f5eb0d86dce73c70c45683a589469eff9297da0e9c01634a61d0c7effb1d2e13965da1a40c5824432a2a3acc4dedd6b3a52e4ec1b8ab0932a53
-EBUILD argon2-cffi-21.2.0.ebuild 1492 BLAKE2B 1731f7ed7acbfeb77ba8ac116d6a245e7359cd2c2873d27538343f6d67d70a88945d646a771a44671c9bcf3581a6a9e1498354b7228377256ef3cc05cd31fcad SHA512 7971e8f6e8f3d1561becf0bd1a5088b39fe0b2194499022211f2b4bfc067f2c73999dbfd128107331653fd63d930ee8e40cfcd8d519bef6109642c2b9fa0eae9
+EBUILD argon2-cffi-21.2.0.ebuild 1489 BLAKE2B 6f946cb63fbb2b0d0be90df2b04f6c26fedf8bc375244aa32a1a9d25c37f49a576660bb5a8f79e7ed43711dc2974e5c4cfbd5c392fbc43d5a4ec9bbea9438e98 SHA512 16e9c42190effb4e5d18f6d82b982b7a62540d26511b3e383a2ba8f422834580a5230dc0b94b82e5f9cea1bc636e58a4719c6080112c892578c4e467e9d5f4e5
 EBUILD argon2-cffi-21.3.0-r1.ebuild 1182 BLAKE2B c29f7f24849ff91682f993ae1a1fd98d086ac7ac5a9079a0b74a73c50d5fe47c47e132519e33f21370983e2d8e459ec9f2926245cc50f16ee2bafc5b51795936 SHA512 e4830868cbcfbf05dc63f12e48ba8651dee880ea12ffa9df4286ab55f7624e0afe0efe8b49cb5439b491586c0c81961ed6618eb6e0e02b126718b9a8fe64e858
 EBUILD argon2-cffi-21.3.0.ebuild 1479 BLAKE2B 07c5b6643dcf64f9d0aa9d5c3f327fe6bb8898e882c8e40aa9a5cb3689a49c86c3a84713d10d1ccec0ae1900c43a262310f60f0d98795d2a530aae6b3391b6cd SHA512 d67b48c4c7f38291eb264ec2acce7d8e3b0f64f42d078920cab3a6bd6592c5adba9d487c079f24e7781100b5e186739fa322e733e831222f350a5ad995504216
 MISC metadata.xml 666 BLAKE2B 831fde25c0b52ed8610f39ab589f339783bace8dc2cc60ffa4736257c352bc82b89e110bf44181790e4a16db967e4c516f21fbc3cd1526a9975cc86b21f723f7 SHA512 543bb0e37fdf96b8c2fa4ec26eae837317dda4688b4293e82268100ce69e3f9987e91b2f141cac1be4becba9698f9806d22242801523bec825271b8fa4f14bc8
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
index 4b92a9605e4c..626912c37ddf 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=">=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 13b2663c4b34..55949cf8b361 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,3 +1,5 @@
 DIST cfn-lint-0.56.3.tar.gz 8278034 BLAKE2B 894d30add7a193d256dc2195c0cd1d4b75f10f60abe9e37c5b0bdd84178d9559759326ad3e55d2321b99588094b436dc2dc8dff1cc561ae56dd4cee98d6b43bd SHA512 8aeaf44a626f9bfc05ebeefc8aec9211fcac1a65de681d5d700f3621631bff15e74ed644b9d0dc8af4d9b0b14802c2259dbc4ccf38594705040f5fd3af1cf482
+DIST cfn-lint-0.56.4.tar.gz 8550039 BLAKE2B 99efd99b423e068717f3050e4da444436463c16b0a55dfc36ca7ca45b1136d08bbce84441c8c4170eff7c82cbd4ecf87b6f78504b1d09d850d803a7e957903c9 SHA512 b7c94d85d58f9e44ff8d5575bb33c8c7fafcb908afe144d585765f02d645436d6583ecc802f0fa376597b75c72ada9a23862141cf1170c1ac1f64f2467d346fb
 EBUILD cfn-lint-0.56.3.ebuild 1702 BLAKE2B 8a8ef3027750e526b208d261e6dd31638e5922fb3502955c78d5d8b507bd257b75efeda5fc6f2a024bc3b07efe5e962b995f409bb9331ce959b99df61ebd01c4 SHA512 d907a4ecd603c0d2b0b75b7a702b7c7173894154ec2bdab364107a7b998d0a5bab210cb8f9161e0a167d5e24e95b673792efcaab6b7f794b9b5757afb740888f
+EBUILD cfn-lint-0.56.4.ebuild 1704 BLAKE2B 42928e071ccafc4418380bb7e4b419d86924d2462913c14473f4e795bf573f50e4a44305db121a7bf96de87b16b80ef038b79551debb13f1c052509942060ded SHA512 0662be6689df0fcfd7fce92053cf8f2199a8b07f27b3969612ce1af9a23ce8d993baff5e2ace11a2cea2686bddaca587cabeb79ab07450db8c89881df0a75fb3
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild b/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild
new file mode 100644
index 000000000000..3a28103e724a
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.56.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.42.0[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	test/unit/module/test_template.py::TestTemplate::test_build_graph
+	# requires git repo
+	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
+	# Internet
+	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
+	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index 93df32d2896d..6a12100f347a 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,6 +1,3 @@
-AUX css-parser-1.0.6-fix-py3.10-test.patch 5335 BLAKE2B c99d96c6fde03b0676521f1586ad60ad8c32f82b27c7fb99054edcff7f61b5450f12600d383c2d5d808643853ba8cfaf9a10eb54677de682d93273f6970eb557 SHA512 6d33f69edd1ef2c8b694e9b8bc34b1dc61be242eb32bbb15006529c6ec7ee9ee8e15566f002ef405d872174df65256dd609d2dbb63f7fbf7d9651fc32c559e11
-DIST css-parser-1.0.6.tar.gz 336932 BLAKE2B 00cfc4597137c0aa6af3cc8a72fa3e59a1d7b83210668c8421c0703a4a38d05d73f691ff00ffac14025f021a10f85c1d3697778794d23f75db381f5e63e24b7d SHA512 4c623541e1145c91458e7e2028f6a0de652ae2189dc99672fc72f098799d6349edb051bafc0901258481fa3422346303d2ef634392889ee83a29814609cdbd43
 DIST css-parser-1.0.7.tar.gz 348843 BLAKE2B 72fd2a0555eea2b912d3088b1d38a4bf082862a47a414c4c00718ad1b31299a3df3b2e9dcf4f22c3195520c28f5652aaf4103a9a999ceb3ea6b8c785f50bb40e SHA512 51e4ca836b18f963d798a14762bed78cbd3034598cc828dfe81b3f7d921a5bfe52374b0dc6160e1c01e40a8c8147a10664b9f7edeee867ca1086e6a4a96ff162
-EBUILD css-parser-1.0.6.ebuild 595 BLAKE2B 9e6986a702a2c7cfce7c75ade323666975d5ab1cdd37ab989cd5055958957d621e48269b2e7d7ff1836767a02d5c5cc0b68d1ce3f065e065736e12aa823d379b SHA512 989c44df0e09396c35b40cc78e45b75fb581aa5e4199babbf1d36b152adcfb907ce7836c4cac31e59b592f6f116b97a87966311e2fcef7bde370cbefe54c5916
-EBUILD css-parser-1.0.7.ebuild 541 BLAKE2B dfc296b6999bb9e635a60e903dc51fdd5bc187d1748e8ce46036d36835dc64c302926be4d105c343a94198beb7561bfc8adb9d57c06b8c2dd360c258617758c1 SHA512 be739f32dcc123b05a14aa7567b9da8f939b538e759abb76aee918196d269f928741409331471d3bddcf47287366fe6b9e5e27acc37695995ec4ff103b4b1d4b
+EBUILD css-parser-1.0.7.ebuild 539 BLAKE2B 1ff6c1dc4c6a78b8c83b85f17e0be129118c1fd3f774f14fb382d4101f04538e5fbbe4a942c5a7d51d669d7358449d22f14c8544694f186d5a8531a5332f3c7f SHA512 5e081b6795adb3374b2fcb54534f1c2af52abc8b7f74e63867ea3b17e1ee46627481750fc67b679095e71d52dd2cd52c6354c2cf8cd3d001be8a4843ae6db416
 MISC metadata.xml 479 BLAKE2B 117a5a889216d7f10d68f4f61a5787e5c921167a26d099e1f268916f5e96c8332a396d2a41d76411e48a67991473ac2dae158b8c978bbc6a88cc015e79d32f5a SHA512 339cb0d6b67f1aa92e4ebef1ffd1dd79975e92d67b91c0fb88a39ae6bd54a7e713964655d8e486b7107562cb5b186404714531c5b348985cbf8d598c00b29f75
diff --git a/dev-python/css-parser/css-parser-1.0.6.ebuild b/dev-python/css-parser/css-parser-1.0.6.ebuild
deleted file mode 100644
index c069413d87d8..000000000000
--- a/dev-python/css-parser/css-parser-1.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
-HOMEPAGE="https://pypi.org/project/css-parser/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.10-test.patch"
-)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/css-parser/css-parser-1.0.7.ebuild b/dev-python/css-parser/css-parser-1.0.7.ebuild
index 5ecdea286917..142831e80e03 100644
--- a/dev-python/css-parser/css-parser-1.0.7.ebuild
+++ b/dev-python/css-parser/css-parser-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch b/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
deleted file mode 100644
index 9107adefed56..000000000000
--- a/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff --git a/css_parser_tests/basetest.py b/css_parser_tests/basetest.py
-index 2b26906..115053f 100644
---- a/css_parser_tests/basetest.py
-+++ b/css_parser_tests/basetest.py
-@@ -149,21 +149,7 @@ class BaseTestCase(unittest.TestCase):
-         else:
-             self.fail("%s did not raise %s" % (callsig, exception))
- 
--    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
--        """
--        Just like unittest.TestCase.assertRaises,
--        but checks that the message is right too.
--
--        Usage::
--
--            self.assertRaisesMsg(
--                MyException, "Exception message",
--                my_function, (arg1, arg2)
--                )
--
--        from
--        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
--        """
-+    def _assertRaisesMsgSubstring(self, excClass, msg, substring_match, callableObj, *args, **kwargs):
-         try:
-             callableObj(*args, **kwargs)
-         except excClass as exc:
-@@ -171,7 +157,7 @@ class BaseTestCase(unittest.TestCase):
-             if not msg:
-                 # No message provided: any message is fine.
-                 return
--            elif excMsg == msg:
-+            elif (msg in excMsg if substring_match else msg == excMsg):
-                 # Message provided, and we got the right message: passes.
-                 return
-             else:
-@@ -189,6 +175,29 @@ class BaseTestCase(unittest.TestCase):
-                 excName
-             )
- 
-+    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
-+        """
-+        Just like unittest.TestCase.assertRaises,
-+        but checks that the message is right too.
-+
-+        Usage::
-+
-+            self.assertRaisesMsg(
-+                MyException, "Exception message",
-+                my_function, arg1, arg2,
-+                kwarg1=val, kwarg2=val)
-+
-+        from
-+        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
-+        """
-+        return self._assertRaisesMsgSubstring(excClass, msg, False, callableObj, *args, **kwargs)
-+
-+    def assertRaisesMsgSubstring(self, excClass, msg, callableObj, *args, **kwargs):
-+        """
-+        Just like assertRaisesMsg, but looks for substring in the message.
-+        """
-+        return self._assertRaisesMsgSubstring(excClass, msg, True, callableObj, *args, **kwargs)
-+
-     def do_equal_p(self, tests, att='cssText', debug=False, raising=True):
-         """
-         if raising self.p is used for parsing, else self.pf
-diff --git a/css_parser_tests/test_property.py b/css_parser_tests/test_property.py
-index ae6ab2a..561a5eb 100644
---- a/css_parser_tests/test_property.py
-+++ b/css_parser_tests/test_property.py
-@@ -162,8 +162,8 @@ class PropertyTestCase(basetest.BaseTestCase):
-         "Property.literalname"
-         p = css_parser.css.property.Property(r'c\olor', 'red')
-         self.assertEqual(r'c\olor', p.literalname)
--        self.assertRaisesMsg(AttributeError, "can't set attribute", p.__setattr__,
--                             'literalname', 'color')
-+        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", p.__setattr__,
-+                                      'literalname', 'color')
- 
-     def test_validate(self):
-         "Property.valid"
-diff --git a/css_parser_tests/test_selector.py b/css_parser_tests/test_selector.py
-index c0c769e..f2746d8 100644
---- a/css_parser_tests/test_selector.py
-+++ b/css_parser_tests/test_selector.py
-@@ -412,7 +412,7 @@ class SelectorTestCase(basetest.BaseTestCase):
- 
-         # readonly
-         def _set(): selector.specificity = 1
--        self.assertRaisesMsg(AttributeError, "can't set attribute", _set)
-+        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", _set)
- 
-         tests = {
-             '*': (0, 0, 0, 0),
-diff --git a/css_parser_tests/test_selectorlist.py b/css_parser_tests/test_selectorlist.py
-index 7028fe7..54c945a 100644
---- a/css_parser_tests/test_selectorlist.py
-+++ b/css_parser_tests/test_selectorlist.py
-@@ -11,6 +11,7 @@ from css_parser.css.selectorlist import SelectorList
- class SelectorListTestCase(basetest.BaseTestCase):
- 
-     def setUp(self):
-+        basetest.BaseTestCase.setUp(self)
-         self.r = SelectorList()
- 
-     def test_init(self):
-diff --git a/run_tests.py b/run_tests.py
-index 554c752..6507434 100755
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -1,10 +1,12 @@
- #!/usr/bin/env python
- # vim:fileencoding=utf-8
--# License: Apache 2.0 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
-+# License: LGPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
- 
--from __future__ import absolute_import, division, print_function, unicode_literals
-+from __future__ import (absolute_import, division, print_function,
-+                        unicode_literals)
- 
- import importlib
-+import logging
- import os
- import sys
- import unittest
-@@ -72,6 +74,7 @@ def find_tests():
- 
- def run_tests(test_names=()):
-     sys.path = [base, os.path.join(base, 'src')] + sys.path
-+    import css_parser
-     tests = find_tests()
-     suites = []
-     for name in test_names:
-@@ -85,6 +88,7 @@ def run_tests(test_names=()):
-     tests = unittest.TestSuite(suites) if suites else tests
- 
-     r = unittest.TextTestRunner
-+    css_parser.log.setLevel(logging.CRITICAL)
-     result = r().run(tests)
- 
-     if not result.wasSuccessful():
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 65449e0006f3..f8b75bdc092b 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,9 +2,7 @@ AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
 DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
 DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
-DIST docutils-0.18.tar.gz 2036219 BLAKE2B cb18016eaf674df18880cfac07484a68cfc158b68adc8c6ff5944b39407460a7feab192fb1c4bbef0293dacf58463e95c04bba53de578cf4e7c9ab8de14f6ed7 SHA512 c61bbe26b5f771dbfa4df94249bf19575088160f82a4a5cdf427a78d2675de915e9d979fffd515e353259ac57a08e7096c970f06ae20d7ca6f48d223072f0096
 EBUILD docutils-0.16-r1.ebuild 1833 BLAKE2B d2f52781d4b94f3224d77d00d62285c60ac8726b574dc6038fead712056ca39c10c917c6f53c6c45d033fcfe0b3394706d8e73f18e93c632c96d68fbf2fef446 SHA512 724bcd297b886e8dd68368a0a70165ac67da72e379d2dc6aa476deafca26c94fdff1df7bad51a5507922b8dc00396e0b688f19da646c0bbe5c6d9093310083e2
 EBUILD docutils-0.17.1.ebuild 1748 BLAKE2B 150d82c9667c782fcd015ec933a647fddf41022dac98253c7c4a187575d4526ad768cf6967f37dcbc89cd1030613b8a76466e6626021c23bf76020be24578cc0 SHA512 08d1c248a3db7098d50f8283b0d7a8b8e1cab5ffd7a8ff4ab8c779b216d3c74ec097f7185514c25ce1154b21f2ed3c03f09ef5b0d8d7ec69abd3f03d2cdb14df
-EBUILD docutils-0.18.1.ebuild 1756 BLAKE2B 42e23242c4edfbbb7bec80d33c1cd89689c6aa70be9fe610d9db6f9c3a2281f0c9782110bd981df915f3ea1629736e8f4c8a6ea4201e30daaa7bf5215a672f29 SHA512 9c8f201f3621614e6d62db780cde5c3cf95402b41d4ba14f846bbd456b25ce1d4e421a82ceb27ea054b1e83e9cc0aec8cb3cb6fcbf44d3bde333c2ef9e25c348
-EBUILD docutils-0.18.ebuild 1748 BLAKE2B ca7185e8f02cd7ac679725e55119543be4e9a19853fb23aca2abfcca4fbd9042405ac5bd3520c3b0ffdface39c245b31b6ce329650ac98a2f65b9b3a8ffa934e SHA512 c52fe86b64915a31e3bed105592afe798db79d32b5ae3c634a89bd9d488763c2d5b6faf5a41cc74ee4bf28ce21bd0f3eab225f4ce14d8b590745f347c89233f7
+EBUILD docutils-0.18.1.ebuild 1748 BLAKE2B 0ef8c8f4d5b8a7e5486b22da44ab1e2590896a926808805aeb014f9e166010240090a32df9ab733c600c0d9ccecf1fad7b29104c36dee2dcede65cf5ac80e123 SHA512 7ed7da4f0cbdad4bed26a29cfc17a1691203b1a050bbf0992cf08cdb04b0364d33aa44f8c4e412532e78f73931a8a1542960f7b5e251261319f87a55ed3aa248
 MISC metadata.xml 389 BLAKE2B b586fccb92f88e7f2ee68879bb919298953da9eb629fc1042f5f35b316b59ffcc614f23135fe1ab4af8ba9646bcbc33f194ac74af795094e20d288817b5e227b SHA512 ac8975a27694a2a0efd07c944a769f1a210bbf4a1550f92f0ead3ac2dc9ffb4d82206858f2a8631f751c81fdace88433b9d89f8c3d6af72907e102da5696693f
diff --git a/dev-python/docutils/docutils-0.18.1.ebuild b/dev-python/docutils/docutils-0.18.1.ebuild
index 59a8486954f7..4ae40190793a 100644
--- a/dev-python/docutils/docutils-0.18.1.ebuild
+++ b/dev-python/docutils/docutils-0.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 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 ~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=""
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/docutils/docutils-0.18.ebuild b/dev-python/docutils/docutils-0.18.ebuild
deleted file mode 100644
index e826ac2f7fba..000000000000
--- a/dev-python/docutils/docutils-0.18.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-python_compile_all() {
-	# Generate html docs from reStructured text sources.
-
-	# Place html4css1.css in base directory to ensure that the generated reference to it is correct.
-	cp docutils/writers/html4css1/html4css1.css . || die
-
-	cd tools || die
-	"${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
-		--stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Install tools.
-	python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
-	local doc="${1}"
-	local dir="txt/$(dirname ${doc})"
-	docinto "${dir}"
-	dodoc "${doc}"
-}
-
-python_install_all() {
-	local DOCS=( *.txt )
-	local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
-	distutils-r1_python_install_all
-
-	local doc
-	while IFS= read -r -d '' doc; do
-		install_txt_doc "${doc}"
-	done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/enrich/Manifest b/dev-python/enrich/Manifest
index 2333043a3b24..958bc55318ca 100644
--- a/dev-python/enrich/Manifest
+++ b/dev-python/enrich/Manifest
@@ -1,3 +1,5 @@
 DIST enrich-1.2.6.tar.gz 15581 BLAKE2B 06f104a11b2dc85c1d80a2b14c548aaac40c78795e86b1c6ae733f884fbd7af0776af53d8cdd15c15d6abb91ca89dd7f815823b419fc2b3de322b50e55844dd0 SHA512 07c280d3526538af9d718c6d423be50d67e8285007a6702b7f3d842725a63cb282192c29481cbea6cbe7da886b630e5694776092dc0ffcaac522ccf1e895b5a9
+DIST enrich-1.2.7.tar.gz 16918 BLAKE2B f8fdcc9322a60d8885faf44efbbeaea2a423dea956941679f96560ed9c6b2db5ec3f143c241fa60d579034e0fdbf8b0e490f8c5dd38cd519a55964135623f804 SHA512 4e3d8598e82d7d013ff74dd325be02245086159fef819431a1ba7505e2e1557992ccbefc0b5a37d0e81487b4e378bef02179c6b74fd50528d6710ff297f0832a
 EBUILD enrich-1.2.6.ebuild 582 BLAKE2B c9a7d2a50b39a66d52381305559fd2b1bbdcfe3fad2481bde21e775743ab4d169350367a184a4a24fa4920921ef43d40700ad778df466d8f5bc47cce256c82de SHA512 a51c6c98f9b099136ec5bf9ce011dcb70961a75c092c17a422589ac61626c4fe833e27b23554370866abbfa60db904c95a09c4f186a04776bea68468fb4cfbfc
+EBUILD enrich-1.2.7.ebuild 587 BLAKE2B 1a5ace7c57f75f0f406201429332b9ae74ef7f9a0d6189c028324b5a69c69dd80d19b6f34792679129da88ed523cb88b35cb889214af9dd6fe1f31f03a74ec42 SHA512 9d15767367c5b8f6c7d96f35c9d1bc04192b8ec27f309d0140cf4acf0ee62a5d0abbee3ebb73ab781f46fd4732cc0e04f940eaf7188ed7f5da13fbb1a5186fbd
 MISC metadata.xml 391 BLAKE2B c8e2ab1ee58575e9cf34a6873a1507d4eba04a61de74156aee7d2c5e16897c11da16b9b2deecfaa3740c501f869bf1b54e4dc597e57d8ae49464acc987154226 SHA512 bd76efefd66c46d17e9b31f674a4cc934e00f4322b1d90c6040a06c637b44985420226eea3202b6fa734983911ac3d1eb2436949bb99edc412e0f633a55d8358
diff --git a/dev-python/enrich/enrich-1.2.7.ebuild b/dev-python/enrich/enrich-1.2.7.ebuild
new file mode 100644
index 000000000000..73f0bf42970e
--- /dev/null
+++ b/dev-python/enrich/enrich-1.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Extend rich functionality"
+HOMEPAGE="https://github.com/pycontribs/enrich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="dev-python/rich[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index 7453a176e9f1..a58b5caa8580 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,3 +1,3 @@
 DIST fido2-0.9.3.tar.gz 217894 BLAKE2B ccc3a9b59045216037664b5bf4b969a79b86b300f67fc4253b563acbbee98912ea076996772f17b88141d2a36a933b4926de96f05c53e204d0bb4eaaa2daad6b SHA512 f105c347784cdfab88ab08852227d24f4bca623145f7f76bd066dadab6ada1eae751934fd4dc7436a5c5fb3a0ed2fc4d5c59bb2a93888d470028f0713ca7e09e
-EBUILD fido2-0.9.3.ebuild 1338 BLAKE2B c24ed847ada26e20b26913a0af124d47e91fad0651e4044f976d0821c240da7e05eff48d08ffa2d61bd598be2b7a008be39cc36af10719a2f34a6f8069b4e672 SHA512 f37f9e4e1ee30ef80ef241d8871a978d5d0944fc9c2e3edc4cf36b51cb1161eb864294b46fac09ee028b0a8b3f9329f3053d425de1e09225d8ce90ed424fdb01
+EBUILD fido2-0.9.3.ebuild 1345 BLAKE2B 4c477249eede6dd1fd6cd1856af5766e95aac6d007e2de65c72688422ae1905e09afb5fb646a1ed78a5409990c127859f96aada6210212c53c723316f39ac133 SHA512 83975e9bb7f1d97b4142974fdb01e3d83fdd8fab874cf1b1a226e296f0976bcd35d7dc96bcf1c1d049e4ed478d037a3a4027f1c9ca0613b398e134ee94e83b82
 MISC metadata.xml 820 BLAKE2B 092fc3aa0dc3e3a8998e7cef0a3229d5b8791983dc07df84c74ff6b7221afc879aa5a39a6ad58ff0bfe2836fa48b57d3445f20a0c78e2affc3bc47b73b81544b SHA512 f588e6637d75b668dabf80fc2c8e1133119a770d4f7fa5077025e0a478f8eb9c7f18eac1ce15395549485625bc4c82bdeebf07440087cd074e95d42a685eef53
diff --git a/dev-python/fido2/fido2-0.9.3.ebuild b/dev-python/fido2/fido2-0.9.3.ebuild
index ae881fb19eca..2e80af42e647 100644
--- a/dev-python/fido2/fido2-0.9.3.ebuild
+++ b/dev-python/fido2/fido2-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Yubico/python-fido2/releases/download/${PV}/${P}.tar
 
 LICENSE="Apache-2.0 BSD-2 MIT MPL-2.0"
 SLOT="0/0.9" # Bumped every time a backwards-incompatible version is released
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="examples"
 RESTRICT="test" # Tests require <dev-python/mock-4
 
diff --git a/dev-python/furo/Manifest b/dev-python/furo/Manifest
index 85e4574ee22e..665d652d68c5 100644
--- a/dev-python/furo/Manifest
+++ b/dev-python/furo/Manifest
@@ -1,3 +1,3 @@
 DIST furo-2021.10.9.tar.gz 69755 BLAKE2B d9dec7f2161491c1b9806fe8e1e98bf6d8f405ae17931e86da6edf44121a0bfbfef4db26f35b53cc929e143926bdbfb4f223aa52fdd65912cd49bd423e574a43 SHA512 4100cb08f6f97ffde2527ec5678e94da759323521bf26ba49dfe4c0851aabc59556872b494a7dec26fbf6e4ac2f2dbc4c7d92f7ef47cae7f9d256af38da91f7e
-EBUILD furo-2021.10.9.ebuild 683 BLAKE2B b4961e8aeeae7a40d02385bd640158dec0e7c83fc3bdfff0f51f4beac2e8f5543dc9bee3aeaca1ea920ccc17d93eb6a52cf738834b152ac723e38364d9d4d8da SHA512 2c06be6a50c2a2358885b59bb1af1a52ae5f3932cee9942a00547ea79237bb92e1e551f4f354e85817060090d0586c707277689f15784f0150f4165909a39284
+EBUILD furo-2021.10.9.ebuild 687 BLAKE2B dd533c0762b768fae8b57744011c10fd2d69c31385d35e2fa0dfcc72a4477504a0c937b3c5d1a9112aadb89812c5559bd0728cc5852a35e2868d2aafbcec1431 SHA512 9b94d076a9b4d31d24abf196f43b1a619ab68d008c2b1a46e33746fb6cbe24d8c0cd5ef248454690fde3c33d8161c8fa8c935412f89a54570a03d2f046a9036e
 MISC metadata.xml 412 BLAKE2B 8152eadd336ba3c73fb48a1ff4bbc236e9857dde77e354811a131794f0b750c0871239fbc2fd773979ec306ca3ddf62166f784559d486e6cd6f5d6b5c3902818 SHA512 fc3918b91916a176ce85d9740caacc70aae03b74339a62c0d77ae1e1f1b92a3db055cf1a1bc655a822ed800178971c39f29c2e45178c5e0ad6ae96f05e42a0cf
diff --git a/dev-python/furo/furo-2021.10.9.ebuild b/dev-python/furo/furo-2021.10.9.ebuild
index 992e79aa37f7..fca9998785fc 100644
--- a/dev-python/furo/furo-2021.10.9.ebuild
+++ b/dev-python/furo/furo-2021.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 17e1904892bf..064a62a7c1ce 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,9 +1,7 @@
-DIST mkdocs-material-8.0.5.tar.gz 7523273 BLAKE2B 93b1f545e90784635a0f9b4c01a697310b18421540fd9563c5307806268af2e48e37c193979b8d86823bd5d875b1cc16d912aab52d108b12d6a796b08f8e7932 SHA512 6508b740ccc4ff7bd30c207cbe437d62c02140566cec047fdf0d98a23894825199b0928764f3fa1fe1314e9e95beaeff817d900dc5bf3d4b42b9b0e677eb3a47
 DIST mkdocs-material-8.1.0.tar.gz 7526249 BLAKE2B 6938ae4ff23ba450520f84630759ce408f1c11d75200281f6c454aa90d6af659d49c0d8f345a87b969e0169d4851a2510906b9e7243a0a93efbc99025dc9792a SHA512 2493edefbdbca0a3708950b62178c66ceefb5fb1868cafcb087bf727c404e3955abb2d45b14e944b4720b532e3cd049fbcae3e0d9b8f36295dede9dd2bdb3717
 DIST mkdocs-material-8.1.3.tar.gz 7654739 BLAKE2B 9b381e99ee2911d9d54a64b40538fb15bf568ba92171d6d42e1679143cf5729c5fabdb24de4d97509bdbdc05e5e282e310c03dc12c973449c935c77ea277dcc9 SHA512 65527fa1b5cd1f3a31cbc84d3bf52aa49844549dde042534f0d24e7bcf175f72ba1b21bda87d1fb4e25307b51f995d8de492b7c5c909f84d075e2b50fe97fc05
 DIST mkdocs-material-8.1.4.tar.gz 7892710 BLAKE2B 3e986279bc93be4599568b431818313e01fe036420a1654a2883f5d855818a7fde64ef04bdf81a9688873a66ecb1e9692147e18a56292071ffbad93157ff06ac SHA512 9298400feb21d9d0027dc22f363f8bdff160b00623ebf09886add90359f739b69c3ee79c3bfc9a4dc18eb2d4cdb5544897aae6a807b0a379cca0dc9df82d16fc
-EBUILD mkdocs-material-8.0.5.ebuild 871 BLAKE2B 0d149c6c59b7634e671885d19c74b03eed141d353836db0af9fb57a68fd80e62767f528c4322512195477c079bd8fb4d2972c6a18d4d0f1a3871b6908e722f0f SHA512 574299bbba77139a6e64c253249e81defc3b4b1ea46d2f756f7029d459b678c95dbd8fa255577170b6feb98bd00b92d802f9cbed73aac3788165c591e3a563eb
-EBUILD mkdocs-material-8.1.0.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
+EBUILD mkdocs-material-8.1.0.ebuild 871 BLAKE2B 0d149c6c59b7634e671885d19c74b03eed141d353836db0af9fb57a68fd80e62767f528c4322512195477c079bd8fb4d2972c6a18d4d0f1a3871b6908e722f0f SHA512 574299bbba77139a6e64c253249e81defc3b4b1ea46d2f756f7029d459b678c95dbd8fa255577170b6feb98bd00b92d802f9cbed73aac3788165c591e3a563eb
 EBUILD mkdocs-material-8.1.3.ebuild 873 BLAKE2B 68b6be9e24bb42029e451fdb1a11e08ba9c503fd844fd74daed8330388d1fa3089d4016626831a780cdd0e397b7354c98c05ee3b17aef69aac7d7d6a18996bdb SHA512 32c73aa64528b90a41859cb3594b6c52e818ea4f61305be5e1bf00702b54f11c76ccf9e79e4c32e959cb41ac5133f3f01017602d31e8f8cf704838b579b3fa10
 EBUILD mkdocs-material-8.1.4.ebuild 873 BLAKE2B 6a520501d9b0ab0abc39c973e632cc4ede50e3cf640d7a31b46eca02b307cc1f5567785029389589562cac70ae2e4ba99fb62ef4ad1a8f17befc310232571c5b SHA512 8313b130b122ea4961a9d0b7d989300c8d0b279fc0cc4190b7ff394ea0a65733dac221128fe10549b31d72927bae3348451b402a02c8e186b8d1fe933bd01786
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
deleted file mode 100644
index c546fa5f2ece..000000000000
--- a/dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	dev-python/mkdocs-minify-plugin
-	dev-python/mkdocs-redirects
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="A Material Design theme for MkDocs"
-HOMEPAGE="
-	https://github.com/squidfunk/mkdocs-material
-	https://pypi.org/project/mkdocs-material
-"
-SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.10[${PYTHON_USEDEP}]
-	>=dev-python/pymdown-extensions-9.0[${PYTHON_USEDEP}]
-	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild b/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
index 19ab08b7c4f0..c546fa5f2ece 100644
--- a/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
+++ b/dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 199f0669a91e..3b5a2fe83648 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,7 +1,5 @@
-DIST natsort-7.2.0.tar.gz 144338 BLAKE2B cba2a547813b56c3f42a6d9526be59ebda0e12f964ce72e166dec825ceab923b06f7be768e4071f9380e7b8c2a2d24a5b9af0ad0752e48655046bca44fd03ab9 SHA512 9490d4f3f304834a82f91fc7f215a9212e5e4a2c78e2d0943d886cff2f50c581171bd27edc8ceec23981ebaf8d13d3be2bf1954439dd76aef9a2cc9983b1968a
 DIST natsort-8.0.1.tar.gz 144778 BLAKE2B 81aaeebb02b0a0e45d9291c4efd341eadff7be9e8b50a966e21b0a22b92eb05cee99148f6e2b93ce792bda2a223f1a64e43d2569dd1cbc4b421e11f2652722f8 SHA512 a1db383c466b8605006d880cb19f284902ae7384bca839877cc7baa0d60b5ab369126ae7efe0b93e1b5a0c399ad902fdd818beed2c34bb209b56e3c960896d4f
 DIST natsort-8.0.2.tar.gz 144912 BLAKE2B 0e5d83e6991ef1208b84cbf17e287f487a2a059d68274876977ae6f18f89492284bc166499a9518bfc2df19999e5593f386ce88beca94c23d8a050697c0b2a36 SHA512 fad31e1af1e1d4a33061b8b3e31d022f353f662d306136d05e0121a0531f33cf388467a40f91f51036f283ab8fbdefc1193d09f440052960ffdf733186b5fb27
-EBUILD natsort-7.2.0.ebuild 555 BLAKE2B 6c99885c6215cf9a1864b3d9404ffdbd0e6955f83da7989d1fe2713fcb6de94dc81614981e0a2307e94a0f1d8aa9e12526ee6b41aa8994c65f947d6e4e8ddfba SHA512 b4694869be9520a60b1490f16d9f41f54f1ac48f387bc0b44720bd306cf9a0604d710d1cef0ea36dd8808a01d19568b054c904a3b6ac54e707ca9d16b6c609da
-EBUILD natsort-8.0.1.ebuild 673 BLAKE2B dfe329b7ebd87052039accd069db81160251915adb253c70a3c7c8bf942ed19d12dc341e83299f79897018f8499abe17104a9d913785fe582828f6f5ac6f4edb SHA512 25fd0f0d2763df4c3d11800737c2d4eee896bff6886ea3131c8a571b9c6928ab7ad4a68df642aa41954881028ce4d415ac8a0475ac61f98767d3a6a2f25d96f7
+EBUILD natsort-8.0.1.ebuild 665 BLAKE2B 58f3a996b8ed1e5eab43c536e8a755681ef0081a3e21109723c8b6e84b568d5584209266198046dee744b9f46d428545036d6553c9f962dabd8e5728630ad2a2 SHA512 0c9dc467c9bc664ef4b00a75e0f6530b691b13f358add27c141aeafe88b832df6609996fe3b5773705d7d89b745b9ca10157cb1f5d23f53eb11ea96d4b3d0d76
 EBUILD natsort-8.0.2.ebuild 673 BLAKE2B dfe329b7ebd87052039accd069db81160251915adb253c70a3c7c8bf942ed19d12dc341e83299f79897018f8499abe17104a9d913785fe582828f6f5ac6f4edb SHA512 25fd0f0d2763df4c3d11800737c2d4eee896bff6886ea3131c8a571b9c6928ab7ad4a68df642aa41954881028ce4d415ac8a0475ac61f98767d3a6a2f25d96f7
 MISC metadata.xml 407 BLAKE2B 385c6b60eff44662eee4337cbcc1f57cd7f1f30f129cb6a22e284ebc7bcbd2e5ae271c27b1b0405b3b4087df72494e3b447bfa1cf84f116befb2811c362ea4a3 SHA512 0c91866fb63b5b74f00a28dfb6bf1afde8b8a48ca830bd6bce7a2f8fcfd80982c51fb20913c467fc44c11f3a8c7f69e8544d21dbcb941b2e80cd8690561b07aa
diff --git a/dev-python/natsort/natsort-7.2.0.ebuild b/dev-python/natsort/natsort-7.2.0.ebuild
deleted file mode 100644
index 0c4fa469d533..000000000000
--- a/dev-python/natsort/natsort-7.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.org/project/natsort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-BDEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/natsort/natsort-8.0.1.ebuild b/dev-python/natsort/natsort-8.0.1.ebuild
index 2e369a39667d..9e2ab71ba51e 100644
--- a/dev-python/natsort/natsort-8.0.1.ebuild
+++ b/dev-python/natsort/natsort-8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index c7a3412ff0a6..605377ae0978 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,5 @@
 DIST pillow-8.4.0.tar.gz 49364586 BLAKE2B f6a0fbafc0869c952bf88ad96146f27cf70c5680f372763bc9989cc49515bc74886a9d7648114797880ca06defc79e2e50d7ecf36bfa7adbd969450615ac0bd1 SHA512 d395f69ccb37c52a3b6f45836700ffbc3173afae31848cc61d7b47db88ca1594541023beb9a14fd9067aca664e182c7d6e3300ab3e3095c31afe8dcbc6e08233
 DIST pillow-9.0.0.tar.gz 49510604 BLAKE2B c3b0d07e8fe280e3a253067c4da18ac2dee40d216280632d58ddaa7848e13a165587b9aca61c98f8b5380e53d6d59a4097320bacf6e016e236239af518ec7780 SHA512 d2fd74dd1b8824d994e3767ef9794175dd2f4adc8173612432a3e171705723ee8757d299a87fb1c010b40919792c1ca76578f41977ee3303ccb6f75165deb791
 EBUILD pillow-8.4.0.ebuild 2630 BLAKE2B 35acb4e2123562d6060a3987ace19eef820440419d6a12e12b45d49b43c97db02874b18161e40eb5fc528142b06564d90ff02c40efc4eaaba18d939bc0684ede SHA512 c92d71605566aed06473690ccfc80b4c7fea02b877e1a8cf287f35b6a263cb5ca28577cddc2a07d8487219a9573e0359eb7f6cd8cf47bedbc303775184f6c8bb
-EBUILD pillow-9.0.0.ebuild 2648 BLAKE2B 8d421470d09feb1602f69f6a0a419b6709187bc9ca5b24dd958020b6332051d387dc6e10e89b145f39d372adfa77d7d4df495bfcd5c7824ec41476fc807e4abf SHA512 55090f6ce934803074d35630752a64639023c971905d66cf463ad3ce260f63869414a858762f9392d91280b5989763397b485e347eda87ee2b01b86e51dc8942
+EBUILD pillow-9.0.0.ebuild 2643 BLAKE2B be583289a7761e94b9480d5d769322abb23205e2ce5c09fd00611923f2ff4d037355f67718814d167c72051365eee87112fd9fc21c4a882cd6488e74677443d2 SHA512 52856dc35de8da8d19d398de4faebf15c8d6d23e54d18e314e8e7fdba1b0078be383af99b1739e53917be46198bd587c222198f81ab5e52d66d56ebc07ed3e1a
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.0.0.ebuild b/dev-python/pillow/pillow-9.0.0.ebuild
index caa5fbbcd092..f0d92c027bf2 100644
--- a/dev-python/pillow/pillow-9.0.0.ebuild
+++ b/dev-python/pillow/pillow-9.0.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff truetype )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 37cae7d7c47e..5f4401018a63 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,4 +1,6 @@
 AUX pycountry-20.7.3-fix-tests-for-pypy3.patch 740 BLAKE2B 64113481df5b7fb385604f16d7b3be066a12b6a5e1dab38cdf879101da132bcacf407fdf773d5f15381789114be265c7e1ee3ab880c38dae6e904e6820923ee5 SHA512 0df7756ac4d3dd3ccc409307f21a95021c93851ad3b6ce07ce244eade4957d9906dc6aaabdbafe671cf6f9619623cdd22097119642c0c926376e4991eb6a1a4f
 DIST pycountry-20.7.3.tar.gz 10137217 BLAKE2B 2b32d450a1d16eab95e0c1ab6cae3bf89c07742d48cf6f8473854119ac0483b5490523e03e823c9b314231983f39d1c8bf595aac201756fee9897a8d15a84c08 SHA512 df88a34307a4275267a7f3af282b73ca5e762c49ad158bfcd39b97c5d852bf045bcfe72351fc6f232c55003a7c4b0a04801eb562ba65ed5d599bd45b2bd3bc58
+DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4
 EBUILD pycountry-20.7.3.ebuild 762 BLAKE2B 040b1bb776c97ffbc408c8ddc7ac239c823b4c75888994cc908856d1674fb24a68b50c1518a1c66d3c5ca36e278d6d7bb625be5d6f4306ad102da3ea9278a3e8 SHA512 ce6776284be36e5e05a667f6db244a2ef8da30248af0bbebd66a41d9c6e152292d0fc4b521eec5ec3df0b5c9b08dcc5b1098e60f681358277a369ad08891047d
+EBUILD pycountry-22.1.10.ebuild 778 BLAKE2B c5f8fdec23537bce893810fca49c8ec1cdbc76707062befe81e57023d30bc979b544f1835883eca72b77f93818b426a0fb0c8c79ef1fc2c7f632ed456f3562cd SHA512 c1d7bd6b4212203895dc264e5c152a0a0f6b79a6ae3644f32f4aa547d241bafa07cd2305d80ed39b1860ef55d810f84b3a51ea8b8ffa51d5178dc33d44ebd1a9
 MISC metadata.xml 473 BLAKE2B d0b559ee14fa944b040388608d545a32952eac9ca3dd4d9c96b21b2457f195dda3034a2df4c3c3f54ac4f19b828e10eb603806ba6442aeff1d1ca93e9c67b5f5 SHA512 a4ef64a3474ced295324a04b292e892e5d4bfabaf850c38421b7d45d1a35a40bc8ca9a452e792d4a33b195896a8f29292b8a019a81b3e86f822ae792ecedba7f
diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild
new file mode 100644
index 000000000000..4fdb4fe48709
--- /dev/null
+++ b/dev-python/pycountry/pycountry-22.1.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
+HOMEPAGE="https://github.com/flyingcircusio/pycountry"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests --install pytest
+
+# https://github.com/flyingcircusio/pycountry/pull/51
+PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" )
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 229f33906506..d9354be2e66c 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,7 +1,9 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
 DIST pylama-8.0.6.tar.gz 34223 BLAKE2B 690a0a1197f6512e9511083aa079843f2ca99c9bdb5d74756531db79f7d39e8e0f60a0955b24bc7739edce0376eb79821a796978fb2365789a97628f03f240f8 SHA512 5bc75e5b2a0b141dbe2ca993d13833914980c735b84f3df766bf750909af1eeaba0d554845d8c09f0d8186ff48c8330d9ffa5b565a577ef6506f32672a2c9209
 DIST pylama-8.3.6.tar.gz 36190 BLAKE2B f0c9944d3aa205c9f52fdfab6b47ad5ad08f1865db22eef20add0652fcb4355f878026aad9f1babbfcb4f98c13bc5cbaa069d9d7b5c7a775d994a8952f8a8cc5 SHA512 c279f3005e354be448f42addcfeae6025e1dd4acf84e5de0c3ae707ceac4f98e43a07f43be347b26bfb8db4167945db1db547ed7bd9eb73ca78bbc92d26fdfff
+DIST pylama-8.3.7.tar.gz 36264 BLAKE2B 8092320c039b5cd45a379a2718443cf03f5cef931767ae765c90096e3b23d5b7242034009eecb40413f05e2de2fd72a4285a91ebbc1fb474d232cffc9c992b94 SHA512 acfab9584e7bd8b146350e6af83975e91391e39c00a0fea23d4e55f46dd684b519088ed68c90e335e334e8526aecab2ad2286a0c082d26a4b867eadcbd8866c8
 EBUILD pylama-7.7.1-r1.ebuild 1265 BLAKE2B 59690378b80f2a9dba5a7fdeb2abb1d518c94edde05a87b63e68309cfbd7293c672a01225dd325dfc46bd04542eadc4b0b46fedad8c4da9a6b627d8f8f47097e SHA512 2535a1bc10f6e15268befa691c177831e4595a429af11c23cbb38327560ae9ebbb7941b32369f9ef2a04a8e7cc9d2a31c2c330cefbe644e85111be3b3e1db1f6
 EBUILD pylama-8.0.6.ebuild 939 BLAKE2B e73e48cfc3729928c111a6bbe69da8da8ba76d3c7b38614f3e6abf1fdbfab7b01c0e26766924ce8ddd8b218f2ad6e9ea5cadedaad235dfd724bdbd4ea28cce7f SHA512 4e1cfa1e1d6b9ab00704a0a689899306d14059f35b2f0c17e3d48214ae135a15387e864df6b60bad37fe18358f9e11f5602b0cf49a9346f184e11832e7391698
 EBUILD pylama-8.3.6.ebuild 981 BLAKE2B 4629454cbe80e27d7ca64a9559a1f1f82ad3bdddc759d6e684427805be34cd85e9862332d9563a41527edaba469d0b67550a68f9a081f4a531326cb659338420 SHA512 0ed01f4605f3e6642aa8b4b236b2246f2b62b8242c2503b26f2d3a580bfc3eb28738246aef96559dce6c4139d2c1b1e10cc5c661c1a2cecd69d562fd0025ef49
+EBUILD pylama-8.3.7.ebuild 981 BLAKE2B 4629454cbe80e27d7ca64a9559a1f1f82ad3bdddc759d6e684427805be34cd85e9862332d9563a41527edaba469d0b67550a68f9a081f4a531326cb659338420 SHA512 0ed01f4605f3e6642aa8b4b236b2246f2b62b8242c2503b26f2d3a580bfc3eb28738246aef96559dce6c4139d2c1b1e10cc5c661c1a2cecd69d562fd0025ef49
 MISC metadata.xml 389 BLAKE2B 4320ff9500cf2ec3d896d0ae766fd5c850b72c773a1626df243904f779db7ab9c28c2db462ab90f72e99b1da96b1131d8da207f9e3d14766ef9c33fe92c4ca76 SHA512 024823ccef87858b76df67e12452882ba523cc05a09fc128d8fe943ac92dc45abd9f3912cf6232fe411874555eec205b2623419d9e0d3247bae7663fa3775894
diff --git a/dev-python/pylama/pylama-8.3.7.ebuild b/dev-python/pylama/pylama-8.3.7.ebuild
new file mode 100644
index 000000000000..989238c5c87e
--- /dev/null
+++ b/dev-python/pylama/pylama-8.3.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Code audit tool for python"
+HOMEPAGE="https://github.com/klen/pylama"
+SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/mccabe-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-6.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/eradicate[${PYTHON_USEDEP}]
+		dev-python/mypy[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/radon[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# not packaged
+	tests/test_linters.py::test_quotes
+	tests/test_linters.py::test_vulture
+)
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index c07c4ec02740..a3d85bb5588a 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,3 @@
 DIST pyscard-2.0.2.tar.gz 149302 BLAKE2B bb1203aea42a0caca5212780f1312e51a4cf1a2b2842e3e33f25c17e57e3400d44c387620ec4a1dc9ca7a4ef5747900981971c87d1e37b6523a5990362645f5a SHA512 f6ab42a0aa037189f2fefe4001dde7f49125fdf63358352af956e58da9a51744a884ff1f7173b71e035a1a4a20825a906ee5d94f314b760333d1110c898a6644
-EBUILD pyscard-2.0.2.ebuild 703 BLAKE2B 5bbf159532f700588da0e554a056af01e1e3b42b078b0bae02fdadd66e4e8d2d9790641fc80da490fbbb09c08b0923541908bcf3df4d0c3f53794128d688025b SHA512 4c24062845e81890852ccc9df5ab0c2fe310018ada6b05eb983d3b13c774b17ba7c4cf6bf76320b12736b26ace23c6d04571d9829269014c478ff7161f0be8da
+EBUILD pyscard-2.0.2.ebuild 710 BLAKE2B 4962e8f42cf403351c450c9a02df985d6bbd4ce7cdea2d86609966d76b9b3be1cb1da114971aeb2b054e5ea85003a354f0ef2dac2cbfd65a243eca09da94f6c0 SHA512 d0aa85b22a359a43b5e28db32a1c688b081197c8d928f4b271df2bab3d60dc2bba83a7461718a1c4c86f99a46ff81df7cbf94ff554705574f8a9018d009bc287
 MISC metadata.xml 426 BLAKE2B a4819bd37d610cf785d4b0e5ba2a709c941000d5cea8e20c8d49e513e7167b55e8e149da9e318281dce7b4eb92cb61e355054c273e3758262c6c25a0757ffba3 SHA512 82e759791154362704f4d7a1a1c72d53710e405c21bf791d0ec609ddfee4b8c04e3490a3f33f8d0e6e295f3b8433520f328dd71bc91cde2926a89a76803fd63d
diff --git a/dev-python/pyscard/pyscard-2.0.2.ebuild b/dev-python/pyscard/pyscard-2.0.2.ebuild
index 96ca5c3fa0f5..3e7340a1891f 100644
--- a/dev-python/pyscard/pyscard-2.0.2.ebuild
+++ b/dev-python/pyscard/pyscard-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="sys-apps/pcsc-lite"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pytest-forked/Manifest b/dev-python/pytest-forked/Manifest
index f608643de557..69a6bfbe590d 100644
--- a/dev-python/pytest-forked/Manifest
+++ b/dev-python/pytest-forked/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-forked-1.3.0.tar.gz 9850 BLAKE2B cbe44d87052c5a3bc58934ac17153401810004aaa38b53ff3100384535cb2ea0fa99dada706113f324fa0a135ddbd9b97488319b4a9554d912388c341b62943c SHA512 25d639aa43380155d7744f1d05a95e0144f5fe7dea42ff3c2bba3803a07d73b5eb008525469330c5dda14800fe4b611241691be197132f31f88f66930c3ecac0
 DIST pytest-forked-1.4.0.tar.gz 10197 BLAKE2B 7a6ec42f7ad1323eea243739a9186fb87eac3016afef844ec39a6e3fd55f7d40b1410fcc27074624f8468e6dabddffcc22ea0597bbbd898fab71c82c06e25b46 SHA512 ba402aec6dbec7a94815913192a49390b637a123d3557f48d809ae2e871e9e0cff8f9d0feb99e2bd06fe9486520b5e539f397d39475a720f8283b1bd21c751c7
-EBUILD pytest-forked-1.3.0-r1.ebuild 935 BLAKE2B 55fa6f0134ca91c17164c797b60f9742ca28b8d93d15af25a2c8a7239f78e44f22edcd4949d06a5fee5c227be9051ac8a7c895c433e1ea4ced1d35bf2c87bc84 SHA512 5bed1117b5d7575785d36e13e2a51e5d89d531cc3eccef7ed99b804e821b477c1479dc2aca51a37613cf2ead610dcbfe3579dbdfc37547ac68cd1a9a32a87a88
-EBUILD pytest-forked-1.4.0.ebuild 860 BLAKE2B afbf7a639e559b6a680ed30f9d9d593e83a4f8fd94328d1642f8dea3b4acb85c8ff6364789bec6a825f0546e283cf21aa51a7f06ccced272bc28cd43d92f654d SHA512 747de247c4f72720419c7294b59f552fb06893dff1392b1a22b5e6bac34b7cefbaf7b13538835c8a92826cb38d98e8bccfd5a793366d0eda76b6a68c3d8e65d3
+EBUILD pytest-forked-1.4.0.ebuild 852 BLAKE2B 770a1d2950c06fd6cb6ad6596df0f9558b1b853053e0eeddc3b926b3452fb8d87b4bb6078ae52e054cdfab25cb65f26424a713d0b636c7adb9eac4d9d6c3d882 SHA512 fcd0e427a1342120c83b2fd96977cf2ca3d6ed2e23bdc381f49d5183ca20bdd980555a4e74a48bbfcacb2fe9eb66fea6a3ff9a035aaa1885d2649db2a5616e8f
 MISC metadata.xml 405 BLAKE2B 8cb6b3e3b440bc53f5d02a9638b00356f64bc02a8d7444ec5e295fcf91507f94c2460acd02008e6b11ca3bc2dd3d2f96ffb61c583fade0ff4ca00a182c01f903 SHA512 4a1dda1d8ada98b57881884ec6e982c308b54ab29e2cfa104f398876a1bd8ee2015dc7de4891c305f65030e30259079667d42c7a80d14d5148feeb5b7cf5904f
diff --git a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild b/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
deleted file mode 100644
index 1047da546dfa..000000000000
--- a/dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="run tests in isolated forked subprocesses"
-HOMEPAGE="https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Please do not RDEPEND on pytest; this package won't do anything
-# without pytest installed, and there is no reason to force older
-# implementations on pytest.
-RDEPEND="
-	dev-python/py[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-3.10[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-	epytest -p no:flaky
-}
diff --git a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
index c65d14f14759..0a182595e8c9 100644
--- a/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
+++ b/dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # Please do not RDEPEND on pytest; this package won't do anything
 # without pytest installed, and there is no reason to force older
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 40af6e4cfbc2..3baa8d18a1c8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-xdist-2.4.0.tar.gz 67199 BLAKE2B bba867bfbd1e161ada2157fdb5a10f929fefed959b64afef74453206d91e5014abaaa1363ac9adbc89ed476a841607f6830781817842b9be119a09bda7278b91 SHA512 2d2da6aaa8da07a28d7c6c81a0044493b7d0d1a68921e7ec94cfd2f698eaa5594b6da4d82524804637d5cc061fbe19034f3c65a07ee5a0c906170856edc3d383
 DIST pytest-xdist-2.5.0.tar.gz 72455 BLAKE2B 4d7427e8a7d85d7b0dcae2697fae0f51913a3a2414fabbb192a8e3938431f5f121677dd43adecfb1fc7f3dd6feb94901e28b0a96787a2c2eadc1504aac55068f SHA512 22da4db7cdd6173fb8377b6adc30b5617ccb0bb308cb5d30980484dd7ddff87cf2a485ae8522c7957d8954dd2f8a5542b9f63b0fa7184cc44e50dbafc3f4e909
-EBUILD pytest-xdist-2.4.0.ebuild 1158 BLAKE2B fd617b12aa19dec1f7f85bce83025ab6c0ca8d913e8a8cfd1a3247c7cedd4cbb4a0d9aa97d6f8e497379578d0e2e7dc322b96d5db2c4373844a195fdfee4be3b SHA512 e37fb1565e462690e5cecb8c70fe4013fc8033d071dd1c83ec9f11215b2ea0508911c3e284907126c80496d4a1985077cf710c827bee1b1e640fd004038e85e0
-EBUILD pytest-xdist-2.5.0.ebuild 1170 BLAKE2B 41b563f4a7bae951c236b7167c54d3b4fdedc6e6072c8ef51b2d722e5b3b873b31fe15c31d75eda96d569df70d92106acd5d8fedfb3a7c35e095f2c910966172 SHA512 890e80a9997191489aed4b17d3b7b168079fc1e93b335535706317c69ed16b1d28949aeb1e8521954204975b07d037ed3ea415003d10ce6cc3f74bfb2a41fcec
+EBUILD pytest-xdist-2.5.0.ebuild 1162 BLAKE2B e759800b95073ef2adcf0e65f6e2adaf4e2b763f647131048f87203568440d8cf1120d9c73dc1b009c48f9c4668291587838a51d6cd26c7c4b4ff53e91e68eb4 SHA512 f84daed8092f781ffec31c7e8ad6283ef6934034b9d5721a19848bb1e184123e03993e7c5a380d11773a2751f3d74cbb9f33deefa5aa55aa402fa85d9c786529
 MISC metadata.xml 403 BLAKE2B 0aef0787ad01d8e5e5a0588b95740ca54527c1f425d17cc6655308ca478597ebdbfc35165e88864163929104aba9820848b63c17c3d77b238c4f0e17d9b98261 SHA512 c12b3e2a13b6497f748b373753410df996955ddcb9631b310104f2ae31a1427d983462c242692c1b6f9a9b9cd36b7f4aaef58e408543572c040e3dbeb38848fe
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
deleted file mode 100644
index 50b0a8e3c26e..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed testing and loop-on-failing modes"
-HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# pytest-xdist >= 2 fails with pytest < 6
-RDEPEND="
-	dev-python/execnet[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	dev-python/pytest-forked[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_test() {
-	# disable autoloading plugins in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading necessary plugins
-	local -x PYTEST_PLUGINS=xdist.plugin,xdist.looponfail,pytest_forked
-
-	distutils_install_for_testing
-	epytest
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
index 25372acff9aa..d1cc99c0a7ff 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 # pytest-xdist >= 2 fails with pytest < 6
 RDEPEND="
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 5084cfa1cb28..16679784bc7f 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,7 +1,5 @@
-DIST readme_renderer-30.0.tar.gz 27065 BLAKE2B 974d6070e2704e293701101a99161b7a23b97799b0bb841bc196e603eb97314fe5dcc93329aea2c67921f3ad6afc8f66c6b3742b4de966547ecc5ba2027421a8 SHA512 fafaae9a9ed61338611c509fd907f6314b97d13a30fb5cdfa2b8dd5d08097fa05d8edd27fd880725f783cf96326dee40e85da60bb4948bc810162b53528d18e4
 DIST readme_renderer-31.0.tar.gz 27617 BLAKE2B 2705157cb0cb04e8891ac5b0c363dbe30559ce3fd5bd5c0014e9746d6334c68b458fc1dad69c8da3088ccf5c70dff31bcc957fb01c26ee37f7370d3ac7dbffc7 SHA512 8399d478f46c58a3abecbbc3242c7cc4801fc84c04dc4ab35b88159e65373fe91ccebb1ab6eba505651b0dcab6f12283f55aad902379a2b0056ddcbce5e76897
 DIST readme_renderer-32.0.tar.gz 27812 BLAKE2B 9e5052bd6d14c9ae6c405934919b2e2555094892f569c3acae2149607c5d94c9522e994110b1b9607429eaf865925a3fbbda5eb78e3ac9ce66024d229c6b223f SHA512 58f3dfe6e19074e8f0c5bb8125c9b414651008cc1246a5100018f24dbb199f5d9d920a0201afe06fc9921d86fca339bd1ebd1b4d8c0606aa59e6e2edd1e8bf56
-EBUILD readme_renderer-30.0.ebuild 772 BLAKE2B 3aa951a47e7a0461b11e25a47eba165e4624c7580aad8b578a091f1e074c7c09fe17c7d287d18d00ff44dca6bde508720918110fc9cc4797c3a07a6bbb593e49 SHA512 66430e60cc77043cc07415391f7b4d01189c9033e369c7532aa9a89e26734ec21fb49c4f027daa2483e2a9202af47a4e40897b4025b0de4ec6d2706df564cd22
-EBUILD readme_renderer-31.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
+EBUILD readme_renderer-31.0.ebuild 772 BLAKE2B bed2426ded206f5d0d5fdffe17280084a2f16fe3ddadb595a97c4a6e8b8e669776bb0c9d1297bf2e81a121c11b8610a82abb1753a5c974d8adaec541f6d93b55 SHA512 9911fff61aaebb5abb80db1a2d3493c1fc36ab2ab36dd2502f61a881daa59d5b6a467ce4d25a6764a2a16891fba68264f31daf02300950c8b53f936997bbd59e
 EBUILD readme_renderer-32.0.ebuild 780 BLAKE2B 0d8476c0aa47ac1df6e44273806216de34b556346a7fc2f4a52aaa170f75c35223f56685368a2d4bdd799f3595013621fa3191df3ac7895a95be1ffe25f57b4c SHA512 5afdeb02eaf6103d7e1b7d0310fee55d51346579aa1e8a65580c0315c410f6f52419a1c0e2b27d0af374dd57ccc1322d6ff8daa7847fb90f69dac66670d833f4
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-30.0.ebuild b/dev-python/readme_renderer/readme_renderer-30.0.ebuild
deleted file mode 100644
index 110c64785058..000000000000
--- a/dev-python/readme_renderer/readme_renderer-30.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/readme_renderer/readme_renderer-31.0.ebuild b/dev-python/readme_renderer/readme_renderer-31.0.ebuild
index 1b1eb632f04d..a2eea87a8145 100644
--- a/dev-python/readme_renderer/readme_renderer-31.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index cf2067450c48..850333d7aa2b 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,3 +1,5 @@
 DIST responses-0.16.0.tar.gz 41943 BLAKE2B cca1d4d0f5bf6980776a9373ac51f5305d8db439eb1c1dca61985704da2dc8d62839e2aa1fde30f9e8aaaf785c0e7cdae56662270ced0627ff1c236c3cf252ad SHA512 b2363cd7c9aad84bfce814fe815663babfe584fa390f95a1d5e01118c8749e98777bf283a7200ea96a7ce5fa1ad6d85ee329e4bd999f3dca0317476b7e976f12
+DIST responses-0.17.0.tar.gz 45064 BLAKE2B dcfa702209df3d62fc3fcc2fd012fa15a75c9a7b9757b99c886265de582924452746b3ed86da7b293897b489ceb48dbf99e74bc008d4aa3932714aed3676ae08 SHA512 238c7b4926857c13a4192bbb38eb0dbd65d110ae86c19c59c1504bdfc912fefebdc3e59c7646ce4f0228a1a080201b11d336bae56fc190665f816c6251de579c
 EBUILD responses-0.16.0.ebuild 766 BLAKE2B e41eb7dc4d95fbb5981e8227909aca0654ad338c48ea52ec6c1e4a1bc6cae00e590824c9e8e1d4ee90f5d2a5b8c2e0e5819ce38baedbfaf202f85256812a9b34 SHA512 15418fb751833c9e73e98c6a4f19a8fbf4066a90ce25eada1c9c915dbaaeac2b572433e9f17dfebc07d2b3457b9a1ab3cfde07780b8e20d67ae93fd484f11c4a
+EBUILD responses-0.17.0.ebuild 774 BLAKE2B e47ab15c00bbd8b7af95dbc62bfeabd74a2c718ce3bd7de24eaf7c311d846b9a80e4ef311bdcdd985274c195b491806ce85941b41c3ece3805ec68b5e699bbba SHA512 82ad6960ed52bb6337208c3462c10333390ce3105ba5b1557eccc4534c1a16663f74d603143c670f7cc6dae94920e92d2f2f973f3e4d8f954287fe318306287b
 MISC metadata.xml 463 BLAKE2B 64d3c7be57863ae6088ce746fbfcc68a8eefc37c6d8fbe1bc6866d4c24ad18e75215158d89217d13f0e5b9db2e82d1aab86fa2ff664098239440bfd3fa3e7cd1 SHA512 546de31e1cde62b866673aedb4d3c1278213b36cc75fe86a8e759eaf16471cdefe91d6b0005b4ec4caf4316f8449717d672ede4181f1c1912f5647d50557eca9
diff --git a/dev-python/responses/responses-0.17.0.ebuild b/dev-python/responses/responses-0.17.0.ebuild
new file mode 100644
index 000000000000..9066717c3083
--- /dev/null
+++ b/dev-python/responses/responses-0.17.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index c6dbf518915a..f6b062867fb1 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,4 @@
 DIST rq-1.10.1.tar.gz 599678 BLAKE2B 0673ca0eea69c3f86e50f5609a9c4ed2c2d93d331479510365a744461a5d878e6de6a9683356562754a25760f8ba1d8a65f6d5acfe878e488a70c54dc0bb5b54 SHA512 1a12bd5db27eb3f9303b2f3465c2f22092f7eebfabfc1e6aa7f65de7ea139df3833f9bbdc7061de564b2418608641b3755993bb918efbf93b04df67ca942ea09
+EBUILD rq-1.10.1-r1.ebuild 1372 BLAKE2B d51a9f18f2820d2e525b92ff8799fc28ada6a8065647b9a474b68e4a4c5d8eaeb9f476fec0031d19a20a6e5cc8eb94ed61a1de53efaaac1e10679b55e0ad97e1 SHA512 0b50779734449c9d6e1626d6c421e7b908b66dc23583837e31f7ea28d691874d3c551a10cd7da16c8a8cd2b94699647a252df3221081afca92915fbc58c758fd
 EBUILD rq-1.10.1.ebuild 1365 BLAKE2B 3953f3844bc30aa69f7f8c8b3882b7de3211e4baea0210cc1acb2b364b79430e25a01a9f98d0dbed0fbc6c77c9cc3487ab5b30f539a3ffc9818e948185c41404 SHA512 d92e32a6fa048b7d43cb16b9e414f8843bbb3b3a940dbd1ff2bef2dd425294395e50d861e94a5d422dff106b403d249eac8c8c8890ca0df0c67856badeca593c
 MISC metadata.xml 453 BLAKE2B 6a46d43b524fded1ad4749fb9669ea07f8b3e23940d0bf2a4db5d92564316b01fdfbe220771e30b1a110ef72c613ad683cdcb7940682ea32198a5b6f027e4db3 SHA512 104ef96c34b55a9fda377c1304ff85781219fdbccef1a83d1bef30cb2fbd0ef816cfe82715af8937f452499135f7ed65c65a29c34919a09b6144ada367c26af5
diff --git a/dev-python/rq/rq-1.10.1-r1.ebuild b/dev-python/rq/rq-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..ec467b29af9a
--- /dev/null
+++ b/dev-python/rq/rq-1.10.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 7abfde23ae9d..ca2f450a40f5 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST sentry-sdk-1.5.1.tar.gz 234143 BLAKE2B 431216c66b195ef7f26fe74d5f2c6e4697d93209ccf650bc0f043f4e7c6bf38a3fa98f39f75d94bc66247a91d0b3e3b85f4fa1912c0f71827a912e65fb976468 SHA512 09e178e5abe2e47d29aee778c8fb48ea5e09efa278dd970e3c856dd04704ef63f3adba0edb68a73c09baa2291bae41cd6fd081dd9f0a2792c1edda480fe1f4b4
+DIST sentry-sdk-1.5.2.tar.gz 238538 BLAKE2B b5ec8da91e6eaf76e5501a3e97e6a06f67b6afb887fcc161ca4c5c6750e294cdb2c72eb7f8ff62b06cb27410f580d3a7ce3aa5981282719a4e4eba3892781394 SHA512 5bac6ce88a2a2f9b6269d6c2483568cbb627e7fb338044272785d1fcd574c7772e47c7304bdc3082058883d53d7ca458f65b3ceeb6d7a7fd70b752b335105193
 EBUILD sentry-sdk-1.5.1.ebuild 2541 BLAKE2B b3e538b030c3d885f5456d3176765f29eb5ec112544c7017e084d246ce8f2095f7657de052110b01650f45c24908abb46bb42c57cf229da859b51df51958e2cd SHA512 413a04501d5e8e66feaaa94a71a183486c3df4deac2ebf1375d7940555d484d41bb1abcd79b38c5d63414e9eba704187b6c82f36140865a2c7678f40165c6839
+EBUILD sentry-sdk-1.5.2.ebuild 2593 BLAKE2B c7223bc55e783f6b93e77ac031077bd27e271799884aa1e97daeddf383bdb774f5c58af41df990f1bcb4dce6d73c8801ead481e0793c8e87c70dc761e1f0c9a8 SHA512 691e050d257372c081eb9a7d9b33dd0d762e642cd9aa190991050399fa196ba6590f4ad7a051b83731af2dde6bebc22a6f40581c536d38dcc91098afbb23cfec
 MISC metadata.xml 510 BLAKE2B e00011699ac2cc83f1923e1f6fa813ede7eab8c57f9ce9d9fca04e721b089db1c5f2bdffaa7b9856f56b433abd9189125e07ffd3f329e4fa8d098e28a4f2d7bd SHA512 bafb77a102d94fe050cb526b298fb8cfd56775cb4d07eda280f6356fbec6fbe5df5c9ebd459d9d4457cd027c2e0d7c349e053fa6070b52f0d2989f6ec600b87d
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild
new file mode 100644
index 000000000000..f7fe237c12d9
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/eventlet[${PYTHON_USEDEP}]
+		' python3_{8..9})
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# broken by rq-1.10.1 (optional dep)
+		tests/integrations/rq/test_rq.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# hangs
+		'tests/test_transport.py::test_transport_works'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest
+}
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index f5447afdd976..5c8ad13d0ab1 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -3,9 +3,11 @@ DIST sphinx-autodoc-typehints-1.13.0.gh.tar.gz 19898 BLAKE2B a927802a9daec5a2755
 DIST sphinx-autodoc-typehints-1.13.1.gh.tar.gz 19923 BLAKE2B d0f72b814c83dd8987b80bdbaffbab5c3a7c671d9e56e9bb62d3cf44dec1df7b5fb9c591928b89680427069ce8d5953f4dea52de9eb4a4add07a332be96c730a SHA512 50e2958aafaa661cb209da04bb456dadddc4782dd2168c3f6524fba26d906479c66e5b22b3f49fff0c4022acb4b5b99ff73b250cb3e4d5dd9f083c4a5ab12531
 DIST sphinx-autodoc-typehints-1.14.0.gh.tar.gz 21541 BLAKE2B 77b0e80e5518d64be9dde3d3d2af3d9e0e325daa6683ce8aabe6ac88373ee76e11273b98cf3a18c1391a451354b9cec164c8c14e81354092181b959223500669 SHA512 eba927531b074edd1bf4ce0f3e5af53b07d1be3f013b5f39babc81101b32a942040f7b72380f9f485a99bdb8bfec69f7f81d50b0ceaf73b2859f292e47416d59
 DIST sphinx-autodoc-typehints-1.14.1.gh.tar.gz 22095 BLAKE2B 43fff7ad0ce83d4a7b50da7b3d0f9936754cb1897defe5d91bfef44dfae4df7bb6a0472fe5012bd2526a642149710e96b407fee3096dfb1474187273133079be SHA512 a720195d8792f3b6f5b8b5ce84b709872e7034c38640c15ab83b1676b5f0c26c650b0e74c34dbf9652e32f8b7f66edb94dcf4447ff2e0a1b196b721583294f49
+DIST sphinx-autodoc-typehints-1.15.1.gh.tar.gz 23279 BLAKE2B 3ba75560111025d2a468572312bd1953315acc55aff4d80f069dcc8fb31fe6253b2dfd3d3f36a75be4dddb3573dd1282d949e5e99df9d4c6cb679c50e7a375d9 SHA512 6cf5750839d550af99ae74c9d31c403aa322108f81b779b8514c90beb315803d5fe550d65bb4cb8861ce224b220ef16b5627198aa0f46b68000c916a2c99983a
 EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1095 BLAKE2B db30b26cc511a28979f07d8509209c124c37b5cb3625dd5bee615b4799bb8574c775a6cf4d19193845be408506f1179ccd3741827066199caf9a55bdfb0edf23 SHA512 b6a223d1c0ad0154485613c17044fb3d482aee2a65c28de8f44dce5aa079bc61685b1feef744bc79f035b2b797afc0e62b85357d6f1aa0fb6383169e7de1d419
 EBUILD sphinx-autodoc-typehints-1.13.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.13.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.14.0.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
 EBUILD sphinx-autodoc-typehints-1.14.1.ebuild 957 BLAKE2B 766c4ace65c37b39de066f20ce2030ad4d3edfa463ea7ce7811ffd3bfb651c52f80d19b08924d5089cbc4ed358d9a93f1338277baec17b4df9d23a361587dce3 SHA512 4bd81844cedcdb40354f87143264a805906f30fc281ff1296a46f86448cd5dc4862311aab78ce3eca5619ec767eaec6460145a3294effcf587de4a2dd267cfa0
+EBUILD sphinx-autodoc-typehints-1.15.1.ebuild 958 BLAKE2B 1646c7932b7ccc4e6121e53e2d1c5860202cbec20e88f3756919444d0da34ef37e43418bbfa3fff834bce6f96feb1b78ed704fd4e5fa266b334d86f377a5c787 SHA512 7c89e7659694060c62cc2a0324a47ce6b811cd8e35fa46d6464643a67642e0304726499c55e9064d239985c743becfa655668e95bb0e1eaca1c4711ec3fe97d1
 MISC metadata.xml 700 BLAKE2B 6e748d584e7640fa73a7f481ba91d37e983e97b332416acae73a87043693e5174b0f98c667e0a41abb7684a29b1136ccf681080b84a7bb8a7db73cbb14b85b69 SHA512 a149590e27acdc56ec0de8d57b5f378134480d24df0f0406a641b27b6cdff14a05dddb99a8e58781c23cc5112b1468fe06e9df28e8532a23b33ca817bd05c137
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild
new file mode 100644
index 000000000000..d294c9d62eb8
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="
+	https://github.com/tox-dev/sphinx-autodoc-typehints/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+
+RDEPEND=">=dev-python/sphinx-4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# this package is addicted to Internet
+	tests/test_sphinx_autodoc_typehints.py::test_format_annotation
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index 8a598a7b7238..a9bf63e257bf 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx-notfound-page-0.7.1.gh.tar.gz 50670 BLAKE2B b438413585fce3623451015d873242de3e6d7c466aa06b0b6398d7e337d2a0d3c2041973b1f1c8491b1f382d8e87a2da00b6a97e3a857b60cb345e715d2aa27b SHA512 f2894b19f8ccee22ac7f6e3a34f8270923e8cc4b2182d490e6ec46477460555de9b67b0075f74cc089b0b9e7474c6db9373d107d272d161d98a3c5609edfa7a0
 DIST sphinx-notfound-page-0.8.gh.tar.gz 57650 BLAKE2B e57634ba9a7faf81e6ee8d9b082d96742b580606f2e2fd559842049ba2e80bcb44bb6bd7a9c7eed6038e4c3ddb0416e32fceb4d47a72b8a600443e0020ff33d6 SHA512 eeb5b8da24ecb8f9814540a126f08204ae623705068608c2ee32a4f90303bdaab5f3934bdc36dd06dff047beb0225603f8cfc9b736769836385837047a36a674
-EBUILD sphinx-notfound-page-0.7.1.ebuild 654 BLAKE2B 200c779ac276a65206a877f470f5a5bd65d81efcd8f92033a25d984cc4b33fa53af12e6ec2f593177404f9039ab9b000e2473623e66cde49e0a64800c0df18a9 SHA512 c427f3e66b30e67e7c6967c892000035e6f70454afb081a9a31791dc7b67bd60f20e9bf10290e2b4a7ad279295f11203fb78bac417bd19dc52a75a469977bb8e
-EBUILD sphinx-notfound-page-0.8.ebuild 686 BLAKE2B 0176bf93efb8f90fec2113f43a6012e47e91e9dc36cb60b2921bc894b6bea11ef975ce88d499151bf7dfb99adda201375c77419f80b72dabb745192f0c5555c4 SHA512 921224e2e1bbf2aa44a5328972c1213e1661e3a4170ee2c2605d74c79591cc67c851b0ac5ebb3061f0350fe73168eb7a8efed3b871af65117313b4a1073486e5
+EBUILD sphinx-notfound-page-0.7.1.ebuild 657 BLAKE2B 32943107b9f3c533f6cb55bbfa6b7b53f6a703f0465ced82c8a2f20bb218bd2ac52f558d5425cea225ed02223b86b36d75768d7f7285a5ff136b1ec6b661fc5c SHA512 3fec71e7e656a1d401735a7fcd5908a0a30b465d8b01ccfa741ac9ef8b637a8b7ad26d0c1917f93c1eb6b8e774787f2c059bacce106a6148159c888f52ec05b9
+EBUILD sphinx-notfound-page-0.8.ebuild 683 BLAKE2B 48811ba11cb27bb0a5da05cf07f16581c82f161d807dd3be4387c2de1be38dd009f8502b0fe190e362e45e09b63e63f23369659d9de4e6b5fe75873049afc5cd SHA512 0841165030dd23494aa92bdce5e42c09b9e7059a961fdd95268f8d1fea1507c117512d3aa05e18ca817409b6422f500265ce1eef5ddb45edba9ffb61891e36f1
 MISC metadata.xml 651 BLAKE2B 7b4c1c58782b6a1e6118744d4933d8bfc1391fef578350f9622dddfb911a4319be8fc2cd2a297d5ac84bb97249d520a1cb740ed00d6314cb3cbf1dce5c119dfd SHA512 4b531fde722c6f0f0709405669efe61cfe2fd14e52f627ee67001b81d5268444b226630f55c6dc6a149ea86699379289368826429754abbad6cdaf36f1f4a673
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
index e0e5014bf924..3a02f9688bd8 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
index 29b071af32ec..7476ce266d1e 100644
--- a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 25254b4c0fc7..da593cd571cb 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -9,6 +9,6 @@ EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa1
 EBUILD sqlalchemy-1.4.26-r1.ebuild 1249 BLAKE2B 706ba01625b89f675bbf51d8f5361d9f516831f35b2265bb4c73f20e42102ae537261ea9f6224fcad679faf760c550d4ee5a5cc4ce0e78d5bb7d81cd756651c1 SHA512 59f36d922f00a51f707b6e80a54f11f102ce20e41746ff430b33bcfcbfe78403a4f70451bb40a71917d5c02f845287d0f0a9fb6be09c08358917b4a73215194f
 EBUILD sqlalchemy-1.4.27-r3.ebuild 1472 BLAKE2B 7b8c6859ffff98a8f6a61d12144be71fb621f49b7091bde8ff87d5e74b7c7308ac2a667a3bc8792aae61db8e7eb4f0e21df08cfe920fe15d109556d17ef567bc SHA512 36be55aeb27a0b01778a93ec9796421c0818aa175ef0d1e83c9a6aa8414884227935a95e8a00a8ac216b90495d552cbd12a9712ec70a5a1907db4a1f1b664a6b
 EBUILD sqlalchemy-1.4.27.ebuild 1257 BLAKE2B 2acc083acaf78a5811a2d602e9e6ae4f19f8feea99fb882d0e79675d29d2e514d79eef0283d6b9968941bbffa73a514c125ad86ae2ffac7c2367a748f5176a37 SHA512 13cfbd30ab3478af1d5558182381d0185b29929f6e7c281e38bc0d317583afe780ef42841bba06c150b001b394f5bc567bf424c8ffee03242b1d4fac2bf0540b
-EBUILD sqlalchemy-1.4.28.ebuild 1476 BLAKE2B 0144e5780f13a789466925812d2af43a82864248e5e429fbcf37402e27d3ceba11dd96252a3ef2768e519520799eef1c78ae89af783904cd2b654c891755fb84 SHA512 e19afc6a5a0bbbfa3a25dc4a3c535b34ec7304f4ea19f38e056e4cb8fb27066db480b09831f7cc28de2848d24368eb573cd61d79229db16f9872abf28afd5254
+EBUILD sqlalchemy-1.4.28.ebuild 1471 BLAKE2B 7d629f1f4230c069872f4e0daad0f51f279374d60a290e00d345f9fbccf9811f0d32bcc727ef194007057607e73b242ebfa2184deffcc60465abe749f3bb74fa SHA512 21c35d8008fcb371ff93cb854184a618e5f8dccd94d8cc936cf85d50a7232b00fdc1f75f6030a915d1247a8d44a8559d68007e0482c6dcf355908b61ad502bef
 EBUILD sqlalchemy-1.4.29.ebuild 1382 BLAKE2B fec8393e744263dcf476779ebd34ed6a9b71a1b0b5f4fac17e509fa263e0891cade06657d24275f24f7505d1270d93a4a0859928311bd6958089970c1a5a58d6 SHA512 d8233d0d9a7d379033ffc90fc07521ea18c0d2e7602d27979dee3c2a763f2b116a7ebc3ed58bb120cd3908b8e73b5c0ec197b7cd043439b65ed305d3db77a30a
 MISC metadata.xml 559 BLAKE2B ea16915a919a696aeb113a3c13077053765cda94a3bd661734713f9ddec74220bd58d0646cba810c7571a738d3c3f5716634e1d83b3225c0b44fc837eaae1990 SHA512 21507feb9afa0e2dff2fad85e61c1245faa9d1ac0140074bec1cfb58b0895e07365ff65e1be9059a37fa1706365ed5d1e0fd6153bf95ab7648b0e45fd11de97c
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
index ae9f2f013d72..3773127b985a 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 BDEPEND="
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 4364e4e81bff..b56ff8cb7245 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,5 +1,3 @@
-DIST wcmatch-8.2.tar.gz 113537 BLAKE2B d1fe53f7d2394af31750c0b98451749201b1adbd8d00a734418afd8e208a9480b913059f78f62016be2fc2109813406c096f8ab60973a716b6ca275377551281 SHA512 d56d868ec0578ae59eb5f39ff17005faed13162141e3ced15c60d8de5f8e8b1a16eaf66e7c73cffdbd288b94db57843112624de8e5b588d26a5e46d4edb72168
 DIST wcmatch-8.3.tar.gz 116600 BLAKE2B 8576a546278a69ba46af262bc925370e6d8b1828975d54fe3fe1a2e39fc8456134c7f7986e1674883ca0f0298c223be7efc67c7296a29d9a4f1b64e42614ce17 SHA512 64cd84e69ceb6c5953f281711d026540ac198256cda3ca32c90d2acb01b18c93ceaebd3440b395c3e77fc7ec38f350821b0095518ab5c065e698cfe0f2df4c1b
-EBUILD wcmatch-8.2.ebuild 1298 BLAKE2B a407e9dc3878ce0d0ee1b14600156b77d5a04de131d21cde63f5761601d9432f2f8e5db3e4a9809b7a429d168df6ea7cbb27656d73ffe0e544cd460315acfd10 SHA512 9435d1e43aa0608eef47e96add8dcd8f45b5c52303ab3eb58e8ba7eeebc27fdc92909a1c08684013715594c1167c9a3391526d729bee951aa2d2b0d6f2881a01
-EBUILD wcmatch-8.3.ebuild 1300 BLAKE2B c2b14167ba60e1851ee4e66ea1b154b38118e0f437085a9728ae4bdce0ae8ce550453e76c905b7390429fb52901e1ec2f08599cc9b230987be169209cdd2f30f SHA512 809f72df9b6459eace7924c714ae7ad74c418d37bc8edb36722f57cec33e01dd7cf1d577f6057090ad1616b97cc22edc53800f402be3fa9540a7d903c7917af0
+EBUILD wcmatch-8.3.ebuild 1298 BLAKE2B be2d3367c2123854c41eb251a53a2cb0adbdb92546c0796df93571a0be702f8323a727d8ff67d6efeb33aac3d585f24b3e72e2290b5ea68f5a530f7141f27da3 SHA512 3ec7ba1eaf35a80a709af752edfd64275021e540324574876ba21b3c80486580c1cd0393c0c13df5b544fdc67a57cd0c74d957e9d50fbd3e303fe61f7a3ddd79
 MISC metadata.xml 3087 BLAKE2B c15652b6011b559ecaddfa76231050204a857839e3520dd77a626580d753225389f4484e22aadcd58e0e61558836655ae29adc01349484774b27142bd633a9b8 SHA512 68361ca29cbebb9a9fc9a456d485b64796b0fffc09201ff1c09e7ed913526923dca179c7e21b0420e50a55e53ab3bd01e6ecea204b38995c81cff36c49059f16
diff --git a/dev-python/wcmatch/wcmatch-8.2.ebuild b/dev-python/wcmatch/wcmatch-8.2.ebuild
deleted file mode 100644
index 83020ce9dad8..000000000000
--- a/dev-python/wcmatch/wcmatch-8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DOCS_BUILDER="mkdocs"
-DOCS_DEPEND="
-	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
-	dev-python/mkdocs-material
-	dev-python/mkdocs-git-revision-date-localized-plugin
-	dev-python/mkdocs-minify-plugin
-	dev-python/pyspelling
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Wildcard/glob file name matcher"
-HOMEPAGE="
-	https://github.com/facelessuser/wcmatch/
-	https://pypi.org/project/wcmatch/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
-	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# tests require some files in homedir
-	> "${HOME}"/test1.txt || die
-	> "${HOME}"/test2.txt || die
-
-	# mkdocs-git-revision-date-localized-plugin needs git repo
-	if use doc; then
-		git init || die
-		git config --global user.email "you@example.com" || die
-		git config --global user.name "Your Name" || die
-		git add . || die
-		git commit -m 'init' || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/wcmatch/wcmatch-8.3.ebuild b/dev-python/wcmatch/wcmatch-8.3.ebuild
index 61d6e0564f4d..8a9fe29ef3f2 100644
--- a/dev-python/wcmatch/wcmatch-8.3.ebuild
+++ b/dev-python/wcmatch/wcmatch-8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 9156652a5435..a3b0c3666827 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -4,5 +4,5 @@ DIST xarray-0.20.1.tar.gz 2896122 BLAKE2B 75dbebab105fb2b0c78d09e6dba30bf90a87d1
 DIST xarray-0.20.2.tar.gz 2906021 BLAKE2B 08ed46a27ce66ec1677e63000d74ecc4a01defa81b8ae1ec24595ff330713bf3e5585adce541e5e6769a74d64a4f5eb9d9aad27450e8088973681d0d60d00f83 SHA512 cd292af68ffd8016e01021e30a2ea83dd36e2f79bd9c3d8e7d83adc5a98a95615091d0102a19a0e3337ae334a701f575a142f476d1465804c8d5fe259ca35f1a
 EBUILD xarray-0.19.0.ebuild 1191 BLAKE2B 1f7651e4eeb28643c44e9aa6fef81fefb33498a82de72d25ede1f90da84bd84a0266a86599db1ca20a3219aeafc8f6fea184381f8918e3b137679fcf2029fcd7 SHA512 24cdbfc4117640a6502ccd77d346580515694cd63713424db9e1142889639f27a93e677bc6a69d9c8c1fc3b87fcc3196d27a74626178954b25fbc84fc89de889
 EBUILD xarray-0.20.1.ebuild 1204 BLAKE2B 9fe3d6c3fc93cc9dcc31634d250f8e58bfcbcf40f51d9d4f3b908e9a4806b06e31dfe72c6fc8bb138a0eb75a05aa8e3310449f7fcf9035e33fe4493c9c4097aa SHA512 8bec5553e9641ac2f12293c1de5f394d7809281379b61f44818a65d36d0d6ecc8de5f41a0b9e21da4504c8cb75d1e0db89da93ab62b4547c08905f9e571b0008
-EBUILD xarray-0.20.2.ebuild 1088 BLAKE2B ed2502b497613f90d8e04e11191494695fd2df2707c2668ecd973fe247a2cb6a7f349d1352bdd121812ec0f6fb49101eb6f32a211fd0e5b1b91b93099c511279 SHA512 13857ce3c4a982f9c0137e7291872d8585ee18f7a12c09181d8b9d6a7d944b931ea1eb63d5900a77b7c859f2c472313d685c9cb7ba5cfc162892b990e70551ea
+EBUILD xarray-0.20.2.ebuild 1084 BLAKE2B 79bf3bc5d536d53752a9af62c94496aa33293ba3618aed5634605951365c7aac7b6d6cddb95f7f6e9b605d64e1c9c140e775352e7494044c1795bafa6ed13020 SHA512 ea723a8c34f4a5ba7d202c83f0583e9e24d790d732630db9e81ebb238a63cf50d324a09fdc0aebc2e8c8d44fe2e0d5272d1f81a03ec203dd1c9ad175bfdd1f26
 MISC metadata.xml 509 BLAKE2B d470cc092eb055215a5868c22f9ec458057cfad600357fa1f658ed4537a6a6f68bda1422c4a665f1963ce0a6049e691befc3ca4baa60cc898364ad5f18164979 SHA512 602755896a3655295058afc8543a4bb64192d5c625f2edd86291c1f23d171f051a4238466163c2d469874aff3e68770fc76177e720870492266fb14e6faf6ce7
diff --git a/dev-python/xarray/xarray-0.20.2.ebuild b/dev-python/xarray/xarray-0.20.2.ebuild
index 19299520c970..2c8a5ca9d9dd 100644
--- a/dev-python/xarray/xarray-0.20.2.ebuild
+++ b/dev-python/xarray/xarray-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f67bf328aaef..e231120569a5 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 6c7768fa2c25..027ee95a6cef 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,9 @@
 DIST byacc-20210808.tgz 891489 BLAKE2B e349e960cdbc654b148ec8412f8502e26976f8a933e3846fc4ff308440c8c8058b3422dbc0a709b792ec727c62f3b4ed7d0679d9d5da69fed8c4e08daa801625 SHA512 cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4
 DIST byacc-20211224.tgz 894135 BLAKE2B 6b9e7686e66d9f23ba92f5d8129bda72f75b71a50a72792ec241270102d972279b775b6dcfba85f79dd3bad04470838c1a9f2a675d620322393c7251afafab25 SHA512 e2b9df443c5b05179815808d61e693e942549ca6484a5ab4fdb285b9468da9ed3a90e00d1950a0fbacd1890e5a69bcc03b6d7135a7bbfa59ab0995125b9a8642
 DIST byacc-20220101.tgz 895100 BLAKE2B a78b3530cae045453a6d19fb0dfe3b84034638c624183a32950a19d9b5dbf6b4e4f32ab943e3bad9e9e497107513763be1f758f7cfdf0ffcf31e23a0e2fa5ad9 SHA512 9aff85f0b4ea7f0c9b2e25a155537c99e0591582b2c76c251f08493987a343a812ff86b9cf3d8ecb0954140817c9b164328117de9116f7013e6ec0d91a27486e
+DIST byacc-20220109.tgz 897220 BLAKE2B ac0030f39198d5a8d5bb17bc693be988ade8f001c06667bae1b70e6724720c2052d27adffda4d2a79c014c0c00841d6671e9a3de45548d9d3ae9086d2f4983d8 SHA512 35d7e8f443548d3cc8365cb61a16dd73c6036c7eff12b61f29f9cdfaf7531bed73c505cb6c7908122a7d29abb8fb814af2e6f79b295f4acb7bfc7732683e5791
 EBUILD byacc-20210808.ebuild 720 BLAKE2B 7adf13f8402a63d3106b295d3f3b7e0b99c674a3c567c7645600e8b73edb26e40fa0f7f72ab334c67ada51662207da29b95eccee092013e5fa51f3385879b85a SHA512 797b80df70601601ee535f1d723d4515c14b613bef1398973b64f9dc70d47a6e8a796fa2880880fb13f9899fa32b5636fd04f99bf9e4bcf13e3be8b1fcce2818
 EBUILD byacc-20211224.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
 EBUILD byacc-20220101.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
+EBUILD byacc-20220109.ebuild 727 BLAKE2B eddd520fa731184dc22a88d520caf04aa128e9dac8cb9882250e1acd6310eabf828cbc280c7aff2db6eb32c39cf34d91da43e462038448b087a0caefcf04286b SHA512 a74182290a2a3100ef3e374f4c35cd97d5507534bc00c7810741eec40282ed4a147bb3bda2befeca8be726b397a350d0ebe68149bbb1792019051634bc299c5d
 MISC metadata.xml 356 BLAKE2B 3f7f63e3c9b146f59f1f5af0d683294a58b264e2945fd1a30635c64d462f4615395a49b6acedaeb3ae6377061e85b2496b898db6d8b39a3b8ac8f3cd800a666c SHA512 6f1890fde8b83fe6821ac2e9d298f4dda67bd1a15b26e54d51de685cba60b7f938e4cea3f335635773bb54f4a7fadc9a41e52dadebbb41897c042b4c995ba634
diff --git a/dev-util/byacc/byacc-20220109.ebuild b/dev-util/byacc/byacc-20220109.ebuild
new file mode 100644
index 000000000000..6f72092c3d7c
--- /dev/null
+++ b/dev-util/byacc/byacc-20220109.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://ftp.invisible-island.net/byacc/${P}.tgz"
+# Seems to be unreliable (unstable tarballs): bug #820167.
+#SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 7a1cd604d26d..399380b95160 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,8 +3,10 @@ AUX strace-5.12-detect-ipx-presence.patch 3902 BLAKE2B bc61d359e670462daafa88951
 DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9
 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a
 DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384
+DIST strace-5.16.tar.xz 2265944 BLAKE2B 0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21 SHA512 db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817
 EBUILD strace-5.12-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.14-r1.ebuild 2481 BLAKE2B a306eb30dcc7685c9637572d61e29fce39d1618e2d5ac38bcffffca953d65ab89847af3df7de80596af9b18484f5116db89b58420d11bdbaf2d002c6ad126a35 SHA512 82347d065e746dbe4e3f5fc8f39b302daa5cacc2296c67032b16db2f2d3dc44f9ae3b1a003cd597be14f1edbcb34cc4d8f945994206550f3f21976e9f25e4775
 EBUILD strace-5.15.ebuild 2441 BLAKE2B ad57aeb288b3a5e2ba836c3eadc267084a3be7bc4fd73cab6edab02b0ee13adc7383342095f0df5dac494f53e1ebb881f752a367ddb1a57bd18ebf16ece20098 SHA512 036814f5d4917313557e6672e580abdcadb6f15b326f37268bc8a215bd3c1ea569d32e74562a37c6e439877ee303d3cbb77199999a7575815869b947b529d993
-EBUILD strace-9999.ebuild 2437 BLAKE2B 13ebd8db417683989394b244d639a9b62d297849c09189cc5dfd6c49eae0adf0da128efcfb817c95e5e1828150c9d1d550c8e21769490ff8a9cce877d44f6f28 SHA512 30049cf1f1dda579d8c21dac484698c8a1b25f2e13f8e85cef9fca621b1f9da84e0fa336a7f5680d43c4cf68476fedbaa02c7ee5a98f0af405ca8cbd9e6582ee
+EBUILD strace-5.16.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
+EBUILD strace-9999.ebuild 2449 BLAKE2B 39f4b09dcd44d6e4e4a717015cc25cce55591eb87b85e67ff0a9f25c1f2e2b47006e2e5f19b19de5a7762c0ecc2914322c0d2d72463a0193f8260ce45b703ea7 SHA512 f2d686319849a3c2d1756a36b0d21bba51ffa790f1d9b978d3e943aa1884380a69bc7c8acdd5e4a7009bb2d41771a863cf2a0a56105c6924552de009430799f1
 MISC metadata.xml 761 BLAKE2B 261db0087db2a12c260efcd80bae1dcabd1b518c7b7d65a7ce4cbd5a2fcf878af3787985d629b43dac0944fe97f7f78df964082c5dbc52da06360ec112a0e7f0 SHA512 dfe6bb1b1149f51947c964d55396c10df38ad68dd987ae3df66b1850b812717d282d41e59a38f35863d22eb7391b7be636b5272e361641c26622618c2cbff19e
diff --git a/dev-util/strace/strace-5.16.ebuild b/dev-util/strace/strace-5.16.ebuild
new file mode 100644
index 000000000000..a0531b88dede
--- /dev/null
+++ b/dev-util/strace/strace-5.16.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 035be39c8354..a0531b88dede 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,12 +19,9 @@ HOMEPAGE="https://strace.io/"
 LICENSE="BSD"
 SLOT="0"
 IUSE="aio perl selinux static unwind elfutils"
-
 REQUIRED_USE="?? ( unwind elfutils )"
 
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 LIB_DEPEND="
 	unwind? ( sys-libs/libunwind[static-libs(+)] )
 	elfutils? ( dev-libs/elfutils[static-libs(+)] )
@@ -58,12 +55,7 @@ src_prepare() {
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
 
-	filter-lfs-flags # configure handles this sanely
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
+	# Stub out the -k test since it's known to be flaky. bug #545812
 	sed -i '1iexit 77' tests*/strace-k.test || die
 }
 
@@ -76,10 +68,17 @@ src_configure() {
 		export "${v}_FOR_BUILD=${!bv}"
 	done
 
-	# Don't require mpers support on non-multilib systems. #649560
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
 	local myeconfargs=(
 		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
 		--enable-mpers=check
+
 		$(use_enable static)
 		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
@@ -90,7 +89,8 @@ src_configure() {
 
 src_test() {
 	if has usersandbox ${FEATURES} ; then
-		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
 		return 0
 	fi
 
@@ -99,6 +99,7 @@ src_test() {
 
 src_install() {
 	default
+
 	if use perl ; then
 		exeinto /usr/bin
 		doexe src/strace-graph
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index b8a90854df2d..c0ecf804e4e0 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,9 @@ AUX umockdev-0.16.1-Werror.patch 596 BLAKE2B 029f0db068fa900a1b0acff33e38634194b
 DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
 DIST umockdev-0.17.1.tar.xz 485480 BLAKE2B 5768d08c3f1cd2334afbf095c7d3f0d9290b92c8b4fbc9ae17f81168ab6320c0e86ef9709d1fee547b624cf084c0a29e1f653d67574a639a65ae71d5950c7f05 SHA512 b747a25cb83c7cf222693818c37fb917e599567a04e69784fae6afa97381cfa630641c2858a6fa156fc1e5f872ae40ea360f9b8e2a20c5adb69fb9eca3852164
+DIST umockdev-0.17.2.tar.xz 486076 BLAKE2B ae1df8b07d93290c9f2be267c4aaf795e8e2e0a9fd492fad4cfe46d8929bb020d9482f7769a62d9b3325a361c3ef276b92454026741f0b985e12f283e2a4f7cc SHA512 fcf8c972dfa063922286702eeede8c273b9e78c1b1274a67ec459f64d17373a172400bff27f2fd9baee19af188fbd28c0f5e97b71bd7c8b50886933ad75547f3
 EBUILD umockdev-0.16.1-r1.ebuild 1189 BLAKE2B c12e23c8fd73e5b7bf152820300bb74c0b0bf28623800aac162a7e95828f54f6a21a934285d694c8840968a3338c5fa4d078e419d7eecf9db5597b6c0c8d7284 SHA512 2c29ab977fe681fc5f9c1054858a7af993689f3db59d00c088cbf0857ed5039852d3060659c292167890f4bbf422c23bbd34bb800c627c93e3d9688a0ef5659a
 EBUILD umockdev-0.16.2.ebuild 1208 BLAKE2B 126666b85478185a70e38b23f0b9940f4d00d18e53058cb1f0e49002c6e5f42a1c929663dcd05019e88b7c02260bfd1b8577fd71dc4f37111981244615bac780 SHA512 023b535bdf6ef5ab951b4ec1812cd31bc1c8b2233ee98d67abf3accf7d7d43e78dea4eed6c9f27e810dbc225d6818fe55a304ad213ed4a469ed352e946daf955
 EBUILD umockdev-0.17.1.ebuild 1143 BLAKE2B 49fa6878982a7ea2028b8061253ef3133c92fb1ea7d5df0608bd4df3b36bd01dd563823f8559f3fde8d73ae951b3efd6f728b6c933f0e76cfb07cffd58254275 SHA512 8fb0bc69fa5e7db04c409b8aea9ec93a1008e5cb01ea89ada29d04d6b2417b7364cc0faf4ee546e6345927e91ab0c590c0c16ca566fb3ccec35d4e22ce7ae9b6
+EBUILD umockdev-0.17.2.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.2.ebuild b/dev-util/umockdev/umockdev-0.17.2.ebuild
new file mode 100644
index 000000000000..7a53f924c567
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_src_prepare
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index ce646e5f59d2..b92803b86538 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 45e4a2452413..f982244c23ca 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,16 +16,20 @@ AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d697
 DIST git-2.32.0.tar.xz 6551348 BLAKE2B 546203ce3f749ba806866a9e9767bc807794cec435fd0b60306ae6cd2b1b17a0159ef9774c79c4f59d0dba45b36941085b55f103e1820450d560bffa41d1058f SHA512 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 DIST git-2.33.1.tar.xz 6558636 BLAKE2B f4959d5309f85e063448673a3f06f1d3cdd65ced5f5173cfe5a38df3b5547cae1c08275bda02e48307e8290628735e2ea1ff49222262e7cd29b252a6aa4d4a15 SHA512 16d417183232e1057bea754d59cdf4bbacc5f1527d1de6ee04cdd293a2512bfa7208e20f6130816605528b59cb1bc3188c5bddf1a42c1413095ee74e44dd2f91
 DIST git-2.34.1.tar.xz 6623760 BLAKE2B 9b5d7a450ec495898bcc0e1f6ae87c0ad102d039cf7c4106cdfe3ada501d9bfaf22b83c522de383d3c01f7d5a29dbfd7fc44b371efa8fc3a418ab3c609a692c1 SHA512 a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
+DIST git-2.35.0.rc0.tar.xz 6614736 BLAKE2B b2207adb76f5e43ac97ad61a37aa0e9dd8c6faccca43d3c7c7560764b11e0851669e88d31ccd776e5298a07c8d875c5649492a0abd509ad0da8ad30da87cb54e SHA512 9aa5d89d7981c73d32e9023dfc61a62e63688c3172cba4bee145b2ff4f5f7bc497435d1b4b535089c698893feabc6057a6522676e52bd3355327dfc0b6b8ba56
 DIST git-htmldocs-2.32.0.tar.xz 1381664 BLAKE2B d1b47aa99d32a252fd20df26eff44a558044f3a389379b161bb43621eb28375eb0621969849a31938ba7fc9fc58b140d27d703559ea5735d0a0ffd2e93cd9692 SHA512 12b84e342f0d19afe385ab8a685ae625e86c3295d1555992e0c427b361aa2cdfc89a679e7dbc468d3568a325dafbf699468aadcdb02f93e372eff3dd96a7cf7f
 DIST git-htmldocs-2.33.1.tar.xz 1396744 BLAKE2B cbd65cf08fc7ea466fcd72820ba3e2135ade37f69c436a4ee7276dc71fb62f6270b71e2f46d981f5681a0fd3c30613d61680c2ef2460d0d7d292f7455e114128 SHA512 5b856b919067e1f644539d43a85aab6f602537ea0970b6248b471e3fa6756a8494f0525a69d22ad3795fcf9e106ff8439e0f6716ba0b8c895d7aad8c59e5bd74
 DIST git-htmldocs-2.34.1.tar.xz 1406464 BLAKE2B 6ee2f58df3c1622d96ac4b1a70d4dc3d0c973635774dd6bb89fea3e502dd82d99d676e2f9cb33c14c429c3d4680cd6020213154099b3f7fe71ad67602ca9bc6c SHA512 cf9fa952d43e477528deece9f22d1bb63fa50b3a831fae20812c6af31c1dbaf193abe2fed48ac9966bcf1787442ceed19f00c00e524a1911f0ea31952a52fc8f
+DIST git-htmldocs-2.35.0.rc0.tar.xz 1405384 BLAKE2B 06293752aba85cfaf5b9a5eb7f63bd553e736f28c6a3764f9de7a9e0ba4f060cdbe803ff6710ae625964b17078b72ff6a95c012226889238c0cd0b7b23704196 SHA512 a41ca05e0c314c0922bf0070a71f0eb9946a48f26598ad950c0e84e1a1021c81a3c75a042601abe2c7d91cd277d2e24fd234f6faedd71d2975fb8a7e24da737a
 DIST git-manpages-2.32.0.tar.xz 491868 BLAKE2B 7598a864246aed771371924604ee13d3f51b839b10b254bb1159dd47266513f5cd6484aab200a7b4ed427edc76538a98e39a040a17201483965175f5e1c5f484 SHA512 5c9950bd5d6904972cddf4afad534197d843c0dee8198d14ec5a3448873cab37dac88295b2a4df3658749f048bda4800b54fdc850517be7208906c911832c66e
 DIST git-manpages-2.33.1.tar.xz 494288 BLAKE2B 1f8bd4f23de31a285d3f4327e562dddafdf9f28e8b36334e54f5e280c81fc8170e8b153ca42baa642d02d8e6fdfcac9a8fdd3cee1e32c29bcd53f689d1a6c463 SHA512 d465a7b491046b7a5da6ad1fc6c62b351c69905932e0672263de5a1d3abe1113660cff9fe30c7be1d1695c6170ceca5a11b3f65e9b2d1545f35cc653e4c6ad62
 DIST git-manpages-2.34.1.tar.xz 497280 BLAKE2B aa3c67cec861eb40eda3e7827d3e380fdfb6f189027fb7e5618258b80ac33918cb3c2ca4d2f8dc5fbee959578766564137e9c4818672f5138304270c486658fe SHA512 8f3b56fa477e5aafec3ef29933234c362a372f59ed95694c4fb82ebb82d2a8ebc0ac17ae36caa9185964eef1700ea8732816e73df4ddd918afc949a8371fa0d8
+DIST git-manpages-2.35.0.rc0.tar.xz 497520 BLAKE2B a7f8ddfc8a9711dcf25fdda447b1e61e054e213a933f31ed56b959ba9ae1f1a3f2978b3868d6a9146642b6ebe6df022d31f72b147c3c61c9489d2d442e81bc26 SHA512 eeeace33390dcd30d2baeb7f0fca622854180e27a33eaa1b6dc10d0e3c5fa7b14f9ecc5622683e9dd0d3da1ed5561ddfaffe29f32aebc2e60418cb967796074e
 EBUILD git-2.32.0-r1.ebuild 17990 BLAKE2B 82b6dbbc1e95178bd988f02c37cddec6a0e36489baf73ea3ebc875f8a1c4fbc2bffde169e43cf47042460e7ae15d2c5843d7f97544b90949297f07db835e08a2 SHA512 1c3a49115a87fffcd664ac413601a2c2dad631f7fd6660881d300869c3ea707197b9932d843333749925e9d96fe84c52b1f5202bc256956fa6b303f4517cf787
 EBUILD git-2.33.1.ebuild 17886 BLAKE2B 3e21f1806e2b3ccecf9de213a5edd0c287004ede5e5653469e7575acf928b8e207a7e8b1b660125797b74e539041f66f23f2272896cb32a57f52fd24945e3354 SHA512 dbdcdcd1a508a4bd8423939bb6ee0ce1510f12f2ec8b0fa02752454fdcddc4fbd786b99bb15ea11f4906001ec67b57aefdf9de038a1ccdcff1ab6c1165c67060
 EBUILD git-2.34.1-r1.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
 EBUILD git-2.34.1.ebuild 17885 BLAKE2B 016e3535fe918c345f42c0f0eb8d09a523c3c57529ddeb26a677aa0d3a74f78b26ccede54407485642652f64c4df9d1a6bec80f7792d6bfedecb7d52a9529db8 SHA512 401e8dacfc58c8b8b76393473c8ae809b77c088b461e1fb2a4ba148c1811144cd43d40f977ade29d1386f094b76ceb85d7e0f55a1baf2ef95ee7047120c70c4d
+EBUILD git-2.35.0_rc0.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
 EBUILD git-9999-r1.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
 EBUILD git-9999-r2.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
 EBUILD git-9999-r3.ebuild 17893 BLAKE2B fa3da8c57ae9571816599eae3d036daba285c7abd213041dc23c5de42dcebc90f5e0b9a0049508f86a3dc88fc112e5d537ced3b19682d31492d3d2a0fc03571f SHA512 8fd18136791a45c7e205aac6a4453d376287daa27abc28f5263bedd986c4e562c78b83c036193583c5145d697b1c3c1df1d36557f5f01cc92b94565efa484f18
diff --git a/dev-vcs/git/git-2.35.0_rc0.ebuild b/dev-vcs/git/git-2.35.0_rc0.ebuild
new file mode 100644
index 000000000000..c77551019c67
--- /dev/null
+++ b/dev-vcs/git/git-2.35.0_rc0.ebuild
@@ -0,0 +1,660 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs elisp-common perl-module bash-completion-r1 plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" == *_rc* ]] || \
+	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
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND="${BDEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.33.0_rc0-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+		$(usex cvs '' NO_CVS=YesPlease)
+		$(usex elibc_musl NO_REGEX=YesPlease '')
+		$(usex iconv '' NO_ICONV=YesPlease)
+		$(usex nls '' NO_GETTEXT=YesPlease)
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+		$(usex perforce '' NO_PYTHON=YesPlease)
+		$(usex subversion '' NO_SVN_TESTS=YesPlease)
+		$(usex threads '' NO_PTHREADS=YesPlease)
+		$(usex tk '' NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	elif use ppcsha1 ; then
+		myopts+=( PPC_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+		if grep -Fq getdelim "${EROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	if has_version '>=app-text/asciidoc-8.0' ; then
+		myopts+=( ASCIIDOC8=YesPlease )
+	fi
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+		sysconfdir="${EPREFIX}"/etc \
+		GIT_TEST_OPTS="--no-color" \
+		OPTAR="$(tc-getAR)" \
+		OPTCC="$(tc-getCC)" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake gitweb || die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		pushd contrib/credential/osxkeychain &>/dev/null || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+		popd &>/dev/null || die
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man || die "emake man failed"
+		if use doc ; then
+			git_emake info html || die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info || die "emake info html failed"
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		git_emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+		popd &>/dev/null || die
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree || die
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	pushd contrib/diff-highlight &>/dev/null || die
+	git_emake || die
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake || die
+		popd &>/dev/null || die
+
+	fi
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install || die "Failed to emake install for git-subtree"
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		pushd contrib/mw-to-git &>/dev/null || die
+		git_emake DESTDIR="${D}" install
+		popd &>/dev/null || die
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" \
+			"git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+src_test() {
+	local disabled=()
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		[[ ${cvs} -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=${cvs}+1
+		[[ ${cvs} -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=${cvs}+1
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+	elog "completion."
+	elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	elog "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 1ff3b80a6246..7176c5d22194 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -1,5 +1,3 @@
-DIST stgit-1.1.tar.gz 313862 BLAKE2B 2d15ba7c2f55ff1211f0d9a3002878102f5023e897d0830daa688a2af8c6a386ec0cf076c728b6f45650ee3382379a32fb4efb25d0da3b28302f158dfca6ef62 SHA512 917c645f219b2725d1e88186674a6184c96f1457d5c7722b4da17931d963f0fe0c675cdaaca435ba7405ba498d6db9a01c9f554d1aa3093cc3205d224d9d9759
 DIST stgit-1.4.tar.gz 390734 BLAKE2B a2c8b6848cacd743022318ebf9a0512c6bd02a2b8c864db2270e5075c82dfd9e6037a3a79978b2061487bf040864077b0f7836c66986d82ff3eb902331589d87 SHA512 5251dc26a7c64dcc83021399f95ea911d6b65cfb2ee5c016c886447740ed48b66d3f0bd92a45b4aed40ae2e77dfe6ba62336dbba6773a1879ab749c95bb99b4b
-EBUILD stgit-1.1.ebuild 1840 BLAKE2B 06b57cfc1df07ac5b62045f765c3d6e03083e1132c12e6d775d5d637a2d4e8fba5a8779e639e9adac07c11c166fa7378d8fe341f53039a4b58a9714d9ed2e9eb SHA512 e365bd59428eef6feb3c71b1282753127f48f49c51408878957a490bf27d426eb70b8d45eb10f92e39dddaeae31f5c3b5eda769d909540994b00631c626c7965
-EBUILD stgit-1.4.ebuild 1820 BLAKE2B 60ea52d5a6c3ccc0c0b580da8901c03ce20ec64f37b5d515da7a408b1f57206635d5b28a95c1e668d3d24c04dc1b1ae3b6bb3e04b600efc6d13f8134ad2a73a9 SHA512 8878c4c2200592eff7384589a737fa79079aae5316d973d0e93128d6ae15470eb13d823bb0cd31df012183354b6269b31bd61a5f977a9f7021194ba9750153c9
+EBUILD stgit-1.4.ebuild 1814 BLAKE2B 40c7993866ef309dfd3e4d517de07d9cc525dc9b3658793dc2b446b7a59907e2161c725bad71d0df6015bd9da180a288b1b0e98b04438d0b58701648c0473341 SHA512 4b4fb8363a90b2b2c5e412fb623d6cc8bad86dac113f3895ae509f9cdecf63f11e16de32eb49dcdc076c1ad0f7927db77413b9843159e87ad4dc577ce0a7e85d
 MISC metadata.xml 347 BLAKE2B 152f011c7facd06cc1c654f388b4a44bbd8486549c07f1329d228e252a411bfb565e4f5b9e37bf9eefc23fda47a774c347d2e82070ac21c0880806bca99a6685 SHA512 04b087c0e6c6ae99128dab9c29e49d55e1cbcac3890f6324d3ea66b14530e92ca9ed32e9a6dfa23f06e23f8b79b3e57ceff2c9cc2995af4e01c91914d50361d0
diff --git a/dev-vcs/stgit/stgit-1.1.ebuild b/dev-vcs/stgit/stgit-1.1.ebuild
deleted file mode 100644
index 09f77c8c71f7..000000000000
--- a/dev-vcs/stgit/stgit-1.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="https://stacked-git.github.io"
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=">=dev-vcs/git-1.6.3.3"
-
-# NOTE: It seems to be quite important which asciidoc version to use.
-# So keep an eye on it for the future.
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-		dev-lang/perl
-	)"
-
-pkg_setup() {
-	if ! use doc; then
-		echo
-		ewarn "Manpages will not be built and installed."
-		ewarn "Enable the 'doc' useflag, if you want them."
-		echo
-	fi
-}
-
-python_prepare_all() {
-	# Upstream's patchset
-	[[ -n ${UPSTREAM_VER} ]] && \
-		eapply "${WORKDIR}"/patches-upstream
-
-	# this will be a noop, as we are working with a tarball,
-	# but throws git errors --> just get rid of it
-	echo "version=\"${PV}\"" > "${S}"/stgit/builtin_version.py
-
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# bug 526468
-	if use doc; then
-		emake htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			doc
-	fi
-}
-
-src_install() {
-	if use doc; then
-		emake DESTDIR="${D}" \
-			htmldir="${EPREFIX}/usr/share/doc/${PF}/html/" \
-			mandir="${EPREFIX}/usr/share/man/" \
-			install-doc install-html
-	fi
-
-	distutils-r1_src_install
-
-	newbashcomp completion/stgit.bash 'stg'
-}
diff --git a/dev-vcs/stgit/stgit-1.4.ebuild b/dev-vcs/stgit/stgit-1.4.ebuild
index fae3f3498df8..ffb9c6761f48 100644
--- a/dev-vcs/stgit/stgit-1.4.ebuild
+++ b/dev-vcs/stgit/stgit-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index d462c764e377..bcc21ac8c638 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index 4653db3ae791..5b0418152da0 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -50,7 +50,7 @@ dune_src_compile() {
 
 dune_src_test() {
 	ebegin "Testing"
-	dune runtest
+	dune runtest --profile release
 	eend $? || die
 }
 
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 3b19b30c57c9..0e14514e298f 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: findlib.eclass
@@ -23,7 +23,7 @@ _FINDLIB_ECLASS=1
 QA_FLAGS_IGNORED='.*'
 
 # Required to use the ocamlopt? dep in RDEPEND below
-IUSE="ocamlopt"
+IUSE="+ocamlopt"
 
 # From this findlib version, there is proper stublibs support.
 DEPEND=">=dev-ml/findlib-1.0.4-r1"
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 589db26f6294..f2f3b7227b09 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index f2eee22d24dc..b0d404cc0af8 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -3,5 +3,5 @@ DIST gnome-commander-1.12.2.tar.xz 7529048 BLAKE2B 468279fcfd25111c673d7ce75124b
 DIST gnome-commander-1.12.3.1.tar.xz 7530232 BLAKE2B 34a4cabafab52ab6f94619dafac4db87c12909eef22c13d50356dad925f129da182348eabd8993f69ffc398db163f81ec59c9a102530a9b49f7714b5d7c6db68 SHA512 1206d545493deeb2237af6b9026baf6faab2a8f6ae86eb1abb5c2e5ceb6212ad66382d3abd07c89f14271ac8709d14548f0bfe68fb0e11b1779e0c061e0272e5
 EBUILD gnome-commander-1.12.1.ebuild 1504 BLAKE2B cb7ba0f30b7ffc26f074266be5b35a7bf75631475f9fd477bfb25d491677fdd789825109911bf0ce7a8a2d9d70a118eb0e849f1619ff2cc0b9f62a2e9cfeb775 SHA512 e953d57b4a39d7bba1d21eb28e0ea24ab5447ef8246e4a4506fbb8dd09e73d0c36c64107c9c40c8c137d4ae7c148c576795916f1f22fc2a7eb1f05aa466c5a53
 EBUILD gnome-commander-1.12.2.ebuild 1411 BLAKE2B 090ef17a6be2870c1bdfc9a125cc48d172284fc2daa0a1e4ba917ff24d629029520a725ecf6e298225714ad56f3ad964bf42dbc373a1a48a3e699a2f24d5cd1b SHA512 758565a4faf50960dfaeed13ddad9d2b09a3b648aec14be6f51f9e462bc2e276cecc9d9ca23319815dc9e10e46f09b115dede245b2c84f1fbc17d67a1992ba55
-EBUILD gnome-commander-1.12.3.1.ebuild 1411 BLAKE2B 9b85ae1688f856b6248cbc73eae32f4d302053a5680c80b15ceaadcf91ae47ce5e4a856e9366fb25244c468ea63f31c13e1f14fe66ed30163bd8019f65bed529 SHA512 633ff96fe545e813a234bdbce6f9c4267c47bb7d3a13d5466931838c3b026932ddcc4d60bc7367bc250e609484fc7f9b3f5f8e9a7e30f4b564f782d6c91dda67
+EBUILD gnome-commander-1.12.3.1.ebuild 1409 BLAKE2B f8a11f356842ca79e089465de1cf70f2d75c7208cdd53333b931d682c4165544a69c374b2b1dca2e33d9e19bf2cac214385e5623faec344cb9a63b8f56dc5784 SHA512 a015e2f2ce55ed7988eeeb8658a01a45619d2befe96a77bec3e968719152cf5b78f5f2b45e08f975a96af54734bc2b7531b59d968352519eb921a011b8113d82
 MISC metadata.xml 1185 BLAKE2B 56389cab7656d7c1ca18798e9d1f0168ee967225f864b8c7534151d9c909f3c68b72cb28154674843abee817c8c485f3d1df27ad04a1613bdb40d4330eaf0038 SHA512 ae95ad3a4b61fc0886ea155f2f22ceeb9b48660711d9c6f0c1c47d27ca3d272422426f46aae4213959b74d763ee8df83ea811a489b7d7f52d457a0089d9abea1
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
index 13c91936a77b..ae817455f405 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://gcmd.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="chm exif gsf pdf samba taglib test +unique"
 RESTRICT="!test? ( test )"
 
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 75ad98ac3486..4a43875db79f 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 2ac43b30a9c5..143f9392d148 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.23.4.tar.xz 629336 BLAKE2B 26f92a14012585ce15ff0f00f3c57c4e11cba986a1b467f210d77bf6488fd552138b3775774fb2b17d1d340e4bb5bad77fd155aeb9986fa190005204aa8416ea SHA512 a84cb7555716333e5d6ab9be114fb4072c315b244add05ad829bd476884c282a17f8166daf35d6a343bfea3407f1388374d8632e37ce6057d546b67f7deea256
 DIST powerdevil-5.23.5.tar.xz 629528 BLAKE2B cb34fa1a7added039b5fdcd974fdb898a2e6bea0143abce4d0c99d140e1f24cde91fa008be6686fa9dc976411cd6813cc7d124e15247d6a618bf0b2ca1a4499d SHA512 906d4481afee63368d62200a51b3bdfc202c28a5336a135ea161a5389518c92ad66fc2a5f502089d9e189c0b3a9d9ae83c17bde03b2cba680f8954b73624787d
-EBUILD powerdevil-5.23.4.ebuild 1951 BLAKE2B 41c5624dcd8801e8d41dad9d9ee5b920d273a7d1ca211b670bd62cf2e4d3dff83ac4e4e7ed9d5a488aaa1ca2d99fa5d211f9d37a6125cfef8a83f8cb6d7c6332 SHA512 3a0acd635117d8577466dec37b7aee3a928151200d8dc143a6d44a1fb5c831b65786b2b42d9382fa12b5ea6bc4a84027cd647be0e41a366dfad495b970821c34
-EBUILD powerdevil-5.23.5.ebuild 1954 BLAKE2B 33b7e916ecf2b788bf6144907c3c02e4e875babd688d2e0d74cef7e95ee63d1b1f3f0896e340726c52de1894d094ba22ee1a00e9838acd8f53d259218d3cb2d9 SHA512 4c6247dbf8a6a9b34274ba9451e7ca3ca7d340c82fd1601732e27fc077888e0ce7ce137607b832d33d427714915dc656faabab7ecc7cc39e17213f24da218701
+EBUILD powerdevil-5.23.4-r1.ebuild 1953 BLAKE2B 77789a40e40e22eecce7800c386238d84ac942d8d8fb4ab9d24266063467b775503ef1d4c9cdabd154e836b1eca369ac13a470274d534230ba6b3f00e7ba8446 SHA512 2c77d8b81d8872f52d4b208276b1c72edbbcda3384989291b40e74cd1cffe86986d65bd22d9b09ac4dd1ed704dc376d74950096a47fc4362694fc3520059e3e1
+EBUILD powerdevil-5.23.5-r1.ebuild 1956 BLAKE2B 3c0d0e37263a897306b6021b9c553374e994e3fb3d2ed224f3aa78290936449f9acc9a08491a7d303fecebfa9ee119f035763698186a080463a6ea4f6ab33ce1 SHA512 546ac21045efd4e20994b73c76f734461b792dbd5056d846719d17c3e09c215b8155865efa1545df42c8b9581a345c3b1ee097bd9b275c66f791b7c7aa7f0803
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
similarity index 95%
rename from kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
index fa6b1b4bd1b9..40e0884adb2a 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -45,7 +45,7 @@ DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
+	brightness-control? ( app-misc/ddcutil:= )
 	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5
diff --git a/kde-plasma/powerdevil/powerdevil-5.23.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
similarity index 97%
rename from kde-plasma/powerdevil/powerdevil-5.23.5.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
index 298d369017f8..4b2632d141ec 100644
--- a/kde-plasma/powerdevil/powerdevil-5.23.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
@@ -45,7 +45,7 @@ DEPEND="
 	>=kde-plasma/libkworkspace-${PVCUT}:5
 	virtual/libudev:=
 	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
+	brightness-control? ( app-misc/ddcutil:= )
 	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a54ed64ed27d..b77cac9abd05 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index c0713a9918b5..25a36ae2cc30 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -15,6 +15,6 @@ DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c6571
 DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
 EBUILD rspamd-2.7-r103.ebuild 2645 BLAKE2B e2116351088e43ee3c62f9defdf8fa46aa2cbde1889219325130d029dcd73dc476d9015b7c3d01b33240e6f650872da61fef47fe7365029a3b9907ba0bab1e56 SHA512 b82708290ae84d57c3903d965df5c108b4a595d4278569f453f3866d5cc119ed07e41e12e1f4ad54d136d296924671670cf9fe0623c4cfccffc464b0a583f245
 EBUILD rspamd-3.0-r3.ebuild 2936 BLAKE2B f34324cbc30d49cea77200a3761a4b3947a4b645d86c82e601dd4a1d14b20fd546a3c04195aa79d70294ba8bcc6f88b34b3247b649603e40ba6d9ae7f3e2493d SHA512 7d6cb01d02542f8275e40e2ff21e390d95da89942d5b8c58cbee27d5ff825507d3c154881ba126411260933600194eba8739f67dd647d692e2ac0fec730bde4e
-EBUILD rspamd-3.1.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94
+EBUILD rspamd-3.1-r1.ebuild 2864 BLAKE2B bfaa8caacbf747a9d96049a294d0de265911662be4acb555e403600d3bd1e673a183f6f35fedae44a357cebe5a32e87f9e59cf4d0e5746dc4dbec392df088da3 SHA512 02c20b2f2fe26f7eb9d331cb2c99a4d1b571145153eb207344ce81fde76df34ab81303319570329c0f672e2f9087eb555b0dc7f974d79e6144a551fc839d4e2f
 EBUILD rspamd-9999.ebuild 2855 BLAKE2B e97810948f4790f44dedc59fa856823ef0cdfc20d0ae4adc2358d6f2644903fd311fd8dd16e0766e4600d0390c4eab33e5432627b08ec0d906c8da1f4c5caf8f SHA512 8d57c5a91580a969aff87c7c6c09c4d3fb5924226588e861e1bb97f2bb2c289382a857009b130410b32241f06d695c214f7ebaddc519a8db2f7710e521910c94
 MISC metadata.xml 747 BLAKE2B 8205e9a0000d40183806cabbd38dd80f8c6cb83d0d375f38e23c884f30e0472591f58eeb2770aab6d976eb084c80f2b15cc348bbc4dafaa356ecbc23f5387762 SHA512 03fbb7317bc3a30c76dbabaf747e8edf028d21e2f5e1e77d3eb419bcbea15ed6f83bb3beddc416730c3da1158ada91441695801fbe4c4332072a2eac9a61dae1
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.1.ebuild
rename to mail-filter/rspamd/rspamd-3.1-r1.ebuild
index b4d4c6d23bae..d1cc32c3e7bb 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,6 @@ RDEPEND="${LUA_DEPS}
 	acct-user/rspamd
 	app-arch/zstd:=
 	dev-db/sqlite:3
-	dev-cpp/doctest
 	dev-libs/glib:2
 	dev-libs/icu:=
 	dev-libs/libev
@@ -51,7 +50,9 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/openssl:0=[-bindist(-)]
 	pcre2? ( dev-libs/libpcre2:=[jit=] )
 	!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	<dev-cpp/doctest-2.4.7"
 BDEPEND="
 	dev-util/ragel
 	virtual/pkgconfig
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ed34e4f3966c..69449507a0cd 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 5270858691e3..73d18adfde3d 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
+DIST gphoto2-2.5.28.tar.bz2 797600 BLAKE2B 78a89eaf5f68f3b902751792404702fa656680e904bc750e6a51934b5cefd8458c95ffd553024e16977270f4b4806c5dc68d9e3accd8759b1357e0619a0dc6a3 SHA512 ca83c677bdaf7c16ed2bc22865bdcc24e1c5721dbcd36a76e2ebe8bb992d46614fd012cd8f38b37598b30b6b57e6bf533318f6a0d490e186f3026676249735c8
 EBUILD gphoto2-2.5.27.ebuild 1209 BLAKE2B f1f3547bffd426b36772ef930f7294f65f9877c23d4d7458185b75a1445dda1efd4a0ddabdee591354cb6ef5bbc9e2f795bf576f5ea4c1c49a44ff3d2a31ed4f SHA512 428e2f4abf2a68d3ed4db3be9041eca736ce0073e8d611e6f5bf69cc0b2afa6860861354c5bdb27f9b38c0284a3e334ad808f8c94f973fb3b7dd8463a70a620b
+EBUILD gphoto2-2.5.28.ebuild 1048 BLAKE2B 95b63ea934ff7481717ed63597011da47ea53efd994299f83deae611b07cf5e1607fd7874dd82abeee603843657a00730e47c65a6250333b17d91234c20b092d SHA512 39d6aaaf9a40ac770a4afe53c03ecd9cb58aa1d63bd7e7beb03a0f403980aa7720a9d7b61baf01c304d2fb034b123323a35950e990a6f7231396a4bcb55906bb
 MISC metadata.xml 330 BLAKE2B 59a3975ec454edf5966f52db0edb971491c88b2e8777ad0aeb1b66e334ff70e1a7f30e0dafabdba5fb7122c2485f9c787d0bd0415f2242f4e327e66797091b6f SHA512 b86a7023ca0d70907981f5c9d4d134c48d794a9737338c8cda610cd5066f7432ada968f064a36f2b948314508811dc6eba8d9f68c3036d392cf41e57f98fc718
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
new file mode 100644
index 000000000000..d63911b2960c
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	>=dev-libs/popt-1.6.1
+	>=media-libs/libexif-0.6.9
+	>=media-libs/libgphoto2-2.5.17:=[exif]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+src_prepare() {
+	default
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with aalib) \
+		$(use_with aalib jpeg) \
+		$(use_with ncurses cdk) \
+		$(use_enable nls) \
+		$(use_with readline)
+}
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 4ca7ec50cabf..58a48bb9c9c0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,3 +1,4 @@
+AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333
 DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a
-EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1107 BLAKE2B 83be2724db19d19ae98b403949d38573e825234a74e8709d4deecbebdbfbe2b002af5eb1a9bbae57ebe959e2294eac4810ad908d417f4523fabb456e1e73cf33 SHA512 06521bb7ab249d3bed620343d34b7a869b2dc8b8e847c577bc66d3a7d2aa28e359efe3c9defec17d9b3c4d282ef3975eb3125c64a8ba32b63b7d25f3d1ec6720
+EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1163 BLAKE2B f6256ef3bc34a273b96ebf5dab5dc544a7ddd98a818c55ea4b3929f9964b9c22fa8c49dd815aae854f0b648a7b5a40c3d687217879afd370d5bd8cade60aac61 SHA512 a3869d2c954e554fde32c2d675db2fef7770e0f9563edf1eba99699567ed33e54adab45478c1bd82bda1eabf5503559f166843cccb93fe7aea4beec295f7a031
 MISC metadata.xml 449 BLAKE2B a1550ecad1311dd85b0ea9c0004205f001f9818c98636b3c5abaef1d4222c14336423ce3ba657b7465d46cdea4ee27ab5fb6bd46e4226c6f9500547205c7b527 SHA512 ec69b35edfcdced05b6903212db25626415162c780326142ffe784373410400f0c898300e001d7f50dd277af053effb9aee1d457fc653d058b864600c9edbb53
diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
new file mode 100644
index 000000000000..301f6fca4276
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
@@ -0,0 +1,18 @@
+Users should be the ones to choose to add -flto or not and how. The test
+may also cause unnecessary noise wrt https://bugs.gentoo.org/830950
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -42,13 +42,4 @@
+ 
+ # enable global link time optimization
+-cmake_policy(SET CMP0069 NEW)
+-set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+-include(CheckIPOSupported)
+-check_ipo_supported(RESULT ipo_supported OUTPUT ipo_supported_output)
+-if(ipo_supported)
+-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+-else()
+-    message(WARNING "IPO is not supported: ${ipo_supported_output}")
+-endif()
+ 
+ if(USE_SYSTEM_NCNN)
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
index 3079c5c096f0..cc5fc8bd42a0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ DEPEND="
 	${RDEPEND}
 	dev-util/vulkan-headers"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+)
+
 src_prepare() {
 	CMAKE_USE_DIR="${S}/src"
 	cmake_src_prepare
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8c04e1a1a263..4830231e5fdf 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 86d154718afb..e048bd41bebc 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,6 @@
+AUX 2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch 6423 BLAKE2B ef91e230e39cb4a57db00b858f7375c1e2d62dd390373b2d70ba9ec4f2950c7a2ccc753ce467de9569c2888f2cd2c4d8f9333edd90a905a98b76b091f1184e82 SHA512 4bfe532bf3148627146310b4ab21814042402a7f0c78411ca5af2d992102d6be82b9675ba90df4c427843faede90bcdbe6e78b700cb4c83e7a2ef3e0b9371465
 DIST libgphoto2-2.5.27.tar.bz2 7540660 BLAKE2B 6fa2d54497e2162b8e9a4be17a8fe74c6e13ccf15d8fe873649c4285188d86e45cbe8359572bcfd252f1abce28ac327d3333fcb62ad958e6f992c9e11fff4fb1 SHA512 7cc82977e62034c539c7e62bff62ee61a299d3adb0c42e88b8e5521e75eedbc22437b9520af8a4bbd7dc0639ce5a8a10b1f5e5e8075e9b73a566da9061c958f8
+DIST libgphoto2-2.5.28.tar.bz2 7399434 BLAKE2B 3feed613fd84cbea6109afa2ce643ad8be9b3df14cf332cbd93a8260d7082756f5278578b4052a289b954751a82a2f62583ea327ce96255bd653912130319bfc SHA512 5898d35a991361a6cc6824cb88aab79326b59e4080b5e885e1619667d11c4a92d24a1d3fbdbd6af49696508ace1eba1b17bf2f406c72dc9ad69bcf019bc86eec
 EBUILD libgphoto2-2.5.27-r1.ebuild 6138 BLAKE2B 83d032cea7648fd9abab34677882082dc9589fa568e6d3451e48c63a8e35b774a41071ccd0c6249b7c3efb2d28cc4fc411827a8bd7b5a5aeeeab5f6730fdf336 SHA512 7f313d046bc0a3ae0cddb1b09b6b5ea472d14a741305bfdc9427872e8b1bcf221793ee20d0e4c86fc1bc83d61e614298efe96cf20da6e032d9d1c73e923e3256
+EBUILD libgphoto2-2.5.28.ebuild 6270 BLAKE2B 0bc7d864dc6e6942e52ca5ee014938688b5a2d47092d3367bc69fb2db842726604497ec6acbc8227a846239ce4c620c86806d76881b90e9a82d7ffcae1a36b15 SHA512 9228db88081ea83e025bbb5b800e6a2e2a36824a629a8263c5dd0dc0687bf92a547b457f820047c65abec6cfedb21f5fca97be06afd5340975e6e5aed278acac
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/files/2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch b/media-libs/libgphoto2/files/2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch
new file mode 100644
index 000000000000..62450f7eb34b
--- /dev/null
+++ b/media-libs/libgphoto2/files/2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch
@@ -0,0 +1,197 @@
+From 613b00785932198ba09d510e2b1aab5aa62e66e4 Mon Sep 17 00:00:00 2001
+From: Hans Ulrich Niedermann <hun@n-dimensional.de>
+Date: Mon, 10 Jan 2022 00:24:06 +0100
+Subject: [PATCH] configure: Allow --with-jpeg=yes argument again
+
+Allow the --with-jpeg=yes configure argument again. This
+was broken by commit ea00220b6f44a00c2efa792c538f1804ebe183c2.
+
+The GP_LIBJPEG macro in the configure script now handles the following cases:
+
+  --with-jpeg=no
+  --without-jpeg
+    Do not use libjpeg. Do not autodetect it either.
+
+  --with-jpeg
+  --with-jpeg=yes
+    Autodetect libjpeg. If not found, abort.
+
+  <no argument given>
+  --with-jpeg=auto
+  --with-jpeg=autodetect
+    Autodetect libjpeg. If found, use it.
+
+However, it does *NOT* handle
+
+  --with-jpeg=/path/to/somewhere
+
+at this time. Set LIBJPEG_CFLAGS and/or LIBJPEG_LIBS
+instead to specify which libjpeg to compile with and
+link against.
+
+This mostly matches the behaviour from before commit
+ea00220b6f44a00c2efa792c538f1804ebe183c2, which was
+
+  --with-jpeg=no
+  --without-jpeg
+    Do not use libjpeg. Do not autodetect it either.
+
+  --with-jpeg
+  --with-jpeg=yes
+  --with-jpeg=<any value other than "no">
+    Autodetect libjpeg. If found, use it. Otherwise, silently
+    ignore the user's wish to build with libjpeg.
+
+  <no argument given>
+    Autodetect libjpeg. If found, use it.
+
+If someone is running configure with --with-jpeg=yes and
+libjpeg cannot be used, we can assume that building without
+using libjpeg is not the outcome the user expects.
+
+Fixes:  https://github.com/gphoto/libgphoto2/issues/759
+Closes: https://github.com/gphoto/libgphoto2/pull/760
+---
+ libgphoto2_port/gphoto-m4/gp-libjpeg.m4 | 99 +++++++++++++++++++------
+ 1 file changed, 76 insertions(+), 23 deletions(-)
+
+diff --git a/libgphoto2_port/gphoto-m4/gp-libjpeg.m4 b/libgphoto2_port/gphoto-m4/gp-libjpeg.m4
+index e707408d1..a60a15f03 100644
+--- a/libgphoto2_port/gphoto-m4/gp-libjpeg.m4
++++ b/libgphoto2_port/gphoto-m4/gp-libjpeg.m4
+@@ -2,9 +2,14 @@ dnl ####################################################################
+ dnl GP_LIBJPEG
+ dnl ####################################################################
+ dnl
++dnl Define the libjpeg related compile and linker flags depending on
++dnl configure arguments and availability on the system.
++dnl
+ dnl   * If --without-jpeg or --with-jpeg=no is given, build without
+ dnl     libjpeg support.
+-dnl   * If not explicitly disabled by --without-jpeg, autodetect libjpeg.
++dnl
++dnl   * If --with-jpeg=auto or --with-jpeg=autodetect is given,
++dnl     autodetect libjpeg:
+ dnl       * If any of LIBJPEG_(CFLAGS|LIBS) is explicitly given, try
+ dnl         compile+link using that.
+ dnl          * If compile+link works, use that.
+@@ -18,28 +23,87 @@ dnl          * If libjpeg.pc has not been found, try default location.
+ dnl              * If compile+link works, use that.
+ dnl              * If compile+link fails, build without libjpeg.
+ dnl
++dnl   * If --with-jpeg or --with-jpeg=yes is given, autodetect as
++dnl     described above, but abort with an error message if libjpeg
++dnl     could not be found.
++dnl
++dnl   * If neither --with-jpeg nor --without-jpeg are explicitly given,
++dnl     run the above autodetect sequence.
++dnl
+ AC_DEFUN([GP_LIBJPEG], [dnl
+ dnl
+ AC_MSG_CHECKING([whether to build with libjpeg])
+ AC_ARG_WITH([jpeg],
+             [AS_HELP_STRING([--without-jpeg],
+-                            [Build without libjpeg (default: with libjpeg)])],
+-            [dnl just keep the with-jpeg however it is given
+-  AS_VAR_IF([with_jpeg], [no], [], [dnl
+-    AC_MSG_ERROR([
+-Unhandled value given to --with-jpeg / --without-jpeg: '$with_jpeg'
+-])
+-  ])
+-], [dnl
+-  with_jpeg=autodetect
++                            [Build without libjpeg (default: autodetect)])],
++            [dnl Normalize --with-jpeg=ARG argument value
++  AS_CASE([$with_jpeg],
++    [autodetect], [with_jpeg=auto],
++  )
++], [dnl Default value
++  with_jpeg=auto
+ ])
++dnl
+ AC_MSG_RESULT([$with_jpeg])
+ dnl
+-AS_VAR_IF([with_jpeg], [no], [dnl Not using libjpeg, so no checks are needed
++AS_CASE([$with_jpeg],
++[no], [
+   # libjpeg explictly disabled from command line
+   GP_CONFIG_MSG([JPEG mangling support],
+                 [no (disabled by --without-jpeg)])
+-], [dnl
++],
++[auto|yes], [
++  GP_LIBJPEG_AUTODETECT
++
++  AS_VAR_IF([have_libjpeg], [no], [dnl
++    AS_VAR_IF([with_jpeg], [yes], [dnl
++      AC_MSG_ERROR([
++libjpeg has been requested explicitly (--with-jpeg=yes), but could not be
++found and made to work.
++])
++    ], [dnl
++      GP_CONFIG_MSG([JPEG mangling support],
++                    [${have_libjpeg} (could not find working libjpeg)])
++    ])
++  ], [dnl
++    AC_DEFINE([HAVE_LIBJPEG], [1],
++              [define if building with libjpeg])
++    GP_CONFIG_MSG([JPEG mangling support],
++                  [${have_libjpeg}])
++  ])
++],
++[AC_MSG_ERROR([
++Unhandled value given to --with-jpeg: ${with_jpeg}
++
++To allow the auto-detection of libjpeg, set up the pkg-config related
++environment variables (PKG_CONFIG, PKG_CONFIG_PATH, PKG_CONFIG_LIBDIR)
++or have libjpeg installed in the standard location to include from and
++link to.
++
++To force specific compile and link flags for libjpeg, set the
++environment variables LIBJPEG_CFLAGS and $LIBJPEG_LIBS accordingly.
++])
++])
++])dnl
++dnl
++dnl
++dnl ####################################################################
++dnl GP_LIBJPEG_AUTODETECT
++dnl
++dnl Do the actual autodetection of libjpeg, setting
++dnl
++dnl   have_libjpeg=yes
++dnl     If libjpeg has been found and can be both compiled with and
++dnl     linked against.
++dnl
++dnl   have_libjpeg=no
++dnl     If libjpeg has not been found or cannot be compiled with or
++dnl     cannot be linked against.
++dnl
++dnl Used once: By GP_LIBJPEG to make the GP_LIBJPEG code more readable.
++dnl ####################################################################
++dnl
++AC_DEFUN([GP_LIBJPEG_AUTODETECT], [dnl
+   have_libjpeg=no
+ 
+   AC_MSG_CHECKING([for libjpeg via variables])
+@@ -78,17 +142,6 @@ libjpeg not found despite LIBJPEG_CFLAGS and/or LIBJPEG_LIBS being set.
+       ])
+     ])
+   ])
+-
+-  AS_VAR_IF([have_libjpeg], [no], [dnl
+-    GP_CONFIG_MSG([JPEG mangling support],
+-                  [${have_libjpeg} (requires libjpeg)])
+-  ], [dnl
+-    AC_DEFINE([HAVE_LIBJPEG], [1],
+-              [define if building with libjpeg])
+-    GP_CONFIG_MSG([JPEG mangling support],
+-                  [${have_libjpeg}])
+-  ])
+-])
+ ])dnl
+ dnl
+ dnl
+-- 
+2.34.1
+
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
new file mode 100644
index 000000000000..21661ad1025e
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#    https://sourceforge.net/p/gphoto/bugs/643/
+
+EAPI=7
+inherit autotools multilib-minimal udev
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+# FIXME: should we also bump for libgphoto2_port.so soname version?
+SLOT="0/6" # libgphoto2.so soname version
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples exif gd jpeg nls serial"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} +cameras_${camera}"
+done
+
+# libgphoto2 actually links to libltdl
+RDEPEND="
+	acct-group/plugdev
+	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+	cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
+	exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
+	gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
+	jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gtk-doc-am
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gphoto2-port-config
+	/usr/bin/gphoto2-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-configure-Allow-with-jpeg-yes-argument-again.patch
+)
+
+pkg_pretend() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	sed -e 's/sleep 2//' -i configure || die
+
+	eautoreconf # For configure.ac patching
+}
+
+multilib_src_configure() {
+	local myconf
+	use doc || myconf=( ac_cv_path_DOXYGEN=no )
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
+	#
+	# Serial port uses either lockdev or ttylock, but we don't have ttylock
+	# --with-doc-dir needed to prevent duplicate docs installation, bug #586842
+	ECONF_SOURCE=${S} \
+	econf \
+		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		$(use_enable serial) \
+		$(use_enable serial lockdev) \
+		--with-libusb=no \
+		--with-libusb-1.0=auto \
+		--disable-ttylock \
+		--with-camlibs=${cameras} \
+		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir="$(get_udevdir)" \
+		"${myconf[@]}"
+}
+
+src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		einfo "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+	dodoc TESTERS MAINTAINERS
+
+	if use examples; then
+		docinto examples
+		dodoc examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug #????
+	if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	local udev_rules cam_list
+	udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${ED}"/${cam_list} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${ED}"/${udev_rules%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
+	fi
+
+}
+
+pkg_postinst() {
+	if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to access your camera."
+	fi
+
+	local old_udev_rules="${EROOT}"/etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
+	fi
+}
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index d8dd907a0354..a31b7caf67b6 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,4 +1,4 @@
 DIST libsamplerate-0.2.2.tar.xz 3319468 BLAKE2B 71b1e8a1644a94fff019abc6bf98c557df84994293f1e9bc651ad3ad3f0afeb24f54b8c75fc26e5202ae7c3a3e34e783fd1be7f7c6fdefe9eac9a5dfe7100b91 SHA512 d23ae54d23209ba22baae9e5fd178dd8e0e99205dada7e7c3a7b3a3d8cf816ed427a411bfeb008427f64da7767d645edce40811f238af11c8c386f5ef25a9f0c
-EBUILD libsamplerate-0.2.2.ebuild 1261 BLAKE2B a7bc596500b0cd9ce0f5a86852abc1632d38e24434b7c4ffa2ebf3ba28cd43f797d6feaa8c4a925520d54da0c4ea6e7cfa9e6b407d0ed0b29e258bdc4926366d SHA512 6ee4f1048d336800fcfea236174bbcdda898ca1c00e71706d5eb4b821ef9f455cfc85ff8a592363e552f7c6250480e63c6a19debe8c10b3eaa3d45e6eeaebbe4
+EBUILD libsamplerate-0.2.2.ebuild 1267 BLAKE2B 56d1f2a6c2175336b734e14441d1ac98949f6f8af9fc95f5dd89c217f8947589c0b67e06b95f60009217c1526bc358752280e7873593d4d9507256f2beca3e3b SHA512 9872c6a9d58da2c9731ee839a3f37764da145ef478be7edf2088db3b525d2f611dc4a8346e331d40e7f9f48b9c00595091734dab14a7fa8b8a81f5e72c9f6d19
 EBUILD libsamplerate-9999.ebuild 1268 BLAKE2B 87baa5925767b94b377850cb1285d2097073880f46e8954f6c4936acf70e5a7da5285ba6df9a2cc6e6d19617f7db012990d9fda418377d821c4bed53d11b4d78 SHA512 11cf28cd637b9731502f15def1ee77ae7e1f3dc454ef9c7f3fd36c2b8e7f12638e52603605e1064ae36e08ec2f96848369a48cc0b1d552374974a4052462bd62
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
index a38ac235842c..9daa1aa4828c 100644
--- a/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsamplerate.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsamplerate/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 LICENSE="BSD-2"
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index ecac52ea9d3d..18895caf79e4 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,5 +1,5 @@
 DIST libsidplayfp-2.3.0.tar.gz 794863 BLAKE2B 5727cdaf155711f8fe582cfa49d868be89fcf7e9f58cb7b8d83fefecbb04830a04957f8f176527928da26cb47c7508d534c1b35607cc713610ddcd920b760049 SHA512 2141bc9768353fadbb8c6f4ba6904388048d4d1432424b87fe60162135059d5c9312f7bf01c67a75eda8b4697d801bc2020f88b696794311eef88864ae65d974
 DIST libsidplayfp-2.3.1.tar.gz 797779 BLAKE2B 45bf858fc984b10538e322c3d1473c490ff1ef88d0e9db170121fefe68356435ddf649bb897c265253632b4b5949e6b417b9c74141d92dca9d6099d7a429784c SHA512 28c33a33ce40df432731afc66e315fe6909edb964fc39f50011761bda43b892e46a758453d191c26da63123fb4fab755f66333ad9c70c1e679c5cad8438a8e22
 EBUILD libsidplayfp-2.3.0.ebuild 672 BLAKE2B 876f2522a085c81373bc6b92462523b10b5f7a1e31f1685ba4f7d28eadc54df685b131c7c2dd9a0cdf1536aa188f05c03c74d79b54007593678cd8bc8108e5ea SHA512 065c651fb8242df4f9d7d050fa8f74a5457ae35080535ca1ca0f399f013c72ca4bc3dcf1b30190bddaa2e43f1865bf703c3f26728edce4333c2867005b4804d0
-EBUILD libsidplayfp-2.3.1.ebuild 674 BLAKE2B 00f48fb109c4077d1532b94cfbbfac6b1030e3f214a2d6841320da8407fbe2b0939b02dae916047748cab4e1f57dc88d65d2e6bbcdfb6739bb2b0a129795d1b5 SHA512 de6661a5f89977c8350b8978340b94f35c3868a1cd644a986d95b3ceabbaf2b1f5d35b9408c89a3ea82e876fbd1f03b2c4330b7aff1df055f49c0559556de433
+EBUILD libsidplayfp-2.3.1.ebuild 672 BLAKE2B 2ea17f4a44c75233f5bd8ba7cd273a9c7881385643623c49e5c4513aed5bad0022680ba2f13ad557c5c4c2dbd0529d8ee5d7ba920bfcf411a5ab4e5c6b299117 SHA512 b6555f22398a1c7a1663928a8e579c0380eaf955fae30cc6960b624a3c53354bfaeca39e753cec5331fb0ede00459c45537dea30f154d6e7fd00ec3b9cafc80d
 MISC metadata.xml 339 BLAKE2B 79d766f101909c202affb7cc72bbefdfb8d5b44fcbf74f17f98e665351384a8110aec7ddec0c685fb328198d29ae4953ce341cda3dd4abd2a67f157d90628175 SHA512 172879da9ed0be1ff48d75d23d3b23e3070247b4ef1decb291b020f7bc1522dd033e78f92d38511eedaae7c1944edc5bb05ff763f4d20a6b7015198ebd38f16f
diff --git a/media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild b/media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild
index ee61db2b1b39..174917107585 100644
--- a/media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~hppa ~riscv ~x86"
+KEYWORDS="amd64 ~hppa ~riscv x86"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index b3b67aae6d30..089f4d58b503 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,4 @@
 DIST libsndfile-1.0.31.tar.bz2 875335 BLAKE2B 33e3c3d111427e829d8233aec52c227188834936839da9a04cf1ea5d2595d6a3127e7ce86d7686ca0336cca2017e6e2466845c27c7fc399efae34a0902316e41 SHA512 62202092e5cac6346fd3c0a977380e9bf888fc59d08c9c9707dc254a8ef6ed6356da2ab0430bb970c7b06ba5bb1dafa5d7b0fe13898834c1fe4acb16f409f0e1
-EBUILD libsndfile-1.0.31.ebuild 1790 BLAKE2B 24ee2ae2b01bc5c0e066d3756fca13d64a47d35ab3835bdf9d5ceb1441c01efc14a871ac111ec09eb47c05785ec38f9037ddd663ec98f659dfe0e6f9b2b15e4e SHA512 334a61143bf172510193e40dd133d431d41f92fdc2f8cb2e53c932f2f7fba8c64364275cddccab6e5e9982efd4412c8ff9ee19d6b3a12d84e3d8566eed275320
+EBUILD libsndfile-1.0.31.ebuild 1796 BLAKE2B bcc411b71c822a9d427e71c682bf3613f5f79958bd76f7664c2d0fbf7e20ff44ee2496defd1fbdc9484c9c96c083515341f0ed30051af471060d6e1270a2e8ab SHA512 787cb47d84d230460a735fa73fe137f4a8d0d1319e47fc034decb3275ace8b4843807787dc5c837251e54deb4cb8a2c20625c3545b49972c43e6d7016e70157c
 EBUILD libsndfile-9999.ebuild 1797 BLAKE2B 8f3d3750ea5b81f17bf56c8582b8bd4b5db9e3805cd13da1baa3b898c624a1fe2dd41e003d6ad55673bc6ed5150de969b49cf6e39d4b55324f875568f8d78bd4 SHA512 551f120d839465e02f66b81b70dd700c7b6607fe719cfb603e9da2fe4ad56f863df2c3bf8d7fb773b7a5514148721c4faa1a15a04ab1125a2754886e9cf0f41d
 MISC metadata.xml 260 BLAKE2B 9945ac40ee60ce67adf51840c3cc2d6d2743dffe4fd2ec965d300c709323f80eb5d35eaeb804414eebb2da1e954ee688067c05093b26499678de524b414ac4ec SHA512 e5b6a2a44cd2a4ea4fb1267eb8f635c079c022853443ad180ca12f2df84492f3ba34db45e4ff5e7e09262a74745f5c0aa04ebccd6f998cf19a6ea2ccd0627701
diff --git a/media-libs/libsndfile/libsndfile-1.0.31.ebuild b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
index 29bd5e0419da..aa0df067763b 100644
--- a/media-libs/libsndfile/libsndfile-1.0.31.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal
 
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index eae162f75e6a..74be58482ad1 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,5 +1,5 @@
 DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
 DIST libtgvoip-2.4.4_p20211129.tar.gz 1098091 BLAKE2B 20d90b10a2f87d05fdb5bf723e87045262cfa06a33a0543a9a73e946f44d7017e04faeba19a13d20ab531c4c335d234c172d0cc93819b35477a990cfcb87dab3 SHA512 e55f05e5459e453d33ff717b928324c39adcb0ab2e6aaefa0f2deb35ca76c956ffc723d7138964a3bc10a7bc1e3bc66360ff8c55a080eb3210f5728542ec7d96
 EBUILD libtgvoip-2.4.4_p20210302-r3.ebuild 1512 BLAKE2B 8f24ed4b309e81ab91508ab07c981a189aa9c641cfce8e9ac324c32dd9773bc3d551ee3944827c67e57bfdd6c5877765e0fdeec982a9a3ce6262cab4054fde65 SHA512 656380dd0edbbef3a7a9dc9e37292bd23e18d9bc69f8da7ef3fd1250729bfadb072265949bf60cd1beb9c3062bc2a1036f2c2507278a3d26a0291fafe69740e4
-EBUILD libtgvoip-2.4.4_p20211129.ebuild 1466 BLAKE2B 9bdff747c1c4a3f9a2e11390dc0921875fb02057d04c740a1e8e362f235b4caeb02427ac059e14c56dac1d4e300c5f50f2748c62048e4c1f1f510df979a6143d SHA512 7848d884235021ac28afc7299c6dea3e30cb5a6ddd8798555eebcb8716c9920ae0f4bba096cd04fd07c04fb30085535d8ef5108d55077be44ebaf8e4b76f0fe7
+EBUILD libtgvoip-2.4.4_p20211129.ebuild 1465 BLAKE2B 9886e71edbdac03dadfc7c90bd85b78f0ddfb50f67811efefab88d9350baa7ce653f31548054cded3f0d9205ac917df9cb6bee8d3eba253fd89b52c00fd08c6c SHA512 0f5279280cbbb3ed6d91148e0e16212440c6b48242a24e1f0cee0d96232446a09c04558f06cf67c6daa32cec53c1fd5d3707de01af1838810e03f4af6b2c6c0b
 MISC metadata.xml 543 BLAKE2B 56f3e74859e09ff7ecaa4f068e1872257213a7239cd946c920c0b2e7e12cfc0bdb314ca1fb0a75b489abd5ae5c4e5b4218ced1b3ee78e60a4e82558100d68e1f SHA512 83e39833446eb97c76280a81e428bdd64b5c46a052e1b87bdc19a5db31478f1004e3ae6f323c7983992541bf9d15f155037523990964ccae4ad8653396f7534b
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
index a4ae918d7bad..fdee80617c06 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 IUSE="+dsp +alsa pulseaudio"
 
 DEPEND="
diff --git a/media-libs/libvorbis/Manifest b/media-libs/libvorbis/Manifest
index 2741f4f05289..5f7a9647e57c 100644
--- a/media-libs/libvorbis/Manifest
+++ b/media-libs/libvorbis/Manifest
@@ -1,3 +1,3 @@
 DIST libvorbis-1.3.7.tar.xz 1203792 BLAKE2B 849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea SHA512 bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
-EBUILD libvorbis-1.3.7.ebuild 1275 BLAKE2B 8bb04176673a32320df7346b96c640e19ca57d6dc63bd7219a2e59e6df4de032b31b5ebf2fe3ecb69a5a6dea0c7d78c2d1c4ad18c27e89fdf84f18106577125a SHA512 19573c250c1403081d8341db8ba7a453acd97ec824dc5565e97b6e456eed134f861679271ec852049a432acf4bcc8847af7498b8be13073e5a19979c033e0ae1
+EBUILD libvorbis-1.3.7.ebuild 1281 BLAKE2B 3e4ad1552df346d9efabd12fcf6e823c7d1c18d2b954aa3c4de4434ce6cf7b4f429e4f6b6dd571839e37e5a93580032f2c43311c12957625f66db95eb2a7f897 SHA512 1fe81c4f9bac5e753e8ac4eea28f54e600ac4ff53641dee4282dbd7de96e785644f198ecf8f95ff72a67a686094678142f4f57e1a9c3fcfd38070622a46e6c81
 MISC metadata.xml 330 BLAKE2B ef2876f07a60f57ac3309470378db229270bd5a8162e0f4d46a4aa5ae452576824c2e48a67a9ca07e30f79d5e3537eb0256250e5a32b90ff124c9fe350f8dde4 SHA512 cc71c708a55c934552da506a07db9809036ae5432005ca52b23db5fb71c830e1536565ad499b2bd926905dcc88e08cc8c248989df77e48b60b14fae9f6c81d78
diff --git a/media-libs/libvorbis/libvorbis-1.3.7.ebuild b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
index 207d84e7f560..cde578a12b47 100644
--- a/media-libs/libvorbis/libvorbis-1.3.7.ebuild
+++ b/media-libs/libvorbis/libvorbis-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.xiph.org/releases/vorbis/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index dc7b038b846f..4ed1d445b6c5 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -7,5 +7,5 @@ AUX netpbm-10.86.24-fix-test-ppc64.patch 634 BLAKE2B 41f42436d5f77a37a1e8cb9200c
 DIST netpbm-10.86.24.tar.xz 3698448 BLAKE2B 189fbaeb91db15e317c62758c64d1165d3cb32fa0221b2dcdefb0425577d4af9a13e66c35774149a44727c99fc18263123fd3c2b71f6409344bcf458341a4470 SHA512 50ad5a726c4219e1d87c7a46868b8f7bdb2d676903f049816b58e00addb416e4684a6c669188beebc5cc3c3961d2b0e35cd663215196d9925e3a23a989e14be3
 DIST netpbm-10.86.27.tar.xz 3699900 BLAKE2B cf1e2742b343100081d53cdccfca5d41ce46ad57adb72c10c2e8ea94547e8d097e657c50554dae79b47c5c2e8d8146d15ef372b9e031152411b3379a0998a8d8 SHA512 b809b05647b4f4509db04a937a5c0b03301ccf93a56d773d6ddfe11a1cdc254befeb311e20306e5329db75fce9697b823c351a32ba0a771f4545793a55cb646c
 EBUILD netpbm-10.86.24-r1.ebuild 5853 BLAKE2B 8ab739e81bee65f04f0f3468468c8193136781326bfff3efaadcb335d529fef3761d61e43ac8e7815700080568e097e0f61529d80363f2c404d77d6bd31c0920 SHA512 365e21e054dac809d2590d60700d8425e611fcaae2e73d07b084a7254b2f05911514fbbbbaadeb0ee05ac7a3fc2e7a7f2b845b62fb1fd569b0d7b435e4ba34ea
-EBUILD netpbm-10.86.27.ebuild 5983 BLAKE2B f259e8866009dfd5250358b97c9dadab1a359d83179d79b25437abcb4801c63baac2cc5785e6ef4f47eab9434ca040baba6a45242df98ed525aa6c2e578600a6 SHA512 219a2e8e5bd79065eb5ede5c22b1af0d1904670a42a278fab60dde778eb59c47d8b388a32f03bdfc94239e90d998c8cb9512bb64bec7d72835fd466ca1da937f
+EBUILD netpbm-10.86.27.ebuild 5980 BLAKE2B 4d7ce3a06f36b2b2f9ae01609c9cb260047911f59eb0ddcdb01696c9f5d689850df3206472724c916001e5b26e50666d336e417a52be069c852c4781e98b4e87 SHA512 1638dd2207a544f7ccc1ad54473f0ca19ca057a1f88f14183c875fd52414e16244f49d7ecd4d8a89f4e88c0148576992181ae4a9ee7c4b36b56538f1de4798c8
 MISC metadata.xml 578 BLAKE2B 44f5899feee3b35c43e1b21f631fc53acc615003a5ed21c3461b5946882f1b67b9de9ac0b3d5d24f9faf291bbc9d3410841ccbba15f4981fb5ec050195bf93d7 SHA512 a9ef7432d1404a5dfc2458761867fbdcb9be368f20ea3290bb0a2aac10a82c968d3d97c4dbbf65f4840f0a60e9266d63c577e33c27d3b8b45b70349cb211478d
diff --git a/media-libs/netpbm/netpbm-10.86.27.ebuild b/media-libs/netpbm/netpbm-10.86.27.ebuild
index b1a743eec5db..f263c1e4370c 100644
--- a/media-libs/netpbm/netpbm-10.86.27.ebuild
+++ b/media-libs/netpbm/netpbm-10.86.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
 # zlib USE flag is no longer used, enabled by default.
 # cannot remove it yet because of #801445
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 6ff459b01903..2c2b5d19d56b 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,4 +1,4 @@
 AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
 DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B a2b310c4afe81e0365bfcc1bc8d5e1768f1813d089376510c97d54fd42fac237710af100aeea005bca53a7bb010832e0f921b2b504c92858fe4dd282fdfbcc70 SHA512 ea34fb01ace8eef285e0739dff8526e20c6d92b37c84599baf0101ca0764a292bc47b01b020e7c68332cc662ded3317ba4e25a5666a9932387efec10dbc0ad52
+EBUILD opus-1.3.1-r2.ebuild 1317 BLAKE2B 03c8ede9678bd117d1e9d2617035663d02dd3421c489a7cf7291a91e646154594d52dde151d6928ef152f2b7cc3d461326a5c725940eca08bfdafdb33dd93e57 SHA512 4350a5fce87e08e51f807a9dfb0a7c15a4a6b40150ffce822c1cc9ea9b37f2617e4623ec14fbc4ca13a6c33617c4f27d65e018bf295071adf3cddbcd731c5cc9
 MISC metadata.xml 464 BLAKE2B af27614c44aeb6d0d0eb053566be211c7997afe134138f7331276e406ad981e7e72303ae6ea9ad01d1a5772d6bce373d03f2996f4a126ce5414fd27626f90593 SHA512 e8d7151b3c61c6cdc6630f743237622bbb57128d1ae507b0ecee718a075f41133f68975ac805f2e886446508a73c158071ea0552a33c5dcd1ef434929f878c90
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
index 22658e5c64bd..10c7e4876985 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
 IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
 
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 1b7d1724dbec..469d92b3bca0 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -7,5 +7,5 @@ DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be
 DIST tg_owt-0_pre20210914.tar.gz 16266351 BLAKE2B 048d6a77046b10af63f4e5c1530b6aeb9d423702a6e34e6e0082a10b06262e19c30aa766cc9ea38549605d8d2cc08bfcd5a4e715ab53c46031c23938f94af27e SHA512 bd46393d9a85fa38fcd560af4f68a4868b25528b134731070e8578217cb0b9bb8b5cf7b3990f619d321ba373e5630a52e467e14d93f71b24de3a5b3e591b8866
 DIST tg_owt-0_pre20211207.tar.gz 16780636 BLAKE2B bfa35a43b2085b897eb16986ecfb79ece5f8076d88572869580716014a564023dbc156b1d0885685bf04c57e34f26870dde497e8aae9889e5b2eed6d9a012d8e SHA512 7f8b1ae63371106cd59db6e2a290fd24554d31de4188d243ed6645468dad91c9653b7685add61291830e5309284a87512a73b63c3be76f01ea33701c72f48c90
 EBUILD tg_owt-0_pre20210914.ebuild 3563 BLAKE2B 76ef2fae542849611b71e814fb3602ffa28400a5f004acf06fd5bfc1d3d70bc73387a38d837e0426aecf9510ba8b8a8ea51f2b291d2c1e7408daaf75a844aca2 SHA512 036453f042f0870d32272c83bc24dd781c4078247edc2d994019c644acf134f431447a81a580afd1cd2eb226f35a8bf682899e97ed56606a1157367bc042522b
-EBUILD tg_owt-0_pre20211207.ebuild 3804 BLAKE2B e9d73d8952ff6ccfab827ffacb211922978b6440436cffb7501c0c1bef9fd06bedb56d5e64858e9a1ed9b4c508358ea74234aab397ff369ac334e1fda251f0c7 SHA512 e4bc3e140a435c2938ac6618f0d7af17967a8ace218c50c4baa38279475147c2e298ffc1290f938d19c3967c75ca2f38c3e9c29cd7510623567dc4256a68613f
+EBUILD tg_owt-0_pre20211207.ebuild 3803 BLAKE2B 1af2e46495689906238a6625cb7a759db5c3238346e0f90c645eac5e73fb6b6e5a23edda4ff35f7e5099dd5f72e0a40fcfae69490b03454acd9c7613415b5ef2 SHA512 f8a6e83e07c9a439776d93b8c7e13f487e0f9aa86c835985a6da11d5ab6464ce93662f6d2669e0d60f8398ce9934ac6bef95ce1d0b3b097c20345cab35c7cb69
 MISC metadata.xml 546 BLAKE2B 10baf770f70a00730c78dee6661096db60de2fd04ddd1f36c54d0ad2423ad78127eb70c56e15dba9dbd15ded61d3a9ee0587987e2bf1d6420204dc1a67a6d6c7 SHA512 cbd8187c0c2e0c7824f82d15a6f2162871339350953ff9f09b42f74077c5d53c9456059437360a823739bd06622ac37b86bd5c5ef17ae284dfe71fccb5862760
diff --git a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
index a2ef4bd232ec..b6dc20152178 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0/${PV##*pre}"
-KEYWORDS="~amd64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~ppc64 ~riscv"
 IUSE="screencast +X"
 
 # This package's USE flags may change the ABI and require a rebuild of
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2c6b96344eee..1c8235dc68f6 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 6bb10bc2fb59..97ab375217f3 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -2,6 +2,8 @@ AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f23
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
 DIST amsynth-1.12.2.tar.gz 1607129 BLAKE2B 8308a8a595dfe7b2c9924ff183134fdd5ad20ac2c957b1f52e474a8cb297cd73ee9f8b9938212deb21701e11ccbf776ea22cab763fb71940bf1df5c169e309db SHA512 a1eef3d5a0d0f0ec1edb93d89b3e456ea133a8445a9be73ba338771ae651a2008aea8dd077a9bcf0cd50e6bcc97ad98ab4c44a9baefd9f3381287afdf3325e8f
 DIST amsynth-1.12.3.tar.gz 1624332 BLAKE2B a78317a08c4b02c14578f68fb0fbd7de9380f439c8bc737321c253df5effcd23219ff02d50520768ed5c698b4f284a87435640e965ee4f1cd6023ae770dfd10a SHA512 ac4f32b2a35ebe15c0c63ded213c2ab73bb3a105ce9c857811f095807a1c032dfd518eea5709ea58594c54324bca194236d5fe4606fac274772c9012be2b1110
+DIST amsynth-1.12.4.tar.gz 1624416 BLAKE2B 1dcd2454d94200b76097d4215ed419123a3b8427064c8f674a1e7cb27620fb5b2977470ea7feb8114c429ed904511ec73c73461b7f38e1388e4cfeabc4e68ec3 SHA512 502fdd1d6c4e54a57482d266977d78008efa26717c173be0bf98e907a111366fd80b65d667b9448e751085901dc5f2a61ac0bf5b1d02e35c695ecd99c9d1df00
 EBUILD amsynth-1.12.2.ebuild 1135 BLAKE2B d1642af920eee3a3f40cdcca6802996ae7c44a2f070288b4639493dd2587c7a0c4b3c2271374d89ff186ff75d2de7a6fc175db10a10182854e35c550333a47ae SHA512 072dd5c9a8f8766db10f61ae69d4c98b4e9df33f2779d966bc8ef999c357b27fcd64bdf0b72e38aac8e2cbcd0a366be6d4c5662a69ba8dd996a35f9b7a2c0368
 EBUILD amsynth-1.12.3.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
+EBUILD amsynth-1.12.4.ebuild 1153 BLAKE2B 9801e8b2e0b620b5360625977556e3f053f4da5d409a7d3d23a59fab201db06df1328415cccbe46e4eecdb065869130265532e652ed301ad557d7d1bb08e3afd SHA512 a78417056fdabe0a6ca6282024b22c70492de41715079018c7b70681546752228df29645dbce199d7e74f3cdcf4aa99e653dc56386cc476872c98e20cb519dd8
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.12.4.ebuild b/media-sound/amsynth/amsynth-1.12.4.ebuild
new file mode 100644
index 000000000000..e42fb11b9d12
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.12.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
+
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+"
+RDEPEND="
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+	)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+	)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
+)
+
+src_prepare() {
+	default
+	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with dssi) \
+		$(use_with gtk gui) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with lv2) \
+		$(use_with nsm) \
+		$(use_with oss) \
+		$(use_with vst)
+}
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index e013381811f4..96fb1a23e069 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,5 @@
 DIST drumstick-2.4.1.tar.gz 2014026 BLAKE2B 4e2765430438505c910919d5a5069b13a63e72083c4a40bd8b406e3463842ccd5ab024f4a0fccbceafe808e3926b3be03e98338afcac4520de978b0f5c950ee8 SHA512 5063201b643cd3e58db4c77521444e7816febb39ceb739309ac63b164b2fc67b6bdec16a98945141d7b41add41d82b2bd2ddf99890f12edb2f86b73e643ac6d6
 DIST drumstick-2.5.0.tar.gz 1914679 BLAKE2B 1b9c12304156577230f22dee5bde068ecdc2a3c0dc7406db4d9d8588788a29e1115330d0f9bab8376e1adb72cbf0ff23f4b72ac66c90e1ee83c8322510cf2a2a SHA512 d2e4438d66307dc8259b1da8455c4f2c9954bc3605836b993ec004fb0ca326189d3c8a706ea86bf4836701b80b24d51e756d46c86f04301d5c1601687d1fa6fc
 EBUILD drumstick-2.4.1.ebuild 1280 BLAKE2B 84f086bcf5bfa81e6f700d1ee82a871daa32929d353db06d91cb572dc18c50dfc25fad9da53a058863281c888bf8fdb2013dcb92baac52ccb1e9b9463c5917b9 SHA512 85a2dc9eff1690c4b441a8b44a3d0bf84240c97fe5a8feb518ffe27b4ac289c46ba78f5709733d6a48a96519f0523cb05700b7be7bfd6db579fef3b2e0225804
-EBUILD drumstick-2.5.0.ebuild 1282 BLAKE2B 019bce62e329ed8f99d946684005d3e9c57d45ef48a9bdc5fe4ac81c6d9f01a8adab66f01bda027d29b6e42ccfc8dd40c24a9a34a40593703a3e25a0ed602cb0 SHA512 497b08f55faf4f3b4f7485936ff1d15515314db60d9366719116e2de469e6880fcb69027066b7f8fa370a667cb969875b589d163256e706849df393e6d03d27a
+EBUILD drumstick-2.5.0.ebuild 1280 BLAKE2B af1759e413709c7eedf42360d78b96adbafe7c5b8f6ffd98f7f9c73b83e578c8036d41a7035999e80113a63bf43e8d30bf27b99528074872e8a8ddf72708d2ca SHA512 90a1641dfbdc541d276af856fd091b9940aa0b276ce126a1877f450d3e78f1eb4069bdf01f575682ba87a1c884a0fca1ac00df615546340469835ff2149a1eb0
 MISC metadata.xml 599 BLAKE2B 1e9aa003d4bb54a9eba1e9ee7a9b36515992fd66bc7f876973c02e59da7dd84667ae8e839ebb1c22a1a463aedb26c5b88588277192673dae23adcd075dde2416 SHA512 59b60a0327a8febf9ddfd6e42d5ff6056a6ee1cca61b0d507f11686eb8fdb6bc2c5f614e19d4276b3c354b291d2bbb8b30b845d8d9bb9dcbadec10db6632e8a5
diff --git a/media-sound/drumstick/drumstick-2.5.0.ebuild b/media-sound/drumstick/drumstick-2.5.0.ebuild
index 70bc8c734398..29329502f5d2 100644
--- a/media-sound/drumstick/drumstick-2.5.0.ebuild
+++ b/media-sound/drumstick/drumstick-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth network pulseaudio"
 
 RESTRICT="test"
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 96d3b1225868..7b16925ef630 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,7 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.9.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
-EBUILD qsynth-0.9.4.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
-EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
+DIST qsynth-0.9.5.tar.gz 331213 BLAKE2B 3973c2ea0599b8bf9f12c3ce1bb7eff00b5d20b4f051ebcb578f556dbfce714cbe0bf77038b553289f27cfedc521bd7e179af652c721375e6bedc4d22ce061d5 SHA512 157e49e8ebfcf550754379c4f2bae221354cffbfe47dcaea747749c00520339f59de5fe7f17e105674ecc6099a98af5f2326d2d258fe359c0c7522366f4267d4
+EBUILD qsynth-0.9.4.ebuild 1399 BLAKE2B 594db33af2cff57be2c05950bdadeae487ac4f931f213d4e528479972d594fdb842353e7248246e178310dd571869ded4587bdbb53cce8ed3cdc14753db01304 SHA512 7d1211bb2c892a6641dc5454be2accc3103be8bd0eefab1186d4aa62f218aee7c810d6f31b2da1458fe0dd56f2193a7641edbc5a170cd58840c6b51e533b6fdc
+EBUILD qsynth-0.9.5.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+EBUILD qsynth-9999.ebuild 1347 BLAKE2B f1e4103cd0ba4bbdb8e8b5e263d00027002501f0d8ad47045956722873959d7c3583bfd9793d44e2dd7f9cc7dcb9926daa7b5e9888dc5646aee72fa304b937a3 SHA512 6079d681effc6f56514d40d79be09c28edf24562e8348467182a06ae06649a3df11303f7832a02de59736993ec173ff9635aa3a7c966facdcaf53d8dbb270aa1
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
index a9c46977ac25..42c724b0c2e2 100644
--- a/media-sound/qsynth/qsynth-0.9.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
diff --git a/media-sound/qsynth/qsynth-0.9.5.ebuild b/media-sound/qsynth/qsynth-0.9.5.ebuild
new file mode 100644
index 000000000000..802d146a7511
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index f2e790dc5a2b..764b1b7b1cea 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -52,7 +52,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
 
 	local cmd
 	if use jack; then
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index da24891ec16b..1559878ba00a 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,5 @@
 DIST rosegarden-21.06.1.tar.bz2 6479487 BLAKE2B c18e1b6d14c2caac1ac7a2ddba2d40fb5a19d8a6468b81c696267ac984875db58943ec0fd46afe4b5d511afa1f5cb1ada93205b6088effcaf75adf234beaa516 SHA512 a0214d95c26e01c5c0ce671bf23f4ebe7f63e54cecf6471226768aae5b4ce8dcf9f03a1970c26317d734a16a0d741d83ce684a53f115db656538522b373ef7a6
 DIST rosegarden-21.12.tar.bz2 6490931 BLAKE2B d1f3bbd173e1d082c5380be2fe0bd9818a741498add5edc9b24c47b9e37e24b928869c00734bf84dd9c2cb9a79fed15275de35a8e7cd4cbbd8ff6cdcb739c09d SHA512 d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
 EBUILD rosegarden-21.06.1.ebuild 1133 BLAKE2B 923da829748128bc080fad7299d0fca0549c8a265e966bb74daae240cccc057da58efbb7b3faaff769e7be7cef564dc46e79315237f1f372bff5c4710be5cd11 SHA512 3f9f4d9cd5754368ef5d1f09abea4c395ea05a48b8c8c695669d51acb823ebca074bfff81c0f37685f62c8c05406f27bfc878a733008fc9e910386b4d3de34a2
-EBUILD rosegarden-21.12.ebuild 1135 BLAKE2B 0043a742125f952ac76ffc12179df22dd24e34398c4df87007a5a3255fe7f8d273637382c5b0ebcd243cbb750d1ed7e9ebb2556957b8d94b774b873fd540f531 SHA512 f6f2595054121d9765f794187be730cc976bf3e47af9d22a8a7896fe3020638206f5a10a1c27fce38134563ed52dcc20f052e265b99620edfc8cb30832bbba90
+EBUILD rosegarden-21.12.ebuild 1133 BLAKE2B a622a2944862fa2075296aadcdf4bcf28f60de9b2d69abb9c56d78d757a74a1e31f526eb2551b08bcd9b740ca33a1193c3ebb39610cfb1a3dc2a5f3e27061e59 SHA512 4663edcf437147fe646031dd7791a49eaec8fc5e1eaaa5d841561d317fb63106af4d8cddff8c5d83bc9377976c4083cf022ce89af2c956d5ed8240139bbaef29
 MISC metadata.xml 350 BLAKE2B a98ce813216f0135bf3db7e71b401be679ac05012731d4380820df75d91cc919db2923c867f1593aff8939c5202b03d3b3c1cdf1a7884ec12f83952a66845a38 SHA512 9287817aa2c7a4d7d7767f3a44561920dc06a40fa376e3f9d04e6998e3995e93ff74170f772baedbd94c4519bd62c2c7b1b619e9a69c4a7c707ece518b6ce7a4
diff --git a/media-sound/rosegarden/rosegarden-21.12.ebuild b/media-sound/rosegarden/rosegarden-21.12.ebuild
index 7c555572ab0a..be07439fa3cb 100644
--- a/media-sound/rosegarden/rosegarden-21.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-21.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="lirc"
 
 BDEPEND="
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index f7cb9ab53067..77049d0f4903 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,5 +1,5 @@
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
-EBUILD sndio-1.8.0.ebuild 1056 BLAKE2B 622f2503a9f3180924dcb1531b3c421f93e0e9cc0281e5ca4d0897ea82e659fdd161e1ac10f0565129fb883c65fd42da271680424a39f1fbd39069b4b1c37455 SHA512 883e1b5b899c5633dcf2f3fd2f167bdbbb33d1434f7309779c6e3cc0fe71d7ff582209ca01f9a228e170506ca22df4d0eb5541468241b1e089d19800b1b41d47
+EBUILD sndio-1.8.0.ebuild 1062 BLAKE2B b2ad8c433260bc1c81afa7c384dc2d4c25bfcec944b8d31ae7b84d83705540a0f6ec8bd4caf4830adf31cd1d4a9f0b3a0e684ecdb07dac13110fd2d47b4afe51 SHA512 3d290983c6e3a69e862ae503db7dc00c8eaa77a0bd050a16add83ca8399b63a74bf8622ce1841421cd118b29ea4ff3488f9d571a6ef6f214e029b65da3becffa
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/media-sound/sndio/sndio-1.8.0.ebuild b/media-sound/sndio/sndio-1.8.0.ebuild
index ca228a614849..2ddabfba5be4 100644
--- a/media-sound/sndio/sndio-1.8.0.ebuild
+++ b/media-sound/sndio/sndio-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_MIN_CLONE_TYPE="single+tags"
 else
 	SRC_URI="http://www.sndio.org/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="ISC"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 2ed5e06158b3..74c933d0f8dd 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest
index cc10eb960447..fd13e757db83 100644
--- a/media-video/yle-dl/Manifest
+++ b/media-video/yle-dl/Manifest
@@ -1,5 +1,3 @@
-DIST yle-dl-20210917.tar.gz 66746 BLAKE2B 91849a5d88615fc01f12ac19cd6c5bc3acf40548c5c024eff6141b6996d0b7b2c9363d1a2d2820cd61f99105fdd1bca835506ba199bf05d2a3b537dc88f41f10 SHA512 a26d4516f932561fe49da4a2c5e7dbc5eb65bcc4e5a7073f3636b70825c54fa9ba74feea55b3f6fcc538f4a300f99262eb4f26ba1e73efd56ff612a86971ac81
 DIST yle-dl-20211213.tar.gz 67655 BLAKE2B 7283ecd6e3502dbceae9aeecee1dcea992c3ba8a9433360e7f1a10cb198b352ce0efd450fcd60a6aada6041c15132e6fd7819fa8975b669c7abc4f543cb65d45 SHA512 d696d5aab8c4a4612ee6dc5e80d81f875e52807ff1704a3c08e449f76d8cf57b89f96830aedd8862063d42d8a84276abbaf6ec6e389657e2ef25c350017d863f
-EBUILD yle-dl-20210917.ebuild 1416 BLAKE2B 907d00143913da09ace5c35e88dccc76559677059eb3332b7f451fb8ee77a6096ee018bde13b8a2f25665b31916336fec467c7cad3ce39efd9408df824dd2770 SHA512 e069ac257aa7aa01e0e419a31ff8c3c12985e5ab1b422f9b6d3f6d0781c171e6f7ded419de8c64b766c1be534fe7fb465271bb35167d3c102bf732abc6818de8
 EBUILD yle-dl-20211213.ebuild 1432 BLAKE2B e2ba41ccc4cddfcbde05b4a6a8150c0f4c8caf2f043c4a0633f4a26d74f21b09f6808a5d2a42dafc675b3b4ab54d714bb2b2a0f2bee720ba63c142d3509f9384 SHA512 989b9e733d7486130d2c28958b0c73aafe021976354a0a7cd9085f2e0233cb1e013a9713e671bcfdb60b882586844f0fc39cee08b528240c4c33355074f35130
 MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77
diff --git a/media-video/yle-dl/yle-dl-20210917.ebuild b/media-video/yle-dl/yle-dl-20210917.ebuild
deleted file mode 100644
index 1e5ecd0a0abd..000000000000
--- a/media-video/yle-dl/yle-dl-20210917.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Download media files from Yle Areena"
-HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl"
-SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Requires an active internet connection during tests,
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="media-video/ffmpeg
-	net-misc/wget
-	>=dev-python/attrs-18.1.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/progress[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		media-video/ffmpeg[gnutls]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests setup.py
-
-DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample )
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/yledl.conf.sample"
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	elog "Sample configuration file has been installed to "
-	elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample"
-	elog
-	optfeature "youtube-dl download engine" net-misc/youtube-dl
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index eb5e0e2b1440..b9b55a01f89a 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e42fb3e12047..94a2f2c79a34 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jan 2022 07:39:17 +0000
+Tue, 11 Jan 2022 05:39:17 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e6aaa43549ab..6c09e21e8d9e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 517807 BLAKE2B 2ecdb63e9cfe1a1b71d23ab4fe58b057928be5a410ab9012b87ec1e7c917af227099229248e5b2c7dc5b25edb96e4adad920259d956349d0ecbb204178f8da2c SHA512 4ca9cc06a8ae7d4eefdd8a435b92f1f4e675295b618afdb11cf1d7f45b49f0fd5137f7f0c81b60933a8b942fe25de9928a9f4ffe0d5968bae8eae39c95a7da50
-TIMESTAMP 2022-01-10T07:39:22Z
+TIMESTAMP 2022-01-11T05:39:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHb4qpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGAlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArQg//XnvH8bEwEuBEpdKEv6KS82vN3Sxg9Hb+gn2hUmORcqTdMZsk6pKl6czZ
-tbxrCgugkcktEGd3YO5emrLbu6t8ow3BtXNc3Bw6Rw46BnB8GwHtRhXQPIpVEuDE
-PlqqPYOabKk9t5fysUwzEL3eJqHOUqm7gzhG42WUmffBRZvKpUZaK2OfieDopMXR
-NJXXZ/13fawF9fDDbW25yUv2yy+oZd9zK6AQPwCyb4uLMcOCA7Q1dBNolTH6RtRz
-yzm9hzkLNVq0/60p5VCkYaMkY+e6zLziUie8pv5YinzF1kg3y7xQoD+YYMha9Sww
-IpCEgY+LRHLMFeEqyRcDlM3ZlJISBfuQWg4Ykr4vOsv30ZtqDY3t80Apk5CYtwUB
-T5AhZ3ftGjavAJOKFYEYTVpZPE088EeCVWjxEzBnJXKtP52Jmn2fU0iavIMihy7U
-t8rQdo8qNdq5HDNmFkWGkPPecEqXa9ds4j6eDbwpEDm9W+Tbo+m4VSAYopXNpGUc
-OJ27icPbwiepNFnC5mM03yZmp8I3YBS4f2b38jL9v3EhFctFtX2jxKDnsFCd5KhT
-rOQGUFsyUWZHwICkNnUedoQDL8hxkJg1Pg8HvOtocAIU11joAZkBBybyfQgU4yTI
-xKV1QCjm1UmWGBjfKtC+FrXTuzIb7I/5lh6o8g3uBKs36FHB+Qk=
-=zvkB
+klA6cQ//RTHmy/QvCh0f44wDQRtt/MmdYmiS2NPa4UixBHz28suT21J6ILFJFsMa
+e+uS2XoHUzD3Gjc07DJ5MZsac36v0r8nz2xRy9v3CvVrC1uyFYDqPythgy56GxDN
+oT+YJOnivhV0F3xaaC3X7BP6zm6a+HWRnECjGKMsA1Uatdh/KQW+ni3+B9yDhCyu
+IXd9S9KKNXX2X6fg2/R7cXGquAaAM1xVEbT0KIXm1UqRU2G1ty0kXlzTpAaZ6IMA
+dkFa6x4YcVFaS8QJHGouKvPKeaQ7TQksb0NqqjXXmDFM5hfYfvWXstt0sLqrWl34
+DFKOvMVnWzT/dxsCcwCDb85VlnsuDZF5N8s5HxiPYxxHbgLHDga2lySJfgzgEnvn
+aQy0Ob4Tp6bf56KzDk31Z4981mAlgZVYMibUahVpfzLkbYsnQEaKcC18q8ii1IOa
+R0i5YcOk5HBunwCHTc4GBsOPpM7Ewtq/RtKb8RXGUKU0FT4jldEH79k19Me+ofA6
+EeWLjwg7qz0MiLgG+OKIynZgrZl3bYY60KLScIqGlwVtsiMs1r03q/ejAddhymA5
+7R3plZCxlY9dQqSkURrL10fCgsEtF33QA3ZCLXvWpXjdKdikdA3uSYn2hND1zAuh
+OuqkNqMk4eg4qRTRffQgbSOQbszBsEyhxOQN6PlWHkoQj3gFJNc=
+=5lW/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e42fb3e12047..846413f7b840 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jan 2022 07:39:17 +0000
+Tue, 11 Jan 2022 05:39:18 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index fdbb06366f74..66fca4bad1a1 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index f84cfe9c7617..c71e587bbf30 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 820f7d7ce7b5..52fd67884d1f 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -4,12 +4,12 @@ DEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=7
 HOMEPAGE=https://brltty.app/
-IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
+IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.4 ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_8 python_targets_python3_9 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	findlib	1470b3b78030acb2c8fcd04414f4c611	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	findlib	e6df6108c2d753998b1206f4d5ea4a2d	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=4bdbfdc381458f0c4307e21dba783703
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1-r1 b/metadata/md5-cache/app-accessibility/brltty-6.1-r1
index 835c687a7a8f..4f1f330638a5 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1-r1
@@ -4,12 +4,12 @@ DEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus
 DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind person
 EAPI=7
 HOMEPAGE=https://brltty.app/
-IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
+IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X +ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.8:* ) ocaml? ( dev-lang/ocaml:=[ocamlopt?] ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_8 python_targets_python3_9 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	findlib	1470b3b78030acb2c8fcd04414f4c611	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	findlib	e6df6108c2d753998b1206f4d5ea4a2d	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=3219d140af682343831d5c931105c633
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 285aa671bb7b..d1e20513770f 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/fastjar-0.98-r3 b/metadata/md5-cache/app-arch/fastjar-0.98-r3
deleted file mode 100644
index 9410388dd380..000000000000
--- a/metadata/md5-cache/app-arch/fastjar-0.98-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-libs/zlib
-DESCRIPTION=A jar program written in C
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/fastjar
-KEYWORDS=amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib !<=dev-java/kaffe-1.1.7-r5
-SLOT=0
-SRC_URI=mirror://nongnu/fastjar/fastjar-0.98.tar.gz
-_md5_=f8779a49f2b2913e115dff69b0b8c5cf
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index c19e62adae8e..77a9c6225108 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/containers-storage-1.30.0 b/metadata/md5-cache/app-containers/containers-storage-1.30.0
deleted file mode 100644
index ed9b82efdcbf..000000000000
--- a/metadata/md5-cache/app-containers/containers-storage-1.30.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.12 app-arch/unzip
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= ) dev-go/go-md2man test? ( sys-fs/btrfs-progs sys-fs/lvm2 sys-apps/util-linux )
-DESCRIPTION=containers/storage library
-EAPI=7
-HOMEPAGE=https://github.com/containers/storage
-IUSE=btrfs +device-mapper test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT
-RDEPEND=btrfs? ( sys-fs/btrfs-progs ) device-mapper? ( sys-fs/lvm2:= )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/storage/archive/v1.30.0.tar.gz -> containers-storage-1.30.0.tar.gz
-_eclasses_=go-module	82631624a3653e595cf9c18164a8c500
-_md5_=1e6e3813db0500baec0ab578bd686375
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 3dc105fd91c1..c6c268c43892 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/ccid-1.4.36 b/metadata/md5-cache/app-crypt/ccid-1.4.36
index ab440ee37e6d..1a0cbb68d2cb 100644
--- a/metadata/md5-cache/app-crypt/ccid-1.4.36
+++ b/metadata/md5-cache/app-crypt/ccid-1.4.36
@@ -5,10 +5,10 @@ DESCRIPTION=CCID free software driver
 EAPI=8
 HOMEPAGE=https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID
 IUSE=twinserial kobil-midentity +usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/pcsc-lite-1.8.3 usb? ( virtual/libusb:1 )
 SLOT=0
 SRC_URI=https://ccid.apdu.fr/files/ccid-1.4.36.tar.bz2
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=91dbe866b4c5d55dbd2d0f2cb5ab3557
+_md5_=73596fa7a173478f05ba2161d876d999
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2 b/metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2
index 1c092aad1289..b4fc01e09a93 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2
@@ -5,11 +5,11 @@ DESCRIPTION=MIT Kerberos V
 EAPI=8
 HOMEPAGE=https://web.mit.edu/kerberos/www/
 IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal || ( >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.19/krb5-1.19.2.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=922b9228e22664b72882d5ba62721a95
+_md5_=a08dcdde549ea038f629d9b22077ebbb
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7 b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
index e29b15918c75..a4c38e0c9056 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=Python library and command line tool for configuring a YubiKey
 EAPI=8
 HOMEPAGE=https://developers.yubico.com/yubikey-manager/
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD-2
 RDEPEND=app-crypt/ccid dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fido2:0/0.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyscard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey-manager-4.0.7.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=358b37cf8ee693622a745287ae1881ef
+_md5_=1541e84fb7ca6f3f0968e5116c76e2b7
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 71129805be46..71e2d9580422 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.54 b/metadata/md5-cache/app-emacs/ebuild-mode-1.54-r1
similarity index 94%
rename from metadata/md5-cache/app-emacs/ebuild-mode-1.54
rename to metadata/md5-cache/app-emacs/ebuild-mode-1.54-r1
index b21b108d7076..87ba609f34c1 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.54
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.54-r1
@@ -9,4 +9,4 @@ RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.54.tar.xz
 _eclasses_=elisp	532fa549a4f54b2a3f83b827b272a4a9	elisp-common	cf4fd1b0835b9f3e638724840468064a	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=4ec37b8ef84ed182d55adac315a735d5
+_md5_=a7716f7b7afe1267a3d503c31a246ab1
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 0b33866c4244..ec209096098f 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/ddccontrol-0.6.0 b/metadata/md5-cache/app-misc/ddccontrol-0.6.0
new file mode 100644
index 000000000000..9f8e739b80f7
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddccontrol-0.6.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-perl/XML-Parser dev-util/gdbus-codegen dev-util/intltool sys-kernel/linux-headers doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 app-text/htmltidy >=dev-libs/libxslt-1.1.6 ) nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=app-misc/ddccontrol-db dev-libs/glib:2 dev-libs/libxml2:2 app-arch/xz-utils gtk? ( dev-libs/atk media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango ) pci? ( sys-apps/pciutils )
+DESCRIPTION=Control monitor parameters, like brightness, contrast, RGB color levels via DDC
+EAPI=8
+HOMEPAGE=http://ddccontrol.sourceforge.net/
+IUSE=doc gtk nls +pci static-libs
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=app-misc/ddccontrol-db dev-libs/glib:2 dev-libs/libxml2:2 app-arch/xz-utils gtk? ( dev-libs/atk media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango ) pci? ( sys-apps/pciutils )
+SLOT=0
+SRC_URI=https://github.com/ddccontrol/ddccontrol/archive/0.6.0.tar.gz -> ddccontrol-0.6.0.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bd5447bac2b71298f1b6d5dcd29b47a9
diff --git a/metadata/md5-cache/app-misc/ddccontrol-db-20210812 b/metadata/md5-cache/app-misc/ddccontrol-db-20210812
new file mode 100644
index 000000000000..c81a1a630a23
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddccontrol-db-20210812
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/intltool dev-perl/XML-Parser nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DESCRIPTION=DDCControl monitor database
+EAPI=8
+HOMEPAGE=http://ddccontrol.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/ddccontrol/ddccontrol-db/archive/20210812.tar.gz -> ddccontrol-db-20210812.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=db7e7221cd56e9a64296bc83614f8834
diff --git a/metadata/md5-cache/app-misc/ddcui-0.1.2 b/metadata/md5-cache/app-misc/ddcui-0.1.2-r1
similarity index 73%
rename from metadata/md5-cache/app-misc/ddcui-0.1.2
rename to metadata/md5-cache/app-misc/ddcui-0.1.2-r1
index 15e1538815b0..25653eec3cc6 100644
--- a/metadata/md5-cache/app-misc/ddcui-0.1.2
+++ b/metadata/md5-cache/app-misc/ddcui-0.1.2-r1
@@ -1,13 +1,13 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib >=app-misc/ddcutil-0.9.9 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/glib >=app-misc/ddcutil-0.9.9:0/3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Graphical user interface for ddcutil - control monitor settings
 EAPI=7
 HOMEPAGE=https://www.ddcutil.com/ddcui_main/
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=dev-libs/glib >=app-misc/ddcutil-0.9.9 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
+RDEPEND=dev-libs/glib >=app-misc/ddcutil-0.9.9:0/3 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5 virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=https://github.com/rockowitz/ddcui/archive/v0.1.2.tar.gz -> ddcui-0.1.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0bab9354b211916a2ad08d2dcaf938af
+_md5_=7d363acc55318c1d7fea6a2cf58c6c8a
diff --git a/metadata/md5-cache/app-misc/ddcui-0.2.0 b/metadata/md5-cache/app-misc/ddcui-0.2.0
new file mode 100644
index 000000000000..3ff0df3c0cf5
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddcui-0.2.0
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/glib >=app-misc/ddcutil-1.2.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5
+DESCRIPTION=Graphical user interface for ddcutil - control monitor settings
+EAPI=8
+HOMEPAGE=https://www.ddcutil.com/ddcui_main/
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib >=app-misc/ddcutil-1.2.0:0/4 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/rockowitz/ddcui/archive/v0.2.0.tar.gz -> ddcui-0.2.0.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=ff297f30b942a314006f92591473c003
diff --git a/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2 b/metadata/md5-cache/app-misc/ddcutil-0.9.9-r3
similarity index 97%
rename from metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
rename to metadata/md5-cache/app-misc/ddcutil-0.9.9-r3
index 0ea068a9264a..e6850146ee93 100644
--- a/metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
+++ b/metadata/md5-cache/app-misc/ddcutil-0.9.9-r3
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) user-permissions? ( acct-group/i2c usb-monitor? ( acct-group/video ) ) X? ( x11-libs/libXrandr x11-libs/libX11 )
 REQUIRED_USE=drm? ( X )
-SLOT=0
+SLOT=0/3
 SRC_URI=https://github.com/rockowitz/ddcutil/archive/v0.9.9.tar.gz -> ddcutil-0.9.9.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=accf06dc94d624bc5288051d3d7a9979
+_md5_=535b54b9470d5141d92f9476562e41af
diff --git a/metadata/md5-cache/app-misc/ddcutil-1.2.1 b/metadata/md5-cache/app-misc/ddcutil-1.2.1
new file mode 100644
index 000000000000..90199d455f37
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ddcutil-1.2.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) user-permissions? ( acct-group/i2c usb-monitor? ( acct-group/video ) ) X? ( x11-libs/libXrandr x11-libs/libX11 )
+DESCRIPTION=Program for querying and changing monitor settings
+EAPI=8
+HOMEPAGE=https://www.ddcutil.com/
+IUSE=drm introspection usb-monitor user-permissions video_cards_nvidia X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) user-permissions? ( acct-group/i2c usb-monitor? ( acct-group/video ) ) X? ( x11-libs/libXrandr x11-libs/libX11 )
+REQUIRED_USE=drm? ( X )
+SLOT=0/4
+SRC_URI=https://github.com/rockowitz/ddcutil/archive/v1.2.1.tar.gz -> ddcutil-1.2.1.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=5620022435213bb155192b4083096e63
diff --git a/metadata/md5-cache/app-misc/fmawk-1.2 b/metadata/md5-cache/app-misc/fmawk-1.2
index 297e75186306..15160d9e1e16 100644
--- a/metadata/md5-cache/app-misc/fmawk-1.2
+++ b/metadata/md5-cache/app-misc/fmawk-1.2
@@ -8,4 +8,4 @@ RDEPEND=virtual/awk
 SLOT=0
 SRC_URI=https://github.com/huijunchen9260/fm.awk/archive/refs/tags/1.2.tar.gz -> fmawk-1.2.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
-_md5_=88f91d0e94629a7dd09f9184597e587d
+_md5_=a2e79f72e22ff7edd6781b10ad3c3fc7
diff --git a/metadata/md5-cache/app-misc/fmawk-1.3 b/metadata/md5-cache/app-misc/fmawk-1.3
new file mode 100644
index 000000000000..f97d2c21bfb8
--- /dev/null
+++ b/metadata/md5-cache/app-misc/fmawk-1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=File manager written in awk
+EAPI=8
+HOMEPAGE=https://github.com/huijunchen9260/fm.awk/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=virtual/awk
+SLOT=0
+SRC_URI=https://github.com/huijunchen9260/fm.awk/archive/refs/tags/1.3.tar.gz -> fmawk-1.3.tar.gz
+_eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a
+_md5_=1437528d081501de5bd33c5413dea12e
diff --git a/metadata/md5-cache/app-misc/fmawk-9999 b/metadata/md5-cache/app-misc/fmawk-9999
index 3130873f090c..303f43a884da 100644
--- a/metadata/md5-cache/app-misc/fmawk-9999
+++ b/metadata/md5-cache/app-misc/fmawk-9999
@@ -8,4 +8,4 @@ PROPERTIES=live
 RDEPEND=virtual/awk
 SLOT=0
 _eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	optfeature	30ce9dec2b8943338c9b015bd32bac6a
-_md5_=728336a549422168099f577c39dc672b
+_md5_=1437528d081501de5bd33c5413dea12e
diff --git a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1 b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
index 02475d93ba08..d11ade701d74 100644
--- a/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+++ b/metadata/md5-cache/app-misc/neofetch-7.1.0-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst prepare
 DESCRIPTION=Simple information system script
 EAPI=7
 HOMEPAGE=https://github.com/dylanaraps/neofetch
-KEYWORDS=amd64 ~arm64 ~mips ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~mips ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT-with-advertising
 SLOT=0
 SRC_URI=https://github.com/dylanaraps/neofetch/archive/7.1.0/neofetch-7.1.0.tar.gz
 _eclasses_=optfeature	30ce9dec2b8943338c9b015bd32bac6a	prefix	d04f14b297013ad1410550c0757f14f8
-_md5_=d95e4397bee43a635736f293f0f80257
+_md5_=c6e0e6eea06346db6e2fdf9bd9f6fb36
diff --git a/metadata/md5-cache/app-misc/solaar-1.1.1 b/metadata/md5-cache/app-misc/solaar-1.1.1
new file mode 100644
index 000000000000..e6398eb24bad
--- /dev/null
+++ b/metadata/md5-cache/app-misc/solaar-1.1.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Linux Device Manager for Logitech Unifying Receivers and Paired Devices
+EAPI=7
+HOMEPAGE=https://pwr-solaar.github.io/Solaar/
+IUSE=doc appindicator libnotify python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/plugdev python_single_target_python3_8? ( dev-python/psutil[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-xlib[python_targets_python3_8(-)] >=dev-python/pyudev-0.13[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/psutil[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-xlib[python_targets_python3_9(-)] >=dev-python/pyudev-0.13[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) x11-libs/gtk+:3[introspection] appindicator? ( dev-libs/libappindicator:3[introspection] ) libnotify? ( x11-libs/libnotify[introspection] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/pwr-Solaar/Solaar/archive/1.1.1.tar.gz -> solaar-1.1.1.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=d175e13818ce820f1eea2fd84ea1e585
diff --git a/metadata/md5-cache/app-misc/tty-clock-2.3 b/metadata/md5-cache/app-misc/tty-clock-2.3
index b32b3b06bd95..060e93c2ef80 100644
--- a/metadata/md5-cache/app-misc/tty-clock-2.3
+++ b/metadata/md5-cache/app-misc/tty-clock-2.3
@@ -4,10 +4,10 @@ DEPEND=sys-libs/ncurses:=[unicode(+)]
 DESCRIPTION=Displays a simple digital clock on the terminal
 EAPI=8
 HOMEPAGE=https://github.com/xorg62/tty-clock
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://github.com/xorg62/tty-clock/archive/refs/tags/v2.3.tar.gz -> tty-clock-2.3.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=904b3d86ee9f4722cd2b8369108a76f7
+_md5_=f58486a2140c9b34c400c3c775c26306
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 89d0a6443157..8e3113c90c73 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/cpdf-2.3.1 b/metadata/md5-cache/app-text/cpdf-2.3.1
index 9d3948ef51f3..f8da12fbe4ac 100644
--- a/metadata/md5-cache/app-text/cpdf-2.3.1
+++ b/metadata/md5-cache/app-text/cpdf-2.3.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4:=[ocamlopt] ~dev-ml/camlpdf-2.3.1:= >=dev-ml/findlib-1
 DESCRIPTION=A command line tool for manipulating PDF files
 EAPI=7
 HOMEPAGE=https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/
-IUSE=doc ocamlopt
+IUSE=doc +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=Coherent-Graphics BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt] ~dev-ml/camlpdf-2.3.1:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/johnwhitington/cpdf-source/archive/v2.3.1.tar.gz -> cpdf-2.3.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=11a709aeb4df4210994788eb005ae36a
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index d76a2a00a844..2f5140d72a45 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5 b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5
index 27f5c127fbb0..59f47ed8e04a 100644
--- a/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5
+++ b/metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5
@@ -1,13 +1,13 @@
-BDEPEND=doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=JSON for Modern C++
 EAPI=8
 HOMEPAGE=https://github.com/nlohmann/json https://nlohmann.github.io/json/
-IUSE=doc test
+IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nlohmann/json/archive/v3.10.5.tar.gz -> nlohmann_json-3.10.5.tar.gz test? ( https://github.com/nlohmann/json_test_data/archive/v3.0.0.tar.gz -> nlohmann_json-testdata-3.0.0.tar.gz )
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=e53a2c6514d16f9385f746202769cf1c
+_md5_=84e9086261cf5a0a15f23d3d5f848e7a
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1 b/metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1
index 0fc029b310b5..d6fc8f186ade 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-cpp/cairomm-1.2.2:0[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 SLOT=1.4
 SRC_URI=mirror://gnome/sources/pangomm/2.42/pangomm-2.42.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8830ef409df013d7be9427aec5514cf4
+_md5_=2cf99881a8415f7bae6be18290a55d64
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.46.2 b/metadata/md5-cache/dev-cpp/pangomm-2.46.2
new file mode 100644
index 000000000000..a97e4a4b9074
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.46.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] dev-lang/perl dev-libs/libxslt ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/xz-utils >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=>=dev-cpp/cairomm-1.2.2:0[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.48.0:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.45.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=C++ interface for pango
+EAPI=8
+HOMEPAGE=https://www.gtkmm.org
+IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-cpp/cairomm-1.2.2:0[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.48.0:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.45.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+SLOT=1.4
+SRC_URI=mirror://gnome/sources/pangomm/2.46/pangomm-2.46.2.tar.xz
+_eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=31011340a954d637fa3378150c42c6bf
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.48.1 b/metadata/md5-cache/dev-cpp/pangomm-2.48.1
index 8f5e72322ee2..51c121fca43e 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.48.1
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.48.1
@@ -11,4 +11,4 @@ RDEPEND=>=dev-cpp/cairomm-1.16.0:1.16[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=2.48
 SRC_URI=mirror://gnome/sources/pangomm/2.48/pangomm-2.48.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5aaca37d71dcdcf474654d469ee2b74a
+_md5_=0701418c3fd230062d25fca86d94eb5b
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.50.0 b/metadata/md5-cache/dev-cpp/pangomm-2.50.0
index a05d430e93b5..60970e9e9fbf 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.50.0
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.50.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-cpp/cairomm-1.16.0:1.16[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 SLOT=2.48
 SRC_URI=mirror://gnome/sources/pangomm/2.50/pangomm-2.50.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	b5c48cddff1da36a205d924d722b28c9	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cdf379b5ba83fe001080f80e5a7a6a98
+_md5_=1952bc063b1d1ef8cdbe9eeac7cbf604
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 51cfbbb62698..6ce874d3a697 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.29 b/metadata/md5-cache/dev-db/lmdb-0.9.29
index dde64f55fe9f..ecb02540f6ff 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.29
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.29
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
 EAPI=7
 HOMEPAGE=https://symas.com/lmdb/technical/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=OPENLDAP
 SLOT=0/0.9.29
 SRC_URI=https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.29/openldap-LMDB_0.9.29.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=48003d252abc3151a8c8d31a8ad0a3b5
+_md5_=74b94b2e51e4a78e605211cbc8b42f3d
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
index 61b74c0594cb..c35c23ce6f44 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
@@ -5,10 +5,10 @@ DESCRIPTION=C client library for MariaDB/MySQL
 EAPI=7
 HOMEPAGE=https://dev.mysql.com/downloads/
 IUSE=ldap static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( dev-libs/cyrus-sasl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<dev-db/mysql-5.6.45-r1 !=dev-db/mysql-5.7.23* !=dev-db/mysql-5.7.24* !=dev-db/mysql-5.7.25* !=dev-db/mysql-5.7.26-r0 !=dev-db/mysql-5.7.27-r0 !<dev-db/percona-server-5.7.26.29-r1
 SLOT=0/21
 SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=c0de325f9e34024d9cabc4753a45fdcf
+_md5_=cf199184e7d1851cdf593ac004227295
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index d32cb8e037e3..44b485a4ebe6 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/bsf-2.4.0-r2 b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
index cababf68a511..8696173376f4 100644
--- a/metadata/md5-cache/dev-java/bsf-2.4.0-r2
+++ b/metadata/md5-cache/dev-java/bsf-2.4.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Bean Script Framework
 EAPI=5
 HOMEPAGE=http://commons.apache.org/bsf/
 IUSE=javascript python tcl doc examples source
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=python? ( dev-java/jython:2.7 ) javascript? ( dev-java/rhino:1.6 ) tcl? ( dev-java/jacl:0 ) dev-java/xalan:0 dev-java/commons-logging:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/jakarta/bsf/source/bsf-src-2.4.0.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7619ac34c4187251014d4de23600098d
+_md5_=c1e4a62e434ee70ae540e510b0a03b64
diff --git a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1 b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
index e4fca952f481..41400bf6b8d5 100644
--- a/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+++ b/metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small embeddable Java source interpreter
 EAPI=7
 HOMEPAGE=https://github.com/beanshell/beanshell
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/bsf:2.3 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beanshell/beanshell/archive/2.0b6.tar.gz -> bsh-2.0b6.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1b53a03dda588c5ae5070ecd16ad0770
+_md5_=e98a6c226c5b8fb77c221f13c03d5b9b
diff --git a/metadata/md5-cache/dev-java/dom4j-2.1.3 b/metadata/md5-cache/dev-java/dom4j-2.1.3
index 22d53b3e3fbd..212fccec4cd9 100644
--- a/metadata/md5-cache/dev-java/dom4j-2.1.3
+++ b/metadata/md5-cache/dev-java/dom4j-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=flexible XML framework for Java
 EAPI=7
 HOMEPAGE=https://dom4j.github.io/
 IUSE=jaxen doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=dom4j
 RDEPEND=dev-java/jaxb-api:2 dev-java/xpp2:0 dev-java/xpp3:0 dev-java/xsdlib:0 jaxen? ( dev-java/jaxen:1.2[dom4j] ) >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz -> dom4j-2.1.3.tar.gz https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5
-_md5_=01e695ad7fd68180226d78babb2a853a
+_md5_=6b7b54ce52fe6dc61ec15e131c7cb961
diff --git a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0 b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
index e138d174df4f..46a89ce4a16b 100644
--- a/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
+++ b/metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Jakarta Activation API jar
 EAPI=8
 HOMEPAGE=https://eclipse-ee4j.github.io/jaf/
 IUSE=doc source
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=EPL-1.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2
 SRC_URI=https://github.com/eclipse-ee4j/jaf/archive/refs/tags/2.1.0.tar.gz -> jakarta-activation-2.1.0.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5
-_md5_=aae9fd112283a5033d9a2a5ec7d2746a
+_md5_=1999852c19527c7c6b18bf571ff77042
diff --git a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1 b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
index ec4d4ab75f50..9bb5ca84ed3d 100644
--- a/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
+++ b/metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Network services database access for java
 EAPI=7
 HOMEPAGE=https://github.com/jnr/jnr-netdb
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://github.com/jnr/jnr-netdb/archive/1.1.4.tar.gz -> jnr-netdb-1.1.4.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5cf1fd023cec64e980ebbc929cc04d54
+_md5_=31f22860ea4a9c15d396360eda1d00b6
diff --git a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1 b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
index c205abf729d4..38d681812cee 100644
--- a/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
+++ b/metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Lightweight cross-platform POSIX emulation layer for Java
 EAPI=7
 HOMEPAGE=https://github.com/jnr/jnr-posix
 IUSE=doc source test
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( CPL-1.0 GPL-2 LGPL-2.1 )
 RDEPEND=dev-java/jnr-constants:0 dev-java/jnr-ffi:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jnr/jnr-posix/archive/3.0.10.tar.gz -> jnr-posix-3.0.10.tar.gz
 _eclasses_=java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=46ef4228bcf868070cd4a3aac5a43bbf
+_md5_=eb871d92ac3fb94b076964bba70590ab
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r4 b/metadata/md5-cache/dev-java/jython-2.7.0-r4
index c6efed36c910..aff1c988898d 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r4
+++ b/metadata/md5-cache/dev-java/jython-2.7.0-r4
@@ -5,11 +5,11 @@ DESCRIPTION=An implementation of Python written in Java
 EAPI=7
 HOMEPAGE=https://www.jython.org
 IUSE=examples test doc source
-KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=dev-java/antlr:3 dev-java/netty-transport:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:20 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-ant-2	262d853e2dd1056dc103b953dfc113b9	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a449babd2547eb4110f1bd376a6b8974
+_md5_=6e3965343bebd4445e890c148ac97bcd
diff --git a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1 b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
index a22697e4a5d9..024cd867c91c 100644
--- a/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
+++ b/metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Async event-driven framework for high performance network applicatio
 EAPI=8
 HOMEPAGE=https://netty.io/
 IUSE=doc source test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/netty-common:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/refs/tags/netty-4.0.36.Final.tar.gz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5
-_md5_=b60c72eed13abdfaf6209ad8248cc904
+_md5_=6f6b407145ed84e4f8764847194e9752
diff --git a/metadata/md5-cache/dev-java/netty-common-4.0.36-r1 b/metadata/md5-cache/dev-java/netty-common-4.0.36-r1
index b2861c853225..7400ddc53cd2 100644
--- a/metadata/md5-cache/dev-java/netty-common-4.0.36-r1
+++ b/metadata/md5-cache/dev-java/netty-common-4.0.36-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Async event-driven framework for high performance network applicatio
 EAPI=8
 HOMEPAGE=https://netty.io/
 IUSE=test doc source
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=virtual/jre:1.8 dev-java/commons-logging:0 dev-java/javassist:3 dev-java/log4j:0 dev-java/slf4j-api:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5
-_md5_=10bdd63565e1e473a4cb31a76bf488fa
+_md5_=5bebf974d51ae715f073207c458fdce5
diff --git a/metadata/md5-cache/dev-java/netty-transport-4.0.36 b/metadata/md5-cache/dev-java/netty-transport-4.0.36
index 4b8485fc30ae..15535b05f955 100644
--- a/metadata/md5-cache/dev-java/netty-transport-4.0.36
+++ b/metadata/md5-cache/dev-java/netty-transport-4.0.36
@@ -4,11 +4,11 @@ DESCRIPTION=Async event-driven framework for high performance network applicatio
 EAPI=5
 HOMEPAGE=https://netty.io/
 IUSE=test doc source
-KEYWORDS=amd64 arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 ~dev-java/netty-buffer-4.0.36:0 ~dev-java/netty-common-4.0.36:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/netty/netty/archive/netty-4.0.36.Final.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=513a6870f29bfb464b3896c35c9da83e
+_md5_=c465b2c79cd6c99793a8686add1e5761
diff --git a/metadata/md5-cache/dev-java/testng-6.9.10 b/metadata/md5-cache/dev-java/testng-6.9.10
index b3047fcc1db1..3dfcdd469600 100644
--- a/metadata/md5-cache/dev-java/testng-6.9.10
+++ b/metadata/md5-cache/dev-java/testng-6.9.10
@@ -4,11 +4,11 @@ DESCRIPTION=Testing framework inspired by JUnit and NUnit with new features
 EAPI=5
 HOMEPAGE=https://testng.org/
 IUSE=test doc source
-KEYWORDS=amd64 arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/bsh:0 dev-java/guice:4 dev-java/junit:4 dev-java/ant-core:0 dev-java/snakeyaml:0 dev-java/jcommander:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cbeust/testng/archive/6.9.10.tar.gz -> testng-6.9.10.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	2d0eb1353bf1264bd6e61736d3e409a2	java-pkg-simple	6b49cf40f97e7a6458469114e1712118	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=0f886da9f2bbb0fe2396701ce99c515b
+_md5_=7340528ad190212b4fb759bee7b3a554
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 912bc32d7dfd..3ec0f1a2762e 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/cl-1.2.4-r1 b/metadata/md5-cache/dev-libs/cl-1.2.4-r1
index 5d45c5ce2b2c..0bc688361ec5 100644
--- a/metadata/md5-cache/dev-libs/cl-1.2.4-r1
+++ b/metadata/md5-cache/dev-libs/cl-1.2.4-r1
@@ -3,10 +3,10 @@ DEPEND=>=dev-lang/erlang-16 dev-util/rebar virtual/opencl
 DESCRIPTION=OpenCL bindings for Erlang
 EAPI=8
 HOMEPAGE=https://github.com/tonyrog/cl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/erlang-16 dev-util/rebar virtual/opencl
 SLOT=0
 SRC_URI=https://github.com/tonyrog/cl/archive/cl-1.2.4.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0b822d259e75223744f93245bfbbd47c
+_md5_=96b02304e56c74943df8661c57dd07d2
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.3.10 b/metadata/md5-cache/dev-libs/libgusb-0.3.10
new file mode 100644
index 000000000000..afd066f54b7b
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgusb-0.3.10
@@ -0,0 +1,16 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) gtk-doc? ( app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 dev-util/gtk-doc ) vala? ( || ( dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
+DESCRIPTION=GObject wrapper for libusb
+EAPI=7
+HOMEPAGE=https://github.com/hughsie/libgusb
+IUSE=gtk-doc +introspection static-libs test +vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libusb:1[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54:= ) sys-apps/hwdata
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://people.freedesktop.org/~hughsient/releases/libgusb-0.3.10.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=78307affa91b90204abd51f601962d0f
diff --git a/metadata/md5-cache/dev-libs/starpu-1.3.9 b/metadata/md5-cache/dev-libs/starpu-1.3.9
index ab896ffb4444..f0e6ccef0d09 100644
--- a/metadata/md5-cache/dev-libs/starpu-1.3.9
+++ b/metadata/md5-cache/dev-libs/starpu-1.3.9
@@ -5,11 +5,11 @@ DESCRIPTION=Unified runtime system for heterogeneous multicore architectures
 EAPI=7
 HOMEPAGE=https://starpu.gitlabpages.inria.fr/
 IUSE=blas cuda doc examples fftw fortran hdf5 mpi opencl opengl openmp spinlock-check static-libs test valgrind
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sci-mathematics/glpk:0= >=sys-apps/hwloc-2.3.0:0= blas? ( virtual/blas ) cuda? ( dev-util/nvidia-cuda-toolkit x11-drivers/nvidia-drivers ) fftw? ( sci-libs/fftw:3.0= ) hdf5? ( sci-libs/hdf5:0= ) mpi? ( virtual/mpi ) opencl? ( virtual/opencl ) opengl? ( media-libs/freeglut:0= ) valgrind? ( dev-util/valgrind ) fortran? ( virtual/fortran )
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://files.inria.fr/starpu/starpu-1.3.9/starpu-1.3.9.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	cuda	8d9c9803e990e31a336935435383ac43	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=79879118377e069f588248935924d4c2
+_md5_=872082a2d26ada46c530ed7c8de27d67
diff --git a/metadata/md5-cache/dev-libs/uthash-2.3.0 b/metadata/md5-cache/dev-libs/uthash-2.3.0
index 0a63558af8bd..bbfb18cb67cb 100644
--- a/metadata/md5-cache/dev-libs/uthash-2.3.0
+++ b/metadata/md5-cache/dev-libs/uthash-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An easy-to-use hash implementation for C programmers
 EAPI=7
 HOMEPAGE=https://troydhanson.github.io/uthash/index.html
 IUSE=test
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-1
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/troydhanson/uthash/archive/v2.3.0.tar.gz -> uthash-2.3.0.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=33ebb158b517ca39f490e12f32363e6f
+_md5_=cc49625c9ddb0e709a558142d69560a0
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index ed2fda7a4504..54be01ae5515 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3 b/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
index 7d4adf901583..36ecc13f4c6e 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
+++ b/metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/astring:= dev-ml/async_unix:= dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.3
 SRC_URI=https://github.com/mirage/alcotest/archive/1.2.3.tar.gz -> alcotest-1.2.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=77374d9208aa6e753d24095016bdce03
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.4.0 b/metadata/md5-cache/dev-ml/alcotest-1.4.0
index 3d54f509001e..2c1e1d7e5cbb 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.4.0
+++ b/metadata/md5-cache/dev-ml/alcotest-1.4.0
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=dev-ml/astring:= dev-ml/async_unix:= dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.4.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.4.0.tar.gz -> alcotest-1.4.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=77374d9208aa6e753d24095016bdce03
diff --git a/metadata/md5-cache/dev-ml/alcotest-1.5.0 b/metadata/md5-cache/dev-ml/alcotest-1.5.0
index d6e3e1b3e389..7a8925ddfd00 100644
--- a/metadata/md5-cache/dev-ml/alcotest-1.5.0
+++ b/metadata/md5-cache/dev-ml/alcotest-1.5.0
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=>=dev-ml/dune-2.8 dev-ml/astring:= dev-ml/async_unix:= dev-ml/cmdliner:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/duration:= >=dev-ml/fmt-0.8.9:= dev-ml/mirage-clock:= dev-ml/re:= dev-ml/result:= dev-ml/logs:= dev-ml/uutf:= dev-ml/uuidm:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.5.0
 SRC_URI=https://github.com/mirage/alcotest/archive/1.5.0.tar.gz -> alcotest-1.5.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ca379f933799032cb611657164e3afd7
diff --git a/metadata/md5-cache/dev-ml/async-0.14.0 b/metadata/md5-cache/dev-ml/async-0.14.0
index 0d8cbd1e6537..37254f14a496 100644
--- a/metadata/md5-cache/dev-ml/async-0.14.0
+++ b/metadata/md5-cache/dev-ml/async-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/async_extra:= dev-ml/async_kernel:= dev-ml/async_unix:= dev-ml/co
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async/archive/v0.14.0.tar.gz -> async-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=eed16425e4f52f9642689d25748723f0
diff --git a/metadata/md5-cache/dev-ml/async_extra-0.14.0 b/metadata/md5-cache/dev-ml/async_extra-0.14.0
index 81479337340e..971909b22194 100644
--- a/metadata/md5-cache/dev-ml/async_extra-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_extra-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/async_rpc_kernel:= dev-ml/async_unix:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_extra/archive/v0.14.0.tar.gz -> async_extra-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6f93872f9c4f8cacf08ea54031356e9c
diff --git a/metadata/md5-cache/dev-ml/async_kernel-0.14.0 b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
index a1b6a55e80d5..49ed75198e04 100644
--- a/metadata/md5-cache/dev-ml/async_kernel-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_kernel-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_kernel/archive/v0.14.0.tar.gz -> async_kernel-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=65b38a4798f76dcd42a2ff97c6586035
diff --git a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1 b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
index 903c2882859f..a78b3bd27867 100644
--- a/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
+++ b/metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/protocol_version_header:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_rpc_kernel/archive/v0.14.0.tar.gz -> async_rpc_kernel-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7f4f3c4a9e0aa029a726caf66d89324b
diff --git a/metadata/md5-cache/dev-ml/async_unix-0.14.0 b/metadata/md5-cache/dev-ml/async_unix-0.14.0
index 0a724df18cac..f2bbd07a6aa8 100644
--- a/metadata/md5-cache/dev-ml/async_unix-0.14.0
+++ b/metadata/md5-cache/dev-ml/async_unix-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/async_kernel:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/async_unix/archive/v0.14.0.tar.gz -> async_unix-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a78f977b7dfcd26f442878a6291e9a6b
diff --git a/metadata/md5-cache/dev-ml/base-0.14.0 b/metadata/md5-cache/dev-ml/base-0.14.0
index c25967f90517..16e3f4d84617 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.0
+++ b/metadata/md5-cache/dev-ml/base-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=<dev-lang/ocaml-4.12 >=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.0.tar.gz -> base-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=dc5c1395c4367c14c64b09bf385617da
diff --git a/metadata/md5-cache/dev-ml/base-0.14.1 b/metadata/md5-cache/dev-ml/base-0.14.1
index db0206a566ed..39952f2abc97 100644
--- a/metadata/md5-cache/dev-ml/base-0.14.1
+++ b/metadata/md5-cache/dev-ml/base-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/sexplib0-0.14.0:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/base/archive/v0.14.1.tar.gz -> base-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=35c64aedea00bac4b4350c5a225288af
diff --git a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0 b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
index 43c673ec874a..5ef2375edd98 100644
--- a/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+++ b/metadata/md5-cache/dev-ml/base_bigstring-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt=] dev-ml/base:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_bigstring/archive/v0.14.0.tar.gz -> base_bigstring-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=385c066e9d3d4fa035de72d884e7f258
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
index d3dc6b556f0c..4fd0c681029b 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.0.tar.gz -> base_quickcheck-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b010bd646ec2210987d13b6f4f6a7350
diff --git a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1 b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
index df0eef2db0a2..782ca326c3a5 100644
--- a/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= dev-ml/splittable_random:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/base_quickcheck/archive/v0.14.1.tar.gz -> base_quickcheck-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=bf6bb2d09169399ded4e7a6a9df1c6e5
diff --git a/metadata/md5-cache/dev-ml/batteries-3.4.0 b/metadata/md5-cache/dev-ml/batteries-3.4.0
index ccb5738a0840..2d704986bddf 100644
--- a/metadata/md5-cache/dev-ml/batteries-3.4.0
+++ b/metadata/md5-cache/dev-ml/batteries-3.4.0
@@ -4,12 +4,12 @@ DEPEND=>=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A community-maintained standard library extension
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/num:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v3.4.0.tar.gz -> batteries-3.4.0.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6bc8998711975611f07a4cdabc315ded
diff --git a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0 b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
index a215b7b524a7..2998c560c262 100644
--- a/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
+++ b/metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/mirage/bigarray-compat/archive/v1.0.0.tar.gz -> bigarray-compat-1.0.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b70a359a5313bb90f964d4766143caf4
diff --git a/metadata/md5-cache/dev-ml/bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
index 7127ad272451..630946f60c20 100644
--- a/metadata/md5-cache/dev-ml/bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/bin_prot-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppx_variants_conv-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/bin_prot/archive/v0.14.0.tar.gz -> bin_prot-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fe61884d68e235e2c2b7c18b30093623
diff --git a/metadata/md5-cache/dev-ml/biniou-1.2.1 b/metadata/md5-cache/dev-ml/biniou-1.2.1
index 028d0089cf62..29f258468012 100644
--- a/metadata/md5-cache/dev-ml/biniou-1.2.1
+++ b/metadata/md5-cache/dev-ml/biniou-1.2.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] dev-ml/easy-format:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.1
 SRC_URI=https://github.com/ocaml-community/biniou/archive/1.2.1.tar.gz -> biniou-1.2.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=59369231073dabc8ba5a01fac7f3af0c
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.1-r1 b/metadata/md5-cache/dev-ml/cairo2-0.6.1-r1
index 86fc08e3780e..e4cf83020d01 100644
--- a/metadata/md5-cache/dev-ml/cairo2-0.6.1-r1
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/cairo:=[svg] dev-ml/dune-configurator:= !dev-ml/ocaml-cairo >=d
 RESTRICT=test
 SLOT=0/0.6.1
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.1/cairo2-0.6.1.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=95c22d11c0bd2c50a1bbc7f2e695fdb6
diff --git a/metadata/md5-cache/dev-ml/cairo2-0.6.2-r1 b/metadata/md5-cache/dev-ml/cairo2-0.6.2-r1
index 933df6200f5a..f5d702118ee0 100644
--- a/metadata/md5-cache/dev-ml/cairo2-0.6.2-r1
+++ b/metadata/md5-cache/dev-ml/cairo2-0.6.2-r1
@@ -11,5 +11,5 @@ RDEPEND=x11-libs/cairo:=[svg] dev-ml/dune-configurator:= !dev-ml/ocaml-cairo >=d
 RESTRICT=test
 SLOT=0/0.6.2
 SRC_URI=https://github.com/Chris00/ocaml-cairo/releases/download/0.6.2/cairo2-0.6.2.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=628c31b85d2684cd93d470eaf4377221
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index 31e4e5b3b828..ca478b12c278 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=An Ocaml library to handle dates and time
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/calendar/
-IUSE=doc ocamlopt
+IUSE=doc +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.04
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=98a4ad1eb8a4730293a71476871017f0
diff --git a/metadata/md5-cache/dev-ml/calendars-1.0.0 b/metadata/md5-cache/dev-ml/calendars-1.0.0
index a7568ad87ec6..05d6c3e22c64 100644
--- a/metadata/md5-cache/dev-ml/calendars-1.0.0
+++ b/metadata/md5-cache/dev-ml/calendars-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/geneweb/calendars/archive/v1.0.0.tar.gz -> calendars-1.0.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6c6a7a2a96c5d77de26591ddd5d9ff2f
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.7.0 b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
index 3862f1d97f8a..5f88dd4f70c1 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -4,11 +4,11 @@ DEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] >=dev-ml/findlib-1.0.4-r
 DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
 EAPI=7
 HOMEPAGE=https://gitlab.com/irill/camlbz2
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.7.0
 SRC_URI=https://gitlab.com/irill/camlbz2/-/archive/0.7.0/camlbz2-0.7.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=b712ef937f54a8d63fea6b28fbdfa455
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11-r1 b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
index f969abb0b709..c9e06be85100 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.11-r1
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.11
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel711.tar.gz -> camlp5-7.11.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=cde1dbd375f335b2f7f5140d4c1e0617
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.12 b/metadata/md5-cache/dev-ml/camlp5-7.12
index b0583059475f..514c2be79fb1 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.12
+++ b/metadata/md5-cache/dev-ml/camlp5-7.12
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.11.2:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.11.2:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.12
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel712.tar.gz -> camlp5-7.12.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=0fe86616a24f55306eb95a0f879f38e9
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.13 b/metadata/md5-cache/dev-ml/camlp5-7.13
index 23d44c41d063..02f1546bf9c0 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.13
+++ b/metadata/md5-cache/dev-ml/camlp5-7.13
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.10.2:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.10.2:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.13
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel713.tar.gz -> camlp5-7.13.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=7b42b54bdb151f0b19380eb4b56e2e35
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.14 b/metadata/md5-cache/dev-ml/camlp5-7.14
index 031753f88d52..905620fe0820 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.14
+++ b/metadata/md5-cache/dev-ml/camlp5-7.14
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.14
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel714.tar.gz -> camlp5-7.14.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=03741aa922888cc118399ea3f49b9f57
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00 b/metadata/md5-cache/dev-ml/camlp5-8.00
index f0a41850ecf7..38555a488be2 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.tar.gz -> camlp5-8.00.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=cafeecbff2773429bd3a4484f4fda5a5
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.01 b/metadata/md5-cache/dev-ml/camlp5-8.00.01
index 42f9f40fc788..33f92ffcc963 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.01
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.01
@@ -3,11 +3,11 @@ DEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.01
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.01.tar.gz -> camlp5-8.00.01.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=39c94b89dcd97e11831bbfc181fd55d0
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.02 b/metadata/md5-cache/dev-ml/camlp5-8.00.02
index 593a67f13d89..6040b3174e1f 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.02
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.02
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.02
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.02.tar.gz -> camlp5-8.00.02.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=c13990ac18b63018473ad47ce92d2e3a
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.3.1 b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
index 32b0c9431846..a539a7212547 100644
--- a/metadata/md5-cache/dev-ml/camlpdf-2.3.1
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml library for reading, writing, and modifying PDF files
 EAPI=7
 HOMEPAGE=https://github.com/johnwhitington/camlpdf/
-IUSE=doc examples ocamlopt
+IUSE=doc examples +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.3.1
 SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.3.1.tar.gz -> camlpdf-2.3.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=0d359c4840afbfdbf87c8432fcfcdf42
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.10 b/metadata/md5-cache/dev-ml/camlzip-1.10
index ad0e68cce2a4..8fe041cc307b 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.10
+++ b/metadata/md5-cache/dev-ml/camlzip-1.10
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib
 DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 dev-lang/ocaml:=[ocamlopt?]
 SLOT=1/1.10
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz -> camlzip-1.10.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=74127cf99b770d401c6cd3ef33eded35
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.11 b/metadata/md5-cache/dev-ml/camlzip-1.11
index 4a3b7d7fe73b..e152c90f168f 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.11
+++ b/metadata/md5-cache/dev-ml/camlzip-1.11
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] >=sys-libs/zlib-1.1.3 >=dev-ml/findlib
 DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] >=sys-libs/zlib-1.1.3 dev-lang/ocaml:=[ocamlopt?]
 SLOT=1/1.11
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz -> camlzip-1.11.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=a77acdccb22ce78df50660ac2d64196e
diff --git a/metadata/md5-cache/dev-ml/camomile-1.0.2 b/metadata/md5-cache/dev-ml/camomile-1.0.2
index 9f7d13f97098..1682f3c7091d 100644
--- a/metadata/md5-cache/dev-ml/camomile-1.0.2
+++ b/metadata/md5-cache/dev-ml/camomile-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/1.0.2
 SRC_URI=https://github.com/yoriyuki/Camomile/archive/1.0.2.tar.gz -> camomile-1.0.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b39d22d19f4a2c11f593a84d84475e5a
diff --git a/metadata/md5-cache/dev-ml/charinfo_width-1.1.0 b/metadata/md5-cache/dev-ml/charinfo_width-1.1.0
index 3d81b25ca675..6c47df9520bf 100644
--- a/metadata/md5-cache/dev-ml/charinfo_width-1.1.0
+++ b/metadata/md5-cache/dev-ml/charinfo_width-1.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/camomile:= dev-ml/ppx_expect:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/kandu/charInfo_width/archive/1.1.0.tar.gz -> charinfo_width-1.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=251d1de1025f2b506f3f1acc755ea8f5
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.14.0 b/metadata/md5-cache/dev-ml/cinaps-0.14.0
index da72b453681f..cdfc396169ea 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.14.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/findlib:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.14.0.tar.gz -> cinaps-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ebea1a9fd4d2e2444753f9faa15b2a3e
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.0 b/metadata/md5-cache/dev-ml/cinaps-0.15.0
index 82a1b7fce7b8..3a9624568776 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.0
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.0
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.0.tar.gz -> cinaps-0.15.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=31fead40087af2e173677dddc5540fdb
diff --git a/metadata/md5-cache/dev-ml/cinaps-0.15.1 b/metadata/md5-cache/dev-ml/cinaps-0.15.1
index d04f32c5bfb7..203e580b7117 100644
--- a/metadata/md5-cache/dev-ml/cinaps-0.15.1
+++ b/metadata/md5-cache/dev-ml/cinaps-0.15.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.15.1
 SRC_URI=https://github.com/ocaml-ppx/cinaps/archive/v0.15.1.tar.gz -> cinaps-0.15.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=31fead40087af2e173677dddc5540fdb
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
index 6c0fb8965d54..62d020fa6244 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.4
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:= dev-ml/t
 DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/cmdliner
-IUSE=+ocamlopt test ocamlopt
+IUSE=+ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=5218301cadbc2c95ef53fe4c49bb784e
diff --git a/metadata/md5-cache/dev-ml/core-0.14.0-r3 b/metadata/md5-cache/dev-ml/core-0.14.0-r3
index 316d20e6d68c..f532c2518927 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.0-r3
+++ b/metadata/md5-cache/dev-ml/core-0.14.0-r3
@@ -11,5 +11,5 @@ RDEPEND=<dev-lang/ocaml-4.12 dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-confi
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core/archive/v0.14.0.tar.gz -> core-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3d54637cd0895fea6c71f8af200dce93
diff --git a/metadata/md5-cache/dev-ml/core-0.14.1 b/metadata/md5-cache/dev-ml/core-0.14.1
index b9e8755861c2..3c80fd90ae69 100644
--- a/metadata/md5-cache/dev-ml/core-0.14.1
+++ b/metadata/md5-cache/dev-ml/core-0.14.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/jst-config:= dev-ml/ppx_jane:=
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/core/archive/v0.14.1.tar.gz -> core-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ceaf21ebf62d4fe25841aaf2f63c0e90
diff --git a/metadata/md5-cache/dev-ml/core_bench-0.14.0 b/metadata/md5-cache/dev-ml/core_bench-0.14.0
index 16714e7d396c..7a948a97aeb0 100644
--- a/metadata/md5-cache/dev-ml/core_bench-0.14.0
+++ b/metadata/md5-cache/dev-ml/core_bench-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/core-0.14.0:= >=dev-ml/core_kernel-0.14.0:= >=dev-ml/ppx_jane-0.14.0:= dev-ml/textutils:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/core_bench/archive/v0.14.0.tar.gz -> core_bench-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=9b6a44dc871f8a8690a1709df31b4bc0
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3 b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
index 51902dd386bc..994c5a6d5797 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quick
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.1.tar.gz -> core_kernel-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4638604d54f6190e569e1f7d2bf3bc23
diff --git a/metadata/md5-cache/dev-ml/core_kernel-0.14.2 b/metadata/md5-cache/dev-ml/core_kernel-0.14.2
index b6d3c60f9c41..5033268e80c7 100644
--- a/metadata/md5-cache/dev-ml/core_kernel-0.14.2
+++ b/metadata/md5-cache/dev-ml/core_kernel-0.14.2
@@ -11,5 +11,5 @@ RDEPEND=dev-lang/ocaml:= dev-ml/base:= dev-ml/base_bigstring:= dev-ml/base_quick
 RESTRICT=test
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/core_kernel/archive/v0.14.2.tar.gz -> core_kernel-0.14.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=286437c83ef8bcc386d58e76a24ac11d
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.7 b/metadata/md5-cache/dev-ml/cppo-1.6.7
index e836eacf5825..6f159dae33c8 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.7
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.7
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.6.7
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.7.tar.gz -> cppo-1.6.7.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=93a2cfbe959b403abe4197b5a2a09e79
diff --git a/metadata/md5-cache/dev-ml/cppo-1.6.8 b/metadata/md5-cache/dev-ml/cppo-1.6.8
index 9c765019e831..d9ff2d4b19fe 100644
--- a/metadata/md5-cache/dev-ml/cppo-1.6.8
+++ b/metadata/md5-cache/dev-ml/cppo-1.6.8
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/ocamlbuild dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.6.8
 SRC_URI=https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz -> cppo-1.6.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e1265bfefc08609dfc70516e96decb75
diff --git a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1 b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
index b520fdbc32f6..57fd397523e5 100644
--- a/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
+++ b/metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=test? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.16.1
 SRC_URI=https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz -> cryptokit-1.16.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8b5830c5643d57d645ced2b9b2943da7
diff --git a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1 b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
index d89847fe3ac8..8d3e34968ff2 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
+++ b/metadata/md5-cache/dev-ml/csexp-1.3.2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/
 RESTRICT=!test? ( test )
 SLOT=0/1.3.2
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.3.2/csexp-1.3.2.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8d0ecc0e23af0889d8464f5615ca1e56
diff --git a/metadata/md5-cache/dev-ml/csexp-1.5.1 b/metadata/md5-cache/dev-ml/csexp-1.5.1
index 2ccf980d7dab..50e8b9e0618a 100644
--- a/metadata/md5-cache/dev-ml/csexp-1.5.1
+++ b/metadata/md5-cache/dev-ml/csexp-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/result-1.5:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/
 RESTRICT=!test? ( test )
 SLOT=0/1.5.1
 SRC_URI=https://github.com/ocaml-dune/csexp/releases/download/1.5.1/csexp-1.5.1.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8d0ecc0e23af0889d8464f5615ca1e56
diff --git a/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1 b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
index 107069a520c2..e18b9f354eec 100644
--- a/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
+++ b/metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=de
 RESTRICT=test
 SLOT=0/6.0.1_p2
 SRC_URI=http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1.orig.tar.gz http://deb.debian.org/debian/pool/main/d/dose3/dose3_6.0.1-2.debian.tar.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=063232bdda5316094045427b50283f15
diff --git a/metadata/md5-cache/dev-ml/dose3-6.1-r1 b/metadata/md5-cache/dev-ml/dose3-6.1-r1
index 10fba686303e..61abc0eaba0d 100644
--- a/metadata/md5-cache/dev-ml/dose3-6.1-r1
+++ b/metadata/md5-cache/dev-ml/dose3-6.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=de
 RESTRICT=test
 SLOT=0/6.1
 SRC_URI=https://gitlab.com/irill/dose3/-/archive/6.1/dose3-6.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c2632208f2a6f420f52d36844b2adbd8
diff --git a/metadata/md5-cache/dev-ml/dose3-7.0.0 b/metadata/md5-cache/dev-ml/dose3-7.0.0
index bb1e4175d3c4..fc391fd19e78 100644
--- a/metadata/md5-cache/dev-ml/dose3-7.0.0
+++ b/metadata/md5-cache/dev-ml/dose3-7.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt=] dev-ml/ocaml-base64:=[ocamlopt=] >=de
 RESTRICT=test
 SLOT=0/7.0.0
 SRC_URI=https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c985c37370cefd56a644b3472d61cbae
diff --git a/metadata/md5-cache/dev-ml/dune-build-info-2.9.1 b/metadata/md5-cache/dev-ml/dune-build-info-2.9.1
index 28017e008cd6..c11701814d0f 100644
--- a/metadata/md5-cache/dev-ml/dune-build-info-2.9.1
+++ b/metadata/md5-cache/dev-ml/dune-build-info-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.9.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.1.tar.gz -> dune-2.9.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=644a9f9317c486921aec001c26ec6d40
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
index 4226e29843ad..e9909fade74b 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.8.2:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b44310d102c4231e7ea09b1010a87ec6
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4 b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
index d2f6b816a42c..88e306802838 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.8.4:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c863b4d3f5216816bed829cbfbe19c79
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.0 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
index 6b49b42c7d55..fdc06a752a39 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.9.0:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.9.0
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=bb6e7f1017f2cd13ecdb3d9e6be30e9e
diff --git a/metadata/md5-cache/dev-ml/dune-configurator-2.9.1 b/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
index a450a4fea516..45596a66e8c8 100644
--- a/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
+++ b/metadata/md5-cache/dev-ml/dune-configurator-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.9.1:=[ocamlopt=] dev-ml/csexp:=[ocamlopt=] d
 RESTRICT=!test? ( test )
 SLOT=0/2.9.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.1.tar.gz -> dune-2.9.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=11c8367726f9fbd79b917e4f193cc501
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
index 4a991e12bd80..e4bb54b297ff 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.8.2
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.2.tar.gz -> dune-2.8.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ab53b8f2ee2fff859aa237b91f027217
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4 b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
index fe1832540610..34dc77e663ac 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.8.4
 SRC_URI=https://github.com/ocaml/dune/archive/2.8.4.tar.gz -> dune-2.8.4.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=933a20dcdce8f16bc497ebb868ebd4ac
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0 b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
index 754dc0350986..1b34eebc5a7f 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.9.0
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.0.tar.gz -> dune-2.9.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a51ab7500c6555e75f1b14bdf32755f2
diff --git a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.1 b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.1
index f4b3029d63b8..8f7c6a0db3c6 100644
--- a/metadata/md5-cache/dev-ml/dune-private-libs-2.9.1
+++ b/metadata/md5-cache/dev-ml/dune-private-libs-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:=[ocamlopt=] dev-ml/findlib:=[ocamlopt=] >=dev-lang/ocaml-4
 RESTRICT=!test? ( test )
 SLOT=0/2.9.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.1.tar.gz -> dune-2.9.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c68ac174fe3c0a8f85ec7bee3ee03b9a
diff --git a/metadata/md5-cache/dev-ml/dune-site-2.9.1 b/metadata/md5-cache/dev-ml/dune-site-2.9.1
index a114ee7b9d62..93596302ab07 100644
--- a/metadata/md5-cache/dev-ml/dune-site-2.9.1
+++ b/metadata/md5-cache/dev-ml/dune-site-2.9.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/dune-private-libs-2.9.1:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlo
 RESTRICT=test
 SLOT=0/2.9.1
 SRC_URI=https://github.com/ocaml/dune/archive/2.9.1.tar.gz -> dune-2.9.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=9f47d45480fc3f97b3f529dfdaf91eaf
diff --git a/metadata/md5-cache/dev-ml/duration-0.1.3 b/metadata/md5-cache/dev-ml/duration-0.1.3
index 83a2c5f84b02..53c89fca7b81 100644
--- a/metadata/md5-cache/dev-ml/duration-0.1.3
+++ b/metadata/md5-cache/dev-ml/duration-0.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.1.3
 SRC_URI=https://github.com/hannesm/duration/archive/0.1.3.tar.gz -> duration-0.1.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6958a3257a38203b1049ad44a4a41385
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.2.0 b/metadata/md5-cache/dev-ml/easy-format-1.2.0
index 29b67cec4b1c..a5baa3c005a8 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Pretty-printing library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/mjambon/easy-format
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=ac78b787a31b18fe4756015720b0ac9d
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
index e2b9746153fc..0bc46c115ac7 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -4,11 +4,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.7
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=3e9bd27402f3d978f12037534b694b0a
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.8 b/metadata/md5-cache/dev-ml/extlib-1.7.8
index acba10189b6a..4e8a78bcf427 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.8
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.8
@@ -4,11 +4,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.8
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.8.tar.gz -> extlib-1.7.8.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=6a2a79fe1808d8f5f3362c2dc7751cbb
diff --git a/metadata/md5-cache/dev-ml/fieldslib-0.14.0 b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
index 9153647fbd45..4d04aeca13dc 100644
--- a/metadata/md5-cache/dev-ml/fieldslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/fieldslib-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/fieldslib/archive/v0.14.0.tar.gz -> fieldslib-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=5336cea5bac127480dceea5d70e5aec0
diff --git a/metadata/md5-cache/dev-ml/fix-20211125 b/metadata/md5-cache/dev-ml/fix-20211125
index 221c2cfda671..c7c4c19aed3c 100644
--- a/metadata/md5-cache/dev-ml/fix-20211125
+++ b/metadata/md5-cache/dev-ml/fix-20211125
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/20211125
 SRC_URI=https://gitlab.inria.fr/fpottier/fix/-/archive/20211125/fix-20211125.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=592871dd04a43c54c7fd444bc0fd88fc
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1 b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
index e1c93aea24fa..f23de595c39c 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
@@ -4,12 +4,12 @@ DEPEND=dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[oc
 DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/stdlib-shims:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.9
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.9.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	opam	bb6e97cce1eab4343c4db2c51acf1349
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=59d49cf54bfee4f447016f2e580f70d2
diff --git a/metadata/md5-cache/dev-ml/fmt-0.9.0 b/metadata/md5-cache/dev-ml/fmt-0.9.0
index 89a8bcc5e963..9d67882fcaeb 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.9.0
+++ b/metadata/md5-cache/dev-ml/fmt-0.9.0
@@ -4,12 +4,12 @@ DEPEND=dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4.08:=[ocamlopt] dev-ml/resu
 DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4.08:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/stdlib-shims:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.9.0
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.9.0.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	opam	bb6e97cce1eab4343c4db2c51acf1349
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=4db469bb8b43392855c791c26dc3093f
diff --git a/metadata/md5-cache/dev-ml/gen-0.5.3-r1 b/metadata/md5-cache/dev-ml/gen-0.5.3-r1
index c2b848c4bc5f..17bc5c5b44e3 100644
--- a/metadata/md5-cache/dev-ml/gen-0.5.3-r1
+++ b/metadata/md5-cache/dev-ml/gen-0.5.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.5.3
 SRC_URI=https://github.com/c-cube/gen/archive/0.5.3.tar.gz -> gen-0.5.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=cc4a415fdc35a24e399e9c8a75bb0bf6
diff --git a/metadata/md5-cache/dev-ml/graphics-5.1.1-r1 b/metadata/md5-cache/dev-ml/graphics-5.1.1-r1
index cd2d93448783..e79ee8dbe3c1 100644
--- a/metadata/md5-cache/dev-ml/graphics-5.1.1-r1
+++ b/metadata/md5-cache/dev-ml/graphics-5.1.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09:= x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/graphics/releases/download/5.1.1/graphics-5.1.1.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a2424668677a91fefe5db3b8608f3ca3
diff --git a/metadata/md5-cache/dev-ml/graphics-5.1.2 b/metadata/md5-cache/dev-ml/graphics-5.1.2
index e944f36c6fec..08867497db92 100644
--- a/metadata/md5-cache/dev-ml/graphics-5.1.2
+++ b/metadata/md5-cache/dev-ml/graphics-5.1.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/dune-configurator:=[ocamlopt?] >=dev-lang/ocaml-4.09:= x11-libs/libX11:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/graphics/releases/download/5.1.2/graphics-5.1.2.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a2424668677a91fefe5db3b8608f3ca3
diff --git a/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1 b/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
index 53bcddadf382..236c2fb3be4a 100644
--- a/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
+++ b/metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ml/dune-configurator >=sci-libs/gsl-1.19:= !dev-ml/ocamlgsl >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/mmottl/gsl-ocaml/releases/download/1.24.3/gsl-1.24.3.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=da97ad6f1e66f7fbd4ee7c33c6e8e003
diff --git a/metadata/md5-cache/dev-ml/integers-0.4.0 b/metadata/md5-cache/dev-ml/integers-0.4.0
index 38d05d794280..8e40df9d283c 100644
--- a/metadata/md5-cache/dev-ml/integers-0.4.0
+++ b/metadata/md5-cache/dev-ml/integers-0.4.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.4.0
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.4.0.tar.gz -> integers-0.4.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=17598d48780fc6047d9fc42e65541826
diff --git a/metadata/md5-cache/dev-ml/integers-0.5.1 b/metadata/md5-cache/dev-ml/integers-0.5.1
index 1f4225c7ff08..b054b36c59b0 100644
--- a/metadata/md5-cache/dev-ml/integers-0.5.1
+++ b/metadata/md5-cache/dev-ml/integers-0.5.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.5.1
 SRC_URI=https://github.com/ocamllabs/ocaml-integers/archive/0.5.1.tar.gz -> integers-0.5.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1a5c8bb625f77c52e9da210011ae4038
diff --git a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0 b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
index 82277b4a7b02..b743f5d61168 100644
--- a/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
+++ b/metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jane-street-headers/archive/v0.14.0.tar.gz -> jane-street-headers-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=73f96c757fa5b2c17a3ee35631cfe8a1
diff --git a/metadata/md5-cache/dev-ml/jingoo-1.4.2 b/metadata/md5-cache/dev-ml/jingoo-1.4.2
index 303d8184621b..308f2a3131c5 100644
--- a/metadata/md5-cache/dev-ml/jingoo-1.4.2
+++ b/metadata/md5-cache/dev-ml/jingoo-1.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/ppx_deriving:= dev-ml/uucp:= dev-ml/uutf:= dev-ml/re:= dev-ml/men
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tategakibunko/jingoo/archive/v1.4.2.tar.gz -> jingoo-1.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1368d4e2e069f081aaa32b11b4b87e3e
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 8887f788ac2b..e94a90bf2b81 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml
 DESCRIPTION=Non-blocking streaming JSON codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/jsonm
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=5929a2fbb46a9132d0287fc6124cbdb6
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.0 b/metadata/md5-cache/dev-ml/jst-config-0.14.0
index d2a1d9bdc0ca..f23391aef114 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.14.0
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.0.tar.gz -> jst-config-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=07610653412a8ccc56fcdd31c4085d12
diff --git a/metadata/md5-cache/dev-ml/jst-config-0.14.1 b/metadata/md5-cache/dev-ml/jst-config-0.14.1
index 78be1f55658b..4078e37c92a5 100644
--- a/metadata/md5-cache/dev-ml/jst-config-0.14.1
+++ b/metadata/md5-cache/dev-ml/jst-config-0.14.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/stdio:= dev-ml/dune-configurator:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/jst-config/archive/v0.14.1.tar.gz -> jst-config-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=adbeae5a69bc51155fdbb7d24ccdb444
diff --git a/metadata/md5-cache/dev-ml/lablgtk-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
index f2ccbdea4174..fcdff8de24b1 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-3.1.1
+++ b/metadata/md5-cache/dev-ml/lablgtk-3.1.1
@@ -11,5 +11,5 @@ PDEPEND=sourceview? ( dev-ml/lablgtk-sourceview:3/3.1.1 )
 RDEPEND=app-text/gtkspell:3= x11-libs/gtk+:3= dev-ml/cairo2:= x11-libs/gtksourceview:3.0= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=3/3.1.1
 SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7045653533ff3dba2bf756c23164546f
diff --git a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1 b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
index 5b995215b846..cd4765f95d25 100644
--- a/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
+++ b/metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=x11-libs/gtksourceview:3.0= >=dev-ml/lablgtk-3.1.1:3= dev-ml/cairo2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=3/3.1.1
 SRC_URI=https://github.com/garrigue/lablgtk/releases/download/3.1.1/lablgtk3-3.1.1.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c85a693667e516353b35a70c85d90d88
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index 0b8c690dcaf3..068d4d117bf8 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=d
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/labltk/labltk-8.06.10-warnings.patch.bz2
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6ba6eef9b04c542994a95d54a76b4cb3
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.11 b/metadata/md5-cache/dev-ml/labltk-8.06.11
index 915144211a76..a2d40aee4c63 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.11
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.11
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.13:=[ocamlopt?,X(+)?] dev-ml/findlib >=d
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.13:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.11
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.11.tar.gz -> labltk-8.06.11.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=c379d3ef15b7109a7b0b3d646e3feab9
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.7 b/metadata/md5-cache/dev-ml/labltk-8.06.7
index 4cafc5b3c088..732c56f805e5 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.7
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.7
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?] >=dev-ml/f
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.7
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.7.tar.gz -> labltk-8.06.7.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=c80e4b28cfb847a73637bb5f9e06e1fe
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.9 b/metadata/md5-cache/dev-ml/labltk-8.06.9
index e961e3aeaaa5..93fb817db6c0 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.9
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.9
@@ -3,11 +3,11 @@ DEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-ml/findlib >=d
 DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.9
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.9.tar.gz -> labltk-8.06.9.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=0f521f98630df1ac61c2e220f05d8783
diff --git a/metadata/md5-cache/dev-ml/lambda-term-3.1.0 b/metadata/md5-cache/dev-ml/lambda-term-3.1.0
index ac1d675c40c3..1396f00899d6 100644
--- a/metadata/md5-cache/dev-ml/lambda-term-3.1.0
+++ b/metadata/md5-cache/dev-ml/lambda-term-3.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/camomile:= dev-ml/lwt:= dev-ml/lwt_log:= dev-ml/mew_vi:= dev-ml/react:= dev-ml/zed:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.1.0
 SRC_URI=https://github.com/ocaml-community/lambda-term/archive/3.1.0.tar.gz -> lambda-term-3.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=79465c392ef7a2aaa6839a70b74e78e9
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0-r1 b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
index f5c2174ae906..96bcb30dbb29 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0-r1
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
@@ -4,12 +4,12 @@ DEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:=
 DESCRIPTION=Logging infrastructure for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/logs https://github.com/dbuenzli/logs
-IUSE=+fmt cli +lwt test ocamlopt
+IUSE=+fmt cli +lwt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/logs/releases/logs-0.7.0.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=85a309608f98e25b0b914db2c602e790
diff --git a/metadata/md5-cache/dev-ml/luv-0.5.10-r3 b/metadata/md5-cache/dev-ml/luv-0.5.10-r3
index 728b52fc9542..a33a938e3c6d 100644
--- a/metadata/md5-cache/dev-ml/luv-0.5.10-r3
+++ b/metadata/md5-cache/dev-ml/luv-0.5.10-r3
@@ -11,5 +11,5 @@ RDEPEND=<=dev-lang/ocaml-4.13:=[ocamlopt?] dev-libs/libuv:= dev-ml/ocaml-ctypes:
 RESTRICT=!test? ( test )
 SLOT=0/0.5.10
 SRC_URI=https://github.com/aantron/luv/releases/download/0.5.10/luv-0.5.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f919afe9925382cf0880470e95f5b30c
diff --git a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1 b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
index 4f78a370df9a..b12615e86188 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.3.0-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/seq:= dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= >=dev-ml/ppxlib-0.18.0:= dev-ml/react:= dev-ml/dune-configurator:= dev-libs/libev >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/5.3.0
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.3.0.tar.gz -> lwt-5.3.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3be37d866bc73375eee161983cd2ce1d
diff --git a/metadata/md5-cache/dev-ml/lwt-5.4.2-r1 b/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
index c1a5d185898a..fd0d9408fa59 100644
--- a/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
+++ b/metadata/md5-cache/dev-ml/lwt-5.4.2-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/result:= dev-ml/mmap:= dev-ml/ocplib-endian:= dev-ml/ppxlib:= dev-ml/react:= dev-ml/luv:= dev-libs/libev >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/5.4.2
 SRC_URI=https://github.com/ocsigen/lwt/archive/5.4.2.tar.gz -> lwt-5.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b6ef6f43faba5091fe35421fda702e7b
diff --git a/metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1 b/metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1
index 9f61481472ba..262b58213561 100644
--- a/metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1
+++ b/metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-ml/lwt:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.1.1
 SRC_URI=https://github.com/ocsigen/lwt_log/archive/1.1.1.tar.gz -> lwt_log-1.1.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=eeb8fc7109d91cad1014ebc5f521e220
diff --git a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3 b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
index 7c0877964c76..d6e272e9cbbd 100644
--- a/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
+++ b/metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/base >=dev-ml/lwt-3.1:= >=dev-ml/ocaml-ssl-0.4.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.1.3
 SRC_URI=https://github.com/ocsigen/lwt_ssl/archive/1.1.3.tar.gz -> lwt_ssl-1.1.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2b3319efe437d18aa0459bfa8321b803
diff --git a/metadata/md5-cache/dev-ml/markup-1.0.0 b/metadata/md5-cache/dev-ml/markup-1.0.0
index c5877f77dc88..b6262fb51fab 100644
--- a/metadata/md5-cache/dev-ml/markup-1.0.0
+++ b/metadata/md5-cache/dev-ml/markup-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/lwt dev-ml/uutf >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.0
 SRC_URI=https://github.com/aantron/markup.ml/archive/1.0.0.tar.gz -> markup-1.0.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=eed3e7e84ad76bf3b99780a27b402c41
diff --git a/metadata/md5-cache/dev-ml/markup-1.0.2 b/metadata/md5-cache/dev-ml/markup-1.0.2
index 573ca44b2f68..ffde2065a16d 100644
--- a/metadata/md5-cache/dev-ml/markup-1.0.2
+++ b/metadata/md5-cache/dev-ml/markup-1.0.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/lwt dev-ml/uutf >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://github.com/aantron/markup.ml/archive/1.0.2.tar.gz -> markup-1.0.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=932971229a56054d7311e821a33bf648
diff --git a/metadata/md5-cache/dev-ml/mccs-1.1.13 b/metadata/md5-cache/dev-ml/mccs-1.1.13
index 8986431c6465..3fe96ae5d86a 100644
--- a/metadata/md5-cache/dev-ml/mccs-1.1.13
+++ b/metadata/md5-cache/dev-ml/mccs-1.1.13
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/cudf:= sci-mathematics/glpk:= >=dev-lang/ocaml-4:=[ocamlopt?] dev
 RESTRICT=!test? ( test )
 SLOT=0/1.1.13
 SRC_URI=https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz -> mccs-1.1.13.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=77338a1e51977785387975b35c998a88
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index e59266d1f019..d1731c4357c4 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-ml/ocamlbuild >=dev-ml/findlib-1.0
 DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/20190924
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=5841849f52bd68f8fda3a6f345b5ab33
diff --git a/metadata/md5-cache/dev-ml/menhir-20210419-r1 b/metadata/md5-cache/dev-ml/menhir-20210419-r1
index ecf33dcf6280..136b894f7a0c 100644
--- a/metadata/md5-cache/dev-ml/menhir-20210419-r1
+++ b/metadata/md5-cache/dev-ml/menhir-20210419-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/20210419
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20210419/menhir-20210419.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=71e5a3b4f1bc5e09b5bc48084a88cea7
diff --git a/metadata/md5-cache/dev-ml/menhir-20211012 b/metadata/md5-cache/dev-ml/menhir-20211012
index f4e7ddd7a6ae..70a4016d6ab5 100644
--- a/metadata/md5-cache/dev-ml/menhir-20211012
+++ b/metadata/md5-cache/dev-ml/menhir-20211012
@@ -10,5 +10,5 @@ LICENSE=GPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/20211012
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20211012/menhir-20211012.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=abb3126df465272611ff9e21373b6338
diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1 b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
index e002e4d1d1a1..696109da0401 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=8a5a0751184bc93d507186e699808717
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1-r2 b/metadata/md5-cache/dev-ml/merlin-4.1-r2
index 2d2002b84c91..6060cd04f143 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.1-r2
+++ b/metadata/md5-cache/dev-ml/merlin-4.1-r2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= =dev-lang/ocaml-4.11*:= e
 RESTRICT=!test? ( test )
 SLOT=0/4.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=b98396d3c91d0948c0a4d375adcd564c
diff --git a/metadata/md5-cache/dev-ml/merlin-4.2 b/metadata/md5-cache/dev-ml/merlin-4.2
index d9156df0b4de..eb860a5f9d46 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.2
+++ b/metadata/md5-cache/dev-ml/merlin-4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.1
 RESTRICT=!test? ( test )
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.2-411.tar.gz -> merlin-4.2-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.2-ocaml-4.12.patch.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=12fcbdcdfda74e269608fd55e421334f
diff --git a/metadata/md5-cache/dev-ml/merlin-4.3.1 b/metadata/md5-cache/dev-ml/merlin-4.3.1
index 4f8779eba8d8..e08229a775fc 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.3.1
+++ b/metadata/md5-cache/dev-ml/merlin-4.3.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( de
 RESTRICT=!test? ( test )
 SLOT=0/4.3.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.3.1-411.tar.gz -> merlin-4.3.1-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.3.1-ocaml-4.12.patch.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea	elisp-common	cf4fd1b0835b9f3e638724840468064a
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404	elisp-common	cf4fd1b0835b9f3e638724840468064a
 _md5_=f0f54939c211439dcfc43009337d0374
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1 b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
index ca408e217149..ed51fa6503a2 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/ocaml:0/4.05 dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=SDK to extend Merlin
 EAPI=7
 HOMEPAGE=https://github.com/let-def/merlin-extend
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=dev-lang/ocaml:0/4.05 dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.3
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz -> merlin-extend-0.3.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b5b1adfb32630e70c7617bcbfc272dfb
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1 b/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
index bf37479815c0..cd3a2f32b16c 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-lang/ocaml:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.6
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.6.tar.gz -> merlin-extend-0.6.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=df4554197f7399e62c2bedf7d75e0977
diff --git a/metadata/md5-cache/dev-ml/mew-0.1.0-r1 b/metadata/md5-cache/dev-ml/mew-0.1.0-r1
index 05b5f089fd7e..bdc670fc0e33 100644
--- a/metadata/md5-cache/dev-ml/mew-0.1.0-r1
+++ b/metadata/md5-cache/dev-ml/mew-0.1.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/result:= dev-ml/trie:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dun
 RESTRICT=!test? ( test )
 SLOT=0/0.1.0
 SRC_URI=https://github.com/kandu/mew/archive/0.1.0.tar.gz -> mew-0.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8605a4c9fcc9b76910c62dfabc91ef9b
diff --git a/metadata/md5-cache/dev-ml/mew_vi-0.5.0 b/metadata/md5-cache/dev-ml/mew_vi-0.5.0
index 50f987fa46de..08fee2120bfa 100644
--- a/metadata/md5-cache/dev-ml/mew_vi-0.5.0
+++ b/metadata/md5-cache/dev-ml/mew_vi-0.5.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/mew:= dev-ml/react:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.5.0
 SRC_URI=https://github.com/kandu/mew_vi/archive/0.5.0.tar.gz -> mew_vi-0.5.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=5d5a49abf48def0d842cc0bcce2226a6
diff --git a/metadata/md5-cache/dev-ml/mirage-clock-3.1.0 b/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
index e8651e6ae503..a9a665736da4 100644
--- a/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
+++ b/metadata/md5-cache/dev-ml/mirage-clock-3.1.0
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.1.0
 SRC_URI=https://github.com/mirage/mirage-clock/archive/v3.1.0.tar.gz -> mirage-clock-3.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=0ca4545df3879e0d5759ee40a232d84c
diff --git a/metadata/md5-cache/dev-ml/mmap-1.1.0 b/metadata/md5-cache/dev-ml/mmap-1.1.0
index ee9b673024ad..c71233f6b09e 100644
--- a/metadata/md5-cache/dev-ml/mmap-1.1.0
+++ b/metadata/md5-cache/dev-ml/mmap-1.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.1.0
 SRC_URI=https://github.com/mirage/mmap/releases/download/v1.1.0/mmap-v1.1.0.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6611b2d207209929d10a6d97035bc080
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index e6a79255705b..29440e9652c0 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] >=de
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=2c99de16380933bea986fda5f2a99343
diff --git a/metadata/md5-cache/dev-ml/num-1.4-r3 b/metadata/md5-cache/dev-ml/num-1.4-r3
index c6bcf5c4b51f..d93d4e2a6873 100644
--- a/metadata/md5-cache/dev-ml/num-1.4-r3
+++ b/metadata/md5-cache/dev-ml/num-1.4-r3
@@ -4,11 +4,11 @@ DEPEND=dev-ml/findlib:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.4.tar.gz -> num-1.4.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=802f5f59840dc689cdfc1f3fec8d9ba7
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index 7f16460e32cd..4beeec4542e8 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -3,11 +3,11 @@ DEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocam
 DESCRIPTION=Ocaml bindings for Augeas
 EAPI=7
 HOMEPAGE=http://augeas.net/
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.5.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=ac4ccf374d07d89650a2c3bbde0a39f2
diff --git a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0 b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
index 1356daf7eb11..72094b70e27a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
+++ b/metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/3.5.0
 SRC_URI=https://github.com/mirage/ocaml-base64/archive/v3.5.0.tar.gz -> ocaml-base64-3.5.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fe6bc2431e193293fb5b7aa303eab219
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
index 459c3e9653de..488eb3de8511 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.12.3
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.3.tar.gz -> ocaml-compiler-libs-0.12.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e948f800ac0591614d8dcabbe76d64b7
diff --git a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4 b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
index 7501f13e99f8..e07a14d8711d 100644
--- a/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
+++ b/metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.12.4
 SRC_URI=https://github.com/janestreet/ocaml-compiler-libs/archive/v0.12.4.tar.gz -> ocaml-compiler-libs-0.12.4.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=150815ce528958d5775a8c9073f29449
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
index 423cf6721b85..8fc54416e1bc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/inte
 DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.17.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz -> ocaml-ctypes-0.17.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=76b4c4c8d786e29e5a420e83a0179822
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
index a595b0738306..9692e79414d0 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/biga
 DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/bigarray-compat:= dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.19.1.tar.gz -> ocaml-ctypes-0.19.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6a33fef6cd9ef0ebc16076129c766bb7
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
index 5542225e5d16..597955176981 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] test? ( dev-ml/ounit2
 DESCRIPTION=OCaml bindings for expat
 EAPI=7
 HOMEPAGE=https://github.com/whitequark/ocaml-expat
-IUSE=doc +ocamlopt test ocamlopt
+IUSE=doc +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=5eb4340f24b2a108c4d7f5537c4fb451
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
index 060c8b2c100d..ed4059b88521 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.2/fileutils-v0.6.2.tbz -> ocaml-fileutils-0.6.2.tar.bz2
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2e6643b3d4c0889c519dd77d71250455
diff --git a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3 b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3
index b05ba0f4ba91..fc26348331df 100644
--- a/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3
+++ b/metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/gildor478/ocaml-fileutils/releases/download/v0.6.3/fileutils-v0.6.3.tbz -> ocaml-fileutils-0.6.3.tar.bz2
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2e6643b3d4c0889c519dd77d71250455
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
index d08227a28697..87682cbaeba9 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
@@ -4,12 +4,12 @@ DEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileuti
 DESCRIPTION=Provides support for internationalization of OCaml program
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
-IUSE=doc +ocamlopt test ocamlopt
+IUSE=doc +ocamlopt test +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=7a3b338614e50907dfe971669b9bebc1
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
index 20b93cf0f365..219b578bb91c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/base:= >=dev-ml/camomile-0.8.3:=[ocamlopt=] >=dev-ml/ocaml-fileut
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a9ab2d138b11c5a045d448357ccb9a9b
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2 b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
index 78e3d17d820e..f19b70792450 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt] dev-ml/ocaml-gettext:= >=dev-l
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6d73558928d6b7890fec1ecc758df2bf
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1 b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
index 77791c84fc8b..ec8522eb6cff 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/base:= dev-ml/camomile:=[ocamlopt=] dev-ml/ocaml-gettext:= !<dev-
 RESTRICT=!test? ( test )
 SLOT=0/0.4.2
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/v0.4.2.tar.gz -> ocaml-gettext-0.4.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ff20e57118cd6bedab3e3fe84c31a546
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index eb0b52d14927..03d8f3280e5c 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -4,11 +4,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml hash-consing library
 EAPI=7
 HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.3
 SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.3.tar.gz -> ocaml-hashcons-1.3.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=52c306cd346c6d6b7bfea8fc80280321
diff --git a/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2 b/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
index d76b20bada49..85bae230c131 100644
--- a/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
+++ b/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
@@ -3,11 +3,11 @@ DEPEND=dev-ml/pcre-ocaml:= >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A small OCaml library to read and write .ini files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-ml/pcre-ocaml:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=27acfcb994338c6134b50cfc23c8b0ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
index decf2fdbef3a..6f31d93bf051 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/cinaps:= dev-ml/ppx_derivers:= >=dev-lang/ocaml-4:=[ocamlopt?] de
 RESTRICT=!test? ( test )
 SLOT=0/1.8.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v1.8.0.tar.gz -> ocaml-migrate-parsetree-1.8.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=670e238ce3e197999804086ecd9e5c8f
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
index 15ef3fbd038c..f53ebb1501fa 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.1.0.tar.gz -> ocaml-migrate-parsetree-2.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=811ee1c37b37786d3250b5aeced79748
diff --git a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0 b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
index f7d873da5483..eb74db629232 100644
--- a/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test ) strip
 SLOT=0/2.2.0
 SRC_URI=https://github.com/let-def/ocaml-migrate-parsetree/archive/v2.2.0.tar.gz -> ocaml-migrate-parsetree-2.2.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b153fa7bd2339a9ac3907cb0d6fd17d2
diff --git a/metadata/md5-cache/dev-ml/ocaml-process-0.2.1 b/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
index 0b02933d4aa4..a85e968371c5 100644
--- a/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
+++ b/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
@@ -4,12 +4,12 @@ DEPEND=>=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Easy process control for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/dsheets/ocaml-process
-IUSE=+ocamlopt test ocamlopt
+IUSE=+ocamlopt test +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://github.com/dsheets/ocaml-process/archive/0.2.1.tar.gz -> ocaml-process-0.2.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=8a1498ea87984b44f625f37ad9a4c6d8
diff --git a/metadata/md5-cache/dev-ml/ocaml-sha-1.15.1 b/metadata/md5-cache/dev-ml/ocaml-sha-1.15.1
index b1cff6b18d31..3cc29b3db1cf 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sha-1.15.1
+++ b/metadata/md5-cache/dev-ml/ocaml-sha-1.15.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/1.15.1
 SRC_URI=https://github.com/djs55/ocaml-sha/archive/v1.15.1.tar.gz -> ocaml-sha-1.15.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ab01a19ff86c572824ed0dd1f3e24922
diff --git a/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2 b/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
index 229c72839406..3543fe6402d8 100644
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/5.0.2
 SRC_URI=https://github.com/mmottl/sqlite3-ocaml/archive/5.0.2.tar.gz -> ocaml-sqlite3-5.0.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3d9ea5cbe6c6c16ea67dc5a6aaea15c4
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
index f59f342cd426..fd2cf3c12f5f 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.5.10
 SRC_URI=https://github.com/savonet/ocaml-ssl/archive/v0.5.10.tar.gz -> ocaml-ssl-0.5.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=113c35dd738560cb2f4af3a24f26d8f4
diff --git a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9 b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
index 2acbefa86eb3..004329c6b441 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
+++ b/metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/openssl:0= >=dev-lang/ocaml-3.10:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.5.9
 SRC_URI=https://github.com/savonet/ocaml-ssl/archive/0.5.9.tar.gz -> ocaml-ssl-0.5.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d6e23431bbf3c5397577d98cb1a16291
diff --git a/metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0 b/metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0
index a239f6b4ccdc..460cd26f81e4 100644
--- a/metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0
+++ b/metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/0.7.0
 SRC_URI=https://github.com/andrenth/ocaml-stdint/archive/0.7.0.tar.gz -> ocaml-stdint-0.7.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3f6a1b577499e7eb30073a134ec9beec
diff --git a/metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1 b/metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
index 7a18314bc8d9..ebc96f9a7254 100644
--- a/metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
+++ b/metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
@@ -7,7 +7,8 @@ IUSE=+ocamlopt test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]
+REQUIRED_USE=test? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/ocaml/ocamlbuild/archive/0.14.0.tar.gz -> ocamlbuild-0.14.0.tar.gz
-_md5_=877e0f86b0783fb858f033254a0b0627
+_md5_=52a379d6b00e14fe6f67a57aad13681d
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
index b4e0a378ed5e..3be807f2d8b0 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
@@ -4,11 +4,11 @@ DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas
 DESCRIPTION=O'Caml Graph library
 EAPI=7
 HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
-IUSE=doc examples gtk +ocamlopt ocamlopt
+IUSE=doc examples gtk +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.8.8
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=fec682d1031c5f5ae701652c09ef1972
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1 b/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
index dfd4a7ee4f5b..2ae37bfa22ab 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.0
 SRC_URI=https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e38770c4486885e19af2a3ac01b44709
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
index 6ebc9dcaa665..dfe3e2e7a968 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -4,12 +4,12 @@ DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-m
 DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
+IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip +ocamlopt
 KEYWORDS=amd64 ppc x86
 LICENSE=ZLIB GPL-2+
 RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=installsources strip
 SLOT=0/4.1.8
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
index 7663509f37a9..0924e05d0f5a 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
@@ -4,12 +4,12 @@ DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-m
 DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
+IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip +ocamlopt
 KEYWORDS=amd64 ppc x86
 LICENSE=ZLIB GPL-2+
 RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=installsources strip
 SLOT=0/4.1.9
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.9.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1 b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
index 75c6ba4173e2..f9e83eb72182 100644
--- a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=de
 DESCRIPTION=OCaml SDL Bindings
 EAPI=7
 HOMEPAGE=http://ocamlsdl.sourceforge.net
-IUSE=doc +ocamlopt opengl truetype ocamlopt
+IUSE=doc +ocamlopt opengl truetype +ocamlopt
 KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 truetype? ( >=media-libs/sdl-ttf-2.0 ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=mirror://sourceforge/ocamlsdl/ocamlsdl-0.9.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=1a311da00e4c349e39769a3da3cd64ec
diff --git a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1 b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
index da0db2da9975..44b9e5a903de 100644
--- a/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
+++ b/metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/1.1
 SRC_URI=https://github.com/OCamlPro/ocplib-endian/archive/1.1.tar.gz -> ocplib-endian-1.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d03cfc46e3130ce275c5e2a47fef1784
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
index d58646ad856c..0b7e88f2db4d 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -4,11 +4,11 @@ DEPEND=>=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A library implementing a simplex algorithm
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/v0.4.tar.gz -> ocplib-simplex-0.4.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=15581ffa1f1c180f16113afbdab0c591
diff --git a/metadata/md5-cache/dev-ml/octavius-1.2.2 b/metadata/md5-cache/dev-ml/octavius-1.2.2
index b104aa775f94..1302347f42b3 100644
--- a/metadata/md5-cache/dev-ml/octavius-1.2.2
+++ b/metadata/md5-cache/dev-ml/octavius-1.2.2
@@ -10,5 +10,5 @@ LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.2
 SRC_URI=https://github.com/ocaml-doc/octavius/archive/v1.2.2.tar.gz -> octavius-1.2.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=19c2771d45485b3e07fd724e3930250e
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.1 b/metadata/md5-cache/dev-ml/ocurl-0.9.1
index 933c0ccece60..2ca14b132ae5 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.1
@@ -4,11 +4,11 @@ DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:
 DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.1.tar.gz -> ocurl-0.9.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=fd07450fc47d4a7c8d6fcbef4bfe2200
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.2 b/metadata/md5-cache/dev-ml/ocurl-0.9.2
index b93a7865cdbe..f369dd69e3d0 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.2
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.2
@@ -4,11 +4,11 @@ DEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:
 DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.2
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.2.tar.gz -> ocurl-0.9.2.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=00be4131a21ad8a975951c8645af9a99
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.10 b/metadata/md5-cache/dev-ml/opam-2.0.10
index 8c867d4049da..dd7b2e42a36d 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-2.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.10:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=abd9956c1121e82edce505fb928f4b77
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
index 15ffede2d727..1ca27c4787aa 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=<dev-lang/ocaml-4.12 dev-ml/cmdliner:= dev-ml/cudf:= dev-ml/dose3:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7dab88ccfbfb58a5b49005460347ea99
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-2.0.8-r2
index 5f6e10520085..743e295ffdf2 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-2.0.8-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b4879115dcf54b12c2729784740fa4aa
diff --git a/metadata/md5-cache/dev-ml/opam-2.0.9 b/metadata/md5-cache/dev-ml/opam-2.0.9
index 671ac57d623f..c864b84edbf1 100644
--- a/metadata/md5-cache/dev-ml/opam-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=A source-based package manager for OCaml
 EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=abd9956c1121e82edce505fb928f4b77
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=c875932f6a288a7b3d209cd9b2489cad
diff --git a/metadata/md5-cache/dev-ml/opam-2.1.0 b/metadata/md5-cache/dev-ml/opam-2.1.0
index 9de5d33d229e..96b7660ffa93 100644
--- a/metadata/md5-cache/dev-ml/opam-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-2.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.1.0:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f38acdff89b5a5a23348e69a9ea1ba19
diff --git a/metadata/md5-cache/dev-ml/opam-2.1.1 b/metadata/md5-cache/dev-ml/opam-2.1.1
index 033715740602..1b7b46ddde26 100644
--- a/metadata/md5-cache/dev-ml/opam-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-2.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-6.0:= dev-ml/extlib:= ~dev-ml/opam-client-2.1.1:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f38acdff89b5a5a23348e69a9ea1ba19
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.10 b/metadata/md5-cache/dev-ml/opam-client-2.0.10
index 533540d8972a..4689b5d14fe7 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.10:= ~dev-ml/opam-state-2.0.10:= ~dev-ml/opam-solver-2.0.10:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ae1dfd8cc91d42201d1f89e282af24ce
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8 b/metadata/md5-cache/dev-ml/opam-client-2.0.8
index 4bff3d10cbba..90814aac3be2 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=<dev-lang/ocaml-4.12 dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=45170d5bdd3ca766efd62fdabae07d98
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
index 4af991a69003..d7332e12a72a 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.8:= ~dev-ml/opam-state-2.0.8:= ~dev-ml/opam-solver-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=88ff55e63de2d7359f458938b695aa5a
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.0.9 b/metadata/md5-cache/dev-ml/opam-client-2.0.9
index ea1dc59b8f33..15007c6fdd17 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-client-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=opam client libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.0.9:= ~dev-ml/opam-state-2.0.9:= ~dev-ml/opam-solver-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=ae1dfd8cc91d42201d1f89e282af24ce
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=56e94173097f374b85551195aa6ad2ed
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.1.0 b/metadata/md5-cache/dev-ml/opam-client-2.1.0
index 0f6e9270b183..299cbabc6021 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-client-2.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.1.0:= ~dev-ml/opam-state-2.1.0:= ~dev-ml/opam-solver-2.1.0:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=90094a2fa5afd0fbdf34167f200661e0
diff --git a/metadata/md5-cache/dev-ml/opam-client-2.1.1 b/metadata/md5-cache/dev-ml/opam-client-2.1.1
index 2359baecd28e..9d898299199a 100644
--- a/metadata/md5-cache/dev-ml/opam-client-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-client-2.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/cmdliner:= ~dev-ml/opam-repository-2.1.1:= ~dev-ml/opam-state-2.1.1:= ~dev-ml/opam-solver-2.1.1:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=90094a2fa5afd0fbdf34167f200661e0
diff --git a/metadata/md5-cache/dev-ml/opam-core-2.0.9 b/metadata/md5-cache/dev-ml/opam-core-2.0.9
index 52772e1c841e..4014fade2872 100644
--- a/metadata/md5-cache/dev-ml/opam-core-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-core-2.0.9
@@ -4,10 +4,10 @@ DEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner
 DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/ocamlgraph:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/cmdliner:= >=dev-lang/ocaml-4:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=c7de4fd7544e630ffc9e7348a3bb1667
+_md5_=0939e8068a91da369594281285956c46
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
index 8f1ac13b0b32..944383f6c552 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
@@ -3,11 +3,11 @@ DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Parser and printer for the opam file syntax
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/opam-file-format
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.0.tar.gz -> opam-file-format-2.1.0.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=82a2e1da0399dcbe2d56d32065b8f09e
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.2 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
index a8c8cacb494f..cc07ae22d11a 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.2
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.2.tar.gz -> opam-file-format-2.1.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8a06e95711fd28a0f977865c4c83e261
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.3 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
index 62e2850b292c..86a0409bc83a 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.1.3
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.3.tar.gz -> opam-file-format-2.1.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8a06e95711fd28a0f977865c4c83e261
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.10 b/metadata/md5-cache/dev-ml/opam-format-2.0.10
index d9826f51b328..0aefd345948e 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.10
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.10:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ee08593fce3c6ed9455f9ad6b6727f58
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
index 3b144d18d8cf..c497ecd90130 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= dev-ml/dose3:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=cec5825c634b44d4cf837278cba43823
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3 b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
index a7657427d257..2b9cc4278247 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.8:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ed9b101e8ec6c95b41d81b699630d515
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.0.9 b/metadata/md5-cache/dev-ml/opam-format-2.0.9
index 3bb803be6c5a..c93393974954 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-format-2.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=Core libraries for opam
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.0.9:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=ee08593fce3c6ed9455f9ad6b6727f58
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=2b8defadb17b53b482a4eb5fc3f9df7c
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-format-2.1.0
index 0614c2e8d94a..f53f737a1654 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-format-2.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.1.0:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d909b4229c310206ef76eb7e5b0c7d87
diff --git a/metadata/md5-cache/dev-ml/opam-format-2.1.1 b/metadata/md5-cache/dev-ml/opam-format-2.1.1
index ad0006a9d86d..a1ec696e0df4 100644
--- a/metadata/md5-cache/dev-ml/opam-format-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-format-2.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-core-2.1.1:= dev-ml/re:= dev-ml/opam-file-format:= >=dev-ml/dose3-6.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d909b4229c310206ef76eb7e5b0c7d87
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.0.9 b/metadata/md5-cache/dev-ml/opam-installer-2.0.9
index c4ae96416252..2d311b76c1f8 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.0.9
@@ -4,10 +4,10 @@ DEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.9 >=dev
 DESCRIPTION=Core installer for opam packages
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.0.9 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.0.9/opam-full-2.0.9.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=03c1110e481a09853e76a104544fd1cc
+_md5_=1ef6aaa54391f69ce813d0a8ddfc7ac7
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.1.0 b/metadata/md5-cache/dev-ml/opam-installer-2.1.0
index 859c68e0a856..4f4167af95cf 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.1.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.0 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.0/opam-full-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f437bfb813bc8ca6c20273183a47040b
diff --git a/metadata/md5-cache/dev-ml/opam-installer-2.1.1 b/metadata/md5-cache/dev-ml/opam-installer-2.1.1
index 1cce51f3c813..2e246d7f278d 100644
--- a/metadata/md5-cache/dev-ml/opam-installer-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-installer-2.1.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.02.3 dev-ml/cmdliner:= ~dev-ml/opam-format-2.1.1 >=dev-ml/dose3-6 >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/releases/download/2.1.1/opam-full-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f437bfb813bc8ca6c20273183a47040b
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.10 b/metadata/md5-cache/dev-ml/opam-repository-2.0.10
index 24afe6743de2..50efc313204d 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.10
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.0.10:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opa
 RESTRICT=test
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=76585f94f8da84e5871145c067c6e4cd
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
index a21431ae3e85..1406c5b73313 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8
@@ -11,5 +11,5 @@ RDEPEND=<dev-lang/ocaml-4.12 ~dev-ml/opam-format-2.0.8:= dev-ml/re:= dev-ml/dose
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=301d3671640350b85f9b8bb0c2a475fa
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
index c1edd53bf3fd..167dae10be95 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=bb1a1f0fcf34b9af71f5dfea96c077a1
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.0.9 b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
index d491d49d8f76..0c7a6eee697a 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam repository libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.9:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam-file-format:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=76585f94f8da84e5871145c067c6e4cd
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=71e050429144afba28a41dadc89262a5
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.1.0 b/metadata/md5-cache/dev-ml/opam-repository-2.1.0
index f6bfd27a56a5..f3d01c51b156 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.1.0:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam
 RESTRICT=test
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3d5116ff1ec8f4ae855362e852a801c5
diff --git a/metadata/md5-cache/dev-ml/opam-repository-2.1.1 b/metadata/md5-cache/dev-ml/opam-repository-2.1.1
index c02007e40d05..1433b1cacec0 100644
--- a/metadata/md5-cache/dev-ml/opam-repository-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-repository-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.1.1:= dev-ml/re:= >=dev-ml/dose3-6.0:= dev-ml/opam
 RESTRICT=test
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3d5116ff1ec8f4ae855362e852a801c5
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.10 b/metadata/md5-cache/dev-ml/opam-solver-2.0.10
index 23c71949df4d..555113d20300 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.10
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.0.10:= dev-ml/opam-file-format:= dev-ml/re:= >=dev
 RESTRICT=!test? ( test )
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=081a9f2af39a1b60e3fb03eb6cbb370e
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
index cb660abac950..4bbe72b163b8 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-
 RESTRICT=!test? ( test )
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a49810dbfa95aafebb7afebbcc8ff73a
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
index 691f3ae564ba..a757bb13cdda 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.0.8:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-
 RESTRICT=!test? ( test )
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=0d306620c041b2c2a838310920552b2b
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.0.9 b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
index 6a866fddbd7c..5ea60bd9515e 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam solver
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-ml/opam-format-2.0.9:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-ml/mccs-1.1.4:= >=dev-ml/dose3-6.0:= dev-ml/cudf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=081a9f2af39a1b60e3fb03eb6cbb370e
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=87b4a6cbf57ef0eea7656cf962d88a3a
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.1.0 b/metadata/md5-cache/dev-ml/opam-solver-2.1.0
index 6538dbe60ec3..7cf0b9c74c02 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.1.0:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-
 RESTRICT=!test? ( test )
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=56009e3e85a4c0c10b03513017e22008
diff --git a/metadata/md5-cache/dev-ml/opam-solver-2.1.1 b/metadata/md5-cache/dev-ml/opam-solver-2.1.1
index a10984bb6abb..f60d9dc5fa60 100644
--- a/metadata/md5-cache/dev-ml/opam-solver-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-solver-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-ml/opam-format-2.1.1:= dev-ml/opam-file-format:= dev-ml/re:= >=dev-
 RESTRICT=!test? ( test )
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=56009e3e85a4c0c10b03513017e22008
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.10 b/metadata/md5-cache/dev-ml/opam-state-2.0.10
index f1a6a3cea917..a52cc5309c8a 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.10
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.10
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.10:= >
 RESTRICT=test
 SLOT=0/2.0.10
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.10.tar.gz -> opam-2.0.10.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2a491625c05b35c106fda78889172612
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8 b/metadata/md5-cache/dev-ml/opam-state-2.0.8
index 63dd8c143260..d0750eac3025 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8
@@ -11,5 +11,5 @@ RDEPEND=<dev-lang/ocaml-4.12 dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7499169612c073ee21e16029df4c3a2b
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1 b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
index 7bfb06012b0a..287d4c5f54dd 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.8:= >=
 RESTRICT=test
 SLOT=0/2.0.8
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.8.tar.gz -> opam-2.0.8.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c1f0061bf7111c5b1004f73d80952ed3
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.0.9 b/metadata/md5-cache/dev-ml/opam-state-2.0.9
index b06575fdfb49..20a7d84e309d 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.0.9
+++ b/metadata/md5-cache/dev-ml/opam-state-2.0.9
@@ -5,11 +5,11 @@ DESCRIPTION=opam state libraries
 EAPI=7
 HOMEPAGE=https://opam.ocaml.org/ https://github.com/ocaml/opam
 IUSE=+ocamlopt
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 arm ~arm64 ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.0.9:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=test
 SLOT=0/2.0.9
 SRC_URI=https://github.com/ocaml/opam/archive/2.0.9.tar.gz -> opam-2.0.9.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
-_md5_=2a491625c05b35c106fda78889172612
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
+_md5_=4015de51cba5acf7d3c0bc56e8718bc8
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.1.0 b/metadata/md5-cache/dev-ml/opam-state-2.1.0
index e2ef605abcc1..cddc1024aa72 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-state-2.1.0
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.1.0:= >=
 RESTRICT=test
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.0.tar.gz -> opam-2.1.0.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fffe85709b2b1fbaf0d62d51c9ba554b
diff --git a/metadata/md5-cache/dev-ml/opam-state-2.1.1 b/metadata/md5-cache/dev-ml/opam-state-2.1.1
index 46de9334ad9f..656c70e704a2 100644
--- a/metadata/md5-cache/dev-ml/opam-state-2.1.1
+++ b/metadata/md5-cache/dev-ml/opam-state-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/re:= dev-ml/opam-file-format:= ~dev-ml/opam-repository-2.1.1:= >=
 RESTRICT=test
 SLOT=0/2.1.1
 SRC_URI=https://github.com/ocaml/opam/archive/2.1.1.tar.gz -> opam-2.1.1.tar.gz https://dev.gentoo.org/~sam/distfiles/dev-ml/opam/opam-2.1.0-dose3-6.patch.xz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fffe85709b2b1fbaf0d62d51c9ba554b
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.3 b/metadata/md5-cache/dev-ml/ounit2-2.2.3
index e8aec055e56f..9b9990350b5a 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.3
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.2.3
 SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.3/ounit-v2.2.3.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=10732129e273a38695736725f2761096
diff --git a/metadata/md5-cache/dev-ml/ounit2-2.2.4 b/metadata/md5-cache/dev-ml/ounit2-2.2.4
index 24e71328c610..c6d6b1262c07 100644
--- a/metadata/md5-cache/dev-ml/ounit2-2.2.4
+++ b/metadata/md5-cache/dev-ml/ounit2-2.2.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/lwt:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.2.4
 SRC_URI=https://github.com/gildor478/ounit/releases/download/v2.2.4/ounit-v2.2.4.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fe45db68c747604d896ef80af6daf2b5
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2 b/metadata/md5-cache/dev-ml/parmap-1.2
index b953affdb061..d886cde30627 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2
+++ b/metadata/md5-cache/dev-ml/parmap-1.2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.tar.gz -> parmap-1.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1a295064f872d5b84c9c35178184b423
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.1 b/metadata/md5-cache/dev-ml/parmap-1.2.1
index 30b5f05276b6..fa3841dbc146 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.1
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.1
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.1.tar.gz -> parmap-1.2.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7a4a9adfd367aee2ff7fd50edd87b7ab
diff --git a/metadata/md5-cache/dev-ml/parmap-1.2.3 b/metadata/md5-cache/dev-ml/parmap-1.2.3
index ae05488384f0..871ba4d12fa9 100644
--- a/metadata/md5-cache/dev-ml/parmap-1.2.3
+++ b/metadata/md5-cache/dev-ml/parmap-1.2.3
@@ -10,5 +10,5 @@ LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.3
 SRC_URI=https://github.com/rdicosmo/parmap/archive/1.2.3.tar.gz -> parmap-1.2.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1a295064f872d5b84c9c35178184b423
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.0 b/metadata/md5-cache/dev-ml/parsexp-0.14.0
index d5fb0493f219..ec1ef8626a29 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.0
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.0.tar.gz -> parsexp-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2a5d4e6019ad5fb84fcc4255f77bac77
diff --git a/metadata/md5-cache/dev-ml/parsexp-0.14.1 b/metadata/md5-cache/dev-ml/parsexp-0.14.1
index 7b8a6e609e3f..b6568def174b 100644
--- a/metadata/md5-cache/dev-ml/parsexp-0.14.1
+++ b/metadata/md5-cache/dev-ml/parsexp-0.14.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/sexplib0:= dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/parsexp/archive/v0.14.1.tar.gz -> parsexp-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=95e2d84bd16ecba6ac8c840f3ee85172
diff --git a/metadata/md5-cache/dev-ml/patience_diff-0.14.0 b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
index b43370d0dbcf..8153d667664a 100644
--- a/metadata/md5-cache/dev-ml/patience_diff-0.14.0
+++ b/metadata/md5-cache/dev-ml/patience_diff-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14
 SRC_URI=https://github.com/janestreet/patience_diff/archive/v0.14.0.tar.gz -> patience_diff-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f1f5c00286b366bd86a6b4ef500a1362
diff --git a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2 b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
index 4ca66b4808ce..179f6b7fbbfc 100644
--- a/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
+++ b/metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-libs/libpcre-4.5 dev-ml/stdio:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/7.4.6
 SRC_URI=https://github.com/mmottl/pcre-ocaml/releases/download/7.4.6/pcre-7.4.6.tbz -> pcre-ocaml-7.4.6.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=5552f02bb3a62d3c73fffee1a152252e
diff --git a/metadata/md5-cache/dev-ml/pprint-20211129 b/metadata/md5-cache/dev-ml/pprint-20211129
index db77481c531f..12ce44e26f56 100644
--- a/metadata/md5-cache/dev-ml/pprint-20211129
+++ b/metadata/md5-cache/dev-ml/pprint-20211129
@@ -10,5 +10,5 @@ LICENSE=LGPL-2 LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/20211129
 SRC_URI=https://github.com/fpottier/pprint/archive/20211129.tar.gz -> pprint-20211129.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2d5f8f121cd160ffea19880b426c40cb
diff --git a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0 b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
index fcc671a34af4..1b5dded7e8f0 100644
--- a/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_assert-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_assert/archive/v0.14.0.tar.gz -> ppx_assert-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=591a2d86252872948d9eeca4182d4b00
diff --git a/metadata/md5-cache/dev-ml/ppx_base-0.14.0 b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
index aa4dc9b7183e..10f6c0de4be7 100644
--- a/metadata/md5-cache/dev-ml/ppx_base-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_base-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_cold-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_enumerate-0.14.0:= >=dev-ml/ppx_hash-0.14.0:= >=dev-ml/ppx_js_style-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_base/archive/v0.14.0.tar.gz -> ppx_base-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=247a247a14aa362a1afc06b1c54653d5
diff --git a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1 b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
index 851293bdb7b1..06ff6bdeff38 100644
--- a/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_bench-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_bench/archive/v0.14.1.tar.gz -> ppx_bench-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a0e553b69907ab178983bc8d245adbda
diff --git a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0 b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
index 1647229956ab..621a04fac697 100644
--- a/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/bin_prot-0.14.0:= >=dev
 RESTRICT=!test? ( test )
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_bin_prot/archive/v0.14.0.tar.gz -> ppx_bin_prot-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=88f799e2f066d7d92a9a7abae2620f4a
diff --git a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0 b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
index f207a0e2e442..d288c6d360b0 100644
--- a/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_cold-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_cold/archive/v0.14.0.tar.gz -> ppx_cold-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d32847e5aa14c4ca77662ba096ca0e62
diff --git a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0 b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
index fef5bb6d2050..0d5a07411740 100644
--- a/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_compare-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-m
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_compare/archive/v0.14.0.tar.gz -> ppx_compare-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b1a80c8cc404da297c71d584aba27f18
diff --git a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0 b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
index a306352c46e0..bd5271ca031f 100644
--- a/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_sexp_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_custom_printf/archive/v0.14.0.tar.gz -> ppx_custom_printf-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=69c5018ebca05c4453ce378480cf3015
diff --git a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1 b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
index b451f254f126..7a99e322ee42 100644
--- a/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
+++ b/metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.2.1
 SRC_URI=https://github.com/diml/ppx_derivers/archive/1.2.1.tar.gz -> ppx_derivers-1.2.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fea7cb45ba62e7d86385be9b8db66057
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-5.2 b/metadata/md5-cache/dev-ml/ppx_deriving-5.2
index 8e7adb156cbd..6fa1b57ecb9b 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-5.2
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-5.2
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:
 RESTRICT=!test? ( test )
 SLOT=0/5.2
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v5.2.tar.gz -> ppx_deriving-5.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1328462542636ee99d013bae80449aca
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1 b/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
index 1d68ce662b1d..4fa2af76217f 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/ppx_tools:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_derivers:
 RESTRICT=!test? ( test )
 SLOT=0/5.2.1
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving/archive/v5.2.1.tar.gz -> ppx_deriving-5.2.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d02c40a3db2df20debacb0c1eca5d386
diff --git a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1 b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
index eb0df30ca430..b5e8a2fb0906 100644
--- a/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
+++ b/metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
@@ -11,5 +11,5 @@ RDEPEND=<dev-ml/yojson-2.0.0:= >=dev-ml/ppxlib-0.20.0:= dev-ml/ppx_deriving:= de
 RESTRICT=!test? ( test )
 SLOT=0/3.6.1
 SRC_URI=https://github.com/ocaml-ppx/ppx_deriving_yojson/archive/v3.6.1.tar.gz -> ppx_deriving_yojson-3.6.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7549c77ace839b5bbb34cf6898aaa54f
diff --git a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0 b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
index b3f7aca599a4..85c2335a057a 100644
--- a/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_enumerate/archive/v0.14.0.tar.gz -> ppx_enumerate-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a1600a795d1134c23b9ca4215fca21a0
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
index cc7ec1231548..71d8746a851d 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_te
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.0.tar.gz -> ppx_expect-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c54ac2d33f3e0fba6989164d356ca0e8
diff --git a/metadata/md5-cache/dev-ml/ppx_expect-0.14.1 b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
index 480c0ed26531..554d8219652f 100644
--- a/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_expect-0.14.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_te
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_expect/archive/v0.14.1.tar.gz -> ppx_expect-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=937c008a78c3c0a0d3d91b7771476888
diff --git a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
index 93125fec1b9a..98871164aa69 100644
--- a/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fail-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fail/archive/v0.14.0.tar.gz -> ppx_fail-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=cbd7de4e980f015920cb3245d30c2573
diff --git a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
index 997afe42021c..21ddc0f169be 100644
--- a/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/fieldslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_fields_conv/archive/v0.14.1.tar.gz -> ppx_fields_conv-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=70de61263be005fc34eaa3431f240eab
diff --git a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0 b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
index 81b7d8eb4867..95522351a29f 100644
--- a/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_fixed_literal/archive/v0.14.0.tar.gz -> ppx_fixed_literal-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a0f974d696978e59d4a9d9b2806a9845
diff --git a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0 b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
index 155f33cfe4b3..f2b92346cf1b 100644
--- a/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_hash-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_compare-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_hash/archive/v0.14.0.tar.gz -> ppx_hash-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ebf039c18654bac98d2ca7cf7df161d9
diff --git a/metadata/md5-cache/dev-ml/ppx_here-0.14.0 b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
index eb501813be58..1677fa29ccb0 100644
--- a/metadata/md5-cache/dev-ml/ppx_here-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_here-0.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-m
 RESTRICT=test
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_here/archive/v0.14.0.tar.gz -> ppx_here-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1a4fe6084e2d1be4e74756ffd9eb534d
diff --git a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1 b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
index ec0439ecfb7e..ca194e1bbb59 100644
--- a/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-
 RESTRICT=test
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_inline_test/archive/v0.14.1.tar.gz -> ppx_inline_test-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6f424a7c8b7c8e59482d824ce28c95d3
diff --git a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0 b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
index b2a35c967bbc..2e757c4c4133 100644
--- a/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_jane-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base_quickcheck-0.14.0:= >=dev-ml/ppx_assert-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppx_bench-0.14.1:= >=dev-ml/ppx_bin_prot-0.14.0:= >=dev-ml/ppx_custom_printf-0.14.0:= >=dev-ml/ppx_expect-0.14.0:= >=dev-ml/ppx_fail-0.14.0:= >=dev-ml/ppx_fields_conv-0.14.1:= >=dev-ml/ppx_fixed_literal-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_inline_test-0.14.1:= >=dev-ml/ppx_let-0.14.0:= >=dev-ml/ppx_module_timer-0.14.0:= >=dev-ml/ppx_optcomp-0.14.0:= >=dev-ml/ppx_optional-0.14.0:= >=dev-ml/ppx_pipebang-0.14.0:= >=dev-ml/ppx_sexp_message-0.14.0:= >=dev-ml/ppx_sexp_value-0.14.0:= >=dev-ml/ppx_stable-0.14.1:= >=dev-ml/ppx_string-0.14.1:= >=dev-ml/ppx_typerep_conv-0.14.1:= >=dev-ml/ppx_variants_conv-0.14.1:= >=dev-ml/ppxlib-0.18.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_jane/archive/v0.14.0.tar.gz -> ppx_jane-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e9cfb9bde23db1cdaae2eafe50a61164
diff --git a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0 b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
index d0aefbbedbf4..cac5e6d8f9a2 100644
--- a/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= dev-ml/octavius:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_js_style/archive/v0.14.0.tar.gz -> ppx_js_style-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a88963ce14258637cab5837b749eaa7e
diff --git a/metadata/md5-cache/dev-ml/ppx_let-0.14.0 b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
index ded77d7f663f..38da774c82c1 100644
--- a/metadata/md5-cache/dev-ml/ppx_let-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_let-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_let/archive/v0.14.0.tar.gz -> ppx_let-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=0419f2e14e70e0516b58be2a7804412b
diff --git a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0 b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
index 8a0545ea6f89..845508766ae2 100644
--- a/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/stdio-0.14.0:= >=dev-ml/time_now-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_module_timer/archive/v0.14.0.tar.gz -> ppx_module_timer-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4eaa724d75147b4c0506681cebe08ce5
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
index 6285cbafbc75..7610706f4aec 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.0.tar.gz -> ppx_optcomp-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e52b529b2569ef93e105e4519651b994
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
index 582c5357214d..554e3262868c 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/stdio-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_optcomp/archive/v0.14.3.tar.gz -> ppx_optcomp-0.14.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a959826d291bb4b6feb0e22fa19a5495
diff --git a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0 b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
index 717ec7353f36..443a464a54ec 100644
--- a/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_optional-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppxlib:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_optional/archive/v0.14.0.tar.gz -> ppx_optional-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=38c47246367d87262117d9408fe5b245
diff --git a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0 b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
index 6c62030a3b91..c45f17e411cd 100644
--- a/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_pipebang/archive/v0.14.0.tar.gz -> ppx_pipebang-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d9c22e66d9e7b8bdcc167b487349b2e6
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
index f2422ea36d02..0a90e14ea228 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.22:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz -> ppx_sexp_conv-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ea84fe064b80adb9ec181f8eaf49a11d
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
index a51f449d9897..57a1520f3523 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.2.tar.gz -> ppx_sexp_conv-0.14.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=9211c788cef931ac9d560ef3469279d2
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3 b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
index 5f1821925d6c..713ef1a6d657 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.3
 SRC_URI=https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.3.tar.gz -> ppx_sexp_conv-0.14.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=471c127b07e954c5e4bdfec86804431b
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
index 477303c4f50c..465f80b8e15b 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= dev-ml/findlib:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_message/archive/v0.14.0.tar.gz -> ppx_sexp_message-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4e3e87b594dee9b58aaae60d5d741d2c
diff --git a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0 b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
index 2361b17db5d4..671d36dccbbd 100644
--- a/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
+++ b/metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_here-0.14.0:= >=dev-ml/ppx_sexp_conv-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/ppx_sexp_value/archive/v0.14.0.tar.gz -> ppx_sexp_value-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c00879a84cd06ba00c44271c93dae1e0
diff --git a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1 b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
index a55a02bbfd15..819fc6753dcb 100644
--- a/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_stable-0.14.1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_stable/archive/v0.14.1.tar.gz -> ppx_stable-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=275c44d0c8bc1589520ab3b82cf9c632
diff --git a/metadata/md5-cache/dev-ml/ppx_string-0.14.1 b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
index ba99a130b957..a5dd9e691500 100644
--- a/metadata/md5-cache/dev-ml/ppx_string-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_string-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/ppx_base-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-ml/stdio-0.14.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_string/archive/v0.14.1.tar.gz -> ppx_string-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=5e5f1cfaaa67f35cdeacc05bb01b3ee7
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.2 b/metadata/md5-cache/dev-ml/ppx_tools-6.2
index 1c5f5c29b529..3818febfc3c2 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.2
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/6.2
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.2.tar.gz -> ppx_tools-6.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a5c0347d627c193e5ddab70c091c5959
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.3 b/metadata/md5-cache/dev-ml/ppx_tools-6.3
index a22c322b24cf..2be4e388de42 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.3
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.3
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/6.3
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.3.tar.gz -> ppx_tools-6.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4b518b0a028c3348faf40d92e1d87802
diff --git a/metadata/md5-cache/dev-ml/ppx_tools-6.4 b/metadata/md5-cache/dev-ml/ppx_tools-6.4
index 5505f3a28174..29a75f946886 100644
--- a/metadata/md5-cache/dev-ml/ppx_tools-6.4
+++ b/metadata/md5-cache/dev-ml/ppx_tools-6.4
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/6.4
 SRC_URI=https://github.com/alainfrisch/ppx_tools/archive/6.4.tar.gz -> ppx_tools-6.4.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=14f0e16810c61b6b1702361c5784d7a2
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
index 98a0f70c9a0a..6c3d2e49da59 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.18.0:= <dev-ml/ppxlib-0.21.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.1.tar.gz -> ppx_typerep_conv-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c9dcffabce93d6e6ffe1ccec658d1e34
diff --git a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
index aa666d4926e7..1b6e36b4e0ab 100644
--- a/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/typerep-0.14.0:= >=dev-ml/ppxlib-0.22.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_typerep_conv/archive/v0.14.2.tar.gz -> ppx_typerep_conv-0.14.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f3a1688d8583953c2e081def9fedb3cc
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
index 5d243a98540d..f3c18ed4cd46 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.18.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=431c04d1d586abf2b136e41694b87bc0
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
index 0dc1d5f33a8f..bc0a36473980 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.1
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.1.tar.gz -> ppx_variants_conv-0.14.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=46e73ac53783d04668cd7ab01d9be85b
diff --git a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2 b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
index 19fd29076487..1d4622bb7ed9 100644
--- a/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
+++ b/metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.14.0:= >=dev-ml/variantslib-0.14.0:= >=dev-ml/ppxlib-0.23.0:= >=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2.0.0:= dev-ml/cinaps:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.2
 SRC_URI=https://github.com/janestreet/ppx_variants_conv/archive/v0.14.2.tar.gz -> ppx_variants_conv-0.14.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=0764c011ade79e1d2a14314b03e3f4a4
diff --git a/metadata/md5-cache/dev-ml/ppxfind-1.4 b/metadata/md5-cache/dev-ml/ppxfind-1.4
index 1cb80b0bba75..15f93c179282 100644
--- a/metadata/md5-cache/dev-ml/ppxfind-1.4
+++ b/metadata/md5-cache/dev-ml/ppxfind-1.4
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=<=dev-ml/ocaml-migrate-parsetree-1.80:= dev-ml/findlib:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.4
 SRC_URI=https://github.com/diml/ppxfind/releases/download/1.4/ppxfind-1.4.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4dc59cefd26db134a8cf705c9b6ab11e
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.18.0 b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
index 1d14c3feb570..563cedc7b15f 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.18.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.18.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.18.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.18.0.tar.gz -> ppxlib-0.18.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=12a4883a25f39116a393df23204ec97b
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
index 728f91ecf133..6872df0054bf 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.20.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.20.0.tar.gz -> ppxlib-0.20.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=eba3637de896ee07a7ed392d1ff4663b
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3 b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
index 391c3d9cf2b2..44c6b59071ba 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/findlib:= >=dev-ml/ocaml-compiler-libs-0.1
 RESTRICT=!test? ( test )
 SLOT=0/0.21.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.21.0.tar.gz -> ppxlib-0.21.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f84c21e5acdb3329ef8cb982ccb5605f
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3 b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
index 97a76ed8a780..cbe9793589af 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2
 RESTRICT=!test? ( test )
 SLOT=0/0.22.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.0.tar.gz -> ppxlib-0.22.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=df83bf17f327315e98045eb1ec948295
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2 b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
index 66f461c06c73..5c3f464db7ca 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2
 RESTRICT=!test? ( test )
 SLOT=0/0.22.2
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.22.2.tar.gz -> ppxlib-0.22.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3a4a6406d24eb11685362280911346f6
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1 b/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
index b98494194874..b2e62addd2a1 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2
 RESTRICT=!test? ( test )
 SLOT=0/0.23.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.23.0.tar.gz -> ppxlib-0.23.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b7a8bfe965b52d08f0dc05996e639d68
diff --git a/metadata/md5-cache/dev-ml/ppxlib-0.24.0 b/metadata/md5-cache/dev-ml/ppxlib-0.24.0
index 08cd46c63431..5382a7087891 100644
--- a/metadata/md5-cache/dev-ml/ppxlib-0.24.0
+++ b/metadata/md5-cache/dev-ml/ppxlib-0.24.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/ocaml-compiler-libs-0.11.0:= >=dev-ml/ocaml-migrate-parsetree-2
 RESTRICT=!test? ( test )
 SLOT=0/0.24.0
 SRC_URI=https://github.com/ocaml-ppx/ppxlib/archive/0.24.0.tar.gz -> ppxlib-0.24.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=9f8be191ec210d1e4373d60174ccd26a
diff --git a/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0 b/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
index 4831d791cdce..60e4c0c0e2a8 100644
--- a/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
+++ b/metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/protocol_version_header/archive/v0.14.0.tar.gz -> protocol_version_header-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=cbb0cb40d3ddf2da03697a5e55adf5d5
diff --git a/metadata/md5-cache/dev-ml/ptmap-2.0.5-r1 b/metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
index d3acaac38655..de2a957f0a5a 100644
--- a/metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
+++ b/metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ml/seq:= dev-ml/stdlib-shims:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.0.5
 SRC_URI=https://github.com/backtracking/ptmap/archive/2.0.5.tar.gz -> ptmap-2.0.5.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d47a3a2595c90872ac1f244fe6703e54
diff --git a/metadata/md5-cache/dev-ml/qcheck-0.18 b/metadata/md5-cache/dev-ml/qcheck-0.18
index cb4c2273b421..4d7772a905f6 100644
--- a/metadata/md5-cache/dev-ml/qcheck-0.18
+++ b/metadata/md5-cache/dev-ml/qcheck-0.18
@@ -11,5 +11,5 @@ RDEPEND=dev-ml/alcotest:= dev-ml/ounit2:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml
 RESTRICT=test
 SLOT=0/0.18
 SRC_URI=https://github.com/c-cube/qcheck/archive/v0.18.tar.gz -> qcheck-0.18.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ed6a410cf57ff148235b92ba4273d7f7
diff --git a/metadata/md5-cache/dev-ml/qtest-2.11.2 b/metadata/md5-cache/dev-ml/qtest-2.11.2
index 5769ace5e27f..70d6b66b6836 100644
--- a/metadata/md5-cache/dev-ml/qtest-2.11.2
+++ b/metadata/md5-cache/dev-ml/qtest-2.11.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-ml/ounit2:= dev-ml/qcheck:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.11.2
 SRC_URI=https://github.com/vincent-hugot/qtest/archive/v2.11.2.tar.gz -> qtest-2.11.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=c11a4415bbe972e3f50084377eff54b6
diff --git a/metadata/md5-cache/dev-ml/re-1.10.3 b/metadata/md5-cache/dev-ml/re-1.10.3
index 3c4c68349bd3..e9cf4ea908c7 100644
--- a/metadata/md5-cache/dev-ml/re-1.10.3
+++ b/metadata/md5-cache/dev-ml/re-1.10.3
@@ -11,5 +11,5 @@ RDEPEND=!dev-ml/ocaml-re dev-ml/seq:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dun
 RESTRICT=!test? ( test )
 SLOT=0/1.10.3
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.10.3.tar.gz -> ocaml-re-1.10.3.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a57de6bd9f55dc2c44b3abb436a4480b
diff --git a/metadata/md5-cache/dev-ml/re-1.9.0 b/metadata/md5-cache/dev-ml/re-1.9.0
index b8fbd770eb93..59232cffd345 100644
--- a/metadata/md5-cache/dev-ml/re-1.9.0
+++ b/metadata/md5-cache/dev-ml/re-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=!dev-ml/ocaml-re dev-ml/seq:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dun
 RESTRICT=!test? ( test )
 SLOT=0/1.9.0
 SRC_URI=https://github.com/ocaml/ocaml-re/archive/1.9.0.tar.gz -> ocaml-re-1.9.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3e9bd73e8212ee5454440ed50c8b4821
diff --git a/metadata/md5-cache/dev-ml/reason-3.7.0-r1 b/metadata/md5-cache/dev-ml/reason-3.7.0-r1
index d2c3ea825e8c..222b3ccc9eec 100644
--- a/metadata/md5-cache/dev-ml/reason-3.7.0-r1
+++ b/metadata/md5-cache/dev-ml/reason-3.7.0-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/fix:= dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/ocaml-migrate-parsetree:= dev-ml/result:= dev-ml/utop:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.7.0
 SRC_URI=https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.7.0.tgz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=11bf6bb375bf09de7cf0d7127d10f247
diff --git a/metadata/md5-cache/dev-ml/result-1.5 b/metadata/md5-cache/dev-ml/result-1.5
index 05f7b7424c23..0f5b3b861d1d 100644
--- a/metadata/md5-cache/dev-ml/result-1.5
+++ b/metadata/md5-cache/dev-ml/result-1.5
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.5
 SRC_URI=https://github.com/janestreet/result/archive/1.5.tar.gz -> result-1.5.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1ca06e8fecb78cf4dc99b4440b38cf7e
diff --git a/metadata/md5-cache/dev-ml/sedlex-2.3-r1 b/metadata/md5-cache/dev-ml/sedlex-2.3-r1
index c41e23f60982..b8173d5fd42a 100644
--- a/metadata/md5-cache/dev-ml/sedlex-2.3-r1
+++ b/metadata/md5-cache/dev-ml/sedlex-2.3-r1
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/gen:= dev-ml/ppxlib:= dev-ml/uchar:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.3
 SRC_URI=https://github.com/ocaml-community/sedlex/archive/v2.3.tar.gz -> sedlex-2.3.tar.gz https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt -> sedlex-2.3-DerivedCoreProperties.txt https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt -> sedlex-2.3-DerivedGeneralCategory.txt https://www.unicode.org/Public/12.1.0/ucd/PropList.txt -> sedlex-2.3-PropList.txt
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d9c3f3bc9737df0b0c63ad916ad0a8ba
diff --git a/metadata/md5-cache/dev-ml/seq-0.2 b/metadata/md5-cache/dev-ml/seq-0.2
index deca7ba68246..2650d5d04a6a 100644
--- a/metadata/md5-cache/dev-ml/seq-0.2
+++ b/metadata/md5-cache/dev-ml/seq-0.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.2.tar.gz -> seq-0.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ac63e83e51514cb2b0c9ff37a61ba861
diff --git a/metadata/md5-cache/dev-ml/seq-0.2.2 b/metadata/md5-cache/dev-ml/seq-0.2.2
index 47b6396e6d82..88f088161a47 100644
--- a/metadata/md5-cache/dev-ml/seq-0.2.2
+++ b/metadata/md5-cache/dev-ml/seq-0.2.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/c-cube/seq/archive/0.2.2.tar.gz -> seq-0.2.2.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=ac63e83e51514cb2b0c9ff37a61ba861
diff --git a/metadata/md5-cache/dev-ml/sexplib-0.14.0 b/metadata/md5-cache/dev-ml/sexplib-0.14.0
index 1558e990c614..51a09ce01819 100644
--- a/metadata/md5-cache/dev-ml/sexplib-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/parsexp:= dev-ml/base:= dev-ml/sexplib0:= dev-ml/num:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib/archive/v0.14.0.tar.gz -> sexplib-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=f39d6232fb3dba5ce9fd8d3261bdc6a9
diff --git a/metadata/md5-cache/dev-ml/sexplib0-0.14.0 b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
index 524bed1a3153..5abbf04f02ea 100644
--- a/metadata/md5-cache/dev-ml/sexplib0-0.14.0
+++ b/metadata/md5-cache/dev-ml/sexplib0-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/sexplib0/archive/v0.14.0.tar.gz -> sexplib0-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=4f949c62c1283787d6ef8d1f1d170617
diff --git a/metadata/md5-cache/dev-ml/spawn-0.13.0 b/metadata/md5-cache/dev-ml/spawn-0.13.0
index 6e9bc6c6d4c9..cc4c2f0afb0a 100644
--- a/metadata/md5-cache/dev-ml/spawn-0.13.0
+++ b/metadata/md5-cache/dev-ml/spawn-0.13.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.13.0
 SRC_URI=https://github.com/janestreet/spawn/archive/v0.13.0.tar.gz -> spawn-0.13.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3c27b9b3c7836560a6ff542c0daaa41c
diff --git a/metadata/md5-cache/dev-ml/splittable_random-0.14.0 b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
index b6213f226c8b..00fad82bab01 100644
--- a/metadata/md5-cache/dev-ml/splittable_random-0.14.0
+++ b/metadata/md5-cache/dev-ml/splittable_random-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= dev-ml/ppx_assert:= dev-ml/ppx_bench:= dev-ml/ppx_inline_test:= dev-ml/ppx_sexp_message:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/splittable_random/archive/v0.14.0.tar.gz -> splittable_random-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b2a3629266290777bc8f7c5bd39cd6f5
diff --git a/metadata/md5-cache/dev-ml/stdio-0.14.0 b/metadata/md5-cache/dev-ml/stdio-0.14.0
index 35b133c479f6..0bf431a9ea31 100644
--- a/metadata/md5-cache/dev-ml/stdio-0.14.0
+++ b/metadata/md5-cache/dev-ml/stdio-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/base-0.11.0:= dev-ml/sexplib0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/stdio/archive/v0.14.0.tar.gz -> stdio-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=fc87acd942b4d1b7023c6fd4f3c2e8b1
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
index 8709cd04f32b..02652bf38c82 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.2.0/stdlib-shims-0.2.0.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=3902f651e22e7d18d4a6b820a4eb219e
diff --git a/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0 b/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
index ad12623f9dac..6b5f4cabe287 100644
--- a/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
+++ b/metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=db4f94f10df20f253c2e8739cec3ace8
diff --git a/metadata/md5-cache/dev-ml/textutils-0.14.0 b/metadata/md5-cache/dev-ml/textutils-0.14.0
index a569dffa917a..a8879a7ea05d 100644
--- a/metadata/md5-cache/dev-ml/textutils-0.14.0
+++ b/metadata/md5-cache/dev-ml/textutils-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core:= dev-ml/core_kernel:= dev-ml/ppx_jane:= dev-ml/uutf:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/textutils/archive/v0.14.0.tar.gz -> textutils-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d18121a704e280b59b196893341209d2
diff --git a/metadata/md5-cache/dev-ml/time_now-0.14.0 b/metadata/md5-cache/dev-ml/time_now-0.14.0
index 35d1e2a5ae3e..6bedca5edcb9 100644
--- a/metadata/md5-cache/dev-ml/time_now-0.14.0
+++ b/metadata/md5-cache/dev-ml/time_now-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/base:= dev-ml/jane-street-headers:= dev-ml/jst-config:= dev-ml/ppx_base:= dev-ml/ppx_optcomp:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/time_now/archive/v0.14.0.tar.gz -> time_now-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=6780d7d8a0d3e403af5af3c845f0872e
diff --git a/metadata/md5-cache/dev-ml/timezone-0.14.0 b/metadata/md5-cache/dev-ml/timezone-0.14.0
index 59a103d94a2a..23026120af24 100644
--- a/metadata/md5-cache/dev-ml/timezone-0.14.0
+++ b/metadata/md5-cache/dev-ml/timezone-0.14.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-ml/core_kernel:= dev-ml/ppx_jane:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/timezone/archive/v0.14.0.tar.gz -> timezone-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=57fdee2208259bf8f4c66f316bc12aa1
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.3 b/metadata/md5-cache/dev-ml/topkg-1.0.3
index 33ee84bec313..fa41503ba7f1 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.3
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -3,11 +3,11 @@ DEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=[oca
 DESCRIPTION=The transitory OCaml software packager
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.3
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.3.tar.gz -> topkg-1.0.3.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=5c2e2141a0c531da7d626b264ce89f77
diff --git a/metadata/md5-cache/dev-ml/trie-1.0.0 b/metadata/md5-cache/dev-ml/trie-1.0.0
index 999e835653ab..a66f6da2c5f7 100644
--- a/metadata/md5-cache/dev-ml/trie-1.0.0
+++ b/metadata/md5-cache/dev-ml/trie-1.0.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.0.0
 SRC_URI=https://github.com/kandu/trie/archive/1.0.0.tar.gz -> trie-1.0.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=e6697aad0709106a3537b4074acb691d
diff --git a/metadata/md5-cache/dev-ml/typerep-0.14.0 b/metadata/md5-cache/dev-ml/typerep-0.14.0
index c8b33d68fbfa..08c78a49bf3c 100644
--- a/metadata/md5-cache/dev-ml/typerep-0.14.0
+++ b/metadata/md5-cache/dev-ml/typerep-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/typerep/archive/v0.14.0.tar.gz -> typerep-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=374bd75dfe307083945d4fa24aff443c
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 21c8a383bd69..ed00a81ea54f 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.03:= dev-ml/ocamlbuild >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.03:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6b1a445737154f460460acfec1dad23d
diff --git a/metadata/md5-cache/dev-ml/unidecode-0.4.0 b/metadata/md5-cache/dev-ml/unidecode-0.4.0
index 6a08b1ab8b0c..73161d2aef0d 100644
--- a/metadata/md5-cache/dev-ml/unidecode-0.4.0
+++ b/metadata/md5-cache/dev-ml/unidecode-0.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/geneweb/unidecode/archive/v0.4.0.tar.gz -> unidecode-0.4.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=2e82a7b47fa8eab09da9a045061a9487
diff --git a/metadata/md5-cache/dev-ml/utop-2.8.0 b/metadata/md5-cache/dev-ml/utop-2.8.0
index 8add6c69d6e9..5405054145bd 100644
--- a/metadata/md5-cache/dev-ml/utop-2.8.0
+++ b/metadata/md5-cache/dev-ml/utop-2.8.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/camomile:= dev-ml/lambda-term:= dev-ml/lwt:= dev-ml/react:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.8.0
 SRC_URI=https://github.com/ocaml-community/utop/archive/2.8.0.tar.gz -> utop-2.8.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d70bc801b346de5aead856ca5ad646f9
diff --git a/metadata/md5-cache/dev-ml/utop-2.9.0 b/metadata/md5-cache/dev-ml/utop-2.9.0
index 43e2d00d6719..996ddd344e04 100644
--- a/metadata/md5-cache/dev-ml/utop-2.9.0
+++ b/metadata/md5-cache/dev-ml/utop-2.9.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/camomile:= dev-ml/lambda-term:= dev-ml/lwt:= dev-ml/react:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.9.0
 SRC_URI=https://github.com/ocaml-community/utop/archive/2.9.0.tar.gz -> utop-2.9.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=d70bc801b346de5aead856ca5ad646f9
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index 97d69cf0da72..ebe0848f1e9e 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdli
 DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
-IUSE=doc utftrip +ocamlopt test ocamlopt
+IUSE=doc utftrip +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
@@ -11,5 +11,5 @@ REQUIRED_USE=utftrip? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b72a59ff745e53a497a6f6fae92b0469
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.2 b/metadata/md5-cache/dev-ml/uutf-1.0.2
index 5b808f270a2b..333ac458224e 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.2
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.2
@@ -3,7 +3,7 @@ DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdli
 DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
-IUSE=doc utftrip +ocamlopt test ocamlopt
+IUSE=doc utftrip +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
@@ -11,5 +11,5 @@ REQUIRED_USE=utftrip? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b72a59ff745e53a497a6f6fae92b0469
diff --git a/metadata/md5-cache/dev-ml/variantslib-0.14.0 b/metadata/md5-cache/dev-ml/variantslib-0.14.0
index 7178ea090d56..8c54d201bc77 100644
--- a/metadata/md5-cache/dev-ml/variantslib-0.14.0
+++ b/metadata/md5-cache/dev-ml/variantslib-0.14.0
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ml/base:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/0.14.0
 SRC_URI=https://github.com/janestreet/variantslib/archive/v0.14.0.tar.gz -> variantslib-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=8cc69d261be9892a13c4c4c9f3066ac3
diff --git a/metadata/md5-cache/dev-ml/yojson-1.7.0 b/metadata/md5-cache/dev-ml/yojson-1.7.0
index 60210d51baec..4d2051a50154 100644
--- a/metadata/md5-cache/dev-ml/yojson-1.7.0
+++ b/metadata/md5-cache/dev-ml/yojson-1.7.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt=] dev-ml/easy-format:=[ocamlopt=] >=d
 RESTRICT=!test? ( test )
 SLOT=0/1.7.0
 SRC_URI=https://github.com/ocaml-community/yojson/archive/1.7.0.tar.gz -> yojson-1.7.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=b5ee693f8b0511151203aaff0757e6f9
diff --git a/metadata/md5-cache/dev-ml/zarith-1.12 b/metadata/md5-cache/dev-ml/zarith-1.12
index 6583e859cdf9..db9cb1a913db 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.12
+++ b/metadata/md5-cache/dev-ml/zarith-1.12
@@ -3,12 +3,12 @@ DEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci
 DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/Zarith
-IUSE=doc mpir +ocamlopt ocamlopt
+IUSE=doc mpir +ocamlopt +ocamlopt
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!ocamlopt? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.12.tar.gz -> zarith-1.12.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a4672134fbe68fac82721e2bfa897538
diff --git a/metadata/md5-cache/dev-ml/zed-3.1.0 b/metadata/md5-cache/dev-ml/zed-3.1.0
index 6375dd73e9e1..895ca1c15062 100644
--- a/metadata/md5-cache/dev-ml/zed-3.1.0
+++ b/metadata/md5-cache/dev-ml/zed-3.1.0
@@ -10,5 +10,5 @@ LICENSE=BSD
 RDEPEND=dev-ml/camomile:= dev-ml/charinfo_width:= dev-ml/react:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.1.0
 SRC_URI=https://github.com/ocaml-community/zed/archive/3.1.0.tar.gz -> zed-3.1.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=1520cbdd1ba796c12c2c66d8997a499d
diff --git a/metadata/md5-cache/dev-perl/FCGI-0.820.0 b/metadata/md5-cache/dev-perl/FCGI-0.820.0
index aeb274993dd7..e1bf49bdc57b 100644
--- a/metadata/md5-cache/dev-perl/FCGI-0.820.0
+++ b/metadata/md5-cache/dev-perl/FCGI-0.820.0
@@ -5,11 +5,11 @@ DESCRIPTION=Fast CGI module
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/FCGI
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=FastCGI
 RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.82.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=bee735a7f2eac1821e80451cd39ff392
+_md5_=80a52d8e1068dd85b0445a69de7fc5b5
diff --git a/metadata/md5-cache/dev-perl/FCGI-Client-0.90.0 b/metadata/md5-cache/dev-perl/FCGI-Client-0.90.0
index f497ea1050d6..bcc75ed92343 100644
--- a/metadata/md5-cache/dev-perl/FCGI-Client-0.90.0
+++ b/metadata/md5-cache/dev-perl/FCGI-Client-0.90.0
@@ -5,11 +5,11 @@ DESCRIPTION=Client library for fastcgi protocol
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/FCGI-Client
 IUSE=test
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-IO dev-perl/Moo dev-perl/Type-Tiny dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=5f91aa971dc488df79007af30560b2e3
+_md5_=ccab6a8eeb7bdeb07e6b5a80957ab61a
diff --git a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1 b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1
index 2c94311abddf..ddf20a03d81d 100644
--- a/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1
+++ b/metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Object Oriented Authentication-Results Headers
 EAPI=8
 HOMEPAGE=https://metacpan.org/release/Mail-AuthenticationResults
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp dev-perl/Clone dev-perl/JSON virtual/perl-Scalar-List-Utils dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-2.20210915.tar.gz
 _eclasses_=multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1
-_md5_=6b13ffecbfada5794b6b79a2ae456dc1
+_md5_=b053730e9b2d189157a18814cf8be4cd
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 2d8b48ba15fa..f9d2ec05f7d5 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.26 b/metadata/md5-cache/dev-python/GitPython-3.1.26
new file mode 100644
index 000000000000..7a373f6cb101
--- /dev/null
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.26
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library used to interact with Git repositories
+EAPI=8
+HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/G/GitPython/GitPython-3.1.26.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.26.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.9.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-5.0.0.gitbundle )
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=f5f654a354a562eaf9948e793300eb12
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index eba11b640d8a..cdd7e91c9c09 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-21.2.0 b/metadata/md5-cache/dev-python/argon2-cffi-21.2.0
index 96e197c88683..5eed229a2bf5 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-21.2.0
+++ b/metadata/md5-cache/dev-python/argon2-cffi-21.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=CFFI bindings to the Argon2 password hashing library
 EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/argon2-cffi-bindings-21.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2-cffi/argon2-cffi-21.2.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=73a2cf917c4c115e9af885e688111275
+_md5_=4ffa182c208131f2f2391cce2d0b46c3
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0 b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
index 7f750d0a3919..e8b18c33da6c 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
+++ b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
@@ -5,7 +5,7 @@ DESCRIPTION=Low-level CFFI bindings for the Argon2 password hashing library
 EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi-bindings
 IUSE=cpu_flags_x86_sse2 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=app-crypt/argon2:= virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ee1ab7c14b706767d0b5c2a27b7dc9db
+_md5_=cf1473fa0441c4a186dc12f7bae00352
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.56.4 b/metadata/md5-cache/dev-python/cfn-lint-0.56.4
new file mode 100644
index 000000000000..fdd6488ae76f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.56.4
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-sam-translator-1.42.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=CloudFormation Linter
+EAPI=8
+HOMEPAGE=https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.42.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.56.4.tar.gz -> cfn-lint-0.56.4.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=8ae4cccabae87e0bae3c7b3c83a2299f
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.6 b/metadata/md5-cache/dev-python/css-parser-1.0.6
deleted file mode 100644
index 3ab56cb1e6f5..000000000000
--- a/metadata/md5-cache/dev-python/css-parser-1.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A CSS Cascading Style Sheets library (fork of cssutils)
-EAPI=7
-HOMEPAGE=https://pypi.org/project/css-parser/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.6.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d479c569fc28c405dd1db6cf5f31d7bb
diff --git a/metadata/md5-cache/dev-python/css-parser-1.0.7 b/metadata/md5-cache/dev-python/css-parser-1.0.7
index 3d6d0784de56..d5eb6139a7fc 100644
--- a/metadata/md5-cache/dev-python/css-parser-1.0.7
+++ b/metadata/md5-cache/dev-python/css-parser-1.0.7
@@ -4,7 +4,7 @@ DESCRIPTION=A CSS Cascading Style Sheets library (fork of cssutils)
 EAPI=8
 HOMEPAGE=https://pypi.org/project/css-parser/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/css-parser/css-parser-1.0.7.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=56de2bf14bc04722f025eef81d73adfb
+_md5_=5a2095de57735496ca1cada8cc133425
diff --git a/metadata/md5-cache/dev-python/docutils-0.18 b/metadata/md5-cache/dev-python/docutils-0.18
deleted file mode 100644
index ab081d9b7044..000000000000
--- a/metadata/md5-cache/dev-python/docutils-0.18
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python Documentation Utilities
-EAPI=8
-HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
-LICENSE=BSD-2 GPL-3 public-domain
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/d/docutils/docutils-0.18.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f1d6abf68daea74fa15a188d3d58db23
diff --git a/metadata/md5-cache/dev-python/docutils-0.18.1 b/metadata/md5-cache/dev-python/docutils-0.18.1
index 154f67eaed8d..db5612129161 100644
--- a/metadata/md5-cache/dev-python/docutils-0.18.1
+++ b/metadata/md5-cache/dev-python/docutils-0.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python Documentation Utilities
 EAPI=8
 HOMEPAGE=https://docutils.sourceforge.io/ https://pypi.org/project/docutils/
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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
 LICENSE=BSD-2 GPL-3 public-domain
 RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/docutils/docutils-0.18.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=18fe3e11b36c5ae4659d641f885fea8c
+_md5_=9c3f1e56de4a4e125deaf063f5f585c2
diff --git a/metadata/md5-cache/dev-python/enrich-1.2.7 b/metadata/md5-cache/dev-python/enrich-1.2.7
new file mode 100644
index 000000000000..b344189b4e03
--- /dev/null
+++ b/metadata/md5-cache/dev-python/enrich-1.2.7
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/rich[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extend rich functionality
+EAPI=8
+HOMEPAGE=https://github.com/pycontribs/enrich
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=dev-python/rich[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/e/enrich/enrich-1.2.7.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0141862e1de3097088183399de50cb85
diff --git a/metadata/md5-cache/dev-python/fido2-0.9.3 b/metadata/md5-cache/dev-python/fido2-0.9.3
index bf96ed33e824..ff92be740372 100644
--- a/metadata/md5-cache/dev-python/fido2-0.9.3
+++ b/metadata/md5-cache/dev-python/fido2-0.9.3
@@ -5,7 +5,7 @@ DESCRIPTION=Python based FIDO 2.0 library
 EAPI=7
 HOMEPAGE=https://github.com/Yubico/python-fido2
 IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=Apache-2.0 BSD-2 MIT MPL-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyscard[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] examples? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0/0.9
 SRC_URI=https://github.com/Yubico/python-fido2/releases/download/0.9.3/fido2-0.9.3.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d5d4728039fc35173e901d9a376c5516
+_md5_=4179df710074f002f581bbd7cbba77e1
diff --git a/metadata/md5-cache/dev-python/furo-2021.10.9 b/metadata/md5-cache/dev-python/furo-2021.10.9
index 242d9d6cd3f2..5ccbd2c126d6 100644
--- a/metadata/md5-cache/dev-python/furo-2021.10.9
+++ b/metadata/md5-cache/dev-python/furo-2021.10.9
@@ -4,11 +4,11 @@ DESCRIPTION=Clean customisable Sphinx documentation theme
 EAPI=8
 HOMEPAGE=https://pypi.org/project/furo/ https://github.com/pradyunsg/furo
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/f/furo/furo-2021.10.9.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=89b671804965ebeb10973def9e0f23cb
+_md5_=58d9c704723f1970f90b83207eb56a3d
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.0.5 b/metadata/md5-cache/dev-python/mkdocs-material-8.0.5
deleted file mode 100644
index 3a9ff1a32c63..000000000000
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/mkdocs-redirects[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A Material Design theme for MkDocs
-EAPI=8
-HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pymdown-extensions-9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.0.5.tar.gz -> mkdocs-material-8.0.5.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0e4aeba32e0d39ce92ba1c461986b48b
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-8.1.0 b/metadata/md5-cache/dev-python/mkdocs-material-8.1.0
index ef89dba8caf9..53e8bba3a42d 100644
--- a/metadata/md5-cache/dev-python/mkdocs-material-8.1.0
+++ b/metadata/md5-cache/dev-python/mkdocs-material-8.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Material Design theme for MkDocs
 EAPI=8
 HOMEPAGE=https://github.com/squidfunk/mkdocs-material https://pypi.org/project/mkdocs-material
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/jinja-2.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/markdown-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pymdown-extensions-9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mkdocs-material-extensions-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/8.1.0.tar.gz -> mkdocs-material-8.1.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d5f4b27e4a9bd77db7ca50510bc8689c
+_md5_=0e4aeba32e0d39ce92ba1c461986b48b
diff --git a/metadata/md5-cache/dev-python/natsort-7.2.0 b/metadata/md5-cache/dev-python/natsort-7.2.0
deleted file mode 100644
index 2ce9682e2892..000000000000
--- a/metadata/md5-cache/dev-python/natsort-7.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Natural sorting for Python
-EAPI=8
-HOMEPAGE=https://pypi.org/project/natsort/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/natsort/natsort-7.2.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=bb66e5c90b27fea6f5c8d39a07f7c670
diff --git a/metadata/md5-cache/dev-python/natsort-8.0.1 b/metadata/md5-cache/dev-python/natsort-8.0.1
index 4570a925a6f2..458bc52c74c6 100644
--- a/metadata/md5-cache/dev-python/natsort-8.0.1
+++ b/metadata/md5-cache/dev-python/natsort-8.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Natural sorting for Python
 EAPI=8
 HOMEPAGE=https://pypi.org/project/natsort/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/natsort/natsort-8.0.1.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a59c7968e3b9ba0326f6aff95a8151c5
+_md5_=fb1dcab618f81d3d7ef797966b77600a
diff --git a/metadata/md5-cache/dev-python/pillow-9.0.0 b/metadata/md5-cache/dev-python/pillow-9.0.0
index 0e948121f0b6..82a3457ec0f2 100644
--- a/metadata/md5-cache/dev-python/pillow-9.0.0
+++ b/metadata/md5-cache/dev-python/pillow-9.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=8
 HOMEPAGE=https://python-pillow.org/
 IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=HPND
 RDEPEND=imagequant? ( media-gfx/libimagequant:0 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:0= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[tk?,threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[tk?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[tk?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[tk?,threads(+)] )
 REQUIRED_USE=test? ( jpeg jpeg2k tiff truetype ) || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/python-pillow/Pillow/archive/9.0.0.tar.gz -> pillow-9.0.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c
-_md5_=98a81fdf18d366e6b2792a30105034c6
+_md5_=17382083f90c55d1fe412ba042b0de2b
diff --git a/metadata/md5-cache/dev-python/pycountry-22.1.10 b/metadata/md5-cache/dev-python/pycountry-22.1.10
new file mode 100644
index 000000000000..69e727f223b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycountry-22.1.10
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Database of countries, subdivisions, languages, currencies and script
+EAPI=8
+HOMEPAGE=https://github.com/flyingcircusio/pycountry
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~ia64 ~ppc ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pycountry/pycountry-22.1.10.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=84f6423d58c82680e5de922033c432a7
diff --git a/metadata/md5-cache/dev-python/pylama-8.3.7 b/metadata/md5-cache/dev-python/pylama-8.3.7
new file mode 100644
index 000000000000..827f9890c076
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pylama-8.3.7
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/eradicate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pylint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/radon[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/mccabe-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydocstyle-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Code audit tool for python
+EAPI=8
+HOMEPAGE=https://github.com/klen/pylama
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mccabe-0.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pycodestyle-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pydocstyle-6.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyflakes-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/klen/pylama/archive/8.3.7.tar.gz -> pylama-8.3.7.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1b76d82286d88fb2b1889f1b467c10ab
diff --git a/metadata/md5-cache/dev-python/pyscard-2.0.2 b/metadata/md5-cache/dev-python/pyscard-2.0.2
index 00d8f8d81a72..35cd9b8c531a 100644
--- a/metadata/md5-cache/dev-python/pyscard-2.0.2
+++ b/metadata/md5-cache/dev-python/pyscard-2.0.2
@@ -5,7 +5,7 @@ DESCRIPTION=Smart card support in python
 EAPI=8
 HOMEPAGE=https://pyscard.sourceforge.io/ https://github.com/LudovicRousseau/pyscard https://pypi.org/project/pyscard/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/pcsc-lite python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyscard/pyscard-2.0.2.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a0281be588b069a54281198e63727cb7
+_md5_=f6b7e62e5ad88c26187835414fbd663d
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
deleted file mode 100644
index 1377241d15d4..000000000000
--- a/metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-3.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=run tests in isolated forked subprocesses
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.3.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=88aa19e492c270fe0cb7dc058c4cbd5d
diff --git a/metadata/md5-cache/dev-python/pytest-forked-1.4.0 b/metadata/md5-cache/dev-python/pytest-forked-1.4.0
index a22c5a6b8a3a..64f050cfc75c 100644
--- a/metadata/md5-cache/dev-python/pytest-forked-1.4.0
+++ b/metadata/md5-cache/dev-python/pytest-forked-1.4.0
@@ -4,7 +4,7 @@ DESCRIPTION=run tests in isolated forked subprocesses
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-forked/ https://github.com/pytest-dev/pytest-forked
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/py[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-forked/pytest-forked-1.4.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6747370e82cb5fbfd657ee44a7c36658
+_md5_=4e937d449b35f771dc39cae214c21494
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.4.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.4.0
deleted file mode 100644
index 9aa67354aa4a..000000000000
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Distributed testing and loop-on-failing modes
-EAPI=7
-HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.4.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1cb67dedff2ea9fb16578f066075869d
diff --git a/metadata/md5-cache/dev-python/pytest-xdist-2.5.0 b/metadata/md5-cache/dev-python/pytest-xdist-2.5.0
index ed9cf9325226..2e58417008c2 100644
--- a/metadata/md5-cache/dev-python/pytest-xdist-2.5.0
+++ b/metadata/md5-cache/dev-python/pytest-xdist-2.5.0
@@ -4,7 +4,7 @@ DESCRIPTION=Distributed testing and loop-on-failing modes
 EAPI=7
 HOMEPAGE=https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-xdist/pytest-xdist-2.5.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=34833ba9214b413b79d4f7efa963fd10
+_md5_=72cb408fbb53c96133738a1ff2ad91ec
diff --git a/metadata/md5-cache/dev-python/readme_renderer-30.0 b/metadata/md5-cache/dev-python/readme_renderer-30.0
deleted file mode 100644
index a1e0b9f90535..000000000000
--- a/metadata/md5-cache/dev-python/readme_renderer-30.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
-EAPI=8
-HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-30.0.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cd1f7f169d4b3a8bc59e9e0c9c37896c
diff --git a/metadata/md5-cache/dev-python/readme_renderer-31.0 b/metadata/md5-cache/dev-python/readme_renderer-31.0
index 7a799e53eb83..cb3fe6e561ee 100644
--- a/metadata/md5-cache/dev-python/readme_renderer-31.0
+++ b/metadata/md5-cache/dev-python/readme_renderer-31.0
@@ -4,7 +4,7 @@ DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
 EAPI=8
 HOMEPAGE=https://github.com/pypa/readme_renderer https://pypi.org/project/readme-renderer/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-31.0.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4809dbd457e4373e68c939bde0c441f2
+_md5_=7763775b81a76a074006d11fd4f4539e
diff --git a/metadata/md5-cache/dev-python/responses-0.17.0 b/metadata/md5-cache/dev-python/responses-0.17.0
new file mode 100644
index 000000000000..96a1ba3b24ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.17.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=8
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/responses/responses-0.17.0.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=72cff9b2dd3dbc4795e646f1cbbb1542
diff --git a/metadata/md5-cache/dev-python/rq-1.10.1-r1 b/metadata/md5-cache/dev-python/rq-1.10.1-r1
new file mode 100644
index 000000000000..d69edf2b72d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rq-1.10.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-db/redis dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sentry-sdk[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=simple, lightweight library for creating and processing background jobs
+EAPI=8
+HOMEPAGE=https://python-rq.org https://github.com/rq/rq
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/click-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/rq/rq/archive/v1.10.1.tar.gz -> rq-1.10.1.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=2d82330e4354b5dc54d1b84c840576d1
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.5.2 b/metadata/md5-cache/dev-python/sentry-sdk-1.5.2
new file mode 100644
index 000000000000..64617cfa9921
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.5.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/asttokens[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/executing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/fakeredis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-login[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gevent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyrsistent[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-django[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/eventlet[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) ) test? ( dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python client for Sentry
+EAPI=8
+HOMEPAGE=https://sentry.io/ https://pypi.org/project/sentry-sdk/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/certifi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getsentry/sentry-python/archive/1.5.2.tar.gz -> sentry-sdk-1.5.2.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=bd1f544621be223c342acbee358af4c1
diff --git a/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.15.1 b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.15.1
new file mode 100644
index 000000000000..ef38dee9c19c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.15.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/sphobjinv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/sphinx-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Type hints support for the Sphinx autodoc extension
+EAPI=8
+HOMEPAGE=https://github.com/tox-dev/sphinx-autodoc-typehints/ https://pypi.org/project/sphinx-autodoc-typehints/
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sphinx-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/sphinx-autodoc-typehints/archive/1.15.1.tar.gz -> sphinx-autodoc-typehints-1.15.1.gh.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=7078f7d70a7040fb772b02cd89ef9d5d
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
index 43fbabb9b5d6..261cace24db8 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
@@ -4,7 +4,7 @@ DESCRIPTION=Create a custom 404 page with absolute URLs hardcoded
 EAPI=7
 HOMEPAGE=https://sphinx-notfound-page.readthedocs.io/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/readthedocs/sphinx-notfound-page/archive/0.7.1.tar.gz -> sphinx-notfound-page-0.7.1.gh.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=f5efa86fb6566ca11c87e94274c4c6b7
+_md5_=77c54f4bc6e3cdd107415530a7b010b4
diff --git a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8 b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8
index 2ed732a3d935..70114fac7d31 100644
--- a/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8
+++ b/metadata/md5-cache/dev-python/sphinx-notfound-page-0.8
@@ -4,7 +4,7 @@ DESCRIPTION=Create a custom 404 page with absolute URLs hardcoded
 EAPI=8
 HOMEPAGE=https://sphinx-notfound-page.readthedocs.io/
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/readthedocs/sphinx-notfound-page/archive/0.8.tar.gz -> sphinx-notfound-page-0.8.gh.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=12b898f2a24a3f288d35850a130e0ec6
+_md5_=5baa90b4a618c5e3ca14c2b7e9a50915
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.4.28 b/metadata/md5-cache/dev-python/sqlalchemy-1.4.28
index 43abfcfa4281..947a903ae1ac 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.4.28
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.4.28
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[sqlite?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.4.28.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=97254a9b2962831b75c6c79f7b6ae3e4
+_md5_=36afe81d1ebfad8a383943aeb3794e6c
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.2 b/metadata/md5-cache/dev-python/wcmatch-8.2
deleted file mode 100644
index edbedf09c01f..000000000000
--- a/metadata/md5-cache/dev-python/wcmatch-8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.2.5-r2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/mkdocs[python_targets_python3_10(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/mkdocs[python_targets_python3_9(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/mkdocs[python_targets_python3_8(-)] ~dev-python/mkdocs_pymdownx_material_extras-1.0.7[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Wildcard/glob file name matcher
-EAPI=7
-HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=amd64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.2.tar.gz -> wcmatch-8.2.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	docs	7c38d94fa7c1b4235fe571dc09e018df	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=520bb8f1337ccbfef70b8ff9c2516311
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.3 b/metadata/md5-cache/dev-python/wcmatch-8.3
index 1211da00aa62..cc460f8f06fc 100644
--- a/metadata/md5-cache/dev-python/wcmatch-8.3
+++ b/metadata/md5-cache/dev-python/wcmatch-8.3
@@ -4,7 +4,7 @@ DESCRIPTION=Wildcard/glob file name matcher
 EAPI=8
 HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 doc
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-python/backrefs-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/bracex-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.3.tar.gz -> wcmatch-8.3.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	docs	7c38d94fa7c1b4235fe571dc09e018df	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ee6f4400e6814d459e04552a438e97f4
+_md5_=70886a6b351cda59282ee6a2b23fc9ac
diff --git a/metadata/md5-cache/dev-python/xarray-0.20.2 b/metadata/md5-cache/dev-python/xarray-0.20.2
index 5c7a14f86725..fe4e6787f681 100644
--- a/metadata/md5-cache/dev-python/xarray-0.20.2
+++ b/metadata/md5-cache/dev-python/xarray-0.20.2
@@ -4,7 +4,7 @@ DESCRIPTION=N-D labeled arrays and datasets in Python
 EAPI=8
 HOMEPAGE=https://xarray.pydata.org/
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-0.20.2.tar.gz
 _eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c0c7b2e42f3605545577e562d2189e5d
+_md5_=c061235d5c0ee81ca37c4440736edb3d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c8d7fa7fc528..d1fb16844929 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/byacc-20220109 b/metadata/md5-cache/dev-util/byacc-20220109
new file mode 100644
index 000000000000..b8c61b48147a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/byacc-20220109
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=The best variant of the Yacc parser generator
+EAPI=7
+HOMEPAGE=https://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://ftp.invisible-island.net/byacc/byacc-20220109.tgz
+_md5_=a502a66385c083acf00fbfdbbf79e46d
diff --git a/metadata/md5-cache/dev-util/patdiff-0.14.0-r1 b/metadata/md5-cache/dev-util/patdiff-0.14.0-r1
index df3e51f50c9a..37e58971f110 100644
--- a/metadata/md5-cache/dev-util/patdiff-0.14.0-r1
+++ b/metadata/md5-cache/dev-util/patdiff-0.14.0-r1
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-lang/ocaml-4.08.0:= dev-ml/core:= dev-ml/core_kernel:= dev-ml/patience_diff:0/0.14 dev-ml/ppx_jane:= dev-ml/pcre-ocaml:= >=dev-ml/re-1.8.0:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0
 SRC_URI=https://github.com/janestreet/patdiff/archive/v0.14.0.tar.gz -> patdiff-0.14.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a4d838f220a9ced37cfe3047cfa66bcc
diff --git a/metadata/md5-cache/dev-util/strace-5.16 b/metadata/md5-cache/dev-util/strace-5.16
new file mode 100644
index 000000000000..c6d548a4c120
--- /dev/null
+++ b/metadata/md5-cache/dev-util/strace-5.16
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=static? ( unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) selinux? ( sys-libs/libselinux[static-libs(+)] ) ) aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers
+DESCRIPTION=A useful diagnostic, instructional, and debugging tool
+EAPI=7
+HOMEPAGE=https://strace.io/
+IUSE=aio perl selinux static unwind elfutils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) ) perl? ( dev-lang/perl )
+REQUIRED_USE=?? ( unwind elfutils )
+SLOT=0
+SRC_URI=https://github.com/strace/strace/releases/download/v5.16/strace-5.16.tar.xz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=2936b030c4cee2d9164260ba2393da67
diff --git a/metadata/md5-cache/dev-util/strace-9999 b/metadata/md5-cache/dev-util/strace-9999
index 2850f4b28f04..61f0fd87acaa 100644
--- a/metadata/md5-cache/dev-util/strace-9999
+++ b/metadata/md5-cache/dev-util/strace-9999
@@ -11,4 +11,4 @@ RDEPEND=!static? ( unwind? ( sys-libs/libunwind ) elfutils? ( dev-libs/elfutils
 REQUIRED_USE=?? ( unwind elfutils )
 SLOT=0
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e75fd1e89e4050c686efd79a76693fdc
+_md5_=2936b030c4cee2d9164260ba2393da67
diff --git a/metadata/md5-cache/dev-util/umockdev-0.17.2 b/metadata/md5-cache/dev-util/umockdev-0.17.2
new file mode 100644
index 000000000000..81be71cb84b2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/umockdev-0.17.2
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-libs/libgudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=7
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.17.2/umockdev-0.17.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=21b20ed87bc1faa172621c3328425d87
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 3cfb313f5eae..0096d2220c53 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-2.35.0_rc0 b/metadata/md5-cache/dev-vcs/git-2.35.0_rc0
new file mode 100644
index 000000000000..ba29d108fefd
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.35.0_rc0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) emacs? ( >=app-editors/emacs-23.1:* ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv )
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) dev-libs/openssl:0= sys-libs/zlib pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) iconv? ( virtual/libiconv ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/testing/git-2.35.0.rc0.tar.xz https://www.kernel.org/pub/software/scm/git/testing/git-manpages-2.35.0.rc0.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/testing/git-htmldocs-2.35.0.rc0.tar.xz )
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	elisp-common	cf4fd1b0835b9f3e638724840468064a	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=66b0d3fa4146e5e3166f86a96d3f5081
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.1 b/metadata/md5-cache/dev-vcs/stgit-1.1
deleted file mode 100644
index f3af422e3b9c..000000000000
--- a/metadata/md5-cache/dev-vcs/stgit-1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-vcs/git-1.6.3.3 doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl )
-DESCRIPTION=Manage a stack of patches using GIT as a backend
-EAPI=7
-HOMEPAGE=https://stacked-git.github.io
-IUSE=doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/ctmarinas/stgit/archive/v1.1.tar.gz -> stgit-1.1.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=c9e819d66356bbe52ec28f7deeb28355
diff --git a/metadata/md5-cache/dev-vcs/stgit-1.4 b/metadata/md5-cache/dev-vcs/stgit-1.4
index 5ccc96720ca8..83ce3e712718 100644
--- a/metadata/md5-cache/dev-vcs/stgit-1.4
+++ b/metadata/md5-cache/dev-vcs/stgit-1.4
@@ -5,11 +5,11 @@ DESCRIPTION=Manage a stack of patches using GIT as a backend
 EAPI=7
 HOMEPAGE=https://stacked-git.github.io
 IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-vcs/git-1.6.3.3 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/ctmarinas/stgit/archive/v1.4.tar.gz -> stgit-1.4.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=867dd3095ec3623aee8f182a46d8809d
+_md5_=111bc8f7f6d65bf91d01ab89a827a218
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3df44acb0e94..261086b2d806 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
index 47fa2cb94375..f2b2510fa3e1 100644
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
+++ b/metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
@@ -5,11 +5,11 @@ DESCRIPTION=A graphical, full featured, twin-panel file manager
 EAPI=7
 HOMEPAGE=https://gcmd.github.io/
 IUSE=chm exif gsf pdf samba taglib test +unique
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/yelp-tools dev-libs/atk dev-libs/glib:2 gnome-base/gconf:2 gnome-base/gnome-vfs media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/pango chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( gnome-extra/libgsf:= ) pdf? ( >=app-text/poppler-0.18 ) samba? ( gnome-base/gnome-vfs:=[samba] ) taglib? ( >=media-libs/taglib-1.4 ) unique? ( >=dev-libs/libunique-0.9.3:1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-commander/1.12/gnome-commander-1.12.3.1.tar.xz
 _eclasses_=gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	optfeature	30ce9dec2b8943338c9b015bd32bac6a	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=0df8cd4f81392e9cae80b509cf098391
+_md5_=46f86794f9f0a7398d93854ea46d3959
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 1e389a82a47a..f383807782ce 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.23.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.23.4-r1
similarity index 82%
rename from metadata/md5-cache/kde-plasma/powerdevil-5.23.4
rename to metadata/md5-cache/kde-plasma/powerdevil-5.23.4-r1
index 2fb34ccf1ede..6be99ca0b0de 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.23.4
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.23.4-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.4:5 >=kde-plasma/libkworkspace-5.23.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.4:5 >=kde-plasma/libkworkspace-5.23.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control caps +wireless debug +handbook
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.4:5 >=kde-plasma/libkworkspace-5.23.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.4:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.4:5 >=kde-plasma/libkworkspace-5.23.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.4:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.23.4/powerdevil-5.23.4.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	36917df90b51554478635e34da581fac	flag-o-matic	d5e1306543bc457213f68bb18f830d14	kde.org	2c51d68845490f23d6f76d49cabdac5d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=3bdb475a06f447b9fbbfc44885683383
+_md5_=db08b71dde67f2e7942e577e38ce4d0e
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.23.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.23.5-r1
similarity index 82%
rename from metadata/md5-cache/kde-plasma/powerdevil-5.23.5
rename to metadata/md5-cache/kde-plasma/powerdevil-5.23.5-r1
index da2a73a6e748..be8a996dbf4f 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.23.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.23.5-r1
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.86.0:5 ) >=kde-frameworks/extra-cmake-modules-5.86.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.5:5 >=kde-plasma/libkworkspace-5.23.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.5:5 >=kde-plasma/libkworkspace-5.23.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) dev-qt/qtcore:5
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 IUSE=brightness-control caps +wireless debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.5:5 >=kde-plasma/libkworkspace-5.23.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.86.0:5 >=kde-frameworks/kauth-5.86.0:5[policykit] >=kde-frameworks/kcompletion-5.86.0:5 >=kde-frameworks/kconfig-5.86.0:5 >=kde-frameworks/kconfigwidgets-5.86.0:5 >=kde-frameworks/kcoreaddons-5.86.0:5 >=kde-frameworks/kcrash-5.86.0:5 >=kde-frameworks/kdbusaddons-5.86.0:5 >=kde-frameworks/kglobalaccel-5.86.0:5 >=kde-frameworks/ki18n-5.86.0:5 >=kde-frameworks/kidletime-5.86.0:5 >=kde-frameworks/kio-5.86.0:5 >=kde-frameworks/knotifications-5.86.0:5 >=kde-frameworks/knotifyconfig-5.86.0:5 >=kde-frameworks/kservice-5.86.0:5 >=kde-frameworks/kwayland-5.86.0:5 >=kde-frameworks/kwidgetsaddons-5.86.0:5 >=kde-frameworks/kxmlgui-5.86.0:5 >=kde-frameworks/solid-5.86.0:5 >=kde-plasma/libkscreen-5.23.5:5 >=kde-plasma/libkworkspace-5.23.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.86.0:5 >=kde-frameworks/networkmanager-qt-5.86.0:5 ) >=kde-plasma/kde-cli-tools-5.23.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.23.5/powerdevil-5.23.5.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	ecm	36917df90b51554478635e34da581fac	flag-o-matic	d5e1306543bc457213f68bb18f830d14	kde.org	2c51d68845490f23d6f76d49cabdac5d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=6e3f5169a20c788a60b9f9d6d31f7add
+_md5_=5c0c13868e12199796b863d3e91b57f1
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 04e0dbea7925..c7a0bef205fe 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/rspamd-3.1 b/metadata/md5-cache/mail-filter/rspamd-3.1-r1
similarity index 75%
rename from metadata/md5-cache/mail-filter/rspamd-3.1
rename to metadata/md5-cache/mail-filter/rspamd-3.1-r1
index 7d73ae6e58da..a055e8e99301 100644
--- a/metadata/md5-cache/mail-filter/rspamd-3.1
+++ b/metadata/md5-cache/mail-filter/rspamd-3.1-r1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ragel virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_luajit? ( dev-lua/LuaBitOp[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/LuaBitOp[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/LuaBitOp[lua_targets_lua5-4(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-cpp/doctest dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer:= sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] )
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_luajit? ( dev-lua/LuaBitOp[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/LuaBitOp[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/LuaBitOp[lua_targets_lua5-4(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer:= sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) <dev-cpp/doctest-2.4.7
 DESCRIPTION=Rapid spam filtering system
 EAPI=7
 HOMEPAGE=https://rspamd.com https://github.com/rspamd/rspamd
 IUSE=blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB
-RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_luajit? ( dev-lua/LuaBitOp[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/LuaBitOp[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/LuaBitOp[lua_targets_lua5-4(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-cpp/doctest dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer:= sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) lua_single_target_luajit? ( dev-lua/LuaBitOp[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( dev-lua/LuaBitOp[lua_targets_lua5-1(-)] ) lua_single_target_lua5-3? ( dev-lua/LuaBitOp[lua_targets_lua5-3(-)] ) lua_single_target_lua5-4? ( dev-lua/LuaBitOp[lua_targets_lua5-4(-)] ) acct-group/rspamd acct-user/rspamd app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2 dev-libs/icu:= dev-libs/libev dev-libs/libfmt:= dev-libs/libsodium:= dev-libs/snowball-stemmer:= sys-apps/file blas? ( virtual/blas virtual/lapack ) cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) jemalloc? ( dev-libs/jemalloc:= ) dev-libs/openssl:0=[-bindist(-)] pcre2? ( dev-libs/libpcre2:=[jit=] ) !pcre2? ( dev-libs/libpcre[jit=] ) virtual/tmpfiles
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) test? ( lua_single_target_luajit )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rspamd/rspamd/archive/3.1.tar.gz -> rspamd-3.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=6fd7300b81c0963303f1ad9bf022c206
+_md5_=f96792535380462afeb58da4b5c71c88
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 38e0545c0d42..94669188584f 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/gphoto2-2.5.28 b/metadata/md5-cache/media-gfx/gphoto2-2.5.28
new file mode 100644
index 000000000000..4531ca5f90e4
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gphoto2-2.5.28
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig nls? ( >=sys-devel/gettext-0.14.1 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=dev-libs/popt-1.6.1 >=media-libs/libexif-0.6.9 >=media-libs/libgphoto2-2.5.17:=[exif] aalib? ( media-libs/aalib virtual/jpeg:0 ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=Free, redistributable digital camera software application
+EAPI=7
+HOMEPAGE=http://www.gphoto.org/
+IUSE=aalib ncurses nls readline
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/popt-1.6.1 >=media-libs/libexif-0.6.9 >=media-libs/libgphoto2-2.5.17:=[exif] aalib? ( media-libs/aalib virtual/jpeg:0 ) ncurses? ( dev-libs/cdk:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/gphoto/gphoto2-2.5.28.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=5ac0a12e5bed7746091faa45ef077afa
diff --git a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521 b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521
index 900430f14a72..0e2f8365d88f 100644
--- a/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521
+++ b/metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521
@@ -10,4 +10,4 @@ RDEPEND=~dev-libs/ncnn-20210525[vulkan] dev-util/glslang media-libs/libwebp:= me
 SLOT=0
 SRC_URI=https://github.com/nihui/waifu2x-ncnn-vulkan/archive/20210521.tar.gz -> waifu2x-ncnn-vulkan-20210521.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=3df5549801fb51f9b0a0fb8abcf16330
+_md5_=a278415a58aa848cccdbbe3cd83d0631
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 17f6848c531e..9a12db726ed3 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.28 b/metadata/md5-cache/media-libs/libgphoto2-2.5.28
new file mode 100644
index 000000000000..59926306f1a6
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.28
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gtk-doc-am sys-devel/flex >=sys-devel/gettext-0.14.1 virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library that implements support for numerous digital cameras
+EAPI=7
+HOMEPAGE=http://www.gphoto.org/
+IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0/6
+SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.28.tar.bz2
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=aa32823b8e2ffa27191ceda0eb94ae9c
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.2.2 b/metadata/md5-cache/media-libs/libsamplerate-0.2.2
index 3c7045cd4581..75e256ccd459 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.2.2
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter fo
 EAPI=8
 HOMEPAGE=https://libsndfile.github.io/libsamplerate/
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsndfile/libsamplerate/releases/download/0.2.2/libsamplerate-0.2.2.tar.xz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=09a2955acfc29c5102a21036e54c8c1e
+_md5_=ffa1145864551bf6f5d4074ac428a3bb
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-2.3.1 b/metadata/md5-cache/media-libs/libsidplayfp-2.3.1
index abdc7c070e19..9aef75bd24d3 100644
--- a/metadata/md5-cache/media-libs/libsidplayfp-2.3.1
+++ b/metadata/md5-cache/media-libs/libsidplayfp-2.3.1
@@ -3,8 +3,8 @@ DESCRIPTION=Library for the sidplay2 fork with resid-fp
 EAPI=8
 HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
 IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~riscv ~x86
+KEYWORDS=amd64 ~hppa ~riscv x86
 LICENSE=GPL-2
 SLOT=0/6
 SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/2.3/libsidplayfp-2.3.1.tar.gz
-_md5_=1341335934352ed8dd202d1596ad6014
+_md5_=f1d815d5f382dd20a2ec0caf3f4db422
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.31 b/metadata/md5-cache/media-libs/libsndfile-1.0.31
index 80b5a4b16ca9..d0825e3856bd 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.31
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.31
@@ -5,11 +5,11 @@ DESCRIPTION=C library for reading and writing files containing sampled sound
 EAPI=7
 HOMEPAGE=https://libsndfile.github.io/libsndfile/
 IUSE=alsa minimal sqlite test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( media-libs/flac:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libogg:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libvorbis:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/opus:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib:= ) sqlite? ( dev-db/sqlite )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fa5830dc1499aa2634418bdb0d7c6867
+_md5_=3e23d749c2418c7eacca5d668c6768a3
diff --git a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129 b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
index b9bcf33d9e70..95a85425cd6f 100644
--- a/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
+++ b/metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
@@ -5,11 +5,11 @@ DESCRIPTION=VoIP library for Telegram clients
 EAPI=8
 HOMEPAGE=https://github.com/telegramdesktop/libtgvoip
 IUSE=+dsp +alsa pulseaudio
-KEYWORDS=~amd64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~ppc64 ~riscv
 LICENSE=Unlicense
 RDEPEND=dev-libs/openssl:= media-libs/opus alsa? ( media-libs/alsa-lib ) dsp? ( media-libs/tg_owt:= ) pulseaudio? ( media-sound/pulseaudio )
 REQUIRED_USE=|| ( alsa pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/libtgvoip/archive/2cffda6222f07cd7d0aa4627a06fa99b05a3956d.tar.gz -> libtgvoip-2.4.4_p20211129.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7b7c31b518f10c54a5b7a41f8616ddcc
+_md5_=50f07d4617db0d1597b7e030f9a35c89
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.7 b/metadata/md5-cache/media-libs/libvorbis-1.3.7
index 9fbf50c56e7c..9a2c14a80453 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.7
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.7
@@ -5,11 +5,11 @@ DESCRIPTION=The Ogg Vorbis sound file format library
 EAPI=7
 HOMEPAGE=https://xiph.org/vorbis/
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cef4878a4ebc150d7ce6f79fc97358c2
+_md5_=704ab8d50131d0d09a6c0c826f75394c
diff --git a/metadata/md5-cache/media-libs/netpbm-10.86.27 b/metadata/md5-cache/media-libs/netpbm-10.86.27
index f73802398ea9..c19e5f09251e 100644
--- a/metadata/md5-cache/media-libs/netpbm-10.86.27
+++ b/metadata/md5-cache/media-libs/netpbm-10.86.27
@@ -5,10 +5,10 @@ DESCRIPTION=A set of utilities for converting to/from the netpbm (and related) f
 EAPI=8
 HOMEPAGE=http://netpbm.sourceforge.net/
 IUSE=doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=jbig? ( media-libs/jbigkit:= ) jpeg? ( virtual/jpeg:0 ) png? ( >=media-libs/libpng-1.4:0= sys-libs/zlib ) postscript? ( app-text/ghostscript-gpl sys-libs/zlib ) rle? ( media-libs/urt:= ) svga? ( media-libs/svgalib ) tiff? ( >=media-libs/tiff-3.5.5:0 ) xml? ( dev-libs/libxml2 ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=https://github.com/ceamac/netpbm-make-dist/releases/download/v10.86.27/netpbm-10.86.27.tar.xz
 _eclasses_=flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8912485e63f6eb3e2396bdeee11eb6cd
+_md5_=13ed53388cd07bf5397a17986ddf969a
diff --git a/metadata/md5-cache/media-libs/opus-1.3.1-r2 b/metadata/md5-cache/media-libs/opus-1.3.1-r2
index 7429b2228a8a..359c2f56e57d 100644
--- a/metadata/md5-cache/media-libs/opus-1.3.1-r2
+++ b/metadata/md5-cache/media-libs/opus-1.3.1-r2
@@ -4,9 +4,9 @@ DESCRIPTION=Open codec for interactive speech and music transmission over the In
 EAPI=7
 HOMEPAGE=https://opus-codec.org/
 IUSE=custom-modes doc static-libs cpu_flags_x86_sse cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a451448b9eb36f92b32eeb150aeb4093
+_md5_=c287725eb294b16aec74300095fe05b3
diff --git a/metadata/md5-cache/media-libs/tg_owt-0_pre20211207 b/metadata/md5-cache/media-libs/tg_owt-0_pre20211207
index 801f1f034c17..9d12d1404ccc 100644
--- a/metadata/md5-cache/media-libs/tg_owt-0_pre20211207
+++ b/metadata/md5-cache/media-libs/tg_owt-0_pre20211207
@@ -5,10 +5,10 @@ DESCRIPTION=WebRTC build for Telegram
 EAPI=8
 HOMEPAGE=https://github.com/desktop-app/tg_owt
 IUSE=screencast +X
-KEYWORDS=~amd64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~ppc64 ~riscv
 LICENSE=BSD
 RDEPEND=dev-cpp/abseil-cpp:=[cxx17(+)] dev-libs/libevent:= dev-libs/openssl:= dev-libs/protobuf:= media-libs/libjpeg-turbo:= >=media-libs/libvpx-1.10.0:= media-libs/openh264:= media-libs/opus media-video/ffmpeg:= net-libs/usrsctp screencast? ( dev-libs/glib:2 media-video/pipewire:= ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXrandr x11-libs/libXtst )
 SLOT=0/20211207
 SRC_URI=https://github.com/desktop-app/tg_owt/archive/d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.tar.gz -> tg_owt-0_pre20211207.tar.gz https://archive.org/download/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar/libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ca2062e76c28fa9d8f44d97ea60f9278
+_md5_=883f4aa7560016cf2ef446a90b04965d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 6cf583928cca..9aadc934649c 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/amsynth-1.12.4 b/metadata/md5-cache/media-sound/amsynth-1.12.4
new file mode 100644
index 000000000000..193ad9da078f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/amsynth-1.12.4
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) jack? ( virtual/jack ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 ) oss? ( virtual/os-headers )
+DESCRIPTION=Virtual analogue synthesizer
+EAPI=8
+HOMEPAGE=https://github.com/amsynth/amsynth
+IUSE=alsa dssi gtk jack lash lv2 nsm oss vst
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib:= media-sound/alsa-utils ) dssi? ( media-libs/dssi:= media-libs/liblo:= ) gtk? ( x11-libs/gtk+:2 x11-libs/libX11 ) jack? ( virtual/jack ) lash? ( media-sound/lash ) lv2? ( media-libs/lv2 )
+REQUIRED_USE=dssi? ( gtk ) lv2? ( gtk )
+SLOT=0
+SRC_URI=https://github.com/amsynth/amsynth/releases/download/release-1.12.4/amsynth-1.12.4.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=50dab15d9bcab12df1bc48d08fbd3d76
diff --git a/metadata/md5-cache/media-sound/drumstick-2.5.0 b/metadata/md5-cache/media-sound/drumstick-2.5.0
index 3261bb0bcdc6..fb1355e122d9 100644
--- a/metadata/md5-cache/media-sound/drumstick-2.5.0
+++ b/metadata/md5-cache/media-sound/drumstick-2.5.0
@@ -5,11 +5,11 @@ DESCRIPTION=Qt/C++ wrapper for ALSA sequencer
 EAPI=8
 HOMEPAGE=https://drumstick.sourceforge.io/
 IUSE=doc fluidsynth network pulseaudio
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib fluidsynth? ( media-sound/fluidsynth ) network? ( dev-qt/qtnetwork:5 ) pulseaudio? ( media-sound/pulseaudio )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/drumstick/drumstick-2.5.0.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=007f902592a41da93b5a44660dd96987
+_md5_=c7f64b80ce2f505899dc8466fc212dde
diff --git a/metadata/md5-cache/media-sound/qsynth-0.9.4 b/metadata/md5-cache/media-sound/qsynth-0.9.4
index fa61e4cba342..af4786140ee9 100644
--- a/metadata/md5-cache/media-sound/qsynth-0.9.4
+++ b/metadata/md5-cache/media-sound/qsynth-0.9.4
@@ -11,5 +11,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 med
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/qsynth/qsynth-0.9.4.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b87b53d9e48e7c8bb5725d20779224e7
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=97256e17b3dec2af0c77a185f9173c48
diff --git a/metadata/md5-cache/media-sound/qsynth-0.9.5 b/metadata/md5-cache/media-sound/qsynth-0.9.5
new file mode 100644
index 000000000000..9b5f8ba60b17
--- /dev/null
+++ b/metadata/md5-cache/media-sound/qsynth-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+DESCRIPTION=Qt application to control FluidSynth
+EAPI=8
+HOMEPAGE=https://qsynth.sourceforge.io/
+IUSE=+alsa debug jack pulseaudio
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+REQUIRED_USE=|| ( alsa jack pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/qsynth/qsynth-0.9.5.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=b4b368b0ae8b921abe4bf84977423b0f
diff --git a/metadata/md5-cache/media-sound/qsynth-9999 b/metadata/md5-cache/media-sound/qsynth-9999
index 5a62a3fb79f8..cbb3e564f99a 100644
--- a/metadata/md5-cache/media-sound/qsynth-9999
+++ b/metadata/md5-cache/media-sound/qsynth-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 REQUIRED_USE=|| ( alsa jack pulseaudio )
 SLOT=0
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=2cc6d914b07b0346431f5fd08c7b94b7
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9f39d814da954193a0ad8ca2e9e51f15
diff --git a/metadata/md5-cache/media-sound/rosegarden-21.12 b/metadata/md5-cache/media-sound/rosegarden-21.12
index f84d98f32a72..46bec3e0ce96 100644
--- a/metadata/md5-cache/media-sound/rosegarden-21.12
+++ b/metadata/md5-cache/media-sound/rosegarden-21.12
@@ -5,11 +5,11 @@ DESCRIPTION=MIDI and audio sequencer and notation editor
 EAPI=8
 HOMEPAGE=https://www.rosegardenmusic.com/
 IUSE=lirc test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib:= >=media-libs/dssi-1.0.0:= media-libs/ladspa-sdk:= media-libs/liblo:= media-libs/liblrdf:= media-libs/libsamplerate:= media-libs/libsndfile:= sci-libs/fftw:3.0 sys-libs/zlib:= virtual/jack x11-libs/libSM:= lirc? ( app-misc/lirc:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/rosegarden/rosegarden-21.12.tar.bz2
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a10a015ffb8e192097d02ebe26cbebda
+_md5_=894b7d795979a6609c639cf5794ac8fd
diff --git a/metadata/md5-cache/media-sound/sndio-1.8.0 b/metadata/md5-cache/media-sound/sndio-1.8.0
index fb97ce072746..d2f7622a45d3 100644
--- a/metadata/md5-cache/media-sound/sndio-1.8.0
+++ b/metadata/md5-cache/media-sound/sndio-1.8.0
@@ -4,10 +4,10 @@ DESCRIPTION=small audio and MIDI framework part of the OpenBSD project
 EAPI=7
 HOMEPAGE=http://www.sndio.org/
 IUSE=alsa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
 LICENSE=ISC
 RDEPEND=dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-user/sndiod
 SLOT=0/7.1
 SRC_URI=http://www.sndio.org/sndio-1.8.0.tar.gz
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=0d0f64602babee6df5893f2b902a6a62
+_md5_=3da1bbba41406245686001a3816df8fa
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 01e492ff190f..37a708bc143b 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/yle-dl-20210917 b/metadata/md5-cache/media-video/yle-dl-20210917
deleted file mode 100644
index 1d4250c40e0d..000000000000
--- a/metadata/md5-cache/media-video/yle-dl-20210917
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-video/ffmpeg[gnutls] dev-python/pip[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Download media files from Yle Areena
-EAPI=8
-HOMEPAGE=https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl
-IUSE=test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-PROPERTIES=test_network
-RDEPEND=media-video/ffmpeg net-misc/wget >=dev-python/attrs-18.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/configargparse-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/progress[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aajanki/yle-dl/archive/20210917.tar.gz -> yle-dl-20210917.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b65148a02e0a8527c5aec125d7d0f52f
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 790e9942fa8c..b685226d989d 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.4.11 b/metadata/md5-cache/net-analyzer/wireshark-3.4.11
index b91858d6a3ea..703e2881ef92 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-3.4.11
+++ b/metadata/md5-cache/net-analyzer/wireshark-3.4.11
@@ -5,7 +5,7 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=7
 HOMEPAGE=https://www.wireshark.org/
 IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/pcap >=dev-libs/glib-2.32:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3.4.11
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.4.11.tar.xz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	fcaps	ac252c3cc67b265cd7ea456f8d58e150	flag-o-matic	d5e1306543bc457213f68bb18f830d14	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=a2597a863f90adabcb5f91295641d35e
+_md5_=3dec4883b07672f55b80aa345b57d30e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 0dbbc1ecc8cd..855756959d9a 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/picocom-3.1 b/metadata/md5-cache/net-dialup/picocom-3.1
index d5b1d8963923..e99edec2ca31 100644
--- a/metadata/md5-cache/net-dialup/picocom-3.1
+++ b/metadata/md5-cache/net-dialup/picocom-3.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=minimal dumb-terminal emulation program
 EAPI=8
 HOMEPAGE=https://github.com/npat-efault/picocom
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/npat-efault/picocom/archive/3.1.tar.gz -> picocom-3.1.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d0de35d4c4a869fc4e1467c9a4fb27b6
+_md5_=4fded38406dd4d8ae23380da7529c79c
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index bd855d02d899..637a6430c2e9 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.0.3 b/metadata/md5-cache/net-firewall/firewalld-1.0.3
new file mode 100644
index 000000000000..4c1953560f2b
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firewalld-1.0.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/intltool-0.35 sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) !!net-firewall/gshield iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) dev-libs/glib:2
+DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
+EAPI=7
+HOMEPAGE=https://firewalld.org/
+IUSE=gui +nftables +iptables python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) !!net-firewall/gshield iptables? ( net-firewall/iptables[ipv6] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/firewalld/firewalld/archive/v1.0.3.tar.gz -> firewalld-1.0.3.tar.gz
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	239e7afa214b50012f83b8bb61de7555	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	plocale	89c6aac5da68423465e6fd79fb4ad5fb	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=9734e36f8464577d7f5d2a7c4c232bf5
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index e0fea6e7b1c4..8f0e2d5a26df 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.6-r2 b/metadata/md5-cache/net-fs/autofs-5.1.6-r2
deleted file mode 100644
index 158e6dba2d6d..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.6-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/pkgconfig virtual/yacc virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) libtirpc? ( net-libs/rpcsvc-proto )
-DESCRIPTION=Kernel based automounter
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=dmalloc ldap +libtirpc mount-locking sasl systemd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.6.tar.xz
-_eclasses_=linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=cc78f83ef545df3f738bfc749b4de1be
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.7-r1 b/metadata/md5-cache/net-fs/autofs-5.1.7-r1
deleted file mode 100644
index 59e5d6e5b611..000000000000
--- a/metadata/md5-cache/net-fs/autofs-5.1.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/flex virtual/pkgconfig virtual/yacc virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) libtirpc? ( net-libs/rpcsvc-proto )
-DESCRIPTION=Kernel based automounter
-EAPI=7
-HOMEPAGE=https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html
-IUSE=dmalloc ldap +libtirpc mount-locking sasl systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.7.tar.xz
-_eclasses_=linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4fe4348daf8e1d7d1525dc380b95deb2
diff --git a/metadata/md5-cache/net-fs/autofs-5.1.8-r1 b/metadata/md5-cache/net-fs/autofs-5.1.8-r1
index cf7e75f4d526..36e907b67f1d 100644
--- a/metadata/md5-cache/net-fs/autofs-5.1.8-r1
+++ b/metadata/md5-cache/net-fs/autofs-5.1.8-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Kernel based automounter
 EAPI=7
 HOMEPAGE=https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html
 IUSE=dmalloc ldap +libtirpc mount-locking sasl systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libnsl:= >=sys-apps/util-linux-2.20 dmalloc? ( dev-libs/dmalloc[threads] ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) systemd? ( sys-apps/systemd ) libtirpc? ( net-libs/libtirpc ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-5.1.8.tar.xz https://dev.gentoo.org/~dlan/distfiles/net-fs/autofs/autofs-5.1.8-patches-0.tar.xz
 _eclasses_=linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=5d53b379b80d88387ca9b7c018fb5406
+_md5_=f93d29e258fc4601e31724c4325d85c0
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 9d62ca209452..a27015a284a2 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.4 b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.5
similarity index 91%
rename from metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.4
rename to metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.5
index 77bed575ceff..049faf2b01c3 100644
--- a/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.4
+++ b/metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.5
@@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64
 LICENSE=MIT
 RDEPEND=app-accessibility/at-spi2-atk:2 dev-libs/atk dev-libs/expat dev-libs/libappindicator dev-libs/nspr dev-libs/nss media-fonts/noto-emoji media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libnotify x11-libs/libxcb x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver x11-libs/pango
 SLOT=0
-SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.7.4/rocketchat-3.7.4.x86_64.rpm
+SRC_URI=https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/3.7.5/rocketchat-3.7.5.x86_64.rpm
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	rpm	f73e907469f65e52192f110dec72dce0	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=61a75ef3eb848da78f229cfbd2771e45
+_md5_=8a9e271e90a31b98913d0024a0dfcdef
diff --git a/metadata/md5-cache/net-im/telegram-desktop-3.3.0 b/metadata/md5-cache/net-im/telegram-desktop-3.3.0
index 290219f83314..61b90ae3316d 100644
--- a/metadata/md5-cache/net-im/telegram-desktop-3.3.0
+++ b/metadata/md5-cache/net-im/telegram-desktop-3.3.0
@@ -5,11 +5,11 @@ DESCRIPTION=Official desktop client for Telegram
 EAPI=8
 HOMEPAGE=https://desktop.telegram.org
 IUSE=+dbus enchant +hunspell screencast +spell wayland +X
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=BSD GPL-3-with-openssl-exception LGPL-2+
 RDEPEND=!net-im/telegram-desktop-bin app-arch/lz4:= dev-cpp/abseil-cpp:= dev-libs/jemalloc:=[-lazy-lock] dev-libs/openssl:= dev-libs/xxhash >=dev-qt/qtcore-5.15:5 >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] >=dev-qt/qtimageformats-5.15:5 >=dev-qt/qtnetwork-5.15:5[ssl] >=dev-qt/qtsvg-5.15:5 >=dev-qt/qtwidgets-5.15:5[png,X?] media-fonts/open-sans media-libs/fontconfig:= ~media-libs/libtgvoip-2.4.4_p20211129 media-libs/openal media-libs/opus:= media-libs/rnnoise ~media-libs/tg_owt-0_pre20211207[screencast=,X=] media-video/ffmpeg:=[opus] sys-libs/zlib:=[minizip] dbus? ( dev-cpp/glibmm:2 dev-qt/qtdbus:5 dev-libs/libdbusmenu-qt[qt5(+)] ) enchant? ( app-text/enchant:= ) hunspell? ( >=app-text/hunspell-1.7:= ) wayland? ( kde-frameworks/kwayland:= ) X? ( x11-libs/libxcb:= )
 REQUIRED_USE=spell? ( ^^ ( enchant hunspell ) )
 SLOT=0
 SRC_URI=https://github.com/telegramdesktop/tdesktop/releases/download/v3.3.0/tdesktop-3.3.0-full.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	optfeature	30ce9dec2b8943338c9b015bd32bac6a	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1d2c8be2d3f1072e870574f8924166be
+_md5_=38ac54d2d474b5936a0ba3ae4dac166f
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 3129e899ed8a..88fb1120fba9 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/ergo-2.9.0 b/metadata/md5-cache/net-irc/ergo-2.9.0
deleted file mode 100644
index 0d1ef33a0fe5..000000000000
--- a/metadata/md5-cache/net-irc/ergo-2.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.14 >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=A modern IRC server written in Go
-EAPI=7
-HOMEPAGE=https://ergo.chat/ https://github.com/ergochat/ergo
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
-RDEPEND=acct-user/oragono acct-group/oragono
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/ergochat/ergo/archive/v2.9.0.tar.gz -> ergo-2.9.0.tar.gz
-_eclasses_=go-module	82631624a3653e595cf9c18164a8c500	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ddb54a859280dc5da9a56277d4bf7325
diff --git a/metadata/md5-cache/net-irc/ergo-2.7.0-r1 b/metadata/md5-cache/net-irc/ergo-2.9.1
similarity index 82%
rename from metadata/md5-cache/net-irc/ergo-2.7.0-r1
rename to metadata/md5-cache/net-irc/ergo-2.9.1
index 55d4127a0216..0864a41f628d 100644
--- a/metadata/md5-cache/net-irc/ergo-2.7.0-r1
+++ b/metadata/md5-cache/net-irc/ergo-2.9.1
@@ -8,6 +8,6 @@ LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
 RDEPEND=acct-user/oragono acct-group/oragono
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/ergochat/ergo/archive/v2.7.0.tar.gz -> ergo-2.7.0.tar.gz
+SRC_URI=https://github.com/ergochat/ergo/archive/v2.9.1.tar.gz -> ergo-2.9.1.tar.gz
 _eclasses_=go-module	82631624a3653e595cf9c18164a8c500	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6bf169012fa1841369ad7a66ce788d03
+_md5_=b5836228c3a4e1ea0556a7167fb9f5f5
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index a4cb4bbce9b9..d20c393dd30f 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libbtbb-2018.08.1 b/metadata/md5-cache/net-libs/libbtbb-2018.08.1
deleted file mode 100644
index 8ee509c1b4fa..000000000000
--- a/metadata/md5-cache/net-libs/libbtbb-2018.08.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plugins? ( dev-libs/glib virtual/pkgconfig ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library to decode Bluetooth baseband packets
-EAPI=6
-HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=static-libs wireshark-plugins
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-SLOT=0/2018.08.1
-SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2018-08-R1.tar.gz -> libbtbb-2018-08-R1.tar.gz
-_eclasses_=cmake-utils	f40ef5c4fb8eda19cca8d6604bef497e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=53fc337fd4c6205ca8a24fa479133198
diff --git a/metadata/md5-cache/net-libs/libbtbb-2020.12.1 b/metadata/md5-cache/net-libs/libbtbb-2020.12.1
deleted file mode 100644
index 05ec9a9155bc..000000000000
--- a/metadata/md5-cache/net-libs/libbtbb-2020.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plugins? ( dev-libs/glib virtual/pkgconfig )
-DESCRIPTION=A library to decode Bluetooth baseband packets
-EAPI=7
-HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=static-libs wireshark-plugins
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
-SLOT=0/2020.12.1
-SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2020-12-R1.tar.gz -> libbtbb-2020-12-R1.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=be0cfbc8abe4b6a35d87244cc4011b92
diff --git a/metadata/md5-cache/net-libs/libbtbb-2020.12.1-r1 b/metadata/md5-cache/net-libs/libbtbb-2020.12.1-r1
new file mode 100644
index 000000000000..99fea79b5050
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libbtbb-2020.12.1-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library to decode Bluetooth baseband packets
+EAPI=8
+HOMEPAGE=https://github.com/greatscottgadgets/libbtbb
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+SLOT=0/2020.12.1
+SRC_URI=https://github.com/greatscottgadgets/libbtbb/archive/2020-12-R1.tar.gz -> libbtbb-2020-12-R1.tar.gz
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e685170f2ea98875927c18a91550015b
diff --git a/metadata/md5-cache/net-libs/libbtbb-9999 b/metadata/md5-cache/net-libs/libbtbb-9999
index 3a44208e96d2..3e13e133498e 100644
--- a/metadata/md5-cache/net-libs/libbtbb-9999
+++ b/metadata/md5-cache/net-libs/libbtbb-9999
@@ -1,13 +1,11 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= ) wireshark-plugins? ( dev-libs/glib virtual/pkgconfig )
-DESCRIPTION=A library to decode Bluetooth baseband packets
-EAPI=7
-HOMEPAGE=http://libbtbb.sourceforge.net/
-IUSE=static-libs wireshark-plugins
+DESCRIPTION=Library to decode Bluetooth baseband packets
+EAPI=8
+HOMEPAGE=https://github.com/greatscottgadgets/libbtbb
+IUSE=static-libs
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=wireshark-plugins? ( >=net-analyzer/wireshark-1.8.3-r1:= )
 SLOT=0/9999
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=be0cfbc8abe4b6a35d87244cc4011b92
+_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=e685170f2ea98875927c18a91550015b
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.34.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.34.3
index 23126b4482f6..ead507e5c98d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.34.3
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.34.3
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.34.3.tar.xz
 _eclasses_=check-reqs	bfb51de63b0462097e40436214dd43c8	cmake	11fee991ab428a3370e5c20fa8231fb6	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnome.org	b5c48cddff1da36a205d924d722b28c9	gnome2	397207e07bdf58b07ce295d0bc1049fe	gnome2-utils	239e7afa214b50012f83b8bb61de7555	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pax-utils	fce6ad998516159787b92e8043167889	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	ruby-single	214d0508e74b80c85efcef39699cb9a2	ruby-utils	08ae6f9c60b19aabce3f66a30cce9a2d	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=d090fa9d8cc8edb5c874bdd805bd8fec
+_md5_=26c44a6c78b22ee6a7f2e155c787d89e
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index bf46628c2efc..232e9552b2ab 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/exabgp-4.2.17 b/metadata/md5-cache/net-misc/exabgp-4.2.17
new file mode 100644
index 000000000000..fc49cde4b490
--- /dev/null
+++ b/metadata/md5-cache/net-misc/exabgp-4.2.17
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=The BGP swiss army knife of networking
+EAPI=7
+HOMEPAGE=https://github.com/Exa-Networks/exabgp
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=acct-group/exabgp acct-user/exabgp virtual/tmpfiles python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Exa-Networks/exabgp/archive/4.2.17.tar.gz -> exabgp-4.2.17.tar.gz
+_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=12debd6f70dbb945b70fbac1c39c9d68
diff --git a/metadata/md5-cache/net-misc/xmrig-6.16.2 b/metadata/md5-cache/net-misc/xmrig-6.16.2
index 0020d7c7c1e5..a55d1b83f27f 100644
--- a/metadata/md5-cache/net-misc/xmrig-6.16.2
+++ b/metadata/md5-cache/net-misc/xmrig-6.16.2
@@ -5,10 +5,10 @@ DESCRIPTION=RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner
 EAPI=7
 HOMEPAGE=https://xmrig.com https://github.com/xmrig/xmrig
 IUSE=cpu_flags_x86_sse4_1 donate hwloc opencl +ssl
-KEYWORDS=amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0 GPL-3+ MIT
 RDEPEND=dev-libs/libuv:= hwloc? ( >=sys-apps/hwloc-2.5.0:= ) opencl? ( virtual/opencl ) ssl? ( dev-libs/openssl:= ) !arm64? ( sys-apps/msr-tools )
 SLOT=0
 SRC_URI=https://github.com/xmrig/xmrig/archive/v6.16.2.tar.gz -> xmrig-6.16.2.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1ec897d85080f661493bb60906f64dca
+_md5_=bea75ef8be7bf4f73106a0f3572ebf98
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 39409fc13a78..c919dbad0cf6 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.19 b/metadata/md5-cache/net-proxy/haproxy-2.2.19
new file mode 100644
index 000000000000..d3954e048e47
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.19
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl +lua_single_target_lua5-3
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre2:= pcre2-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) slz? ( dev-libs/libslz:= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.2
+SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.19.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	lua-single	ba92a0c9d413e015c6625cdb0b9aaf99	lua-utils	7b7cd623ac8b9dd4a7a6ee27219cada6	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b4d792178a5c424ff200bcd6b71ce68a
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 60bb7e27fad3..8b07d22d9be6 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/libreswan-4.5 b/metadata/md5-cache/net-vpn/libreswan-4.5
index ce803c69eafc..d988a0d44243 100644
--- a/metadata/md5-cache/net-vpn/libreswan-4.5
+++ b/metadata/md5-cache/net-vpn/libreswan-4.5
@@ -5,11 +5,11 @@ DESCRIPTION=IPsec implementation for Linux, fork of Openswan
 EAPI=7
 HOMEPAGE=https://libreswan.org/
 IUSE=caps curl dnssec ldap networkmanager pam seccomp selinux systemd test
-KEYWORDS=~amd64 ~arm ~ppc x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2 BSD-4 RSA DES
 RDEPEND=dev-libs/gmp:0= dev-libs/libevent:0= dev-libs/nspr >=dev-libs/nss-3.42 >=sys-kernel/linux-headers-4.19 virtual/libcrypt:= caps? ( sys-libs/libcap-ng ) curl? ( net-misc/curl ) dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns:= ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) dev-libs/nss[utils(+)] sys-apps/iproute2 !net-vpn/strongswan selinux? ( sec-policy/selinux-ipsec ) virtual/tmpfiles
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.libreswan.org/libreswan-4.5.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=ea9bec48529a050aeef66908faca3310
+_md5_=5678c0a0032897c71911886149836033
diff --git a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6 b/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
deleted file mode 100644
index c51e127185fd..000000000000
--- a/metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pythondialog:0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-vpn/openvpn
-DESCRIPTION=A VPN command-line tool from protonvpn - python rewrite
-EAPI=7
-HOMEPAGE=https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-python/docopt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pythondialog:0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] net-vpn/openvpn python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/ProtonVPN/linux-cli/archive/v2.2.6.tar.gz -> protonvpn-cli-2.2.6.tar.gz
-_eclasses_=distutils-r1	f57fddd704fa9e86e732403aaa7ab164	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=dff777953ab9486b651d354cec757c59
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index f4d8b9bb7cad..a728b502189b 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.1 b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
index 056cb29aea00..0b73601b82c8 100644
--- a/metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/quazip:0= dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative
 DESCRIPTION=GPS mapping utility
 EAPI=7
 HOMEPAGE=https://github.com/Maproom/qmapshack/wiki
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/quazip:0= dev-qt/designer:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qthelp:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] >=sci-geosciences/routino-3.1.1 sci-libs/alglib sci-libs/gdal:= >=sci-libs/proj-8:=
 SLOT=0
 SRC_URI=https://github.com/Maproom/qmapshack/archive/V_1.16.1.tar.gz -> qmapshack-1.16.1.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=9810364e17a672ea805e700076103827
+_md5_=b52f5255501153ec775478c42090210f
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 2042abc2589c..85db391e35f6 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/gdal-3.4.1 b/metadata/md5-cache/sci-libs/gdal-3.4.1
index a2c0d9c2e1d3..b12b4d728185 100644
--- a/metadata/md5-cache/sci-libs/gdal-3.4.1
+++ b/metadata/md5-cache/sci-libs/gdal-3.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=Translator library for raster geospatial data formats (includes OGR
 EAPI=8
 HOMEPAGE=https://gdal.org/
 IUSE=armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 java
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD Info-ZIP MIT
 RDEPEND=dev-libs/expat dev-libs/json-c:= dev-libs/libpcre dev-libs/libxml2:2 dev-libs/openssl:= media-libs/tiff >=sci-libs/libgeotiff-1.5.1-r1:= >=sci-libs/proj-6.0.0:= sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo:=[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio:= ) geos? ( >=sci-libs/geos-3.8.0 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3.1 ) heif? ( media-libs/libheif:= ) hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/openjpeg:2= ) lzma? ( || ( app-arch/xz-utils app-arch/lzma ) ) mdb? ( dev-java/jackcess:1 ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf:= ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) oracle? ( dev-db/oracle-instantclient:= ) pdf? ( app-text/poppler:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) spatialite? ( dev-db/spatialite ) sqlite? ( dev-db/sqlite:3 ) webp? ( media-libs/libwebp:= ) xls? ( dev-libs/freexl ) zstd? ( app-arch/zstd:= ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=mdb? ( java ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) spatialite? ( sqlite )
 SLOT=0/30
 SRC_URI=https://download.osgeo.org/gdal/3.4.1/gdal-3.4.1.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	bash-completion-r1	d3a60385655d9b402be765a6de333245	distutils-r1	f57fddd704fa9e86e732403aaa7ab164	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	python-r1	4c008ab1e6c02cbead059dfe8b864c26	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=792ccc911c146a6bd9b89be7a387a4df
+_md5_=7a659392e26815ab44e85dcc2e212da6
diff --git a/metadata/md5-cache/sci-libs/gsl-2.7.1-r1 b/metadata/md5-cache/sci-libs/gsl-2.7.1-r1
index c54c14fa2d6f..7ac9d344404f 100644
--- a/metadata/md5-cache/sci-libs/gsl-2.7.1-r1
+++ b/metadata/md5-cache/sci-libs/gsl-2.7.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=The GNU Scientific Library
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gsl/
 IUSE=cblas-external +deprecated static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=cblas-external? ( virtual/cblas:= )
 SLOT=0/27
 SRC_URI=mirror://gnu/gsl/gsl-2.7.1.tar.gz https://dev.gentoo.org/~sam/distfiles/sci-libs/gsl/gsl-2.7-cblas.patch.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5f8dc8caf3692f7f91fc35fcc26f8db0
+_md5_=8a52cdf71547c9bd72871107d872b2da
diff --git a/metadata/md5-cache/sci-libs/libqalculate-3.22.0 b/metadata/md5-cache/sci-libs/libqalculate-3.22.0
index 7c9abf430d13..cda18c8e7da1 100644
--- a/metadata/md5-cache/sci-libs/libqalculate-3.22.0
+++ b/metadata/md5-cache/sci-libs/libqalculate-3.22.0
@@ -5,11 +5,11 @@ DESCRIPTION=A modern multi-purpose calculator library
 EAPI=8
 HOMEPAGE=https://qalculate.github.io/
 IUSE=curl icu gnuplot readline test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-libs/gmp:0= dev-libs/libxml2:2 dev-libs/mpfr:0= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:0= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
 RESTRICT=!test? ( test )
 SLOT=0/22
 SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v3.22.0/libqalculate-3.22.0.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a38cdfeedf5f5651a5909341f63c73a5
+_md5_=c32b6e55ca0e78cc0f317c8bc5e060cb
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index a5ea4fe133e9..7eb05de1fd79 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1 b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1
index 3d4be5952d4f..f98991414f15 100644
--- a/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1
+++ b/metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1
@@ -10,5 +10,5 @@ LICENSE=CeCILL-C
 RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt=] >=sci-mathematics/psmt2-frontend-0.4.0:= >=dev-ml/menhir-20181006:= >=dev-ml/ocplib-simplex-0.4:= dev-ml/camlzip:= dev-ml/cmdliner:= dev-ml/num:= dev-ml/seq:= dev-ml/stdlib-shims:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/2.4.1
 SRC_URI=https://github.com/OCamlPro/alt-ergo/archive/2.4.1.tar.gz -> alt-ergo-2.4.1.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=a876e76f95ae843e5353279c991918e5
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1 b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
index cdcf378b4643..230894fd157a 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
@@ -3,12 +3,12 @@ DEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? (
 DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
-IUSE=gtk debug +ocamlopt doc ocamlopt
+IUSE=gtk debug +ocamlopt doc +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.13.0.tar.gz -> coq-8.13.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=cf095aa4b2685a05dc9a994fa9bd075f
diff --git a/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1 b/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1
index fb313e4aca13..c799dc026666 100644
--- a/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1
+++ b/metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1
@@ -10,5 +10,5 @@ LICENSE=CeCILL-B CeCILL-C
 RDEPEND=>=dev-lang/ocaml-4.08.0:=[ocamlopt?] >=sci-mathematics/why3-1.4:= dev-ml/batteries:= dev-ml/camlzip:= dev-ml/dune-build-info:= dev-ml/dune-site:= dev-ml/ocaml-inifiles:= dev-ml/pcre-ocaml:= dev-ml/yojson:= dev-ml/zarith:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/1.0_pre20211210
 SRC_URI=https://github.com/EasyCrypt/easycrypt/archive/49aec58ea63a64adcf5fbabcc14c6739f337b206.tar.gz -> easycrypt-1.0_pre20211210.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=7d9df0050e18ac45acbfa6b6bf1b98bf
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
index b1e089aa40af..115b2e572ec3 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
@@ -4,11 +4,11 @@ DEPEND=>=dev-ml/menhir-20181006 >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Library to parse and type-check an extension of the SMT-LIB 2 standard
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Coquera/psmt2-frontend
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-ml/menhir-20181006 dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Coquera/psmt2-frontend/archive/0.2.tar.gz -> psmt2-frontend-0.2.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=8babbf81ec962f9ae8c2edc628d37b26
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
index 63739d830e86..dd916481a31d 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=dev-ml/menhir-20181006:= >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/0.4.0
 SRC_URI=https://github.com/OCamlPro-Coquera/psmt2-frontend/archive/0.4.0.tar.gz -> psmt2-frontend-0.4.0.tar.gz
-_eclasses_=dune	dce723780ea5cdf2d76da678d3bd9cea
+_eclasses_=dune	45f8b4ed9487a03522a647f3f33cb404
 _md5_=710c25e3cf2848a7eafb556f5d8902ee
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1 b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
index 8918a5bb06c7..ecbb519a32c0 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
@@ -4,11 +4,11 @@ DEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=de
 DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
-IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip ocamlopt
+IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2
 RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20151112:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.4.0
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.4.0.tar.gz
-_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=35aacde1da0e63b4e24fdd40ad629df9
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.8.13 b/metadata/md5-cache/sci-mathematics/z3-4.8.13
index 4c3595074a6d..6bd0eaae4b15 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.8.13
+++ b/metadata/md5-cache/sci-mathematics/z3-4.8.13
@@ -5,11 +5,11 @@ DESCRIPTION=An efficient theorem prover
 EAPI=7
 HOMEPAGE=https://github.com/Z3Prover/z3/
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/4.8
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.8.13.tar.gz
 _eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	cmake-multilib	de2335e0bd21535a925d008ee3b98e2a	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b495c7f8ecf506da1c8ac47d6dee4143
+_md5_=d9d6958347612c7d83f703dc48c63bb9
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 989e21105ecd..a7cc93d355c9 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1 b/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
deleted file mode 100644
index c353032dd58e..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar x11-libs/cairo ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:= python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar x11-libs/cairo ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) synaptics? ( gnutls ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/archive/1.5.9.tar.gz -> fwupd-1.5.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=ddd491b525a31828d01761c220448e32
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1 b/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
deleted file mode 100644
index 8cf663e0d354..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/archive/1.6.4.tar.gz -> fwupd-1.6.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=1c58210e2e532345479565f24bccfb2d
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.1 b/metadata/md5-cache/sys-apps/fwupd-1.7.1
deleted file mode 100644
index 0370a1019903..000000000000
--- a/metadata/md5-cache/sys-apps/fwupd-1.7.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
-EAPI=7
-HOMEPAGE=https://fwupd.org
-IUSE=amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl virtual/libelf:0= virtual/udev archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.1.tar.gz -> fwupd-1.7.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=00238d428a15506601bd1696291bbf42
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.3 b/metadata/md5-cache/sys-apps/fwupd-1.7.3
new file mode 100644
index 000000000000..e30d3dbbd643
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.3
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=7
+HOMEPAGE=https://fwupd.org
+IUSE=amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.0[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.3.tar.gz -> fwupd-1.7.3.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-single-r1	9783802d3840cbbd78c02b313df760cc	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	78150b86094c58851346877cbf691245	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_md5_=a6686dc01db80256c88dc33691360927
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.14-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
deleted file mode 100644
index 5a776f33f934..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=https://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.14.tar.gz -> haveged-1.9.14.tar.gz
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7272395e6a79c15bb08d01bffb517b91
diff --git a/metadata/md5-cache/sys-apps/haveged-1.9.8c-r1 b/metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
deleted file mode 100644
index dcef50afc030..000000000000
--- a/metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=A simple entropy daemon using the HAVEGE algorithm
-EAPI=7
-HOMEPAGE=https://www.issihosts.com/haveged/
-IUSE=selinux static-libs threads
-KEYWORDS=amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=!<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-entropyd )
-SLOT=0
-SRC_URI=https://github.com/jirka-h/haveged/archive/v1.9.8c.tar.gz -> haveged-1.9.8c.tar.gz
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=75e2c43eb63a1e6d74f130a611c988b3
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.63 b/metadata/md5-cache/sys-apps/hdparm-9.63
new file mode 100644
index 000000000000..4a6cf101a347
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hdparm-9.63
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Utility to change hard drive performance parameters
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/hdparm/
+IUSE=static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hdparm/hdparm-9.63.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=ebfbbddbf1d3c6eddf44b69137f379e6
diff --git a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3 b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
index 442e9a18200f..f0a10df9539a 100644
--- a/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
+++ b/metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
@@ -5,10 +5,10 @@ DESCRIPTION=Utility for controlling IPMI enabled devices
 EAPI=7
 HOMEPAGE=http://ipmitool.sf.net/
 IUSE=openbmc openipmi static
-KEYWORDS=~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0= openbmc? ( sys-apps/systemd:0= ) sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/ipmitool/ipmitool/archive/7fd7c0f2ba39e223868a8d83d81d4074f057d6fc.tar.gz -> ipmitool-1.8.18_p20201004.tar.gz https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=de1c017359cc1b78e1a8eee0db401e28
+_md5_=0e6f9fed3b2a483b89dfb732f08077fa
diff --git a/metadata/md5-cache/sys-apps/ipmiutil-3.1.7 b/metadata/md5-cache/sys-apps/ipmiutil-3.1.7
index 77eb180c1941..9c7c398d00e6 100644
--- a/metadata/md5-cache/sys-apps/ipmiutil-3.1.7
+++ b/metadata/md5-cache/sys-apps/ipmiutil-3.1.7
@@ -5,10 +5,10 @@ DESCRIPTION=IPMI Management Utilities
 EAPI=7
 HOMEPAGE=http://ipmiutil.sourceforge.net/
 IUSE=static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=amd64 ~hppa ~ppc x86
 LICENSE=BSD
 RDEPEND=>=dev-libs/openssl-1:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/ipmiutil/ipmiutil-3.1.7.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=60b802a80eec4a13ede040251640cddf
+_md5_=148cef74cd8299e366483d273596903c
diff --git a/metadata/md5-cache/sys-apps/systemd-249.7-r1 b/metadata/md5-cache/sys-apps/systemd-249.7-r1
new file mode 100644
index 000000000000..0a0129dd8c10
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-249.7-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) homed? ( >=dev-libs/openssl-1.1.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] >=net-libs/gnutls-3.1.4:0= ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) repart? ( >=dev-libs/openssl-1.1.0:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=homed? ( cryptsetup pam ) importd? ( curl gcrypt lzma ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.7/systemd-stable-249.7.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz
+_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=467490686ce5e6d1312785225d3e9db6
diff --git a/metadata/md5-cache/sys-apps/systemd-250-r1 b/metadata/md5-cache/sys-apps/systemd-250-r1
deleted file mode 100644
index 0a6114876c81..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-250-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
-IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 hostnamed-fallback? ( acct-group/systemd-hostname sys-apps/dbus-broker ) selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) policykit? ( !hostnamed-fallback ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd/archive/v250/systemd-250.tar.gz
-_eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=7f8218489172468bec7b43f5510af3e3
diff --git a/metadata/md5-cache/sys-apps/systemd-250.1 b/metadata/md5-cache/sys-apps/systemd-250.2
similarity index 98%
rename from metadata/md5-cache/sys-apps/systemd-250.1
rename to metadata/md5-cache/sys-apps/systemd-250.2
index 928e9b99b85f..943e90d4b443 100644
--- a/metadata/md5-cache/sys-apps/systemd-250.1
+++ b/metadata/md5-cache/sys-apps/systemd-250.2
@@ -12,6 +12,6 @@ RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) policykit? ( !hostnamed-fallback ) pwquality? ( homed )
 RESTRICT=!test? ( test )
 SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.1/systemd-stable-250.1.tar.gz
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.2/systemd-stable-250.2.tar.gz
 _eclasses_=bash-completion-r1	d3a60385655d9b402be765a6de333245	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	meson	9f3e84959ae1d60e19bc91f212774dcc	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	wrapper	4251d4c84c25f59094fd557e0063a974
 _md5_=868fca88d1cad77fb078ce02aa15375e
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
new file mode 100644
index 000000000000..6063ed7748e2
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd >=sys-kernel/linux-headers-3.11
+DESCRIPTION=Creates, deletes and cleans up volatile and temporary files and directories
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=selinux test
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=BSD-2 GPL-2 LGPL-2.1 MIT public-domain
+RDEPEND=sys-apps/acl:0= >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= selinux? ( sys-libs/libselinux:0= ) virtual/libcrypt:= !sys-apps/opentmpfiles !sys-apps/systemd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.7.tar.gz -> systemd-stable-249.7.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz )
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=aa2ec1dea1550635c3d6ac5b5a6d1b37
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index bc68c35a4f5c..468c426daba7 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225 b/metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225
index 3c65e9c5ff25..4258c5ae5731 100644
--- a/metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225
+++ b/metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225
@@ -5,10 +5,10 @@ DESCRIPTION=Graphical boot animation (splash) and logger
 EAPI=7
 HOMEPAGE=https://cgit.freedesktop.org/plymouth/
 IUSE=debug +gtk +libkms +pango +split-usr static-libs +udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.2.16:= gtk? ( dev-libs/glib:2 >=x11-libs/gtk+-3.14:3 x11-libs/cairo ) libkms? ( x11-libs/libdrm[libkms] ) pango? ( >=x11-libs/pango-1.21 ) udev? ( virtual/udev ) !<sys-kernel/dracut-0.37-r3
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/5b91b9ed84cc91759c986634a4d64d474e6092cf/plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c5abbafce00e03a08458bd36d2330b65
+_md5_=dc24e61b5cec533a5ccd1f158e990a90
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index b74ae93b4654..b771bec6a040 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/k3s-1.23.1 b/metadata/md5-cache/sys-cluster/k3s-1.23.1
index 02f77a2cba9d..d7d1d8e70fa5 100644
--- a/metadata/md5-cache/sys-cluster/k3s-1.23.1
+++ b/metadata/md5-cache/sys-cluster/k3s-1.23.1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
 DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-misc/yq net-firewall/conntrack-tools rootless? ( app-containers/slirp4netns )
+DEPEND=app-misc/yq net-firewall/conntrack-tools sys-fs/btrfs-progs rootless? ( app-containers/slirp4netns )
 DESCRIPTION=Lightweight Kubernetes
 EAPI=7
 HOMEPAGE=https://k3s.io
@@ -13,4 +13,4 @@ RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/k3s-io/k3s/archive/refs/tags/v1.23.1+k3s1.tar.gz -> k3s-1.23.1.tar.gz mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod mirror://goproxy//bazil.org/fuse/@v/v0.0.0-20200407214033-5883e5a4b512.mod -> bazil.org%2Ffuse%2F@v%2Fv0.0.0-20200407214033-5883e5a4b512.mod mirror://goproxy//bitbucket.org/bertimus9/systemstat/@v/v0.0.0-20180207000608-0eeff89b0690.mod -> bitbucket.org%2Fbertimus9%2Fsystemstat%2F@v%2Fv0.0.0-20180207000608-0eeff89b0690.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.3.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.4.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.7.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.7.0.mod mirror://goproxy//cloud.google.com/go/bigquery/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/datastore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/firestore/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.0.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.1.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.2.0.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod mirror://goproxy//cloud.google.com/go/pubsub/@v/v1.3.1.mod -> cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.3.1.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.0.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.10.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.5.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.6.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod mirror://goproxy//cloud.google.com/go/storage/@v/v1.8.0.mod -> cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.38.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.44.2.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod mirror://goproxy//cloud.google.com/go/@v/v0.45.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.46.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.50.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.50.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.52.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.52.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.53.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.53.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.54.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.54.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.56.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.56.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.57.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.57.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.62.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.62.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.65.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.65.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.72.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.72.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.74.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.78.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.79.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.81.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.83.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.84.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.84.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.87.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.87.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.90.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.90.0.mod mirror://goproxy//cloud.google.com/go/@v/v0.93.3.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.93.3.mod mirror://goproxy//cloud.google.com/go/@v/v0.94.1.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.94.1.mod mirror://goproxy//cloud.google.com/go/@v/v0.97.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.97.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.97.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.97.0.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20190408044501-666a987793e9.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod mirror://goproxy//dmitri.shuralyov.com/gpu/mtl/@v/v0.0.0-20201218220906-28db891af037.mod -> dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20201218220906-28db891af037.mod mirror://goproxy//github.com/360!ent!sec!group-!skylar/excelize/@v/v1.4.1.mod -> github.com%2F360!ent!sec!group-!skylar%2Fexcelize%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/agnivade/levenshtein/@v/v1.0.1.mod -> github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/ajstarks/svgo/@v/v0.0.0-20180226025133-644b8db467af.mod -> github.com%2Fajstarks%2Fsvgo%2F@v%2Fv0.0.0-20180226025133-644b8db467af.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/alexflint/go-filemutex/@v/v0.0.0-20171022225611-72bdc8eae2ae.mod -> github.com%2Falexflint%2Fgo-filemutex%2F@v%2Fv0.0.0-20171022225611-72bdc8eae2ae.mod mirror://goproxy//github.com/andreyvit/diff/@v/v0.0.0-20170406064948-c7f18ee00883.mod -> github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod mirror://goproxy//github.com/andybalholm/cascadia/@v/v1.0.0.mod -> github.com%2Fandybalholm%2Fcascadia%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/antihax/optional/@v/v1.0.0.mod -> github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20210826220005-b48c857c3a0e.zip -> github.com%2Fantlr%2Fantlr4%2Fruntime%2F!go%2Fantlr%2F@v%2Fv0.0.0-20210826220005-b48c857c3a0e.zip mirror://goproxy//github.com/antlr/antlr4/runtime/!go/antlr/@v/v0.0.0-20210826220005-b48c857c3a0e.mod -> github.com%2Fantlr%2Fantlr4%2Fruntime%2F!go%2Fantlr%2F@v%2Fv0.0.0-20210826220005-b48c857c3a0e.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/consul-api/@v/v0.0.0-20180202201655-eb2c6b5be1b6.mod -> github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20180720115003-f9ffefc3facf.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.zip -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip mirror://goproxy//github.com/asaskevich/govalidator/@v/v0.0.0-20190424111038-f61b66f89f4a.mod -> github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod mirror://goproxy//github.com/auth0/go-jwt-middleware/@v/v1.0.1.mod -> github.com%2Fauth0%2Fgo-jwt-middleware%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.12.54.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.12.54.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.35.24.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.35.24.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.49.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.38.49.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.49.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v55.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20170929234023-d6e3b3328b78.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210608223527-2377c96fe795.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210608223527-2377c96fe795.mod mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.zip -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.zip mirror://goproxy//github.com/!azure/go-ansiterm/@v/v0.0.0-20210617225240-d185dfc1b5a1.mod -> github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20210617225240-d185dfc1b5a1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/adal/@v/v0.9.13.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/date/@v/v0.3.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/mocks/@v/v0.4.1.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/to/@v/v0.4.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/@v/v0.11.18.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.zip -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!azure/go-autorest/autorest/validation/@v/v0.1.0.mod -> github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.zip -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/!azure/go-autorest/logger/@v/v0.2.1.mod -> github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.zip -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/!azure/go-autorest/tracing/@v/v0.6.0.mod -> github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v14.2.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.0.3.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/benbjohnson/clock/@v/v1.1.0.zip -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/benbjohnson/clock/@v/v1.1.0.mod -> github.com%2Fbenbjohnson%2Fclock%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.zip -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/bits-and-blooms/bitset/@v/v1.2.0.mod -> github.com%2Fbits-and-blooms%2Fbitset%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.3-0.20200106085610-5cbc8cc4026c.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod mirror://goproxy//github.com/bketelsen/crypt/@v/v0.0.4.mod -> github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.0+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.zip -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip mirror://goproxy//github.com/blang/semver/@v/v3.5.1+incompatible.mod -> github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20201105010758-936f38b697fd.zip -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.zip mirror://goproxy//github.com/bronze1man/go!strongswan!vici/@v/v0.0.0-20201105010758-936f38b697fd.mod -> github.com%2Fbronze1man%2Fgo!strongswan!vici%2F@v%2Fv0.0.0-20201105010758-936f38b697fd.mod mirror://goproxy//github.com/buger/jsonparser/@v/v0.0.0-20180808090653-f4dd9f5a6b44.mod -> github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20180808090653-f4dd9f5a6b44.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.zip -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!burnt!sushi/xgb/@v/v0.0.0-20160522181843-27f122750802.mod -> github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.zip -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/canonical/go-dqlite/@v/v1.5.1.mod -> github.com%2Fcanonical%2Fgo-dqlite%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/cenkalti/backoff/v4/@v/v4.1.1.mod -> github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.1.1.mod mirror://goproxy//github.com/census-instrumentation/opencensus-proto/@v/v0.2.1.mod -> github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20191021191039-0944d244cd40.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20191021191039-0944d244cd40.mod mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.zip -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.zip mirror://goproxy//github.com/certifi/gocertifi/@v/v0.0.0-20200922220541-2c3bb06c6054.mod -> github.com%2Fcertifi%2Fgocertifi%2F@v%2Fv0.0.0-20200922220541-2c3bb06c6054.mod mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.zip -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/cespare/xxhash/@v/v1.1.0.mod -> github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.zip -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.zip mirror://goproxy//github.com/chai2010/gettext-go/@v/v0.0.0-20160711120539-c6fed771bfd5.mod -> github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.zip -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.zip mirror://goproxy//github.com/checkpoint-restore/go-criu/v5/@v/v5.0.0.mod -> github.com%2Fcheckpoint-restore%2Fgo-criu%2Fv5%2F@v%2Fv5.0.0.mod mirror://goproxy//github.com/cheggaaa/pb/@v/v1.0.29.mod -> github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod mirror://goproxy//github.com/chzyer/logex/@v/v1.1.10.mod -> github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/chzyer/readline/@v/v0.0.0-20180603132655-2972be24d48e.mod -> github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod mirror://goproxy//github.com/chzyer/test/@v/v0.0.0-20180213035817-a1ea475d72b1.mod -> github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.2.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.4.0.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.zip -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.zip mirror://goproxy//github.com/cilium/ebpf/@v/v0.6.2.mod -> github.com%2Fcilium%2Febpf%2F@v%2Fv0.6.2.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/clusterhq/flocker-go/@v/v0.0.0-20160920122132-2b8b7259d313.mod -> github.com%2Fclusterhq%2Fflocker-go%2F@v%2Fv0.0.0-20160920122132-2b8b7259d313.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20191209042840-269d4d468f6f.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20201120205902-5459f2c99403.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod mirror://goproxy//github.com/cncf/udpa/go/@v/v0.0.0-20210930031921-04548b0d99d4.mod -> github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20210930031921-04548b0d99d4.mod mirror://goproxy//github.com/cncf/xds/go/@v/v0.0.0-20210312221358-fbca930ec8ed.mod -> github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210312221358-fbca930ec8ed.mod mirror://goproxy//github.com/cncf/xds/go/@v/v0.0.0-20210805033703-aa0b78936158.mod -> github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210805033703-aa0b78936158.mod mirror://goproxy//github.com/cncf/xds/go/@v/v0.0.0-20210922020428-25de7278fc84.mod -> github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210922020428-25de7278fc84.mod mirror://goproxy//github.com/cncf/xds/go/@v/v0.0.0-20211011173535-cb28da3451f1.mod -> github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20211011173535-cb28da3451f1.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20190809214429-80d97fb3cbaa.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.zip -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.zip mirror://goproxy//github.com/cockroachdb/datadriven/@v/v0.0.0-20200714090401-bf6692d28da5.mod -> github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20200714090401-bf6692d28da5.mod mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.zip -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/cockroachdb/errors/@v/v1.2.4.mod -> github.com%2Fcockroachdb%2Ferrors%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.zip -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.zip mirror://goproxy//github.com/cockroachdb/logtags/@v/v0.0.0-20190617123548-eb05cc24525f.mod -> github.com%2Fcockroachdb%2Flogtags%2F@v%2Fv0.0.0-20190617123548-eb05cc24525f.mod mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/aufs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Faufs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/btrfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fbtrfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/cgroups/@v/v0.0.0-20210114181951-8a68de567b68.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20210114181951-8a68de567b68.mod mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.zip -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/containerd/cgroups/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/console/@v/v1.0.3.zip -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/containerd/console/@v/v1.0.3.mod -> github.com%2Fcontainerd%2Fconsole%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.0.0-20210208174643-50096c924a4e.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20210208174643-50096c924a4e.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/continuity/@v/v0.2.1.zip -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/containerd/continuity/@v/v0.2.1.mod -> github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/fifo/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Ffifo%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.4.zip -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/containerd/fuse-overlayfs-snapshotter/@v/v1.0.4.mod -> github.com%2Fcontainerd%2Ffuse-overlayfs-snapshotter%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/go-cni/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fgo-cni%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/go-runc/@v/v0.0.0-20201020171139-16b287bc67d0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20201020171139-16b287bc67d0.mod mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/go-runc/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.zip -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containerd/imgcrypt/@v/v1.1.1.mod -> github.com%2Fcontainerd%2Fimgcrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.zip -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/containerd/nri/@v/v0.1.0.mod -> github.com%2Fcontainerd%2Fnri%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.10.1.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.10.1.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/estargz/@v/v0.9.0.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2Festargz%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.10.1.zip -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.10.1.zip mirror://goproxy//github.com/containerd/stargz-snapshotter/@v/v0.10.1.mod -> github.com%2Fcontainerd%2Fstargz-snapshotter%2F@v%2Fv0.10.1.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/ttrpc/@v/v1.1.0.zip -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/containerd/ttrpc/@v/v1.1.0.mod -> github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.1.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.zip -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/containerd/typeurl/@v/v1.0.2.mod -> github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.zip -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/containerd/zfs/@v/v1.0.0.mod -> github.com%2Fcontainerd%2Fzfs%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.7.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.0.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.zip -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/containernetworking/cni/@v/v0.8.1.mod -> github.com%2Fcontainernetworking%2Fcni%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.8.6.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.zip -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/containernetworking/plugins/@v/v0.9.1.mod -> github.com%2Fcontainernetworking%2Fplugins%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.zip -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/containers/ocicrypt/@v/v1.1.1.mod -> github.com%2Fcontainers%2Focicrypt%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.5.0.zip -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/container-storage-interface/spec/@v/v1.5.0.mod -> github.com%2Fcontainer-storage-interface%2Fspec%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/coredns/caddy/@v/v1.1.0.mod -> github.com%2Fcoredns%2Fcaddy%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/coredns/corefile-migration/@v/v1.0.14.mod -> github.com%2Fcoredns%2Fcorefile-migration%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/coreos/bbolt/@v/v1.3.2.mod -> github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.1.11+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.1.11+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.10+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod mirror://goproxy//github.com/coreos/etcd/@v/v3.3.13+incompatible.mod -> github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.4.5.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.4.5.mod mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.zip -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/coreos/go-iptables/@v/v0.5.0.mod -> github.com%2Fcoreos%2Fgo-iptables%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.1.0+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.2.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.zip -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/coreos/go-semver/@v/v0.3.0.mod -> github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20180511133405-39ca1b05acc7.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.zip -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip mirror://goproxy//github.com/coreos/go-systemd/@v/v0.0.0-20190321100706-95778dfbb74e.mod -> github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.1.0.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.1.0.mod mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.zip -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.zip mirror://goproxy//github.com/coreos/go-systemd/v22/@v/v22.3.2.mod -> github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20160727233714-3ac0863d7acf.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod mirror://goproxy//github.com/coreos/pkg/@v/v0.0.0-20180928190104-399ea9e2e55f.mod -> github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0-20190314233015-f79a8a8ca69d.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.0.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.zip -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/cpuguy83/go-md2man/v2/@v/v2.0.1.mod -> github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.11.zip -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/creack/pty/@v/v1.1.11.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.7.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/creack/pty/@v/v1.1.9.mod -> github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.zip -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/cyphar/filepath-securejoin/@v/v0.2.2.mod -> github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/d2g/dhcp4client/@v/v1.0.0.mod -> github.com%2Fd2g%2Fdhcp4client%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/d2g/dhcp4server/@v/v0.0.0-20181031114812-7d4a0a7f59a5.mod -> github.com%2Fd2g%2Fdhcp4server%2F@v%2Fv0.0.0-20181031114812-7d4a0a7f59a5.mod mirror://goproxy//github.com/d2g/dhcp4/@v/v0.0.0-20170904100407-a1d1b6c41b1c.mod -> github.com%2Fd2g%2Fdhcp4%2F@v%2Fv0.0.0-20170904100407-a1d1b6c41b1c.mod mirror://goproxy//github.com/d2g/hardwareaddr/@v/v0.0.0-20190221164911-e7d9fbe030e4.mod -> github.com%2Fd2g%2Fhardwareaddr%2F@v%2Fv0.0.0-20190221164911-e7d9fbe030e4.mod mirror://goproxy//github.com/danieljoos/wincred/@v/v1.1.0.mod -> github.com%2Fdanieljoos%2Fwincred%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.zip -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.zip mirror://goproxy//github.com/daviddengcn/go-colortext/@v/v0.0.0-20160507010035-511bcaf42ccd.mod -> github.com%2Fdaviddengcn%2Fgo-colortext%2F@v%2Fv0.0.0-20160507010035-511bcaf42ccd.mod mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170629053852-f6cab0c35083.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170629053852-f6cab0c35083.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/dgryski/go-sip13/@v/v0.0.0-20181026042036-e10d5fee7954.mod -> github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.10+incompatible.zip -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.10+incompatible.zip mirror://goproxy//github.com/docker/cli/@v/v20.10.10+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.10+incompatible.mod mirror://goproxy//github.com/docker/cli/@v/v20.10.9+incompatible.mod -> github.com%2Fdocker%2Fcli%2F@v%2Fv20.10.9+incompatible.mod mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.zip -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.zip mirror://goproxy//github.com/docker/distribution/@v/v2.7.1+incompatible.mod -> github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.zip -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.zip mirror://goproxy//github.com/docker/docker-credential-helpers/@v/v0.6.4.mod -> github.com%2Fdocker%2Fdocker-credential-helpers%2F@v%2Fv0.6.4.mod mirror://goproxy//github.com/docker/docker/@v/v20.10.7+incompatible.zip -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.zip mirror://goproxy//github.com/docker/docker/@v/v20.10.7+incompatible.mod -> github.com%2Fdocker%2Fdocker%2F@v%2Fv20.10.7+incompatible.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.zip -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.zip mirror://goproxy//github.com/docker/go-events/@v/v0.0.0-20190806004212-e31b211e4f1c.mod -> github.com%2Fdocker%2Fgo-events%2F@v%2Fv0.0.0-20190806004212-e31b211e4f1c.mod mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.zip -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/docker/go-metrics/@v/v0.0.1.mod -> github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/docker/go-units/@v/v0.3.3.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.3.3.mod mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.zip -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/docker/go-units/@v/v0.4.0.mod -> github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/docopt/docopt-go/@v/v0.0.0-20180111231733-ee0de3bc6815.mod -> github.com%2Fdocopt%2Fdocopt-go%2F@v%2Fv0.0.0-20180111231733-ee0de3bc6815.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v0.0.0-20171111073723-bb3d318650d4.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.zip -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/dustin/go-humanize/@v/v1.0.0.mod -> github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/dustmop/soup/@v/v1.1.2-0.20190516214245-38228baa104e.mod -> github.com%2Fdustmop%2Fsoup%2F@v%2Fv1.1.2-0.20190516214245-38228baa104e.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.zip -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.zip -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip mirror://goproxy//github.com/emicklei/go-restful/@v/v2.9.5+incompatible.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.10-0.20210907150352-cf90f659a021.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.10-0.20210907150352-cf90f659a021.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.1-0.20191026205805-5f8ba28d4473.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.4.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20201210154907-fd9021fe5dad.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210217033140-668b12f5399d.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.9.9-0.20210512163311-63b5d3c536b0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210512163311-63b5d3c536b0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.1.0.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.zip -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.zip mirror://goproxy//github.com/erikdubbelboer/gspt/@v/v0.0.0-20190125194910-e68493906b83.mod -> github.com%2Ferikdubbelboer%2Fgspt%2F@v%2Fv0.0.0-20190125194910-e68493906b83.mod mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.zip -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/euank/go-kmsg-parser/@v/v2.0.0+incompatible.mod -> github.com%2Feuank%2Fgo-kmsg-parser%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.11.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.11.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.12.0+incompatible.zip -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.12.0+incompatible.zip mirror://goproxy//github.com/evanphx/json-patch/@v/v4.12.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.12.0+incompatible.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.5.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.zip -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.zip mirror://goproxy//github.com/exponent-io/jsonpath/@v/v0.0.0-20151013193312-d6023ce2651d.mod -> github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod mirror://goproxy//github.com/fanliao/go-promise/@v/v0.0.0-20141029170127-1890db352a72.mod -> github.com%2Ffanliao%2Fgo-promise%2F@v%2Fv0.0.0-20141029170127-1890db352a72.mod mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/camelcase/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.zip -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/felixge/httpsnoop/@v/v1.0.1.mod -> github.com%2Ffelixge%2Fhttpsnoop%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/flannel-io/flannel/@v/v0.15.1.zip -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.15.1.zip mirror://goproxy//github.com/flannel-io/flannel/@v/v0.15.1.mod -> github.com%2Fflannel-io%2Fflannel%2F@v%2Fv0.15.1.mod mirror://goproxy//github.com/flynn/go-shlex/@v/v0.0.0-20150515145356-3f9db97f8568.mod -> github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod mirror://goproxy//github.com/fogleman/gg/@v/v1.2.1-0.20190220221249-0403632d5b90.mod -> github.com%2Ffogleman%2Fgg%2F@v%2Fv1.2.1-0.20190220221249-0403632d5b90.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.2+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.2+incompatible.mod mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.zip -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.zip mirror://goproxy//github.com/form3tech-oss/jwt-go/@v/v3.2.3+incompatible.mod -> github.com%2Fform3tech-oss%2Fjwt-go%2F@v%2Fv3.2.3+incompatible.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.11.3.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.11.3.mod mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.zip -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.zip mirror://goproxy//github.com/frankban/quicktest/@v/v1.12.1.mod -> github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.zip -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/fvbommel/sortorder/@v/v1.0.1.mod -> github.com%2Ffvbommel%2Fsortorder%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/getkin/kin-openapi/@v/v0.76.0.mod -> github.com%2Fgetkin%2Fkin-openapi%2F@v%2Fv0.76.0.mod mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.zip -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/getsentry/raven-go/@v/v0.2.0.mod -> github.com%2Fgetsentry%2Fraven-go%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20180905125535-1ca0a4f7cbcb.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod mirror://goproxy//github.com/globalsign/mgo/@v/v0.0.0-20181015135952-eeefdecb41b8.mod -> github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.zip -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.zip mirror://goproxy//github.com/go-bindata/go-bindata/@v/v3.1.2+incompatible.mod -> github.com%2Fgo-bindata%2Fgo-bindata%2F@v%2Fv3.1.2+incompatible.mod mirror://goproxy//github.com/goccy/go-json/@v/v0.7.10.zip -> github.com%2Fgoccy%2Fgo-json%2F@v%2Fv0.7.10.zip mirror://goproxy//github.com/goccy/go-json/@v/v0.7.10.mod -> github.com%2Fgoccy%2Fgo-json%2F@v%2Fv0.7.10.mod mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.zip -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.zip mirror://goproxy//github.com/godbus/dbus/@v/v0.0.0-20180201030542-885f9cc04c9c.mod -> github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20180201030542-885f9cc04c9c.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.3.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.3.mod mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.zip -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.zip mirror://goproxy//github.com/godbus/dbus/v5/@v/v5.0.4.mod -> github.com%2Fgodbus%2Fdbus%2Fv5%2F@v%2Fv5.0.4.mod mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.zip -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/go-errors/errors/@v/v1.0.1.mod -> github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/gofrs/flock/@v/v0.8.1.zip -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/gofrs/flock/@v/v0.8.1.mod -> github.com%2Fgofrs%2Fflock%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/gofrs/uuid/@v/v4.0.0+incompatible.zip -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.zip mirror://goproxy//github.com/gofrs/uuid/@v/v4.0.0+incompatible.mod -> github.com%2Fgofrs%2Fuuid%2F@v%2Fv4.0.0+incompatible.mod mirror://goproxy//github.com/go-gl/glfw/@v/v0.0.0-20190409004039-e6da0acd62b1.mod -> github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20191125211704-12ad95a8df72.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod mirror://goproxy//github.com/go-gl/glfw/v3.3/glfw/@v/v0.0.0-20200222043503-6f7a984d4dc4.mod -> github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.3.2.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.4.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.2.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/go-ini/ini/@v/v1.28.1.mod -> github.com%2Fgo-ini%2Fini%2F@v%2Fv1.28.1.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-kit/log/@v/v0.1.0.mod -> github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/golang/freetype/@v/v0.0.0-20170609003504-e2365dfdc4a0.mod -> github.com%2Fgolang%2Ffreetype%2F@v%2Fv0.0.0-20170609003504-e2365dfdc4a0.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/glog/@v/v1.0.0.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20180513044358-24b0969c4cb7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190129154638-5b532d6fd5ef.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20190702054246-869f871628b6.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20191227052852-215e87163ea7.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20200121045136-8c9f03a8e57e.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.zip -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.zip mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20210331224755-41bb18bfe9da.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20210331224755-41bb18bfe9da.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.2.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.3.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.3.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/mock/@v/v1.4.4.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/golang/mock/@v/v1.5.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/mock/@v/v1.6.0.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/golang/mock/@v/v1.6.0.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/golangplus/bytes/@v/v0.0.0-20160111154220-45c989fe5450.mod -> github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod mirror://goproxy//github.com/golangplus/fmt/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ffmt%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golangplus/testing/@v/v0.0.0-20180327235837-af21d9c3145e.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.zip -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/golangplus/testing/@v/v1.0.0.mod -> github.com%2Fgolangplus%2Ftesting%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.4.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.5.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.3.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.5.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.3.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.5.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v0.4.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v1.2.0.zip -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/go-logr/logr/@v/v1.2.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/go-logr/zapr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Fzapr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-logr/zapr/@v/v1.2.0.mod -> github.com%2Fgo-logr%2Fzapr%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.4.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.zip -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip mirror://goproxy//github.com/googleapis/gax-go/v2/@v/v2.0.5.mod -> github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.3.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.1.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.5.5.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/btree/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/btree/@v/v1.0.1.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/google/btree/@v/v1.0.1.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/google/cel-go/@v/v0.9.0.zip -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.9.0.zip mirror://goproxy//github.com/google/cel-go/@v/v0.9.0.mod -> github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/google/cel-spec/@v/v0.6.0.mod -> github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v1.16.1-0.20210702024009-ea6160c1d0e3.zip -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv1.16.1-0.20210702024009-ea6160c1d0e3.zip mirror://goproxy//github.com/!google!cloud!platform/k8s-cloud-provider/@v/v1.16.1-0.20210702024009-ea6160c1d0e3.mod -> github.com%2F!google!cloud!platform%2Fk8s-cloud-provider%2F@v%2Fv1.16.1-0.20210702024009-ea6160c1d0e3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.2.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.3.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.4.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.5.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/google/go-containerregistry/@v/v0.6.1-0.20211111182346-7a6ee45528a9.zip -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.6.1-0.20211111182346-7a6ee45528a9.zip mirror://goproxy//github.com/google/go-containerregistry/@v/v0.6.1-0.20211111182346-7a6ee45528a9.mod -> github.com%2Fgoogle%2Fgo-containerregistry%2F@v%2Fv0.6.1-0.20211111182346-7a6ee45528a9.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/martian/@v/v2.1.0+incompatible.mod -> github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.0.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.1.0.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//github.com/google/martian/v3/@v/v3.2.1.mod -> github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20181206194817-3ea8567a2e57.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20190515194954-54271f7e092f.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20191218002539-d4f498aebedc.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200212024743-f11f1df84d12.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200212024743-f11f1df84d12.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200229191704-1ebb73c60ed3.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200430221834-fc25d7d30c6d.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20200708004538-1a94d8640e99.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201023163331-3e6fc7fc9c4c.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20201203190320-1bf35d6f28c2.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210122040257-d980be63207e.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210226084205-cbba55b83ad5.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210601050228-01bbb1931b22.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210609004039-a478d1d731e9.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.mod mirror://goproxy//github.com/google/pprof/@v/v0.0.0-20210720184732-4bb14d4b1be1.mod -> github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210720184732-4bb14d4b1be1.mod mirror://goproxy//github.com/google/renameio/@v/v0.1.0.mod -> github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.zip -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip mirror://goproxy//github.com/google/shlex/@v/v0.0.0-20191202100458-e7afc7fbc510.mod -> github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod mirror://goproxy//github.com/google/uuid/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.2.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/google/uuid/@v/v1.2.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.2.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.3.0.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/google/uuid/@v/v1.3.0.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.0.0-20180825180245-b006789cd277.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/analysis/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/errors/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Ferrors%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.zip -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.zip mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/loads/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Floads%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.0.0-20180920151709-4f900dc2ade9.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.0.0-20180920151709-4f900dc2ade9.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/runtime/@v/v0.19.4.mod -> github.com%2Fgo-openapi%2Fruntime%2F@v%2Fv0.19.4.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.0.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.0.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.3.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.3.mod mirror://goproxy//github.com/go-openapi/strfmt/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fstrfmt%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.17.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.17.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.zip -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.zip mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.14.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.14.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.19.5.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.19.5.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.18.0.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.2.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod mirror://goproxy//github.com/go-openapi/validate/@v/v0.19.8.mod -> github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.8.mod mirror://goproxy//github.com/go-ozzo/ozzo-validation/@v/v3.5.0+incompatible.mod -> github.com%2Fgo-ozzo%2Fozzo-validation%2F@v%2Fv3.5.0+incompatible.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.1.0.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20200217142428-fce0ec30dd00.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20200217142428-fce0ec30dd00.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.4.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.8.0.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v0.0.0-20170926233335-4201258b820c.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.2.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.zip -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/go-sql-driver/mysql/@v/v1.6.0.mod -> github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/go-task/slim-sprig/@v/v0.0.0-20210107165309-348f09dbbbc0.mod -> github.com%2Fgo-task%2Fslim-sprig%2F@v%2Fv0.0.0-20210107165309-348f09dbbbc0.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.0.1-0.20190118093823-f849b5445de4.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-middleware/@v/v1.3.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.zip -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/grpc-ecosystem/go-grpc-prometheus/@v/v1.2.0.mod -> github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.zip -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.zip mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.16.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.0.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/grpc-ecosystem/grpc-gateway/@v/v1.9.5.mod -> github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.1.1-0.20210825171523-3ab5d95a30ae.zip -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.1-0.20210825171523-3ab5d95a30ae.zip mirror://goproxy//github.com/hanwen/go-fuse/v2/@v/v2.1.1-0.20210825171523-3ab5d95a30ae.mod -> github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.1.1-0.20210825171523-3ab5d95a30ae.mod mirror://goproxy//github.com/hashicorp/consul/api/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/consul/sdk/@v/v0.1.1.mod -> github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.7.0.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.7.0.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.7.0.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/heketi/heketi/@v/v10.3.0+incompatible.mod -> github.com%2Fheketi%2Fheketi%2F@v%2Fv10.3.0+incompatible.mod mirror://goproxy//github.com/heketi/tests/@v/v0.0.0-20151005000721-f3775cbcefd6.mod -> github.com%2Fheketi%2Ftests%2F@v%2Fv0.0.0-20151005000721-f3775cbcefd6.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hugelgupf/socketpair/@v/v0.0.0-20190730060125-05d35a94e714.mod -> github.com%2Fhugelgupf%2Fsocketpair%2F@v%2Fv0.0.0-20190730060125-05d35a94e714.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20181102032728-5e5cf60278f6.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod mirror://goproxy//github.com/ianlancetaylor/demangle/@v/v0.0.0-20200824232613-28f6c0f3b639.mod -> github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.12.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.12.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.5.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/insomniacslk/dhcp/@v/v0.0.0-20210120172423-cc9239ac6294.mod -> github.com%2Finsomniacslk%2Fdhcp%2F@v%2Fv0.0.0-20210120172423-cc9239ac6294.mod mirror://goproxy//github.com/ishidawataru/sctp/@v/v0.0.0-20190723014705-7c296d48a2b5.mod -> github.com%2Fishidawataru%2Fsctp%2F@v%2Fv0.0.0-20190723014705-7c296d48a2b5.mod mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.zip -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.zip mirror://goproxy//github.com/!jeff!ashton/win_pdh/@v/v0.0.0-20161109143554-76bb4ee9f0ab.mod -> github.com%2F!jeff!ashton%2Fwin_pdh%2F@v%2Fv0.0.0-20161109143554-76bb4ee9f0ab.mod mirror://goproxy//github.com/j-keck/arping/@v/v0.0.0-20160618110441-2cf9dc699c56.mod -> github.com%2Fj-keck%2Farping%2F@v%2Fv0.0.0-20160618110441-2cf9dc699c56.mod mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.zip -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip mirror://goproxy//github.com/jmespath/go-jmespath/internal/testify/@v/v1.5.1.mod -> github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20160803190731-bd40a432e4c7.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.4.0.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/joho/godotenv/@v/v0.0.0-20161216230537-726cc8b906e3.mod -> github.com%2Fjoho%2Fgodotenv%2F@v%2Fv0.0.0-20161216230537-726cc8b906e3.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.1.0.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.zip -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/jonboulle/clockwork/@v/v0.2.2.mod -> github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.zip -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/josharian/intern/@v/v1.0.0.mod -> github.com%2Fjosharian%2Fintern%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jpillora/backoff/@v/v1.0.0.mod -> github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20190606172950-9527aa82566a.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20190606172950-9527aa82566a.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20200117123717-f846d4f6c1f4.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20200117123717-f846d4f6c1f4.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201009170750-9c6f07d100c1.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201009170750-9c6f07d100c1.mod mirror://goproxy//github.com/jsimonetti/rtnetlink/@v/v0.0.0-20201110080708-d2c240429e6c.mod -> github.com%2Fjsimonetti%2Frtnetlink%2F@v%2Fv0.0.0-20201110080708-d2c240429e6c.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.10.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.11.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.12.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.12.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.12.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.12.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.0.0-20190106144839-af01ea7f8024.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod mirror://goproxy//github.com/jstemmer/go-junit-report/@v/v0.9.1.mod -> github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.3.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/jung-kurt/gofpdf/@v/v1.0.3-0.20190309125859-24315acbbda5.mod -> github.com%2Fjung-kurt%2Fgofpdf%2F@v%2Fv1.0.3-0.20190309125859-24315acbbda5.mod mirror://goproxy//github.com/k3s-io/cadvisor/@v/v0.43.0-k3s1.zip -> github.com%2Fk3s-io%2Fcadvisor%2F@v%2Fv0.43.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cadvisor/@v/v0.43.0-k3s1.mod -> github.com%2Fk3s-io%2Fcadvisor%2F@v%2Fv0.43.0-k3s1.mod mirror://goproxy//github.com/k3s-io/containerd/@v/v1.5.8-k3s2.zip -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.8-k3s2.zip mirror://goproxy//github.com/k3s-io/containerd/@v/v1.5.8-k3s2.mod -> github.com%2Fk3s-io%2Fcontainerd%2F@v%2Fv1.5.8-k3s2.mod mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.22.0-k3s1.zip -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.22.0-k3s1.zip mirror://goproxy//github.com/k3s-io/cri-tools/@v/v1.22.0-k3s1.mod -> github.com%2Fk3s-io%2Fcri-tools%2F@v%2Fv1.22.0-k3s1.mod mirror://goproxy//github.com/k3s-io/etcd/api/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/api/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/client/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/client/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/etcdutl/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/etcdutl/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fetcdutl%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/etcd/server/v3/@v/v3.5.0-k3s2.zip -> github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.zip mirror://goproxy//github.com/k3s-io/etcd/server/v3/@v/v3.5.0-k3s2.mod -> github.com%2Fk3s-io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0-k3s2.mod mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.11.7.zip -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.7.zip mirror://goproxy//github.com/k3s-io/helm-controller/@v/v0.11.7.mod -> github.com%2Fk3s-io%2Fhelm-controller%2F@v%2Fv0.11.7.mod mirror://goproxy//github.com/k3s-io/kine/@v/v0.8.1.zip -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/k3s-io/kine/@v/v0.8.1.mod -> github.com%2Fk3s-io%2Fkine%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/k3s-io/klog/@v/v1.0.0-k3s2.zip -> github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s2.zip mirror://goproxy//github.com/k3s-io/klog/@v/v1.0.0-k3s2.mod -> github.com%2Fk3s-io%2Fklog%2F@v%2Fv1.0.0-k3s2.mod mirror://goproxy//github.com/k3s-io/klog/v2/@v/v2.30.0-k3s1.zip -> github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.30.0-k3s1.zip mirror://goproxy//github.com/k3s-io/klog/v2/@v/v2.30.0-k3s1.mod -> github.com%2Fk3s-io%2Fklog%2Fv2%2F@v%2Fv2.30.0-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiextensions-apiserver%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapimachinery%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapiserver%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/api/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fapi%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fclient-go%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcli-runtime%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcloud-provider%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcluster-bootstrap%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcode-generator%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-base%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcomponent-helpers%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcontroller-manager%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcri-api%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fcsi-translation-lib%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-aggregator%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-controller-manager%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubectl%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkubelet%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-proxy%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fkube-scheduler%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Flegacy-cloud-providers%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmetrics%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fmount-utils%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fpod-security-admission%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2Fstaging%2Fsrc%2Fk8s.io%2Fsample-apiserver%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.23.1-k3s1.zip -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.23.1-k3s1.zip mirror://goproxy//github.com/k3s-io/kubernetes/@v/v1.23.1-k3s1.mod -> github.com%2Fk3s-io%2Fkubernetes%2F@v%2Fv1.23.1-k3s1.mod mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.zip -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.zip mirror://goproxy//github.com/karrick/godirwalk/@v/v1.16.1.mod -> github.com%2Fkarrick%2Fgodirwalk%2F@v%2Fv1.16.1.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.5.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/compress/@v/v1.13.6.zip -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.6.zip mirror://goproxy//github.com/klauspost/compress/@v/v1.13.6.mod -> github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.13.6.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.3.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.3.1.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.2.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.3.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/kr/fs/@v/v0.1.0.mod -> github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.1.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.5.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/text/@v/v0.2.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/text/@v/v0.2.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.zip -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.zip mirror://goproxy//github.com/kylelemons/godebug/@v/v0.0.0-20170820004349-d65d576e9348.mod -> github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.zip -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/libopenstorage/openstorage/@v/v1.0.0.mod -> github.com%2Flibopenstorage%2Fopenstorage%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/lib/pq/@v/v1.10.2.zip -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.zip mirror://goproxy//github.com/lib/pq/@v/v1.10.2.mod -> github.com%2Flib%2Fpq%2F@v%2Fv1.10.2.mod mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.zip -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip mirror://goproxy//github.com/liggitt/tabwriter/@v/v0.0.0-20181228230101-89fcab3d43de.mod -> github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.zip -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/lithammer/dedent/@v/v1.1.0.mod -> github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/lpabon/godbc/@v/v0.1.1.mod -> github.com%2Flpabon%2Fgodbc%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.0.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.1.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/magiconair/properties/@v/v1.8.5.mod -> github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20180823135443-60711f1a8329.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190312143242-1de009706dbe.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190614124828-94de47d64c63.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190614124828-94de47d64c63.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20190626092158-b2ccc519800e.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190626092158-b2ccc519800e.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.0.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.zip -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.zip mirror://goproxy//github.com/mailru/easyjson/@v/v0.7.6.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.6.mod mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.zip -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip mirror://goproxy//github.com/!make!now!just/heredoc/@v/v0.0.0-20170808103936-bb23615498cd.mod -> github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.2.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.7.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-shellwords/@v/v1.0.3.mod -> github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.zip -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.zip mirror://goproxy//github.com/mattn/go-sqlite3/@v/v1.14.8.mod -> github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.8.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.2-0.20181231171920-c182affec369.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.2-0.20181231171920-c182affec369.mod mirror://goproxy//github.com/mdlayher/ethernet/@v/v0.0.0-20190606142754-0394541c37b7.mod -> github.com%2Fmdlayher%2Fethernet%2F@v%2Fv0.0.0-20190606142754-0394541c37b7.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v0.0.0-20190409211403-11939a169225.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv0.0.0-20190409211403-11939a169225.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.0.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.0.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mdlayher/netlink/@v/v1.1.1.mod -> github.com%2Fmdlayher%2Fnetlink%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20190606142536-fef19f00fc18.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20190606142536-fef19f00fc18.mod mirror://goproxy//github.com/mdlayher/raw/@v/v0.0.0-20191009151244-50f2db8cc065.mod -> github.com%2Fmdlayher%2Fraw%2F@v%2Fv0.0.0-20191009151244-50f2db8cc065.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.11.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.11.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.15.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210211115548-6eac466e5fa3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210211115548-6eac466e5fa3.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17-0.20210324224401-5516f17a5958.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17-0.20210324224401-5516f17a5958.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.17.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.17.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.5.0.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.5.0.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.16.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.16.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.22.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.22.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.22.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.22.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.23.zip -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.23.zip mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.23.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.23.mod mirror://goproxy//github.com/!microsoft/hcsshim/@v/v0.8.6.mod -> github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.6.mod mirror://goproxy//github.com/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.zip -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/miekg/pkcs11/@v/v1.0.3.mod -> github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.zip -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.zip mirror://goproxy//github.com/mindprince/gonvml/@v/v0.0.0-20190828220739-9ebdce4bb989.mod -> github.com%2Fmindprince%2Fgonvml%2F@v%2Fv0.0.0-20190828220739-9ebdce4bb989.mod mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.zip -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/minio/md5-simd/@v/v1.1.0.mod -> github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.zip -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip mirror://goproxy//github.com/minio/minio-go/v7/@v/v7.0.7.mod -> github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.zip -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/minio/sha256-simd/@v/v0.1.1.mod -> github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/minio/sio/@v/v0.2.1.mod -> github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.zip -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.zip mirror://goproxy//github.com/mistifyio/go-zfs/@v/v2.1.2-0.20190413222219-f784269be439+incompatible.mod -> github.com%2Fmistifyio%2Fgo-zfs%2F@v%2Fv2.1.2-0.20190413222219-f784269be439+incompatible.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.4.1.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.zip -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/ipvs/@v/v1.0.1.mod -> github.com%2Fmoby%2Fipvs%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/locker/@v/v1.0.1.zip -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/moby/locker/@v/v1.0.1.mod -> github.com%2Fmoby%2Flocker%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.zip -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/moby/spdystream/@v/v0.2.0.mod -> github.com%2Fmoby%2Fspdystream%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.4.1.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.5.0.zip -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/moby/sys/mountinfo/@v/v0.5.0.mod -> github.com%2Fmoby%2Fsys%2Fmountinfo%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.zip -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/moby/sys/symlink/@v/v0.1.0.mod -> github.com%2Fmoby%2Fsys%2Fsymlink%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20201216013528-df9cb8a40635.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20201216013528-df9cb8a40635.mod mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.zip -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.zip mirror://goproxy//github.com/moby/term/@v/v0.0.0-20210610120745-9d4ed1856297.mod -> github.com%2Fmoby%2Fterm%2F@v%2Fv0.0.0-20210610120745-9d4ed1856297.mod mirror://goproxy//github.com/moby/vpnkit/@v/v0.5.0.mod -> github.com%2Fmoby%2Fvpnkit%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.2.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.2.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170603005431-491d3605edfb.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170603005431-491d3605edfb.mod mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.zip -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.zip mirror://goproxy//github.com/mohae/deepcopy/@v/v0.0.0-20170929034955-c48cc78d4826.mod -> github.com%2Fmohae%2Fdeepcopy%2F@v%2Fv0.0.0-20170929034955-c48cc78d4826.mod mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.zip -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.zip mirror://goproxy//github.com/monochromegane/go-gitignore/@v/v0.0.0-20200626010858-205db1a8cc00.mod -> github.com%2Fmonochromegane%2Fgo-gitignore%2F@v%2Fv0.0.0-20200626010858-205db1a8cc00.mod mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.zip -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/morikuni/aec/@v/v1.0.0.mod -> github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.zip -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.zip mirror://goproxy//github.com/mrunalp/fileutils/@v/v0.5.0.mod -> github.com%2Fmrunalp%2Ffileutils%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.zip -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.zip mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20191010083416-a7dc8b61c822.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod mirror://goproxy//github.com/mvdan/xurls/@v/v1.1.0.mod -> github.com%2Fmvdan%2Fxurls%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.zip -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.zip -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.zip mirror://goproxy//github.com/natefinch/lumberjack/@v/v2.0.0+incompatible.mod -> github.com%2Fnatefinch%2Flumberjack%2F@v%2Fv2.0.0+incompatible.mod mirror://goproxy//github.com/niemeyer/pretty/@v/v0.0.0-20200227124842-a10e7caefd8e.mod -> github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.8.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.8.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.1.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/oklog/ulid/@v/v1.3.1.mod -> github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.0-20170122224234-a0225b3f23b5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.4.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/olekukonko/tablewriter/@v/v0.0.5.mod -> github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/!one!of!one/xxhash/@v/v1.2.2.mod -> github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20151202141238-7f8ab55aaf3b.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20151202141238-7f8ab55aaf3b.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.10.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.14.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.16.4.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.16.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.4.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.8.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20151007035656-2152b45fa28a.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20151007035656-2152b45fa28a.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.3.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.14.0.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.14.0.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.14.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.14.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.3.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.5.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.8.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.zip -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/opencontainers/go-digest/@v/v1.0.0.mod -> github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.1.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20210730191737-8e42a01fb1b7.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210730191737-8e42a01fb1b7.mod mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20210819154149-5ad6f50d6283.zip -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.zip mirror://goproxy//github.com/opencontainers/image-spec/@v/v1.0.2-0.20210819154149-5ad6f50d6283.mod -> github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.2-0.20210819154149-5ad6f50d6283.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.3.zip -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/opencontainers/runc/@v/v1.0.3.mod -> github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.2.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20200929063507-e6143ca7d51d.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20200929063507-e6143ca7d51d.mod mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.zip -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.zip mirror://goproxy//github.com/opencontainers/runtime-spec/@v/v1.0.3-0.20210326190908-1c3f411f0417.mod -> github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.3-0.20210326190908-1c3f411f0417.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.2.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.2.mod mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.3.zip -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.3.zip mirror://goproxy//github.com/opencontainers/selinux/@v/v1.8.3.mod -> github.com%2Fopencontainers%2Fselinux%2F@v%2Fv1.8.3.mod mirror://goproxy//github.com/opentracing/opentracing-go/@v/v1.1.0.mod -> github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/otiai10/copy/@v/v1.6.0.zip -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/otiai10/copy/@v/v1.6.0.mod -> github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/otiai10/curr/@v/v0.0.0-20150429015615-9b4961190c95.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod mirror://goproxy//github.com/otiai10/curr/@v/v1.0.0.mod -> github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.0.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/otiai10/mint/@v/v1.3.2.zip -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/otiai10/mint/@v/v1.3.2.mod -> github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/paulmach/orb/@v/v0.1.3.mod -> github.com%2Fpaulmach%2Forb%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.0.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pborman/uuid/@v/v1.2.1.mod -> github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.2.0.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.3.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.4.zip -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.4.zip mirror://goproxy//github.com/pelletier/go-toml/@v/v1.9.4.mod -> github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.4.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.6.0+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.6.0+incompatible.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.9.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/pkg/sftp/@v/v1.10.1.mod -> github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20171018203845-0dec1b30a021.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.3.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.1.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.11.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.7.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190812154241-14fe0d1b01d4.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181113130724-41aa239b4cce.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/common/@v/v0.10.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.26.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.28.0.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.28.0.zip mirror://goproxy//github.com/prometheus/common/@v/v0.28.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.28.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190507164030-5867b95ac084.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20190522114515-bc1a522cf7b1.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190522114515-bc1a522cf7b1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.1.3.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.6.0.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod mirror://goproxy//github.com/prometheus/tsdb/@v/v0.7.1.mod -> github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/!puerkito!bio/goquery/@v/v1.5.0.mod -> github.com%2F!puerkito!bio%2Fgoquery%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.zip -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.1.1.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.zip -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20170810143723-de5bf2ad4578.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.mod mirror://goproxy//github.com/qri-io/starlib/@v/v0.4.2-0.20200213133954-ff2e8cd5ef8d.mod -> github.com%2Fqri-io%2Fstarlib%2F@v%2Fv0.4.2-0.20200213133954-ff2e8cd5ef8d.mod mirror://goproxy//github.com/quobyte/api/@v/v0.1.8.mod -> github.com%2Fquobyte%2Fapi%2F@v%2Fv0.1.8.mod mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.3.1.zip -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.3.1.zip mirror://goproxy//github.com/rancher/dynamiclistener/@v/v0.3.1.mod -> github.com%2Francher%2Fdynamiclistener%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/rancher/lasso/@v/v0.0.0-20210616224652-fc3ebd901c08.zip -> github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.zip mirror://goproxy//github.com/rancher/lasso/@v/v0.0.0-20210616224652-fc3ebd901c08.mod -> github.com%2Francher%2Flasso%2F@v%2Fv0.0.0-20210616224652-fc3ebd901c08.mod mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.zip -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rancher/remotedialer/@v/v0.2.0.mod -> github.com%2Francher%2Fremotedialer%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/rancher/wharfie/@v/v0.5.1.zip -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/rancher/wharfie/@v/v0.5.1.mod -> github.com%2Francher%2Fwharfie%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.10.zip -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.10.zip mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.10.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.10.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.3.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.3.mod mirror://goproxy//github.com/rancher/wrangler/@v/v0.8.9.mod -> github.com%2Francher%2Fwrangler%2F@v%2Fv0.8.9.mod mirror://goproxy//github.com/remyoudompheng/bigfft/@v/v0.0.0-20170806203942-52369c62f446.mod -> github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.zip -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/!rican7/retry/@v/v0.1.0.mod -> github.com%2F!rican7%2Fretry%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.zip -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.zip mirror://goproxy//github.com/robfig/cron/v3/@v/v3.0.1.mod -> github.com%2Frobfig%2Fcron%2Fv3%2F@v%2Fv3.0.1.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v0.0.0-20150106093220-6724a57986af.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod mirror://goproxy//github.com/rogpeppe/fastuuid/@v/v1.2.0.mod -> github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/rogpeppe/go-internal/@v/v1.3.0.mod -> github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.zip -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.zip mirror://goproxy//github.com/rootless-containers/rootlesskit/@v/v0.14.5.mod -> github.com%2Frootless-containers%2Frootlesskit%2F@v%2Fv0.14.5.mod mirror://goproxy//github.com/rs/xid/@v/v1.2.1.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/rs/xid/@v/v1.3.0.zip -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.zip mirror://goproxy//github.com/rs/xid/@v/v1.3.0.mod -> github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.zip -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.zip mirror://goproxy//github.com/rubiojr/go-vhd/@v/v0.0.0-20200706105327-02e210299021.mod -> github.com%2Frubiojr%2Fgo-vhd%2F@v%2Fv0.0.0-20200706105327-02e210299021.mod mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.zip -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip mirror://goproxy//github.com/russross/blackfriday/@v/v1.5.2.mod -> github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.0.1.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.zip -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip mirror://goproxy//github.com/russross/blackfriday/v2/@v/v2.1.0.mod -> github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/safchain/ethtool/@v/v0.0.0-20190326074333-42ed695e3de8.mod -> github.com%2Fsafchain%2Fethtool%2F@v%2Fv0.0.0-20190326074333-42ed695e3de8.mod mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.zip -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/satori/go.uuid/@v/v1.2.0.mod -> github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.zip -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/seccomp/libseccomp-golang/@v/v0.9.1.mod -> github.com%2Fseccomp%2Flibseccomp-golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.0.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.zip -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/sergi/go-diff/@v/v1.1.0.mod -> github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.zip -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/shurcoo!l/sanitized_anchor_name/@v/v1.0.0.mod -> github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.6.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.7.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.8.1.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v1.1.0.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v1.1.0.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20190330032615-68dc04aab96a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.4.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.zip -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.zip mirror://goproxy//github.com/soheilhy/cmux/@v/v0.1.5.mod -> github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.5.mod mirror://goproxy//github.com/songgao/water/@v/v0.0.0-20200317203138-2b4b6d7c09d8.mod -> github.com%2Fsonggao%2Fwater%2F@v%2Fv0.0.0-20200317203138-2b4b6d7c09d8.mod mirror://goproxy//github.com/spaolacci/murmur3/@v/v0.0.0-20180118202830-f09979ecbc72.mod -> github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod mirror://goproxy//github.com/spf13/afero/@v/v1.1.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.2.2.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.zip -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip mirror://goproxy//github.com/spf13/afero/@v/v1.6.0.mod -> github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.0.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/spf13/cast/@v/v1.3.1.mod -> github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.2-0.20171109065643-2da4a54c5cee.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.0.0.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.1.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.3.mod mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/spf13/cobra/@v/v1.2.1.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.0.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/spf13/jwalterweatherman/@v/v1.1.0.mod -> github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1-0.20171106142849-4c012f6dcd95.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.1.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/spf13/viper/@v/v1.4.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.7.0.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/spf13/viper/@v/v1.8.1.mod -> github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.zip -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.zip mirror://goproxy//github.com/stefanberger/go-pkcs11uri/@v/v0.0.0-20201008174630-78d3cae3a980.mod -> github.com%2Fstefanberger%2Fgo-pkcs11uri%2F@v%2Fv0.0.0-20201008174630-78d3cae3a980.mod mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.zip -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/stoewer/go-strcase/@v/v1.2.0.mod -> github.com%2Fstoewer%2Fgo-strcase%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/storageos/go-api/@v/v2.2.0+incompatible.mod -> github.com%2Fstorageos%2Fgo-api%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.2.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.3-0.20181224173747-660f15d67dbb.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.3-0.20181224173747-660f15d67dbb.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.5.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/subosito/gotenv/@v/v1.2.0.mod -> github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.zip -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.zip mirror://goproxy//github.com/syndtr/gocapability/@v/v0.0.0-20200815063812-42c35b437635.mod -> github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20200815063812-42c35b437635.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.2.6+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.2.6+incompatible.mod mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.zip -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.zip mirror://goproxy//github.com/tchap/go-patricia/@v/v2.3.0+incompatible.mod -> github.com%2Ftchap%2Fgo-patricia%2F@v%2Fv2.3.0+incompatible.mod mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v1.0.67.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.67.mod mirror://goproxy//github.com/tidwall/pretty/@v/v1.0.0.mod -> github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20170815181823-89b8d40f7ca8.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20190109142713-0ad062ec5ee5.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.zip -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.zip mirror://goproxy//github.com/tmc/grpc-websocket-proxy/@v/v0.0.0-20201229170055-e5319fda7802.mod -> github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20201229170055-e5319fda7802.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20191220191345-2ba4b9c3382c.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20191220191345-2ba4b9c3382c.mod mirror://goproxy//github.com/ugorji/go/@v/v0.0.0-20170107133203-ded73eae5db7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20170107133203-ded73eae5db7.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.4.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod mirror://goproxy//github.com/urfave/cli/@v/v1.20.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.21.0.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.21.0.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.1.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.2.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.2.mod mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.zip -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.zip mirror://goproxy//github.com/urfave/cli/@v/v1.22.4.mod -> github.com%2Furfave%2Fcli%2F@v%2Fv1.22.4.mod mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.zip -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip mirror://goproxy//github.com/urfave/cli/v2/@v/v2.3.0.mod -> github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod mirror://goproxy//github.com/urfave/negroni/@v/v1.0.0.mod -> github.com%2Furfave%2Fnegroni%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/u-root/u-root/@v/v7.0.0+incompatible.mod -> github.com%2Fu-root%2Fu-root%2F@v%2Fv7.0.0+incompatible.mod mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.2.zip -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.2.zip mirror://goproxy//github.com/vbatts/tar-split/@v/v0.11.2.mod -> github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.2.mod mirror://goproxy//github.com/vektah/gqlparser/@v/v1.1.2.mod -> github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v0.0.0-20181108222139-023a6dafdcdf.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv0.0.0-20181108222139-023a6dafdcdf.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.0.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.zip -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.zip mirror://goproxy//github.com/vishvananda/netlink/@v/v1.1.1-0.20201029203352-d40f9887b852.mod -> github.com%2Fvishvananda%2Fnetlink%2F@v%2Fv1.1.1-0.20201029203352-d40f9887b852.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20180720170159-13995c7128cc.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20180720170159-13995c7128cc.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20191106174202-0a2b9b5464df.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20191106174202-0a2b9b5464df.mod mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.zip -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.zip mirror://goproxy//github.com/vishvananda/netns/@v/v0.0.0-20200728191858-db3c7e526aae.mod -> github.com%2Fvishvananda%2Fnetns%2F@v%2Fv0.0.0-20200728191858-db3c7e526aae.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.20.3.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.20.3.mod mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.zip -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.zip mirror://goproxy//github.com/xiang90/probing/@v/v0.0.0-20190116061207-43a291ad63a2.mod -> github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.zip -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.zip mirror://goproxy//github.com/xlab/treeprint/@v/v0.0.0-20181112141820-a009c3971eca.mod -> github.com%2Fxlab%2Ftreeprint%2F@v%2Fv0.0.0-20181112141820-a009c3971eca.mod mirror://goproxy//github.com/xordataexchange/crypt/@v/v0.0.3-0.20170626215501-b2862e3d0a77.mod -> github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.25.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.27.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.1.32.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.2.1.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.3.5.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod mirror://goproxy//github.com/yuin/goldmark/@v/v1.4.0.mod -> github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.4.0.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.2.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.3.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.zip -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.zip mirror://goproxy//go.etcd.io/bbolt/@v/v1.3.6.mod -> go.etcd.io%2Fbbolt%2F@v%2Fv1.3.6.mod mirror://goproxy//go.etcd.io/etcd/api/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fapi%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/client/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.zip -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.zip mirror://goproxy//go.etcd.io/etcd/client/v2/@v/v2.305.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv2%2F@v%2Fv2.305.0.mod mirror://goproxy//go.etcd.io/etcd/client/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fclient%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/pkg/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fpkg%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.zip -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.zip mirror://goproxy//go.etcd.io/etcd/raft/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fraft%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/server/v3/@v/v3.5.0.mod -> go.etcd.io%2Fetcd%2Fserver%2Fv3%2F@v%2Fv3.5.0.mod mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.zip -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.zip mirror://goproxy//go.etcd.io/etcd/@v/v0.0.0-20191023171146-3cf2f69b5738.mod -> go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190510104115-cbcb75029529.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190605123033-f99c8df09eb5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200622213623-75b288015ac9.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201002170205-7f63de1d35b0.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201002170205-7f63de1d35b0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210220033148-5ea612d1eb83.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210220033148-5ea612d1eb83.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210322153248-0c34fe9e7dc2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210322153248-0c34fe9e7dc2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20210817164053-32db794688a5.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180321215751-8460e604b9de.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180321215751-8460e604b9de.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20180807140117-3d87b88a115f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20180807140117-3d87b88a115f.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190125153040-c74c464bbbf2.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190306152737-a1d7652674e8.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190312203227-4b39c73a6495.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190510132918-efd6b22b2522.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190731235908-ec7cb31e5a56.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190731235908-ec7cb31e5a56.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190829153037-c13cbed26979.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191030013958-a1ab85dbe136.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191129062945-2f5052295587.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191129062945-2f5052295587.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20191227195350-da58074b4299.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200119233911-0405dc783f0a.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200207192155-f17229e696bd.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20200224162631-6cc2880d07d6.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.zip -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.zip mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20210220032938-85be41e4509f.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20210220032938-85be41e4509f.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20180708004352-c73c2afc3b81.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20180708004352-c73c2afc3b81.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190227222117-0694c2d4d067.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod mirror://goproxy//golang.org/x/image/@v/v0.0.0-20190802002840-cff245a6509b.mod -> golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190301231843-5614ed5bae6f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190409202823-959b441ac422.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190409202823-959b441ac422.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190909230951-414d861bb4ac.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190909230951-414d861bb4ac.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190930215403-16217165b5de.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20191125180803-fdd1cda4f05f.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200130185559-910be7a94367.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200130185559-910be7a94367.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20200302205851-738671d3881b.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20200302205851-738671d3881b.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20201208152925-83fdc39ff7b5.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20201208152925-83fdc39ff7b5.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.zip -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.zip mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20210508222113-6edffad5e616.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20210508222113-6edffad5e616.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190312151609-d3739f865fa6.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20190719004257-d2bd2a29d028.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod mirror://goproxy//golang.org/x/mobile/@v/v0.0.0-20201217150744-e6ae53a27f4f.mod -> golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20201217150744-e6ae53a27f4f.mod mirror://goproxy//golang.org/x/mod/@v/v0.0.0-20190513183733-4bf6d317e70e.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191105210325-c90efee705ee.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191107180719-034126e5016b.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191107180719-034126e5016b.mod mirror://goproxy//golang.org/x/mod/@v/v0.1.1-0.20191209134235-331c550502dd.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191209134235-331c550502dd.mod mirror://goproxy//golang.org/x/mod/@v/v0.2.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.3.1-0.20200828183125-ce943fd02449.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.3.1-0.20200828183125-ce943fd02449.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.0.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.0.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.1.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.1.mod mirror://goproxy//golang.org/x/mod/@v/v0.4.2.zip -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip mirror://goproxy//golang.org/x/mod/@v/v0.4.2.mod -> golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190501004415-9ce7a6920f09.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190522155817-f3200d17e092.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190603091049-60506f45cf65.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190724013045-ca1201d0de80.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190827160401-ba9fcec4b297.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190827160401-ba9fcec4b297.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191209160850-c0dbc17a3553.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200114155413-6afb5195e5aa.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200202094626-16171245cfb2.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200222125558-5a598a2470a0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200222125558-5a598a2470a0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200226121028-0de0cce0169b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200301022130-244492dfa37a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200324143707-d3edc9973b7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200625001655-4c5254603344.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200822124328-c89045814202.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201006153459-a7d1128ccaa0.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201006153459-a7d1128ccaa0.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201021035429-f5854403a974.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201110031124-69a78807bb2b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201202161906-c7110b5ffcbb.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201202161906-c7110b5ffcbb.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20201224014010-6772e930b67b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201224014010-6772e930b67b.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210226172049-e18ecbb05110.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210405180319-a5a99cb37ef4.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210520170846-37e1c6afe023.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210520170846-37e1c6afe023.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210813160813-60bc85c4be6d.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210813160813-60bc85c4be6d.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210813160813-60bc85c4be6d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210813160813-60bc85c4be6d.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210825183410-e898025ed96a.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210825183410-e898025ed96a.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20210825183410-e898025ed96a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210825183410-e898025ed96a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190226205417-e64efc72b421.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20190604053449-0f29369cfe45.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20191202225959-858c2ad4c8b6.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200902213428-5d25da1a8d43.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200902213428-5d25da1a8d43.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201109201403-9fd604954f58.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201109201403-9fd604954f58.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20201208152858-08078c50e5b5.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20201208152858-08078c50e5b5.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210218202405-ba52d332ba99.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210220000619-9bb904979d93.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210313182246-cd4f82c27b84.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210402161424-2e8d93401602.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210427180440-81ed05c6b58c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210427180440-81ed05c6b58c.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210514164344-f6687ab2804c.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210628180205-a41e5a781914.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210628180205-a41e5a781914.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210805134026-6f1e6394065a.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210805134026-6f1e6394065a.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20210819190943-2bc19b11175f.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210819190943-2bc19b11175f.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20211005180243-6b3c2da341f1.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211005180243-6b3c2da341f1.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20211005180243-6b3c2da341f1.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211005180243-6b3c2da341f1.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200317015054-43a5402ce75a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201020160332-67f06af15bc9.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20201207232520-09787c993a3a.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20210220032951-036812b2e83c.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20210220032951-036812b2e83c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181107165924-66b7b1311ac8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190312061237-fead79001313.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190502145724-3ef323f4f1fd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190507160741-ecd444e8653b.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606165138-5da285871e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190606203320-7fc4e5ec1444.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606203320-7fc4e5ec1444.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190624142023-c5567b49c5d0.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190726091711-fc99dfbffb4e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190801041406-cbf593c0f2f3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191001151750-bb3f8db39f24.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191115151921-52ab43148777.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191115151921-52ab43148777.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191204072324-ce4227a45e2e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191210023423-ac6580df4449.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191210023423-ac6580df4449.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191228213918-04cbcbbfeed8.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200106162015-b016eb3dc98e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200113162924-86b910548bc1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200120151820-655fe14d7479.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200120151820-655fe14d7479.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200202164722-d101bd2416d5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200212091648-12a6c2dcc1e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200217220822-9197077df867.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200217220822-9197077df867.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200302150141-5c8b2ff67527.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200615200032-f1bc736245b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200728102440-3e129f6d46b1.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200728102440-3e129f6d46b1.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200831180312-196b9ba8737a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200831180312-196b9ba8737a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200909081042-eff7692f9009.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200909081042-eff7692f9009.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200916030750-2334cc1a136f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200916030750-2334cc1a136f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200922070232-aee5d888a860.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200922070232-aee5d888a860.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200923182605-d9f96fdee20d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200923182605-d9f96fdee20d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200930185726-fdedc70b468f.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201117170446-d9b008d0a637.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201117170446-d9b008d0a637.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201119102817-f84b799fce68.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201201145000-ef89a241ccb3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201201145000-ef89a241ccb3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210119212857-b64e53b001e4.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210119212857-b64e53b001e4.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210124154548-22da62e12c0c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210324051608-47abb6519492.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210324051608-47abb6519492.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210330210617-4fbd30eecc44.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210403161142-5e06dd20ab57.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210423082822-04245dca01da.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210426230700-d19ff857e887.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210426230700-d19ff857e887.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210603081109-ebe580a85c40.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210616094352-59db8d763f22.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210831042530-f4d43177bf5e.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210831042530-f4d43177bf5e.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210831042530-f4d43177bf5e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210831042530-f4d43177bf5e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20211025201205-69cdffdb9359.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211025201205-69cdffdb9359.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20211025201205-69cdffdb9359.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20211025201205-69cdffdb9359.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201126162022-7de9c90e9dd1.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210220032956-6a3ed077a48d.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20210615171337-6886f2dfbf5b.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20170915032832-14c0d48ead0c.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20171227012246-e19ae1496984.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20171227012246-e19ae1496984.mod mirror://goproxy//golang.org/x/text/@v/v0.3.1-0.20180807135948-17ff2d5776d2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/text/@v/v0.3.3.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/text/@v/v0.3.5.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod mirror://goproxy//golang.org/x/text/@v/v0.3.6.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip mirror://goproxy//golang.org/x/text/@v/v0.3.6.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod mirror://goproxy//golang.org/x/text/@v/v0.3.7.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.zip mirror://goproxy//golang.org/x/text/@v/v0.3.7.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.7.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20181108054448-85acf8d2951c.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210220033141-f8bda1e9f3ba.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210220033141-f8bda1e9f3ba.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20210723032227-1f47c861a9ac.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20210723032227-1f47c861a9ac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180525024113-a5b4c53f6e8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180525024113-a5b4c53f6e8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190125232054-d66bd3c5d5a6.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190125232054-d66bd3c5d5a6.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190206041539-40960b6deb8e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190206041539-40960b6deb8e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312151545-0bb0c0a6e846.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190312170243-e65039ee4138.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190425150028-36563e24a262.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190506145303-2d16b83fe98c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190606124116-d0a3d012864b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190614205625-5aca471b1d59.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190617190820-da514acc4774.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190621195816-6e04913cbbac.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190624222133-a101b041ded4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190628153133-6cdbf07be9d0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190816200558-6889da9d5479.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190911174233-4f2ddba30aff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191012152004-8de300cfc20a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191017205301-920acffc3e65.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191017205301-920acffc3e65.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191108193012-7d206e10da11.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191112195655-aa38f8e97acc.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191113191852-77e3bb0ad9e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191113191852-77e3bb0ad9e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191115202509-3a792d9c32b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191115202509-3a792d9c32b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191125144606-a911d9008d1f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191130070609-6e064ea0cf2d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191130070609-6e064ea0cf2d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191216173652-a0e659d51361.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216173652-a0e659d51361.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20191227053925-7b8e75db28f4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117012304-6edc0a871e69.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117012304-6edc0a871e69.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200117161641-43d50277825c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200117161641-43d50277825c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200122220014-bf1340f18c4a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200122220014-bf1340f18c4a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200130002326-2f3ba24bd6e7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200130002326-2f3ba24bd6e7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200204074204-1cc6d1ef6c74.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200204074204-1cc6d1ef6c74.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200207183749-b753a1ba74fa.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200207183749-b753a1ba74fa.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200212150539-ea181f53ac56.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200212150539-ea181f53ac56.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200224181240-023911ca70b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200224181240-023911ca70b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200227222343-706bc42d1f0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200227222343-706bc42d1f0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200304193943-95d2e580d8eb.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200304193943-95d2e580d8eb.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200312045724-11d5b4c81c7d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200312045724-11d5b4c81c7d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200331025713-a30bf2db82d4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200331025713-a30bf2db82d4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200501065659-ab2804fb9c9d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200501065659-ab2804fb9c9d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200505023115-26f46d2f7ef8.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200505023115-26f46d2f7ef8.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200512131952-2bc93b1c0c88.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200512131952-2bc93b1c0c88.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200515010526-7d3b6ebf133d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200515010526-7d3b6ebf133d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200618134242-20370b0cb4b2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200618134242-20370b0cb4b2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200619180055-7c47624df98f.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200619180055-7c47624df98f.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200729194436-6467de6f59a7.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200729194436-6467de6f59a7.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200804011535-6c149bb5ef0d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200804011535-6c149bb5ef0d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200825202427-b303f430e36d.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20200904185747-39188db58858.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200904185747-39188db58858.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201110124207-079ba7bd75cd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201110124207-079ba7bd75cd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201201161351-ac6f37ff4c2a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201201161351-ac6f37ff4c2a.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201208233053-a543418bbed2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20201224043029-2b0845dc783e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201224043029-2b0845dc783e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210105154028-b0ab187a4818.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20210106214847-113979e3529a.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.0.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.1.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.2.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.4.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.4.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.5.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.mod mirror://goproxy//golang.org/x/tools/@v/v0.1.6-0.20210820212750-d4cc65f0b2ff.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6-0.20210820212750-d4cc65f0b2ff.zip mirror://goproxy//golang.org/x/tools/@v/v0.1.6-0.20210820212750-d4cc65f0b2ff.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6-0.20210820212750-d4cc65f0b2ff.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20200804184101-5ec99f83aff1.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod mirror://goproxy//gomodules.xyz/jsonpatch/v2/@v/v2.0.1.mod -> gomodules.xyz%2Fjsonpatch%2Fv2%2F@v%2Fv2.0.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.0.3.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.1.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod mirror://goproxy//go.mongodb.org/mongo-driver/@v/v1.1.2.mod -> go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.zip -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.zip mirror://goproxy//go.mozilla.org/pkcs7/@v/v0.0.0-20200128120323-432b2356ecb1.mod -> go.mozilla.org%2Fpkcs7%2F@v%2Fv0.0.0-20200128120323-432b2356ecb1.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20180816165407-929014505bf4.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20180816165407-929014505bf4.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.0.0-20190331200053-3d26580ed485.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.0.0-20190331200053-3d26580ed485.mod mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.zip -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.zip mirror://goproxy//gonum.org/v1/gonum/@v/v0.6.2.mod -> gonum.org%2Fv1%2Fgonum%2F@v%2Fv0.6.2.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190313105609-8cb42192e0e0.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190313105609-8cb42192e0e0.mod mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.zip -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.zip mirror://goproxy//gonum.org/v1/netlib/@v/v0.0.0-20190331212654-76723241ea4e.mod -> gonum.org%2Fv1%2Fnetlib%2F@v%2Fv0.0.0-20190331212654-76723241ea4e.mod mirror://goproxy//gonum.org/v1/plot/@v/v0.0.0-20190515093506-e2840ee46a6b.mod -> gonum.org%2Fv1%2Fplot%2F@v%2Fv0.0.0-20190515093506-e2840ee46a6b.mod mirror://goproxy//google.golang.org/api/@v/v0.13.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod mirror://goproxy//google.golang.org/api/@v/v0.14.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.14.0.mod mirror://goproxy//google.golang.org/api/@v/v0.15.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.15.0.mod mirror://goproxy//google.golang.org/api/@v/v0.17.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.17.0.mod mirror://goproxy//google.golang.org/api/@v/v0.18.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.18.0.mod mirror://goproxy//google.golang.org/api/@v/v0.19.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.19.0.mod mirror://goproxy//google.golang.org/api/@v/v0.20.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.20.0.mod mirror://goproxy//google.golang.org/api/@v/v0.22.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.22.0.mod mirror://goproxy//google.golang.org/api/@v/v0.24.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.24.0.mod mirror://goproxy//google.golang.org/api/@v/v0.28.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.28.0.mod mirror://goproxy//google.golang.org/api/@v/v0.29.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.29.0.mod mirror://goproxy//google.golang.org/api/@v/v0.30.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.30.0.mod mirror://goproxy//google.golang.org/api/@v/v0.35.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.35.0.mod mirror://goproxy//google.golang.org/api/@v/v0.36.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.36.0.mod mirror://goproxy//google.golang.org/api/@v/v0.40.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod mirror://goproxy//google.golang.org/api/@v/v0.4.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod mirror://goproxy//google.golang.org/api/@v/v0.41.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod mirror://goproxy//google.golang.org/api/@v/v0.43.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod mirror://goproxy//google.golang.org/api/@v/v0.44.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.44.0.mod mirror://goproxy//google.golang.org/api/@v/v0.46.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.46.0.mod mirror://goproxy//google.golang.org/api/@v/v0.47.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod mirror://goproxy//google.golang.org/api/@v/v0.48.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod mirror://goproxy//google.golang.org/api/@v/v0.50.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.50.0.mod mirror://goproxy//google.golang.org/api/@v/v0.51.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.51.0.mod mirror://goproxy//google.golang.org/api/@v/v0.54.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.54.0.mod mirror://goproxy//google.golang.org/api/@v/v0.55.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.55.0.mod mirror://goproxy//google.golang.org/api/@v/v0.57.0.zip -> google.golang.org%2Fapi%2F@v%2Fv0.57.0.zip mirror://goproxy//google.golang.org/api/@v/v0.57.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.57.0.mod mirror://goproxy//google.golang.org/api/@v/v0.7.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod mirror://goproxy//google.golang.org/api/@v/v0.8.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod mirror://goproxy//google.golang.org/api/@v/v0.9.0.mod -> google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.5.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.1.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.5.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.6.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.6.mod mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.zip mirror://goproxy//google.golang.org/appengine/@v/v1.6.7.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.6.7.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20200224152610-e50cd9704f63.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200224152610-e50cd9704f63.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210831024726-fe130286e0e2.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210831024726-fe130286e0e2.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20210831024726-fe130286e0e2.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210831024726-fe130286e0e2.mod mirror://goproxy//google.golang.org/grpc/cmd/protoc-gen-go-grpc/@v/v1.1.0.mod -> google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.20.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.21.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.25.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.26.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.27.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.29.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.29.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.33.2.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.33.2.mod mirror://goproxy//google.golang.org/grpc/@v/v1.36.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.37.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.38.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.40.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.40.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.40.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.40.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.42.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.42.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.42.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.42.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.22.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.25.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.26.0-rc.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.27.1.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.mod mirror://goproxy//go.opencensus.io/@v/v0.21.0.mod -> go.opencensus.io%2F@v%2Fv0.21.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.0.mod -> go.opencensus.io%2F@v%2Fv0.22.0.mod mirror://goproxy//go.opencensus.io/@v/v0.22.2.mod -> go.opencensus.io%2F@v%2Fv0.22.2.mod mirror://goproxy//go.opencensus.io/@v/v0.22.3.mod -> go.opencensus.io%2F@v%2Fv0.22.3.mod mirror://goproxy//go.opencensus.io/@v/v0.22.4.mod -> go.opencensus.io%2F@v%2Fv0.22.4.mod mirror://goproxy//go.opencensus.io/@v/v0.22.5.mod -> go.opencensus.io%2F@v%2Fv0.22.5.mod mirror://goproxy//go.opencensus.io/@v/v0.23.0.zip -> go.opencensus.io%2F@v%2Fv0.23.0.zip mirror://goproxy//go.opencensus.io/@v/v0.23.0.mod -> go.opencensus.io%2F@v%2Fv0.23.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fgoogle.golang.org%2Fgrpc%2Fotelgrpc%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2Finstrumentation%2Fnet%2Fhttp%2Fotelhttp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.zip -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/contrib/@v/v0.20.0.mod -> go.opentelemetry.io%2Fcontrib%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/exporters/otlp/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fexporters%2Fotlp%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/oteltest/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Foteltest%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/export/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fexport%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/metric/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2Fmetric%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/sdk/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Fsdk%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/trace/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2Ftrace%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.zip -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.zip mirror://goproxy//go.opentelemetry.io/otel/@v/v0.20.0.mod -> go.opentelemetry.io%2Fotel%2F@v%2Fv0.20.0.mod mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.zip -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.zip mirror://goproxy//go.opentelemetry.io/proto/otlp/@v/v0.7.0.mod -> go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20200227125254-8fa46927fb4f.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20201130134442-10cb98267c6c.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20201130134442-10cb98267c6c.mod mirror://goproxy//gopkg.in/cheggaaa/pb.v1/@v/v1.0.25.mod -> gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod mirror://goproxy//gopkg.in/errgo.v2/@v/v2.1.0.mod -> gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.zip -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.zip mirror://goproxy//gopkg.in/gcfg.v1/@v/v1.2.0.mod -> gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.0.mod mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.51.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.57.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.zip -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.zip mirror://goproxy//gopkg.in/natefinch/lumberjack.v2/@v/v2.0.0.mod -> gopkg.in%2Fnatefinch%2Flumberjack.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.2.2.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.5.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.zip -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.zip mirror://goproxy//gopkg.in/warnings.v0/@v/v0.1.1.mod -> gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0-20170812160011-eb3733d160e7.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.0.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.3.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20191120175047-4206685974f2.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200121175148-a6ecf24a6d71.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200615113413-eeeca48fe776.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20210107192922-496545a6307b.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20190528202925-30ae18b8564f.mod -> go.starlark.net%2F@v%2Fv0.0.0-20190528202925-30ae18b8564f.mod mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.zip -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.zip mirror://goproxy//go.starlark.net/@v/v0.0.0-20200306205701-8dd3e2ee1dd5.mod -> go.starlark.net%2F@v%2Fv0.0.0-20200306205701-8dd3e2ee1dd5.mod mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.zip -> gotest.tools%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//gotest.tools/@v/v2.2.0+incompatible.mod -> gotest.tools%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.2.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod mirror://goproxy//gotest.tools/v3/@v/v3.0.3.zip -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.zip mirror://goproxy//gotest.tools/v3/@v/v3.0.3.mod -> gotest.tools%2Fv3%2F@v%2Fv3.0.3.mod mirror://goproxy//go.uber.org/atomic/@v/v1.3.2.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod mirror://goproxy//go.uber.org/atomic/@v/v1.4.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.zip -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip mirror://goproxy//go.uber.org/atomic/@v/v1.7.0.mod -> go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.zip -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.zip mirror://goproxy//go.uber.org/goleak/@v/v1.1.10.mod -> go.uber.org%2Fgoleak%2F@v%2Fv1.1.10.mod mirror://goproxy//go.uber.org/multierr/@v/v1.1.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.zip -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.zip mirror://goproxy//go.uber.org/multierr/@v/v1.6.0.mod -> go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.10.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.17.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.19.0.zip -> go.uber.org%2Fzap%2F@v%2Fv1.19.0.zip mirror://goproxy//go.uber.org/zap/@v/v1.19.0.mod -> go.uber.org%2Fzap%2F@v%2Fv1.19.0.mod mirror://goproxy//go.uber.org/zap/@v/v1.9.1.mod -> go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190106161140-3f1c8253044a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190418001031-e561f6794a2a.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2019.2.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.3.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.1-2020.1.4.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod mirror://goproxy//inet.af/tcpproxy/@v/v0.0.0-20200125044825-b6bb9b5b8252.zip -> inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.zip mirror://goproxy//inet.af/tcpproxy/@v/v0.0.0-20200125044825-b6bb9b5b8252.mod -> inet.af%2Ftcpproxy%2F@v%2Fv0.0.0-20200125044825-b6bb9b5b8252.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.22.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.3.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.22.4.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.22.4.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/apiserver/@v/v0.22.4.zip -> k8s.io%2Fapiserver%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/apiserver/@v/v0.22.4.mod -> k8s.io%2Fapiserver%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/api/@v/v0.22.3.mod -> k8s.io%2Fapi%2F@v%2Fv0.22.3.mod mirror://goproxy//k8s.io/api/@v/v0.22.4.zip -> k8s.io%2Fapi%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/api/@v/v0.22.4.mod -> k8s.io%2Fapi%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/client-go/@v/v0.22.3.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.22.3.mod mirror://goproxy//k8s.io/client-go/@v/v0.22.4.zip -> k8s.io%2Fclient-go%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/client-go/@v/v0.22.4.mod -> k8s.io%2Fclient-go%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/component-base/@v/v0.22.4.zip -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/component-base/@v/v0.22.4.mod -> k8s.io%2Fcomponent-base%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/cri-api/@v/v0.22.4.zip -> k8s.io%2Fcri-api%2F@v%2Fv0.22.4.zip mirror://goproxy//k8s.io/cri-api/@v/v0.22.4.mod -> k8s.io%2Fcri-api%2F@v%2Fv0.22.4.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200114144118-36b2048a9120.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20200413195148-3a45101e95ac.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20210813121822-485abfe95c7c.zip -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20210813121822-485abfe95c7c.zip mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20210813121822-485abfe95c7c.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20210813121822-485abfe95c7c.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.0.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.zip -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.zip mirror://goproxy//k8s.io/klog/v2/@v/v2.9.0.mod -> k8s.io%2Fklog%2Fv2%2F@v%2Fv2.9.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20210421082810-95288971da7e.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20210421082810-95288971da7e.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20211109043538-20434351676c.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20211109043538-20434351676c.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20211115234752-e816edb12b65.zip -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20211115234752-e816edb12b65.zip mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20211115234752-e816edb12b65.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20211115234752-e816edb12b65.mod mirror://goproxy//k8s.io/system-validators/@v/v1.6.0.mod -> k8s.io%2Fsystem-validators%2F@v%2Fv1.6.0.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20190801114015-581e00157fb1.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20191114184206-e782cd3c129f.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20201110183641-67b214c5f920.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20201110183641-67b214c5f920.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210802155522-efc7438f0176.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210802155522-efc7438f0176.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210819203725-bdf08cb9a70a.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210819203725-bdf08cb9a70a.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210819203725-bdf08cb9a70a.mod mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210930125809-cb0fa318a74b.zip -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210930125809-cb0fa318a74b.zip mirror://goproxy//k8s.io/utils/@v/v0.0.0-20210930125809-cb0fa318a74b.mod -> k8s.io%2Futils%2F@v%2Fv0.0.0-20210930125809-cb0fa318a74b.mod mirror://goproxy//modernc.org/cc/@v/v1.0.0.mod -> modernc.org%2Fcc%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/golex/@v/v1.0.0.mod -> modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/mathutil/@v/v1.0.0.mod -> modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/strutil/@v/v1.0.0.mod -> modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod mirror://goproxy//modernc.org/xc/@v/v1.0.0.mod -> modernc.org%2Fxc%2F@v%2Fv1.0.0.mod mirror://goproxy//rsc.io/binaryregexp/@v/v0.2.0.mod -> rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod mirror://goproxy//rsc.io/pdf/@v/v0.1.1.mod -> rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod mirror://goproxy//rsc.io/quote/v3/@v/v3.1.0.mod -> rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod mirror://goproxy//rsc.io/sampler/@v/v1.3.0.mod -> rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.22.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.22.mod mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.25.zip -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.25.zip mirror://goproxy//sigs.k8s.io/apiserver-network-proxy/konnectivity-client/@v/v0.0.25.mod -> sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.25.mod mirror://goproxy//sigs.k8s.io/cli-utils/@v/v0.16.0.mod -> sigs.k8s.io%2Fcli-utils%2F@v%2Fv0.16.0.mod mirror://goproxy//sigs.k8s.io/controller-runtime/@v/v0.4.0.mod -> sigs.k8s.io%2Fcontroller-runtime%2F@v%2Fv0.4.0.mod mirror://goproxy//sigs.k8s.io/json/@v/v0.0.0-20211020170558-c049b76a60c6.zip -> sigs.k8s.io%2Fjson%2F@v%2Fv0.0.0-20211020170558-c049b76a60c6.zip mirror://goproxy//sigs.k8s.io/json/@v/v0.0.0-20211020170558-c049b76a60c6.mod -> sigs.k8s.io%2Fjson%2F@v%2Fv0.0.0-20211020170558-c049b76a60c6.mod mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.10.1.zip -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.10.1.zip mirror://goproxy//sigs.k8s.io/kustomize/api/@v/v0.10.1.mod -> sigs.k8s.io%2Fkustomize%2Fapi%2F@v%2Fv0.10.1.mod mirror://goproxy//sigs.k8s.io/kustomize/cmd/config/@v/v0.10.2.mod -> sigs.k8s.io%2Fkustomize%2Fcmd%2Fconfig%2F@v%2Fv0.10.2.mod mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.4.1.zip -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.4.1.zip mirror://goproxy//sigs.k8s.io/kustomize/kustomize/v4/@v/v4.4.1.mod -> sigs.k8s.io%2Fkustomize%2Fkustomize%2Fv4%2F@v%2Fv4.4.1.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.13.0.zip -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.13.0.zip mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.13.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.13.0.mod mirror://goproxy//sigs.k8s.io/kustomize/kyaml/@v/v0.4.0.mod -> sigs.k8s.io%2Fkustomize%2Fkyaml%2F@v%2Fv0.4.0.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.0.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.0.2.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.zip -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.zip mirror://goproxy//sigs.k8s.io/structured-merge-diff/v4/@v/v4.1.2.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv4%2F@v%2Fv4.1.2.mod mirror://goproxy//sigs.k8s.io/testing_frameworks/@v/v0.1.2.mod -> sigs.k8s.io%2Ftesting_frameworks%2F@v%2Fv0.1.2.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.zip -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod https://github.com/k3s-io/containerd/archive/refs/tags/v1.5.8-k3s2.tar.gz -> k3s-containerd-1.5.8-k3s2.tar.gz https://github.com/opencontainers/runc/archive/refs/tags/v1.0.3.tar.gz -> k3s-runc-v1.0.3-r1.tar.gz https://helm.traefik.io/traefik/traefik-10.3.0.tgz https://github.com/rancher/plugins/archive/refs/tags/v0.9.1-k3s1.tar.gz -> k3s-cni-plugins-0.9.1.tar.gz amd64? ( https://github.com/rancher/k3s-root/releases/download/v0.9.1/k3s-root-amd64.tar -> k3s-root-amd64-0.9.1.tar )
 _eclasses_=go-module	82631624a3653e595cf9c18164a8c500	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e138b49ae1204a3bb13e742aa5a0bb39
+_md5_=352912752a7b69bed8d858b2dc2b83c2
diff --git a/metadata/md5-cache/sys-cluster/mpich-3.4.3 b/metadata/md5-cache/sys-cluster/mpich-3.4.3
index 2febfdd51074..62ac5a0d2d6d 100644
--- a/metadata/md5-cache/sys-cluster/mpich-3.4.3
+++ b/metadata/md5-cache/sys-cluster/mpich-3.4.3
@@ -5,11 +5,11 @@ DESCRIPTION=A high performance and portable MPI implementation
 EAPI=7
 HOMEPAGE=https://www.mpich.org/
 IUSE=+cxx doc fortran mpi-threads +romio threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=mpich2
 RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/hwloc-2.0.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libunwind:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] romio? ( net-fs/nfs-utils ) !sys-cluster/mpich2 !sys-cluster/openmpi !sys-cluster/nullmpi fortran? ( virtual/fortran )
 REQUIRED_USE=mpi-threads? ( threads )
 SLOT=0
 SRC_URI=https://www.mpich.org/static/downloads/3.4.3/mpich-3.4.3.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	fortran-2	7e39eb204d37699d5f1eaf9f4d61888a	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b36a68f007cb3fdcf2710ba4f16d1806
+_md5_=8149abb99e53c0f9b7c91a2d6f994270
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index eefff594410b..e8ce0ea43a61 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999 b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
index 1f30d8d1c53b..151ec02bcde7 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
@@ -11,6 +11,6 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-11.2.0-musl-patches-1.tar.bz2
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-2.tar.bz2 mirror://gentoo/gcc-12.0.0-patches-2.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-11.2.0-musl-patches-1.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	prefix	d04f14b297013ad1410550c0757f14f8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	856095d8c34ad0a9da753e576bf429b9	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=01cb490ab54f210cb097828a4b2ad742
+_md5_=f99c2efe117bea0b3913c98d9bfc70cb
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7fc3a9c6e566..d7bfd7c914eb 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.5 b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.5
index d64161d04b48..e3876be834ac 100644
--- a/metadata/md5-cache/sys-fs/btrfsmaintenance-0.5
+++ b/metadata/md5-cache/sys-fs/btrfsmaintenance-0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Scripts for btrfs maintenance tasks like periodic scrub, balance, tr
 EAPI=7
 HOMEPAGE=https://github.com/kdave/btrfsmaintenance
 IUSE=systemd
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-shells/bash sys-apps/util-linux sys-fs/btrfs-progs systemd? ( sys-apps/systemd ) !systemd? ( virtual/cron )
 SLOT=0
 SRC_URI=https://github.com/kdave/btrfsmaintenance/archive/v0.5.tar.gz -> btrfsmaintenance-0.5.tar.gz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=fb5d5b1e2fed6fc6449b028011a56b38
+_md5_=3dcb33675ecaf098a18d6b17705461b3
diff --git a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6 b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
index 223fd550ad23..79a7eee04b21 100644
--- a/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
+++ b/metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
@@ -4,9 +4,9 @@ DESCRIPTION=a set of command-line programs providing a simple interface to inoti
 EAPI=8
 HOMEPAGE=https://github.com/inotify-tools/inotify-tools
 IUSE=doc
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~riscv sparc ~x86
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/inotify-tools/inotify-tools/archive/3.21.9.6.tar.gz -> inotify-tools-3.21.9.6.tar.gz
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=6b7a0fc6675dcea9e772abfa209bb15a
+_md5_=bd6bf4c2da572b57f4d978c25cdf7f29
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index d1862afd368e..fce211c407cf 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88
index c179b1ed2510..e08e59827085 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.88
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-95.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-95.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88-1.xpak -> gentoo-kernel-5.10.88-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88-1.xpak -> gentoo-kernel-5.10.88-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88-1.xpak -> gentoo-kernel-5.10.88-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88-1.xpak -> gentoo-kernel-5.10.88-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1d7864f7c7111abc3495db20cf30046e
+_md5_=628d834a77f916519f4972b34f823e16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89
index d8a6c58aa1c8..66586b650048 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.89
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-96.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-96.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89-1.xpak -> gentoo-kernel-5.10.89-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89-1.xpak -> gentoo-kernel-5.10.89-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89-1.xpak -> gentoo-kernel-5.10.89-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89-1.xpak -> gentoo-kernel-5.10.89-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=76043ef0a4e0029d6463638eb1dc9d72
+_md5_=554ce478be7de0af303e0980ed485a0f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90
index eb117c8fa49b..1ce472d63a12 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.90
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-97.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-97.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90-1.xpak -> gentoo-kernel-5.10.90-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90-1.xpak -> gentoo-kernel-5.10.90-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90-1.xpak -> gentoo-kernel-5.10.90-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90-1.xpak -> gentoo-kernel-5.10.90-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=a53bb55281a16e3303d70f0d909a4e9c
+_md5_=554ce478be7de0af303e0980ed485a0f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21
index e73ca5f7ae57..c6cd3362e186 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.14.21
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-24.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-24.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.21-1.xpak -> gentoo-kernel-5.14.21-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.21-1.xpak -> gentoo-kernel-5.14.21-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=8040503440faa9331505cbbbbc2a081a
+_md5_=e1ce77e044f92b45e9cc791a3340158e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1
index 2162c0f259ea..43866a14dcf5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.14.21
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.14.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-24.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.14-24.extras.tar.xz arm64? ( https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.21-1.xpak -> gentoo-kernel-5.14.21-1.arm64.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=419ee33763bd83839911c76903513e32
+_md5_=200ed22813704de3836a251358e74623
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11
index 303100daaa1d..7ffe04413ee4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.11
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-13.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-13.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11-1.xpak -> gentoo-kernel-5.15.11-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11-1.xpak -> gentoo-kernel-5.15.11-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11-1.xpak -> gentoo-kernel-5.15.11-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11-1.xpak -> gentoo-kernel-5.15.11-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=4a4d1eb2d7dd78fec8457f5240f4871a
+_md5_=85a2dac9aad0fc52d3a54fb0013d020a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12
index 3779acebf077..853643a32654 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.12
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-14.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-14.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12-1.xpak -> gentoo-kernel-5.15.12-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12-1.xpak -> gentoo-kernel-5.15.12-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12-1.xpak -> gentoo-kernel-5.15.12-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.12-1.xpak -> gentoo-kernel-5.15.12-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=96724cdc5aad853a5d2ddf46a54d04cc
+_md5_=2645fe32effd7e07abd539fb6b17eaa2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13
index 9058b8f42d94..ae21236ce967 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.13
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-15.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-15.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13-1.xpak -> gentoo-kernel-5.15.13-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13-1.xpak -> gentoo-kernel-5.15.13-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13-1.xpak -> gentoo-kernel-5.15.13-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13-1.xpak -> gentoo-kernel-5.15.13-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=e1266ff0b09d13842d52cd9e8bc2ea33
+_md5_=2645fe32effd7e07abd539fb6b17eaa2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168
index dab865552dce..e4552fce5ac2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.168
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-172.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-172.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168-1.xpak -> gentoo-kernel-5.4.168-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168-1.xpak -> gentoo-kernel-5.4.168-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168-1.xpak -> gentoo-kernel-5.4.168-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.168-1.xpak -> gentoo-kernel-5.4.168-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=37f9b428f200f9cbdc05a0210ce0b0f6
+_md5_=bc7b23e472e3685d77f8db3b3a30bb7f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169
index bfe90ff93202..6e03c1135727 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.169
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-173.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-173.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169-1.xpak -> gentoo-kernel-5.4.169-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169-1.xpak -> gentoo-kernel-5.4.169-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169-1.xpak -> gentoo-kernel-5.4.169-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.169-1.xpak -> gentoo-kernel-5.4.169-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=602ac9ee4e1c4ac04b47ba8eb46abdc9
+_md5_=2a4e2c40dce13e8b51a02867b188bd4d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170
index 2733a2a10b7b..b899f0aa9963 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.170
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-174.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-174.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170-1.xpak -> gentoo-kernel-5.4.170-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170-1.xpak -> gentoo-kernel-5.4.170-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170-1.xpak -> gentoo-kernel-5.4.170-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170-1.xpak -> gentoo-kernel-5.4.170-1.x86.xpak )
 _eclasses_=dist-kernel-utils	74074c49ea85735400eeaf6a3a348969	kernel-install	de572f44bffdb7e6199595c2280b90ee	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=7eaac0ed925112a499d276ad6a0a0fd9
+_md5_=2a4e2c40dce13e8b51a02867b188bd4d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.16.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.16.0
new file mode 100644
index 000000000000..1ce0124d9bb6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.16.0
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.16 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.16.0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.16-1.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.16-1.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.16-1.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.16-1.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.16-1.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.16-1.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.16-1.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.16-1.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.16-1.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=1d5f69e66ad733a9a0a85e5ea800d117
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-5.16 b/metadata/md5-cache/sys-kernel/linux-headers-5.16
new file mode 100644
index 000000000000..1e4a57184b29
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-headers-5.16
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/xz-utils dev-lang/perl
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Linux system headers
+EAPI=7
+HOMEPAGE=https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel
+IUSE=headers-only
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz https://dev.gentoo.org/~soap/distfiles/sys-kernel/linux-headers/gentoo-headers-5.16-0.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=0207f8dd2c9369fb02038de95a4015bd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.0
new file mode 100644
index 000000000000..d18ea00dc943
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.16.0
@@ -0,0 +1,14 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources for the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.16.0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	0504e914bab621103eb74f52fad0fc6d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 98fb0b816e9b..46f8847795ff 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/cpupower-5.12 b/metadata/md5-cache/sys-power/cpupower-5.12
index 834df52b9e54..5a222fcf8616 100644
--- a/metadata/md5-cache/sys-power/cpupower-5.12
+++ b/metadata/md5-cache/sys-power/cpupower-5.12
@@ -5,10 +5,10 @@ DESCRIPTION=Shows and sets processor power related values
 EAPI=7
 HOMEPAGE=https://www.kernel.org/
 IUSE=nls
-KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils
 SLOT=0/0
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.12.tar.xz
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1384f616d3f578a13be3a175c382e01f
+_md5_=9941787eabcd93c8d98b049b20fbe9e1
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7512bdf37fb1..7aa207737f88 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/jack-2 b/metadata/md5-cache/virtual/jack-2
index a77722e10101..2213d4d04126 100644
--- a/metadata/md5-cache/virtual/jack-2
+++ b/metadata/md5-cache/virtual/jack-2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for JACK Audio Connection Kit
 EAPI=7
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
 RDEPEND=|| ( media-sound/jack2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-sound/jack-audio-connection-kit[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-video/pipewire[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,jack-sdk(-)] )
 SLOT=0
 _eclasses_=multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=411ef40eafe94157c6377b16f7fdf2e7
+_md5_=c0b6a0f3a30d97203cc52443db267b47
diff --git a/metadata/md5-cache/virtual/w3m-0 b/metadata/md5-cache/virtual/w3m-0
deleted file mode 100644
index 9c9835ca72d7..000000000000
--- a/metadata/md5-cache/virtual/w3m-0
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the w3m web browser
-EAPI=6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( www-client/w3m www-client/w3mmee )
-SLOT=0
-_md5_=471fe51bf4cb93ec4f7bed875062bb8c
diff --git a/metadata/md5-cache/virtual/w3m-1 b/metadata/md5-cache/virtual/w3m-1
index 9075714dae39..0319a21a034e 100644
--- a/metadata/md5-cache/virtual/w3m-1
+++ b/metadata/md5-cache/virtual/w3m-1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for the w3m web browser
 EAPI=7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( www-client/w3m www-client/w3mmee )
 SLOT=0
-_md5_=8c273622c157e5832f086ba37740474f
+_md5_=903fdbcffe98efe4ce826f308890f7dc
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5783a9aa8293..9550c6b50fd5 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-97.0.4692.71 b/metadata/md5-cache/www-client/google-chrome-beta-98.0.4758.48
similarity index 94%
rename from metadata/md5-cache/www-client/google-chrome-beta-97.0.4692.71
rename to metadata/md5-cache/www-client/google-chrome-beta-98.0.4758.48
index f9c0e6781725..8d8fa0c1ace9 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-97.0.4692.71
+++ b/metadata/md5-cache/www-client/google-chrome-beta-98.0.4758.48
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_97.0.4692.71-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_98.0.4758.48-1_amd64.deb
 _eclasses_=chromium-2	e1f861cb956ab20ffc32a1944eb99a78	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	pax-utils	fce6ad998516159787b92e8043167889	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b2d4718df4c59a52b966de28f55f366c
+_md5_=faa645b7359f053364f6713740aca1f6
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 93d9eb41a499..2dd735e2e409 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-97.0.4692.71_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-98.0.4758.48_beta
similarity index 86%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-97.0.4692.71_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-98.0.4758.48_beta
index 0b006ec1a17d..2012212d82aa 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-97.0.4692.71_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-98.0.4758.48_beta
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_97.0.4692.71-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_98.0.4758.48-1_amd64.deb
 _eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721
-_md5_=a3bf49fa2bf74776e84f08fb8eeebda7
+_md5_=78286cc17ab4d536dd9721b3c8c8acb4
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 9385be3ddd72..4dc9bbeaa0ed 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.147 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.147
index c8b9e895fc38..3f13ab03e39f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.147
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.147
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.147/NVIDIA-Linux-x86-390.147.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.147.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.147.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.147.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.147.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.147.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a5b0795de6be987f5acfb2220fcb175d
+_md5_=504d41836711a87fb3f1a67304448105
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2
index cabbcb187999..9295024f9802 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/460
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/460.91.03/NVIDIA-Linux-x86_64-460.91.03.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/460.91.03/NVIDIA-Linux-aarch64-460.91.03.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-460.91.03.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-460.91.03.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=5c9db2be2773353b9cc60bba77685040
+_md5_=ae7f1428121d483b9fdda0e3af8d623f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
index 0ec80c553eda..9315102829bc 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/vulkan-beta-4706216-linux -> NVIDIA-Linux-x86_64-470.62.16.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.86.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.86.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d844ce77615202fda14b16d33bfc48c9
+_md5_=9fff877508452ee10392be7bd3b5262f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
index a20529583ab9..b0901b0588af 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/470
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/470.94/NVIDIA-Linux-x86_64-470.94.run ) arm64? ( https://us.download.nvidia.com/XFree86/aarch64/470.94/NVIDIA-Linux-aarch64-470.94.run ) https://github.com/NVIDIA/nvidia-installer/archive/refs/tags/470.94.tar.gz -> nvidia-installer-470.94.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/refs/tags/470.94.tar.gz -> nvidia-modprobe-470.94.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/refs/tags/470.94.tar.gz -> nvidia-persistenced-470.94.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/470.94.tar.gz -> nvidia-settings-470.94.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/refs/tags/470.94.tar.gz -> nvidia-xconfig-470.94.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f1854c8fc012b2c4b658df9bf3baa145
+_md5_=b906ba7f4b504ec6f62863baebb4b926
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2
index 352d7f58396d..3d743e460d18 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2
@@ -12,4 +12,4 @@ RESTRICT=bindist
 SLOT=0/495
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/495.44/NVIDIA-Linux-x86_64-495.44.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/495.44/NVIDIA-Linux-aarch64-495.44.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-495.44.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-495.44.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=207482da317a1fed571d725df11dddbf
+_md5_=6c6e63da57560eafdc876e1fe3ea6dab
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46
index 6a7620441b6a..aa130fc46bd5 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46
@@ -11,4 +11,4 @@ RDEPEND=acct-group/video persistenced? ( acct-user/nvpd net-libs/libtirpc:= ) to
 SLOT=0/495
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/495.46/NVIDIA-Linux-x86_64-495.46.run ) arm64? ( https://us.download.nvidia.com/XFree86/aarch64/495.46/NVIDIA-Linux-aarch64-495.46.run ) https://github.com/NVIDIA/nvidia-installer/archive/refs/tags/495.46.tar.gz -> nvidia-installer-495.46.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/refs/tags/495.46.tar.gz -> nvidia-modprobe-495.46.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/refs/tags/495.46.tar.gz -> nvidia-persistenced-495.46.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/495.46.tar.gz -> nvidia-settings-495.46.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/refs/tags/495.46.tar.gz -> nvidia-xconfig-495.46.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=f344ed2662e9842a76d49fb3805bf35e
+_md5_=90561993a2fd3ad144965e3a3c6cd0fa
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10
index f56d0cf7bb7a..278c80a7db32 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10
@@ -12,4 +12,4 @@ RESTRICT=bindist
 SLOT=0/495
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/495.46/NVIDIA-Linux-x86_64-495.46.run ) arm64? ( https://us.download.nvidia.com/XFree86/aarch64/495.46/NVIDIA-Linux-aarch64-495.46.run ) https://github.com/NVIDIA/nvidia-installer/archive/refs/tags/495.46.tar.gz -> nvidia-installer-495.46.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/refs/tags/495.46.tar.gz -> nvidia-modprobe-495.46.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/refs/tags/495.46.tar.gz -> nvidia-persistenced-495.46.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/495.46.tar.gz -> nvidia-settings-495.46.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/refs/tags/495.46.tar.gz -> nvidia-xconfig-495.46.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6f3bf927b7f553211977d9e40f2fa3a4
+_md5_=ba94cd96d59661d70d3ad844a2ecf0e2
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20 b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20
index c48878b8be14..e35267928485 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20
@@ -11,4 +11,4 @@ RESTRICT=bindist
 SLOT=0/495
 SRC_URI=amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/495.46/NVIDIA-Linux-x86_64-495.46.run ) arm64? ( https://us.download.nvidia.com/XFree86/aarch64/495.46/NVIDIA-Linux-aarch64-495.46.run ) https://github.com/NVIDIA/nvidia-installer/archive/refs/tags/495.46.tar.gz -> nvidia-installer-495.46.tar.gz https://github.com/NVIDIA/nvidia-modprobe/archive/refs/tags/495.46.tar.gz -> nvidia-modprobe-495.46.tar.gz https://github.com/NVIDIA/nvidia-persistenced/archive/refs/tags/495.46.tar.gz -> nvidia-persistenced-495.46.tar.gz https://github.com/NVIDIA/nvidia-settings/archive/refs/tags/495.46.tar.gz -> nvidia-settings-495.46.tar.gz https://github.com/NVIDIA/nvidia-xconfig/archive/refs/tags/495.46.tar.gz -> nvidia-xconfig-495.46.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	linux-info	2f039741fe92bcea55c78806d16ac0f5	linux-mod	20ad8e2cff64a7b4107dc468daf3d592	multilib	de4beb52bfa93c4c5d96792a6b5e1784	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c8d2464e0e29abf2054614da6d74e95e
+_md5_=0dc3258d9c7c60e3c2c696dcdc236af4
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 79faf74f8f93..a25ff312bca1 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
index c7c0e896f32b..cda4083c7566 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org XScrnSaver library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXScrnSaver
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXScrnSaver-1.2.3.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	4c1d5c48b38c2a0457352b812ac916a8
-_md5_=8041dc81d41d1105a2d0dd5f3d6a85c0
+_md5_=08a5138781b984d80651aade0221f887
diff --git a/metadata/md5-cache/x11-libs/libXi-1.8 b/metadata/md5-cache/x11-libs/libXi-1.8
index 1bab931ae9d5..de6438ede7b8 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.8
+++ b/metadata/md5-cache/x11-libs/libXi-1.8
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Xi library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXi
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXi-1.8.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	4c1d5c48b38c2a0457352b812ac916a8
-_md5_=82cb93a695dc8828e9ec2112dfcc7d5e
+_md5_=fd0c46e48d04e789af2aa8230f2d5b3f
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
index 03d9483143ae..dff9c998d16e 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Xxf86vm library
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXxf86vm
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-base/xorg-proto >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
 _eclasses_=autotools	c9df06c186913b43eb211100ef5fe2cf	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	05a584848db4901c97fcd94ae7cc3a97	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	19ec165e9adcaa4c132b9e3fe3e7f556	multilib-minimal	be5919734a8448dddd49c2b26db45091	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xorg-3	4c1d5c48b38c2a0457352b812ac916a8
-_md5_=60e027cf5109135f5676008c6b0fe963
+_md5_=a7c2411deede458caee72d4fceaa90df
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index aad9222a6e36..55cf3863006d 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/picom-8.2-r2 b/metadata/md5-cache/x11-misc/picom-8.2-r2
index 0cb2cd1540b5..c98197ea04b8 100644
--- a/metadata/md5-cache/x11-misc/picom-8.2-r2
+++ b/metadata/md5-cache/x11-misc/picom-8.2-r2
@@ -5,7 +5,7 @@ DESCRIPTION=A lightweight compositor for X11 (previously a compton fork)
 EAPI=7
 HOMEPAGE=https://github.com/yshui/picom
 IUSE=+config-file dbus +doc +drm opengl pcre test test
-KEYWORDS=amd64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=MPL-2.0 MIT
 RDEPEND=dev-libs/libev dev-libs/uthash x11-libs/libX11 x11-libs/libxcb x11-libs/libXext x11-libs/pixman x11-libs/xcb-util-image x11-libs/xcb-util-renderutil config-file? ( dev-libs/libconfig:= ) dbus? ( sys-apps/dbus ) drm? ( x11-libs/libdrm ) opengl? ( virtual/opengl ) pcre? ( dev-libs/libpcre ) !x11-misc/compton
 REQUIRED_USE=test? ( dbus )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/yshui/picom/archive/v8.2.tar.gz -> picom-8.2.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	9f3e84959ae1d60e19bc91f212774dcc	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	python-any-r1	13f6d423c5c5bc519a9b552654cc745f	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	fa024aa649b6bd544144bf94893d402c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=b8da54a5b5847ab6c10c414087c04c92
+_md5_=20749c4bbc6dd6a4e2384ba6a41d72c5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 062fb118c616..b65e96ae3020 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15563 BLAKE2B de135e6488ddf981f69c63c25215e6facf104d70eba96049c2ef35d70db344af8a2ecc031fd47d2ade8f7e7131a3ebb547dacc9d95347170ac2b98c3bd550280 SHA512 3b03ad337a567fa9bf851b48bd8ba4f0370167f9223bb3f373724110c6bf3ac60c2ced7a79dc0708b9299b94c92153c55cc42185a0fff58ab1fb7d32efd15e42
-TIMESTAMP 2022-01-10T07:39:22Z
+TIMESTAMP 2022-01-11T05:39:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHb4qpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmHdGAlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCfgRAAmjHuspAq4/JJbjf7T2YDDOyPOsm6TWWdGhb8jvRQ3JtjBRpO97oVeKIr
-e24mCasJ91yZkGdjuGe51dB5tngn2XMjM5BH5JMgbGMXBmLxWgHJBEoOwgXPH6Rd
-pUYdaApCUA/0u2WctEVgbZV0VoKC4t5vNmqA7BSwT+8yx49C3EL7YMwnNMNDn6aV
-XlUH+V4oHGtdowCDMkFuXmVVl1MTpvcFy63Tm1Kc+GLX3c67Hp+h8SaOF/E8mbmf
-Aws1ed/I0pXh8zE6g5VPhPZwiZDGQ23mj1kg1wBdsbfuEoUfAzCQOyZN8fIC9bca
-BjxuppgeoVpbtXiZ7PMZLeTIwzEVwxnWyD2QEaAITMZBnbD5PO+4KKjWIPO1HZym
-kfX6bnsIiqBY9vemYoqAiV95l9IWyw9k21IvCq3ry7WwjJWYkbannYnlyt8ByhYy
-hWpPKpi9IRKwupOtfzu8SQP6qS3NaiTEXPE0VfEW+kfaPlrB6Xv0puUdPSrJ0YOj
-V7s6BpKM4VgMBOXzqLGjHZg5ShUjq+lJTfjTZqNB84BwtqsXJLN64AtgheO8s+9O
-0JY7rSRxy4BdhieiQ/oq93vBZNiAz16694UlkKF0zZ8+RTQeBKprgcvdX7ylUjc4
-55EAIxN3DVLIO3htanwXrbYy6iCRvp9F7MFbmrrIHVEwYg5Qg8Q=
-=oFkn
+klAlexAAod/xrKeguCcZzyum13KgI42lm4OpivSzICAGFoVxCB4Qqe8BBlhNyOjJ
+cg1W/QWfg77jI6s4Izj7wX6Pthc9FVLce/Va+0T8CYomn/1knUaukEvOqwth2UMd
+eQKlJsgRbZYfJcIItRM/JJ2UgnVW6yXXcGh2S1RyKnXcEYmkCVtpsh6PDFYdaCQz
+crXoVJu9AWtJqevMDLdn0rQpGvXwdFS0zayYoUNn5GHAODeI9lfqa6C/IihXMOR3
+A+94pnGX5R16NGx3p+pFV3y8Hu4NU789zaUOJci+4ndUoW5l+iWNUlafDLSJEBlu
+Mv0E8QG78yuiDkK0EXcEKLk4kbdgPdzQi4wA8v6QQMHBb074pe/MkBT7kTD2z4aj
+83mq34KJEak0u111YBQikeT7uZLGDjDm/Dymg981SIwzLx5t9H7ldSZamLTyR3P9
+FhHw/yPEbnvVpiuikcsqcI/BndoFzC+iKzB1TIUJMyfBSoEY4/1pMKJUwERNlChn
+6NH0CUUS0nCAtqOhmhABPibtt/HcsTw87cnM2E1lU1eGFvCz6OYzOdM+DVr6AqbC
+IyvMqN1LMc8TwVrmdmTeAp3E3TEGAJnYPGdfakvmQ4cQhVG0NnpMCvEcPLKDd2/n
+RMM1L3qZ+P8wXHSV9nvXgQx6s7sw0RNGU6T10FU8x+1kVMobm8Y=
+=sHwv
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e42fb3e12047..846413f7b840 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jan 2022 07:39:17 +0000
+Tue, 11 Jan 2022 05:39:18 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index f6e1429d94e6..99d72c2bc21c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3247,6 +3247,11 @@
       <name>Mike Gilbert</name>
       <role>Lead</role>
     </member>
+    <member>
+      <email>gyakovlev@gentoo.org</email>
+      <name>Georgy Yakovlev</name>
+      <role>minor helper, musl testing, tmpfiles</role>
+    </member>
     <member>
       <email>williamh@gentoo.org</email>
       <name>William Hubbs</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index 98c95ad5c528..dfb0a61a5e12 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan 10 07:39:17 AM UTC 2022
+Tue Jan 11 05:39:17 AM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 9bc567101c96..123e811ad483 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -1272,7 +1272,6 @@
 2011141839 ./app-arch/duff/duff-0.5.2.ebuild
 2109132339 ./app-arch/dump/dump-0.4.47-r1.ebuild
 2112102340 ./app-arch/engrampa/engrampa-1.24.2.ebuild
-2101061609 ./app-arch/fastjar/fastjar-0.98-r3.ebuild
 2111230439 ./app-arch/file-roller/file-roller-3.40.0.ebuild
 1712291639 ./app-arch/funzix/funzix-1.0.ebuild
 2108050539 ./app-arch/gcab/gcab-1.4.ebuild
@@ -1573,7 +1572,7 @@
 1904220939 ./app-crypt/bcwipe/bcwipe-1.9.13.ebuild
 1809280333 ./app-crypt/bsign/bsign-0.4.5-r1.ebuild
 2110142009 ./app-crypt/ccid/ccid-1.4.35.ebuild
-2110171409 ./app-crypt/ccid/ccid-1.4.36.ebuild
+2201110540 ./app-crypt/ccid/ccid-1.4.36.ebuild
 2108110339 ./app-crypt/ccrypt/ccrypt-1.11-r3.ebuild
 2108120139 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
 2112052109 ./app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild
@@ -1694,7 +1693,7 @@
 2110112239 ./app-crypt/minisign/minisign-9999.ebuild
 2109132339 ./app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
 2112312109 ./app-crypt/mit-krb5/mit-krb5-1.19.2-r1.ebuild
-2201081709 ./app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
+2201110209 ./app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
 2103170539 ./app-crypt/monkeysphere/monkeysphere-0.44.ebuild
 2006101909 ./app-crypt/moolticute/moolticute-0.43.19.ebuild
 1910290939 ./app-crypt/moolticute/moolticute-9999.ebuild
@@ -1775,7 +1774,7 @@
 1802221208 ./app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
 2112310439 ./app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
 2109121040 ./app-crypt/yubikey-manager/yubikey-manager-4.0.5-r1.ebuild
-2112310439 ./app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+2201110540 ./app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
 2109101209 ./app-crypt/yubioath-desktop/yubioath-desktop-5.0.5.ebuild
 2111231609 ./app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild
 2012281609 ./app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
@@ -2756,7 +2755,7 @@
 1910161309 ./app-emacs/dts-mode/dts-mode-0.1.0_pre20161103.ebuild
 2104221839 ./app-emacs/dts-mode/dts-mode-0.1.1.ebuild
 2108250239 ./app-emacs/ebuild-mode/ebuild-mode-1.53.ebuild
-2112281309 ./app-emacs/ebuild-mode/ebuild-mode-1.54.ebuild
+2201102239 ./app-emacs/ebuild-mode/ebuild-mode-1.54-r1.ebuild
 2107131039 ./app-emacs/ebuild-run-mode/ebuild-run-mode-20210713.ebuild
 1906271039 ./app-emacs/ecb/ecb-2.50_pre20170728.ebuild
 1802210008 ./app-emacs/edb/edb-1.32.ebuild
@@ -3591,9 +3590,13 @@
 2110071139 ./app-misc/datovka/datovka-4.18.0.ebuild
 2112210709 ./app-misc/ddate/ddate-0.2.2_p20160627.ebuild
 2104161439 ./app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
+2201101939 ./app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
 2106071139 ./app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
-2105212009 ./app-misc/ddcui/ddcui-0.1.2.ebuild
-2108180339 ./app-misc/ddcutil/ddcutil-0.9.9-r2.ebuild
+2201102009 ./app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
+2201101509 ./app-misc/ddcui/ddcui-0.1.2-r1.ebuild
+2201101509 ./app-misc/ddcui/ddcui-0.2.0.ebuild
+2201101509 ./app-misc/ddcutil/ddcutil-0.9.9-r3.ebuild
+2201101509 ./app-misc/ddcutil/ddcutil-1.2.1.ebuild
 2112020639 ./app-misc/delay/delay-1.6-r2.ebuild
 2106131009 ./app-misc/detachtty/detachtty-11.0.0.ebuild
 1710212030 ./app-misc/detachtty/detachtty-9-r1.ebuild
@@ -3746,9 +3749,9 @@
 2102110639 ./app-misc/muttprint/muttprint-0.73-r5.ebuild
 2104161439 ./app-misc/mvcase/mvcase-0.1-r2.ebuild
 2008272109 ./app-misc/mx5000tools/mx5000tools-0.1.2-r1.ebuild
-2110161809 ./app-misc/neofetch/neofetch-7.1.0-r1.ebuild
 2102051009 ./app-misc/neofetch/neofetch-7.1.0.ebuild
 2104281009 ./app-misc/neofetch/neofetch-9999.ebuild
+2201101409 ./app-misc/neofetch/neofetch-7.1.0-r1.ebuild
 1808150909 ./app-misc/nnn/nnn-1.9.ebuild
 1810252109 ./app-misc/nnn/nnn-2.0.ebuild
 1811241209 ./app-misc/nnn/nnn-2.1.ebuild
@@ -3859,6 +3862,7 @@
 2104111439 ./app-misc/solaar/solaar-1.0.5-r2.ebuild
 2102280539 ./app-misc/solaar/solaar-9999.ebuild
 2111280410 ./app-misc/solaar/solaar-1.0.7.ebuild
+2201110810 ./app-misc/solaar/solaar-1.1.1.ebuild
 2104190809 ./app-misc/sonypid/sonypid-1.9.ebuild
 2008251339 ./app-misc/spacenavd/spacenavd-0.7.1.ebuild
 2112291709 ./app-misc/spacenavd/spacenavd-0.8.ebuild
@@ -3949,9 +3953,10 @@
 2112121739 ./app-misc/ytree/ytree-2.04.ebuild
 2104060140 ./app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
 2110270939 ./app-misc/zygrib/zygrib-8.0.1-r2.ebuild
-2111282040 ./app-misc/fmawk/fmawk-1.2.ebuild
-2111282040 ./app-misc/fmawk/fmawk-9999.ebuild
-2112281809 ./app-misc/tty-clock/tty-clock-2.3.ebuild
+2201101839 ./app-misc/fmawk/fmawk-1.2.ebuild
+2201101839 ./app-misc/fmawk/fmawk-1.3.ebuild
+2201101839 ./app-misc/fmawk/fmawk-9999.ebuild
+2201110540 ./app-misc/tty-clock/tty-clock-2.3.ebuild
 2110242009 ./app-mobilephone/anyremote/anyremote-6.5.ebuild
 2111100039 ./app-mobilephone/dfu-util/dfu-util-0.11.ebuild
 2110040939 ./app-mobilephone/dfu-util/dfu-util-9999.ebuild
@@ -5233,11 +5238,12 @@
 2109252140 ./dev-cpp/nlohmann_json/nlohmann_json-3.10.2.ebuild
 2110170309 ./dev-cpp/nlohmann_json/nlohmann_json-3.10.4.ebuild
 2108180709 ./dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
-2201091240 ./dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
+2201110739 ./dev-cpp/nlohmann_json/nlohmann_json-3.10.5.ebuild
 2112041609 ./dev-cpp/notcurses/notcurses-3.0.0.ebuild
-2112180709 ./dev-cpp/pangomm/pangomm-2.50.0.ebuild
-2112220739 ./dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
-2201021409 ./dev-cpp/pangomm/pangomm-2.48.1.ebuild
+2201110210 ./dev-cpp/pangomm/pangomm-2.42.2-r1.ebuild
+2201110210 ./dev-cpp/pangomm/pangomm-2.46.2.ebuild
+2201110210 ./dev-cpp/pangomm/pangomm-2.48.1.ebuild
+2201110210 ./dev-cpp/pangomm/pangomm-2.50.0.ebuild
 2104192239 ./dev-cpp/picojson/picojson-1.3.0.ebuild
 1702282250 ./dev-cpp/pngpp/pngpp-0.2.9.ebuild
 2009241009 ./dev-cpp/popl/popl-1.2.0.ebuild
@@ -5312,7 +5318,7 @@
 2111121039 ./dev-db/libzdb/libzdb-3.2.2.ebuild
 2102252239 ./dev-db/lmdb++/lmdb++-0.9.14.0.ebuild
 2102261639 ./dev-db/lmdb++/lmdb++-1.0.0.ebuild
-2110071009 ./dev-db/lmdb/lmdb-0.9.29.ebuild
+2201101839 ./dev-db/lmdb/lmdb-0.9.29.ebuild
 2111291139 ./dev-db/m17n-db/m17n-db-1.8.0.ebuild
 2105031139 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
 2111150440 ./dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -5368,7 +5374,7 @@
 2106290913 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.25-r1.ebuild
 2110160709 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
 2108042239 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.26.ebuild
-2111140710 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
+2201110810 ./dev-db/mysql-connector-c/mysql-connector-c-8.0.27.ebuild
 2112260340 ./dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
 1902082039 ./dev-db/mysql-super-smack/mysql-super-smack-1.3-r4.ebuild
 2109132339 ./dev-db/mysql-workbench/mysql-workbench-8.0.26-r1.ebuild
@@ -6690,8 +6696,8 @@
 1908060939 ./dev-java/boot-bin/boot-bin-2.8.3.ebuild
 2112222209 ./dev-java/brotli-dec/brotli-dec-0.1.2.ebuild
 2104231309 ./dev-java/browserlauncher2/browserlauncher2-1.3-r2.ebuild
-2112010009 ./dev-java/bsf/bsf-2.4.0-r2.ebuild
-2112010009 ./dev-java/bsh/bsh-2.0_beta6-r1.ebuild
+2201102239 ./dev-java/bsf/bsf-2.4.0-r2.ebuild
+2201102239 ./dev-java/bsh/bsh-2.0_beta6-r1.ebuild
 2101062239 ./dev-java/byaccj/byaccj-1.15-r2.ebuild
 2101062239 ./dev-java/c3p0/c3p0-0.9.5.1.ebuild
 1702282250 ./dev-java/cdi-api/cdi-api-1.2-r1.ebuild
@@ -6740,7 +6746,7 @@
 2012172009 ./dev-java/dnsjava/dnsjava-2.1.8.ebuild
 2104171709 ./dev-java/dom4j/dom4j-1.6.1-r8.ebuild
 2104182009 ./dev-java/dom4j/dom4j-1.6.1-r9.ebuild
-2112030309 ./dev-java/dom4j/dom4j-2.1.3.ebuild
+2201102240 ./dev-java/dom4j/dom4j-2.1.3.ebuild
 2112222209 ./dev-java/easymock/easymock-3.3.1-r1.ebuild
 1704090052 ./dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
 1901231809 ./dev-java/eclipse-ecj/eclipse-ecj-4.10.ebuild
@@ -6821,7 +6827,7 @@
 2108270839 ./dev-java/jai-imageio-jpeg2000/jai-imageio-jpeg2000-1.4.0.ebuild
 2111102009 ./dev-java/jakarta-activation-api/jakarta-activation-api-1.2.2.ebuild
 2112110640 ./dev-java/jakarta-activation-api/jakarta-activation-api-2.0.1-r1.ebuild
-2112111040 ./dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
+2201110210 ./dev-java/jakarta-activation-api/jakarta-activation-api-2.1.0.ebuild
 2112091440 ./dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
 2106131039 ./dev-java/jakarta-oro/jakarta-oro-2.0.8-r5.ebuild
 2101062239 ./dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -6895,8 +6901,8 @@
 2112311309 ./dev-java/jnr-constants/jnr-constants-0.10.3.ebuild
 2111232009 ./dev-java/jnr-ffi/jnr-ffi-2.2.8.ebuild
 2112271940 ./dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild
-2112311309 ./dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
-2112311309 ./dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
+2201102240 ./dev-java/jnr-netdb/jnr-netdb-1.1.4-r1.ebuild
+2201102240 ./dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild
 2112222209 ./dev-java/jnr-x86asm/jnr-x86asm-1.0.2-r2.ebuild
 2112171409 ./dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild
 2112231109 ./dev-java/joda-convert/joda-convert-2.2.2.ebuild
@@ -6925,7 +6931,7 @@
 2105061339 ./dev-java/junit/junit-4.13.2.ebuild
 2112222209 ./dev-java/junitparams/junitparams-1.1.1.ebuild
 2101062239 ./dev-java/junitperf/junitperf-1.9.1-r2.ebuild
-2201021409 ./dev-java/jython/jython-2.7.0-r4.ebuild
+2201102240 ./dev-java/jython/jython-2.7.0-r4.ebuild
 2201080009 ./dev-java/jzlib/jzlib-1.1.3-r2.ebuild
 1703180409 ./dev-java/kunststoff/kunststoff-2.0.2-r2.ebuild
 1702282250 ./dev-java/kxml/kxml-2.3.0.ebuild
@@ -6958,10 +6964,10 @@
 1702282250 ./dev-java/myfaces-builder-annotations/myfaces-builder-annotations-1.0.9.ebuild
 2101062239 ./dev-java/nanoxml/nanoxml-2.2.3-r4.ebuild
 2111250739 ./dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
-2201091209 ./dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
+2201102240 ./dev-java/netty-buffer/netty-buffer-4.0.36-r1.ebuild
 2111250739 ./dev-java/netty-common/netty-common-4.0.36.ebuild
-2201011139 ./dev-java/netty-common/netty-common-4.0.36-r1.ebuild
-2111250739 ./dev-java/netty-transport/netty-transport-4.0.36.ebuild
+2201102240 ./dev-java/netty-common/netty-common-4.0.36-r1.ebuild
+2201102240 ./dev-java/netty-transport/netty-transport-4.0.36.ebuild
 2112222209 ./dev-java/objenesis-test/objenesis-test-3.2.ebuild
 2201091209 ./dev-java/objenesis/objenesis-3.2.ebuild
 2111090609 ./dev-java/openjdk-bin/openjdk-bin-17.0.1_p12.ebuild
@@ -7052,7 +7058,7 @@
 2201051309 ./dev-java/swt/swt-3.7.2-r3.ebuild
 2201051309 ./dev-java/swt/swt-3.8.2-r3.ebuild
 2201051309 ./dev-java/swt/swt-3.8.2-r4.ebuild
-2112010009 ./dev-java/testng/testng-6.9.10.ebuild
+2201102240 ./dev-java/testng/testng-6.9.10.ebuild
 2002231739 ./dev-java/tijmp/tijmp-0.8-r1.ebuild
 1912110241 ./dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
 1912110241 ./dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -7422,7 +7428,7 @@
 2104060140 ./dev-libs/check/check-0.15.2-r1.ebuild
 2106251539 ./dev-libs/chmlib/chmlib-0.40-r1.ebuild
 2104161439 ./dev-libs/cl/cl-1.2.3.ebuild
-2201092239 ./dev-libs/cl/cl-1.2.4-r1.ebuild
+2201110210 ./dev-libs/cl/cl-1.2.4-r1.ebuild
 2109291739 ./dev-libs/clhpp/clhpp-2.0.15.ebuild
 2009191939 ./dev-libs/clipper/clipper-6.4.2.ebuild
 2010100809 ./dev-libs/cloog/cloog-0.20.0.ebuild
@@ -7738,6 +7744,7 @@
 2111282210 ./dev-libs/libgudev/libgudev-237-r1.ebuild
 2112072339 ./dev-libs/libgusb/libgusb-0.3.7-r1.ebuild
 2112180709 ./dev-libs/libgusb/libgusb-0.3.9.ebuild
+2201110040 ./dev-libs/libgusb/libgusb-0.3.10.ebuild
 2110272109 ./dev-libs/libgweather/libgweather-40.0.ebuild
 2009181139 ./dev-libs/libhid/libhid-0.2.17.ebuild
 2108201839 ./dev-libs/libical/libical-3.0.10.ebuild
@@ -8169,7 +8176,7 @@
 2104031909 ./dev-libs/squareball/squareball-9999.ebuild
 2111150309 ./dev-libs/starpu/starpu-1.2.6-r1.ebuild
 2110290739 ./dev-libs/starpu/starpu-1.3.8.ebuild
-2112271740 ./dev-libs/starpu/starpu-1.3.9.ebuild
+2201110210 ./dev-libs/starpu/starpu-1.3.9.ebuild
 2011302209 ./dev-libs/stb/stb-20200713.ebuild
 2107180039 ./dev-libs/stfl/stfl-0.24-r4.ebuild
 2008302139 ./dev-libs/template-glib/template-glib-3.34.0.ebuild
@@ -8222,7 +8229,7 @@
 2011222239 ./dev-libs/utfcpp/utfcpp-3.1.ebuild
 2011222239 ./dev-libs/utfcpp/utfcpp-9999.ebuild
 2201022309 ./dev-libs/utfcpp/utfcpp-3.1.2.ebuild
-2110110009 ./dev-libs/uthash/uthash-2.3.0.ebuild
+2201110540 ./dev-libs/uthash/uthash-2.3.0.ebuild
 2104040239 ./dev-libs/uulib/uulib-0.5.20-r1.ebuild
 2111060742 ./dev-libs/vala-common/vala-common-0.52.5.ebuild
 2111110139 ./dev-libs/vala-common/vala-common-0.52.7.ebuild
@@ -8532,7 +8539,7 @@
 2104181009 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.10.ebuild
 2103121839 ./dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
 2109201339 ./dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
-2201091339 ./dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+2201101340 ./dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
 2103140409 ./dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild
 2105042239 ./dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild
 2103171209 ./dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
@@ -8546,55 +8553,55 @@
 2201090510 ./dev-ml/ocurl/ocurl-0.9.2.ebuild
 2111060709 ./dev-ml/opam-client/opam-client-2.0.10.ebuild
 2110012239 ./dev-ml/opam-client/opam-client-2.0.8.ebuild
-2110031309 ./dev-ml/opam-client/opam-client-2.0.9.ebuild
 2110031309 ./dev-ml/opam-client/opam-client-2.1.0.ebuild
 2111060709 ./dev-ml/opam-client/opam-client-2.1.1.ebuild
 2112191409 ./dev-ml/opam-client/opam-client-2.0.8-r1.ebuild
+2201110410 ./dev-ml/opam-client/opam-client-2.0.9.ebuild
 2111060709 ./dev-ml/opam-core/opam-core-2.0.10.ebuild
 2107241809 ./dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
-2107280609 ./dev-ml/opam-core/opam-core-2.0.9.ebuild
 2110030039 ./dev-ml/opam-core/opam-core-2.1.0.ebuild
 2111060709 ./dev-ml/opam-core/opam-core-2.1.1.ebuild
+2201110410 ./dev-ml/opam-core/opam-core-2.0.9.ebuild
 2103140409 ./dev-ml/opam-file-format/opam-file-format-2.1.0.ebuild
 2106030409 ./dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
 2111101139 ./dev-ml/opam-file-format/opam-file-format-2.1.3.ebuild
 2111060709 ./dev-ml/opam-format/opam-format-2.0.10.ebuild
 2110012139 ./dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
-2110031309 ./dev-ml/opam-format/opam-format-2.0.9.ebuild
 2110031309 ./dev-ml/opam-format/opam-format-2.1.0.ebuild
 2111060709 ./dev-ml/opam-format/opam-format-2.1.1.ebuild
 2112191409 ./dev-ml/opam-format/opam-format-2.0.8-r3.ebuild
+2201110410 ./dev-ml/opam-format/opam-format-2.0.9.ebuild
 2111060709 ./dev-ml/opam-installer/opam-installer-2.0.10.ebuild
 2103150709 ./dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
 2110022239 ./dev-ml/opam-installer/opam-installer-2.0.8-r2.ebuild
 2110141309 ./dev-ml/opam-installer/opam-installer-2.0.8-r3.ebuild
-2107280609 ./dev-ml/opam-installer/opam-installer-2.0.9.ebuild
 2110030039 ./dev-ml/opam-installer/opam-installer-2.1.0.ebuild
 2111060709 ./dev-ml/opam-installer/opam-installer-2.1.1.ebuild
+2201110410 ./dev-ml/opam-installer/opam-installer-2.0.9.ebuild
 2111060709 ./dev-ml/opam-repository/opam-repository-2.0.10.ebuild
 2110012209 ./dev-ml/opam-repository/opam-repository-2.0.8.ebuild
-2110031309 ./dev-ml/opam-repository/opam-repository-2.0.9.ebuild
 2110031309 ./dev-ml/opam-repository/opam-repository-2.1.0.ebuild
 2111060709 ./dev-ml/opam-repository/opam-repository-2.1.1.ebuild
 2112191409 ./dev-ml/opam-repository/opam-repository-2.0.8-r1.ebuild
+2201110410 ./dev-ml/opam-repository/opam-repository-2.0.9.ebuild
 2111060709 ./dev-ml/opam-solver/opam-solver-2.0.10.ebuild
 2103140409 ./dev-ml/opam-solver/opam-solver-2.0.8.ebuild
-2110031309 ./dev-ml/opam-solver/opam-solver-2.0.9.ebuild
 2110031309 ./dev-ml/opam-solver/opam-solver-2.1.0.ebuild
 2111060709 ./dev-ml/opam-solver/opam-solver-2.1.1.ebuild
 2112191409 ./dev-ml/opam-solver/opam-solver-2.0.8-r1.ebuild
+2201110410 ./dev-ml/opam-solver/opam-solver-2.0.9.ebuild
 2111060709 ./dev-ml/opam-state/opam-state-2.0.10.ebuild
 2110012209 ./dev-ml/opam-state/opam-state-2.0.8.ebuild
-2110031309 ./dev-ml/opam-state/opam-state-2.0.9.ebuild
 2110031309 ./dev-ml/opam-state/opam-state-2.1.0.ebuild
 2111060709 ./dev-ml/opam-state/opam-state-2.1.1.ebuild
 2112191409 ./dev-ml/opam-state/opam-state-2.0.8-r1.ebuild
+2201110410 ./dev-ml/opam-state/opam-state-2.0.9.ebuild
 2111060709 ./dev-ml/opam/opam-2.0.10.ebuild
 2110012239 ./dev-ml/opam/opam-2.0.8-r1.ebuild
-2110110809 ./dev-ml/opam/opam-2.0.9.ebuild
 2110141109 ./dev-ml/opam/opam-2.1.0.ebuild
 2111060709 ./dev-ml/opam/opam-2.1.1.ebuild
 2112191409 ./dev-ml/opam/opam-2.0.8-r2.ebuild
+2201110410 ./dev-ml/opam/opam-2.0.9.ebuild
 2110031309 ./dev-ml/ounit2/ounit2-2.2.3.ebuild
 2110031309 ./dev-ml/ounit2/ounit2-2.2.4.ebuild
 2110031309 ./dev-ml/parmap/parmap-1.2.1.ebuild
@@ -9309,10 +9316,10 @@
 2110242139 ./dev-perl/ExtUtils-Typemaps-Default/ExtUtils-Typemaps-Default-1.50.0-r1.ebuild
 2105290039 ./dev-perl/ExtUtils-XSBuilder/ExtUtils-XSBuilder-0.280.0-r2.ebuild
 2110291639 ./dev-perl/ExtUtils-XSpp/ExtUtils-XSpp-0.180.0-r1.ebuild
-2112310939 ./dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild
+2201101109 ./dev-perl/FCGI-Client/FCGI-Client-0.90.0.ebuild
 2110280109 ./dev-perl/FCGI-ProcManager/FCGI-ProcManager-0.280.0-r1.ebuild
 2105301309 ./dev-perl/FCGI/FCGI-0.790.0.ebuild
-2112310939 ./dev-perl/FCGI/FCGI-0.820.0.ebuild
+2201101109 ./dev-perl/FCGI/FCGI-0.820.0.ebuild
 2108060339 ./dev-perl/FFI-CheckLib/FFI-CheckLib-0.280.0.ebuild
 2106022209 ./dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.10.0-r1.ebuild
 2110280109 ./dev-perl/Fatal-Exception/Fatal-Exception-0.50.0-r3.ebuild
@@ -9665,7 +9672,7 @@
 2101070139 ./dev-perl/Mac-Pasteboard/Mac-Pasteboard-0.3.0.ebuild
 2111112209 ./dev-perl/Mail-Audit/Mail-Audit-2.228.0-r2.ebuild
 2110121039 ./dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.101.120.ebuild
-2201091439 ./dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild
+2201101440 ./dev-perl/Mail-AuthenticationResults/Mail-AuthenticationResults-2.202.109.150-r1.ebuild
 2109070339 ./dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.2.0.ebuild
 2108060339 ./dev-perl/Mail-Box-IMAP4/Mail-Box-IMAP4-3.7.0.ebuild
 2109070339 ./dev-perl/Mail-Box-POP3/Mail-Box-POP3-3.3.0.ebuild
@@ -11007,6 +11014,7 @@
 2201062239 ./dev-python/Faker/Faker-11.3.0.ebuild
 2201081709 ./dev-python/GitPython/GitPython-3.1.24-r1.ebuild
 2201081309 ./dev-python/GitPython/GitPython-3.1.25.ebuild
+2201102310 ./dev-python/GitPython/GitPython-3.1.26.ebuild
 2110111109 ./dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
 2109081439 ./dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
 2108250839 ./dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -11080,9 +11088,9 @@
 2201081309 ./dev-python/argcomplete/argcomplete-2.0.0.ebuild
 2112042109 ./dev-python/argh/argh-0.26.2-r2.ebuild
 2111181139 ./dev-python/argon2-cffi/argon2-cffi-21.1.0-r1.ebuild
-2112200209 ./dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
 2112200209 ./dev-python/argon2-cffi/argon2-cffi-21.3.0-r1.ebuild
 2112200209 ./dev-python/argon2-cffi/argon2-cffi-21.3.0.ebuild
+2201110010 ./dev-python/argon2-cffi/argon2-cffi-21.2.0.ebuild
 2109121140 ./dev-python/argparse-manpage/argparse-manpage-1.5-r1.ebuild
 2111291809 ./dev-python/argparse-manpage/argparse-manpage-2.ebuild
 2108281710 ./dev-python/arpeggio/arpeggio-1.10.2.ebuild
@@ -11210,6 +11218,7 @@
 2111271040 ./dev-python/cffi/cffi-1.15.0.ebuild
 2110220239 ./dev-python/cfgv/cfgv-3.3.1.ebuild
 2112240209 ./dev-python/cfn-lint/cfn-lint-0.56.3.ebuild
+2201102310 ./dev-python/cfn-lint/cfn-lint-0.56.4.ebuild
 2109251109 ./dev-python/cftime/cftime-1.5.1.ebuild
 2106011409 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
 2105181609 ./dev-python/chai/chai-1.1.2.ebuild
@@ -11278,8 +11287,7 @@
 2201032239 ./dev-python/croniter/croniter-1.1.0.ebuild
 2111261140 ./dev-python/cryptography/cryptography-36.0.0.ebuild
 2111281810 ./dev-python/cryptography/cryptography-3.4.7-r2.ebuild
-2112031709 ./dev-python/css-parser/css-parser-1.0.6.ebuild
-2112110740 ./dev-python/css-parser/css-parser-1.0.7.ebuild
+2201102310 ./dev-python/css-parser/css-parser-1.0.7.ebuild
 2108220139 ./dev-python/cssselect/cssselect-1.1.0-r1.ebuild
 2106052209 ./dev-python/cssselect2/cssselect2-0.4.1.ebuild
 2111262339 ./dev-python/cssutils/cssutils-2.3.0.ebuild
@@ -11394,8 +11402,7 @@
 2106041309 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
 2106041539 ./dev-python/docutils/docutils-0.16-r1.ebuild
 2107130109 ./dev-python/docutils/docutils-0.17.1.ebuild
-2111240109 ./dev-python/docutils/docutils-0.18.1.ebuild
-2112100040 ./dev-python/docutils/docutils-0.18.ebuild
+2201102310 ./dev-python/docutils/docutils-0.18.1.ebuild
 2112260340 ./dev-python/dogpile-cache/dogpile-cache-1.1.4.ebuild
 2109091909 ./dev-python/doit-py/doit-py-0.5.0.ebuild
 2109091909 ./dev-python/doit/doit-0.33.1.ebuild
@@ -11419,6 +11426,7 @@
 2110141109 ./dev-python/emoji/emoji-1.6.1.ebuild
 2108281710 ./dev-python/empy/empy-3.3.4.ebuild
 2110071039 ./dev-python/enrich/enrich-1.2.6.ebuild
+2201102310 ./dev-python/enrich/enrich-1.2.7.ebuild
 2110190339 ./dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
 2106290913 ./dev-python/entrypoints/entrypoints-0.3-r2.ebuild
 2110252039 ./dev-python/environs/environs-9.3.4.ebuild
@@ -11443,7 +11451,7 @@
 2201100810 ./dev-python/fastjsonschema/fastjsonschema-2.15.3.ebuild
 2110312109 ./dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
 2111080609 ./dev-python/feedparser/feedparser-6.0.8.ebuild
-2112310439 ./dev-python/fido2/fido2-0.9.3.ebuild
+2201110540 ./dev-python/fido2/fido2-0.9.3.ebuild
 2109220139 ./dev-python/fields/fields-5.0.0-r2.ebuild
 2112021209 ./dev-python/filelock/filelock-3.4.0.ebuild
 2112262210 ./dev-python/filelock/filelock-3.4.2.ebuild
@@ -11517,7 +11525,7 @@
 2201081639 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha0.ebuild
 2106150839 ./dev-python/funcy/funcy-1.16.ebuild
 2112200939 ./dev-python/funcy/funcy-1.17.ebuild
-2112111110 ./dev-python/furo/furo-2021.10.9.ebuild
+2201110010 ./dev-python/furo/furo-2021.10.9.ebuild
 2111011109 ./dev-python/fuse-python/fuse-python-1.0.4.ebuild
 2103040739 ./dev-python/fusepy/fusepy-3.0.1.ebuild
 2111080609 ./dev-python/future/future-0.18.2-r1.ebuild
@@ -11859,10 +11867,9 @@
 2112231639 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.11.1.ebuild
 2112252240 ./dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.10.3.ebuild
 2110110009 ./dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.3.ebuild
-2112102040 ./dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
 2112200009 ./dev-python/mkdocs-material/mkdocs-material-8.1.3.ebuild
 2201022209 ./dev-python/mkdocs-material/mkdocs-material-8.1.4.ebuild
-2201082109 ./dev-python/mkdocs-material/mkdocs-material-8.0.5.ebuild
+2201102310 ./dev-python/mkdocs-material/mkdocs-material-8.1.0.ebuild
 2111212209 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0.ebuild
 2112260340 ./dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.5.0-r1.ebuild
 2111121209 ./dev-python/mkdocs-redirects/mkdocs-redirects-1.0.3-r1.ebuild
@@ -11914,9 +11921,8 @@
 2105132239 ./dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
 2105181609 ./dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
 2105051639 ./dev-python/namespace-zope/namespace-zope-1-r1.ebuild
-2112101510 ./dev-python/natsort/natsort-7.2.0.ebuild
-2112112240 ./dev-python/natsort/natsort-8.0.1.ebuild
 2112151939 ./dev-python/natsort/natsort-8.0.2.ebuild
+2201102310 ./dev-python/natsort/natsort-8.0.1.ebuild
 2107172139 ./dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
 2110251639 ./dev-python/nbclassic/nbclassic-0.3.3.ebuild
 2112291609 ./dev-python/nbclassic/nbclassic-0.3.4.ebuild
@@ -12064,7 +12070,7 @@
 2201010439 ./dev-python/pikepdf/pikepdf-4.3.1.ebuild
 2106052109 ./dev-python/pilkit/pilkit-2.0.ebuild
 2112080609 ./dev-python/pillow/pillow-8.4.0.ebuild
-2201070209 ./dev-python/pillow/pillow-9.0.0.ebuild
+2201102240 ./dev-python/pillow/pillow-9.0.0.ebuild
 2201011409 ./dev-python/pip/pip-21.3.1-r1.ebuild
 2111221709 ./dev-python/pipenv/pipenv-2021.11.9.ebuild
 2201090439 ./dev-python/pipenv/pipenv-2021.11.23.ebuild
@@ -12180,6 +12186,7 @@
 2111270009 ./dev-python/pycodestyle/pycodestyle-2.8.0.ebuild
 2111131309 ./dev-python/pycollada/pycollada-0.7.2.ebuild
 2109140439 ./dev-python/pycountry/pycountry-20.7.3.ebuild
+2201102310 ./dev-python/pycountry/pycountry-22.1.10.ebuild
 2112290009 ./dev-python/pycparser/pycparser-2.21.ebuild
 2201081539 ./dev-python/pycryptodome/pycryptodome-3.12.0.ebuild
 2111042339 ./dev-python/pycson/pycson-0.8-r1.ebuild
@@ -12253,6 +12260,7 @@
 2111171109 ./dev-python/pylama/pylama-7.7.1-r1.ebuild
 2112281339 ./dev-python/pylama/pylama-8.0.6.ebuild
 2201021639 ./dev-python/pylama/pylama-8.3.6.ebuild
+2201102310 ./dev-python/pylama/pylama-8.3.7.ebuild
 2112302339 ./dev-python/pylast/pylast-4.4.0.ebuild
 2104042209 ./dev-python/pylatex/pylatex-1.4.1.ebuild
 2111171009 ./dev-python/pylev/pylev-1.4.0.ebuild
@@ -12324,7 +12332,7 @@
 2112260340 ./dev-python/pyroute2/pyroute2-0.5.14.ebuild
 2112240439 ./dev-python/pyrqlite/pyrqlite-2.1.1.ebuild
 2111180910 ./dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
-2112310439 ./dev-python/pyscard/pyscard-2.0.2.ebuild
+2201110540 ./dev-python/pyscard/pyscard-2.0.2.ebuild
 2110190339 ./dev-python/pyscreenshot/pyscreenshot-3.0.ebuild
 2105140139 ./dev-python/pyserial/pyserial-3.5.ebuild
 2112141639 ./dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
@@ -12366,8 +12374,7 @@
 2109012139 ./dev-python/pytest-flake8/pytest-flake8-1.0.7.ebuild
 2108270909 ./dev-python/pytest-flakes/pytest-flakes-4.0.3.ebuild
 2110271139 ./dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
-2108220139 ./dev-python/pytest-forked/pytest-forked-1.3.0-r1.ebuild
-2112102040 ./dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
+2201102310 ./dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
 2109250109 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
 2110032209 ./dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
 2106111409 ./dev-python/pytest-html/pytest-html-3.1.1.ebuild
@@ -12408,8 +12415,7 @@
 2111191009 ./dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
 2106111809 ./dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
 2107290309 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
-2110240339 ./dev-python/pytest-xdist/pytest-xdist-2.4.0.ebuild
-2112102040 ./dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
+2201102310 ./dev-python/pytest-xdist/pytest-xdist-2.5.0.ebuild
 2109220109 ./dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
 2110190339 ./dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
 2111122139 ./dev-python/pytest/pytest-6.2.5-r2.ebuild
@@ -12567,9 +12573,8 @@
 2111022139 ./dev-python/rdflib/rdflib-6.0.2.ebuild
 2201100939 ./dev-python/rdflib/rdflib-6.1.1.ebuild
 2108021209 ./dev-python/re-assert/re-assert-1.1.0.ebuild
-2110312109 ./dev-python/readme_renderer/readme_renderer-30.0.ebuild
-2112102040 ./dev-python/readme_renderer/readme_renderer-31.0.ebuild
 2112141339 ./dev-python/readme_renderer/readme_renderer-32.0.ebuild
+2201102310 ./dev-python/readme_renderer/readme_renderer-31.0.ebuild
 2109270139 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.4.ebuild
 2112101540 ./dev-python/rebulk/rebulk-3.1.0.ebuild
 2201021509 ./dev-python/recommonmark/recommonmark-0.7.1.ebuild
@@ -12605,6 +12610,7 @@
 2109090339 ./dev-python/resolvelib/resolvelib-0.5.4.ebuild
 2111170540 ./dev-python/resolvelib/resolvelib-0.8.1.ebuild
 2111262339 ./dev-python/responses/responses-0.16.0.ebuild
+2201102310 ./dev-python/responses/responses-0.17.0.ebuild
 2105231509 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
 2106290913 ./dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
 2105110109 ./dev-python/retrying/retrying-1.3.3.ebuild
@@ -12633,6 +12639,7 @@
 2112281739 ./dev-python/rpy/rpy-3.4.5.ebuild
 2103031609 ./dev-python/rpyc/rpyc-5.0.1.ebuild
 2201081639 ./dev-python/rq/rq-1.10.1.ebuild
+2201110010 ./dev-python/rq/rq-1.10.1-r1.ebuild
 2112252110 ./dev-python/rsa/rsa-4.8.ebuild
 2111091409 ./dev-python/rst-linker/rst-linker-2.2.0-r1.ebuild
 2107020039 ./dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -12665,6 +12672,7 @@
 2111181139 ./dev-python/send2trash/send2trash-1.8.0.ebuild
 2112260340 ./dev-python/sentinels/sentinels-1.0.0.ebuild
 2112222139 ./dev-python/sentry-sdk/sentry-sdk-1.5.1.ebuild
+2201102340 ./dev-python/sentry-sdk/sentry-sdk-1.5.2.ebuild
 2106150139 ./dev-python/serpent/serpent-1.40.ebuild
 2106052139 ./dev-python/serverfiles/serverfiles-0.3.1.ebuild
 2111281810 ./dev-python/service_identity/service_identity-21.1.0.ebuild
@@ -12730,6 +12738,7 @@
 2201050039 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.13.1.ebuild
 2201062209 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.0.ebuild
 2201072009 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.14.1.ebuild
+2201102310 ./dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.15.1.ebuild
 2110092239 ./dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0-r1.ebuild
 2111050109 ./dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
 2112132209 ./dev-python/sphinx-gallery/sphinx-gallery-0.10.1.ebuild
@@ -12739,8 +12748,8 @@
 2112220539 ./dev-python/sphinx-jinja/sphinx-jinja-1.2.1-r1.ebuild
 2201032109 ./dev-python/sphinx-jinja/sphinx-jinja-1.4.0.ebuild
 2112131909 ./dev-python/sphinx-multiversion/sphinx-multiversion-0.2.4.ebuild
-2112260340 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
-2112260340 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
+2201110010 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
+2201102310 ./dev-python/sphinx-notfound-page/sphinx-notfound-page-0.8.ebuild
 2107271339 ./dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
 2110231639 ./dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
 2109270139 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -12801,9 +12810,9 @@
 2104232109 ./dev-python/sqlalchemy/sqlalchemy-1.3.24.ebuild
 2111121309 ./dev-python/sqlalchemy/sqlalchemy-1.4.27.ebuild
 2111191909 ./dev-python/sqlalchemy/sqlalchemy-1.4.26-r1.ebuild
-2112111040 ./dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
 2112230539 ./dev-python/sqlalchemy/sqlalchemy-1.4.27-r3.ebuild
 2112231239 ./dev-python/sqlalchemy/sqlalchemy-1.4.29.ebuild
+2201110210 ./dev-python/sqlalchemy/sqlalchemy-1.4.28.ebuild
 2110270109 ./dev-python/sqlitedict/sqlitedict-1.7.0.ebuild
 2109121040 ./dev-python/sqlparse/sqlparse-0.4.2.ebuild
 2105040139 ./dev-python/ssh2-python/ssh2-python-0.26.0.ebuild
@@ -12980,8 +12989,7 @@
 2108201039 ./dev-python/watchdog/watchdog-1.0.2.ebuild
 2112122139 ./dev-python/watchdog/watchdog-2.1.6.ebuild
 2112130639 ./dev-python/watchgod/watchgod-0.7.ebuild
-2109231839 ./dev-python/wcmatch/wcmatch-8.2.ebuild
-2111031010 ./dev-python/wcmatch/wcmatch-8.3.ebuild
+2201101440 ./dev-python/wcmatch/wcmatch-8.3.ebuild
 2106290913 ./dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
 2109111040 ./dev-python/weasyprint/weasyprint-53.3.ebuild
 2111150009 ./dev-python/weasyprint/weasyprint-53.4.ebuild
@@ -13020,8 +13028,8 @@
 2108031409 ./dev-python/wxpython/wxpython-4.0.7-r1.ebuild
 2111230440 ./dev-python/xapp/xapp-2.2.1.ebuild
 2111181409 ./dev-python/xarray/xarray-0.19.0.ebuild
-2112101410 ./dev-python/xarray/xarray-0.20.2.ebuild
 2112122209 ./dev-python/xarray/xarray-0.20.1.ebuild
+2201110710 ./dev-python/xarray/xarray-0.20.2.ebuild
 2109072139 ./dev-python/xcffib/xcffib-0.11.1.ebuild
 2110071039 ./dev-python/xdoctest/xdoctest-0.15.10.ebuild
 2111150309 ./dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -13076,7 +13084,7 @@
 2112020739 ./dev-python/patatt/patatt-0.4.9.ebuild
 2112110110 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.2.ebuild
 2112252040 ./dev-python/mkdocs-git-authors-plugin/mkdocs-git-authors-plugin-0.6.3.ebuild
-2112111110 ./dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
+2201110010 ./dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.ebuild
 2112100010 ./dev-python/imageio-ffmpeg/imageio-ffmpeg-0.4.5.ebuild
 2112121139 ./dev-python/ajsonrpc/ajsonrpc-1.2.0.ebuild
 2112302239 ./dev-python/cons/cons-0.4.4.ebuild
@@ -15961,6 +15969,7 @@
 2111201009 ./dev-util/byacc/byacc-20210808.ebuild
 2201010739 ./dev-util/byacc/byacc-20211224.ebuild
 2201070039 ./dev-util/byacc/byacc-20220101.ebuild
+2201101639 ./dev-util/byacc/byacc-20220109.ebuild
 2107031009 ./dev-util/cargo-audit/cargo-audit-0.15.0.ebuild
 2110072009 ./dev-util/cargo-audit/cargo-audit-0.15.2.ebuild
 2108182309 ./dev-util/cargo-c/cargo-c-0.6.2-r1.ebuild
@@ -16533,10 +16542,11 @@
 2112210139 ./dev-util/src-cli/src-cli-3.30.1.ebuild
 2010101409 ./dev-util/statifier/statifier-1.7.4-r1.ebuild
 2012231444 ./dev-util/stepman/stepman-0.10.5.ebuild
-2110030139 ./dev-util/strace/strace-9999.ebuild
 2112100440 ./dev-util/strace/strace-5.12-r1.ebuild
 2112100440 ./dev-util/strace/strace-5.14-r1.ebuild
 2112260040 ./dev-util/strace/strace-5.15.ebuild
+2201101639 ./dev-util/strace/strace-5.16.ebuild
+2201101639 ./dev-util/strace/strace-9999.ebuild
 1811300009 ./dev-util/stressapptest/stressapptest-1.0.9.ebuild
 2112130009 ./dev-util/stripe-mock/stripe-mock-0.116.0.ebuild
 2012231444 ./dev-util/stubgen/stubgen-2.08.ebuild
@@ -16573,6 +16583,7 @@
 2111232309 ./dev-util/umockdev/umockdev-0.16.1-r1.ebuild
 2111282210 ./dev-util/umockdev/umockdev-0.16.2.ebuild
 2112192109 ./dev-util/umockdev/umockdev-0.17.1.ebuild
+2201110040 ./dev-util/umockdev/umockdev-0.17.2.ebuild
 2107140109 ./dev-util/uncrustify/uncrustify-0.71.0.ebuild
 2109271539 ./dev-util/uncrustify/uncrustify-0.72.0.ebuild
 2109271539 ./dev-util/uncrustify/uncrustify-9999.ebuild
@@ -16678,6 +16689,7 @@
 2201012339 ./dev-vcs/git/git-9999-r2.ebuild
 2201012339 ./dev-vcs/git/git-9999-r3.ebuild
 2201012339 ./dev-vcs/git/git-9999.ebuild
+2201110210 ./dev-vcs/git/git-2.35.0_rc0.ebuild
 2101310343 ./dev-vcs/gitg/gitg-3.32.1-r1.ebuild
 2112301409 ./dev-vcs/gitg/gitg-41.ebuild
 2107140109 ./dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r2.ebuild
@@ -16720,8 +16732,7 @@
 2110020709 ./dev-vcs/repo/repo-2.17.ebuild
 2106020039 ./dev-vcs/reposurgeon/reposurgeon-4.27.ebuild
 2101312309 ./dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
-2109141739 ./dev-vcs/stgit/stgit-1.1.ebuild
-2112231739 ./dev-vcs/stgit/stgit-1.4.ebuild
+2201110210 ./dev-vcs/stgit/stgit-1.4.ebuild
 2111030109 ./dev-vcs/subversion/subversion-1.14.1.ebuild
 1911100639 ./dev-vcs/svn2cl/svn2cl-0.12.ebuild
 2103040109 ./dev-vcs/svn2cl/svn2cl-0.14.ebuild
@@ -17727,7 +17738,7 @@
 2108271839 ./gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
 2108101909 ./gnome-extra/gnome-commander/gnome-commander-1.12.1.ebuild
 2112040609 ./gnome-extra/gnome-commander/gnome-commander-1.12.2.ebuild
-2112040609 ./gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
+2201101210 ./gnome-extra/gnome-commander/gnome-commander-1.12.3.1.ebuild
 2105291209 ./gnome-extra/gnome-contacts/gnome-contacts-40.0.ebuild
 2112310709 ./gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
@@ -18735,8 +18746,8 @@
 2201041839 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.23.5.ebuild
 2112140209 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.4.ebuild
 2201041839 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.23.5.ebuild
-2112140209 ./kde-plasma/powerdevil/powerdevil-5.23.4.ebuild
-2201041839 ./kde-plasma/powerdevil/powerdevil-5.23.5.ebuild
+2201101509 ./kde-plasma/powerdevil/powerdevil-5.23.4-r1.ebuild
+2201101509 ./kde-plasma/powerdevil/powerdevil-5.23.5-r1.ebuild
 2112140209 ./kde-plasma/sddm-kcm/sddm-kcm-5.23.4.ebuild
 2201041839 ./kde-plasma/sddm-kcm/sddm-kcm-5.23.5.ebuild
 2112140209 ./kde-plasma/systemsettings/systemsettings-5.23.4.ebuild
@@ -18868,8 +18879,8 @@
 2104192239 ./mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
 2111221339 ./mail-filter/rspamd/rspamd-2.7-r103.ebuild
 2111221339 ./mail-filter/rspamd/rspamd-3.0-r3.ebuild
-2112012309 ./mail-filter/rspamd/rspamd-3.1.ebuild
 2112012309 ./mail-filter/rspamd/rspamd-9999.ebuild
+2201102110 ./mail-filter/rspamd/rspamd-3.1-r1.ebuild
 2005271639 ./mail-filter/scmail/scmail-1.3.ebuild
 2101070439 ./mail-filter/sieve-connect/sieve-connect-0.90.ebuild
 2012281809 ./mail-filter/sigh/sigh-1607.1.6-r1.ebuild
@@ -19316,6 +19327,7 @@
 1912221939 ./media-gfx/gnuclad/gnuclad-0.2.4.ebuild
 1804182308 ./media-gfx/gozer/gozer-0.7-r3.ebuild
 2105291839 ./media-gfx/gphoto2/gphoto2-2.5.27.ebuild
+2201110040 ./media-gfx/gphoto2/gphoto2-2.5.28.ebuild
 1912131839 ./media-gfx/gphotofs/gphotofs-0.5-r1.ebuild
 2108261809 ./media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
 2109170609 ./media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -19504,7 +19516,7 @@
 2103091139 ./media-gfx/viewnior/viewnior-1.7-r2.ebuild
 2112081340 ./media-gfx/viewnior/viewnior-1.8.ebuild
 1810201939 ./media-gfx/w3mimgfb/w3mimgfb-0.9.1.ebuild
-2105312239 ./media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
+2201110140 ./media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
 2011181009 ./media-gfx/wings/wings-2.2.6.1.ebuild
 2108141509 ./media-gfx/word_cloud/word_cloud-1.8.1.ebuild
 2109022012 ./media-gfx/xdot/xdot-1.2.ebuild
@@ -19790,6 +19802,7 @@
 2112221939 ./media-libs/libglvnd/libglvnd-9999.ebuild
 2201070009 ./media-libs/libglvnd/libglvnd-1.4.0.ebuild
 2105291839 ./media-libs/libgphoto2/libgphoto2-2.5.27-r1.ebuild
+2201110740 ./media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
 2109240512 ./media-libs/libgpod/libgpod-0.8.3-r5.ebuild
 2102281609 ./media-libs/libgroove/libgroove-4.3.0-r1.ebuild
 2102222209 ./media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -19894,8 +19907,8 @@
 2201011709 ./media-libs/libraw/libraw-0.20.2.ebuild
 2108211209 ./media-libs/libreplaygain/libreplaygain-477-r1.ebuild
 2111102109 ./media-libs/librosprite/librosprite-0.1.3-r2.ebuild
-2110092239 ./media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
 2109051539 ./media-libs/libsamplerate/libsamplerate-9999.ebuild
+2201101609 ./media-libs/libsamplerate/libsamplerate-0.2.2.ebuild
 2110241139 ./media-libs/libsbsms/libsbsms-2.3.0.ebuild
 2110161109 ./media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
 2110310339 ./media-libs/libsdl2/libsdl2-2.0.16-r1.ebuild
@@ -19904,18 +19917,18 @@
 2109030139 ./media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild
 2108211209 ./media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
 2110260639 ./media-libs/libsidplayfp/libsidplayfp-2.3.0.ebuild
-2112101240 ./media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild
+2201101440 ./media-libs/libsidplayfp/libsidplayfp-2.3.1.ebuild
 2110021639 ./media-libs/libsixel/libsixel-1.10.3.ebuild
 2110011709 ./media-libs/libsixel/libsixel-1.8.6.ebuild
 1912130410 ./media-libs/libsmf/libsmf-1.3.ebuild
-2110272109 ./media-libs/libsndfile/libsndfile-1.0.31.ebuild
 2110272109 ./media-libs/libsndfile/libsndfile-9999.ebuild
+2201101609 ./media-libs/libsndfile/libsndfile-1.0.31.ebuild
 2007211239 ./media-libs/libsoundio/libsoundio-2.0.0.ebuild
 2110241139 ./media-libs/libsoundtouch/libsoundtouch-2.3.1.ebuild
 2111102109 ./media-libs/libsvgtiny/libsvgtiny-0.1.7-r2.ebuild
 2104021709 ./media-libs/libtaginfo/libtaginfo-0.2.1.ebuild
 2112110040 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r3.ebuild
-2201072009 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
+2201101210 ./media-libs/libtgvoip/libtgvoip-2.4.4_p20211129.ebuild
 2105251739 ./media-libs/libtheora/libtheora-1.1.1-r2.ebuild
 2108211209 ./media-libs/libtiger/libtiger-0.3.4-r1.ebuild
 2112210710 ./media-libs/libtimidity/libtimidity-0.2.7.ebuild
@@ -19928,7 +19941,7 @@
 2108120640 ./media-libs/libvisio/libvisio-0.1.7.ebuild
 2108120640 ./media-libs/libvisio/libvisio-9999.ebuild
 2108101609 ./media-libs/libvisual/libvisual-0.4.0-r3.ebuild
-2105251139 ./media-libs/libvorbis/libvorbis-1.3.7.ebuild
+2201101609 ./media-libs/libvorbis/libvorbis-1.3.7.ebuild
 2201051309 ./media-libs/libvpx/libvpx-1.10.0.ebuild
 2201051309 ./media-libs/libvpx/libvpx-1.11.0.ebuild
 2201051309 ./media-libs/libvpx/libvpx-1.7.0-r1.ebuild
@@ -19961,7 +19974,7 @@
 2111070510 ./media-libs/mutagen/mutagen-1.45.1.ebuild
 2108101909 ./media-libs/nas/nas-1.9.4-r2.ebuild
 2112011639 ./media-libs/netpbm/netpbm-10.86.24-r1.ebuild
-2201081539 ./media-libs/netpbm/netpbm-10.86.27.ebuild
+2201110210 ./media-libs/netpbm/netpbm-10.86.27.ebuild
 2102252009 ./media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.91.ebuild
 2007240409 ./media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
 2102252009 ./media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
@@ -20001,7 +20014,7 @@
 2110302039 ./media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
 2110302039 ./media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
 2111221739 ./media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
-2107131439 ./media-libs/opus/opus-1.3.1-r2.ebuild
+2201101609 ./media-libs/opus/opus-1.3.1-r2.ebuild
 2108101209 ./media-libs/opusfile/opusfile-0.12.ebuild
 2111022340 ./media-libs/osl/osl-1.11.15.0-r1.ebuild
 2111022340 ./media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -20077,7 +20090,7 @@
 1912291610 ./media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
 2108101609 ./media-libs/taglib/taglib-1.12.ebuild
 2201072009 ./media-libs/tg_owt/tg_owt-0_pre20210914.ebuild
-2201072009 ./media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
+2201101210 ./media-libs/tg_owt/tg_owt-0_pre20211207.ebuild
 1906090109 ./media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
 2106031939 ./media-libs/tiff/tiff-4.3.0.ebuild
 2110161709 ./media-libs/tremor/tremor-0_pre20130223-r2.ebuild
@@ -20718,6 +20731,7 @@
 2109041339 ./media-sound/alsaplayer/alsaplayer-0.99.81-r2.ebuild
 2111100809 ./media-sound/amsynth/amsynth-1.12.2.ebuild
 2201031139 ./media-sound/amsynth/amsynth-1.12.3.ebuild
+2201101210 ./media-sound/amsynth/amsynth-1.12.4.ebuild
 2109270139 ./media-sound/apetag/apetag-1.12-r3.ebuild
 2009202339 ./media-sound/apulse/apulse-0.1.13.ebuild
 2107121539 ./media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -20793,7 +20807,7 @@
 2112112140 ./media-sound/din/din-52.ebuild
 2107172140 ./media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
 2111260910 ./media-sound/drumstick/drumstick-2.4.1.ebuild
-2112111110 ./media-sound/drumstick/drumstick-2.5.0.ebuild
+2201101440 ./media-sound/drumstick/drumstick-2.5.0.ebuild
 2012292009 ./media-sound/dvda-author/dvda-author-10.06-r1.ebuild
 2201021409 ./media-sound/easyeffects/easyeffects-6.1.5.ebuild
 2109280109 ./media-sound/easytag/easytag-2.4.3-r2.ebuild
@@ -21027,8 +21041,9 @@
 2106091639 ./media-sound/qmmp/qmmp-9999.ebuild
 2112061309 ./media-sound/qsampler/qsampler-0.9.4.ebuild
 2112061309 ./media-sound/qsampler/qsampler-9999.ebuild
-2108080310 ./media-sound/qsynth/qsynth-0.9.4.ebuild
-2102071739 ./media-sound/qsynth/qsynth-9999.ebuild
+2201101210 ./media-sound/qsynth/qsynth-0.9.4.ebuild
+2201101210 ./media-sound/qsynth/qsynth-0.9.5.ebuild
+2201101210 ./media-sound/qsynth/qsynth-9999.ebuild
 2005210139 ./media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
 2005201639 ./media-sound/qtgain/qtgain-1.0.0.ebuild
 2111201039 ./media-sound/qtractor/qtractor-0.9.24.ebuild
@@ -21044,7 +21059,7 @@
 2105261539 ./media-sound/rip/rip-1.07-r3.ebuild
 2011141839 ./media-sound/ripperx/ripperx-2.7.3.ebuild
 2108240140 ./media-sound/rosegarden/rosegarden-21.06.1.ebuild
-2112101210 ./media-sound/rosegarden/rosegarden-21.12.ebuild
+2201101440 ./media-sound/rosegarden/rosegarden-21.12.ebuild
 2107140009 ./media-sound/rplay/rplay-3.3.2-r4.ebuild
 1910180209 ./media-sound/saydate/saydate-0.3.0.ebuild
 2107011139 ./media-sound/schismtracker/schismtracker-20210525.ebuild
@@ -21065,8 +21080,8 @@
 2106190039 ./media-sound/snd/snd-17.4-r2.ebuild
 2101312139 ./media-sound/sndfile-tools/sndfile-tools-1.5.ebuild
 2101312139 ./media-sound/sndfile-tools/sndfile-tools-9999.ebuild
-2109140839 ./media-sound/sndio/sndio-1.8.0.ebuild
 2104131409 ./media-sound/sndio/sndio-9999.ebuild
+2201101609 ./media-sound/sndio/sndio-1.8.0.ebuild
 2104161439 ./media-sound/sndpeek/sndpeek-1.41-r1.ebuild
 2112271140 ./media-sound/solfege/solfege-3.23.4.ebuild
 2108190439 ./media-sound/sonata/sonata-1.7.0.ebuild
@@ -21414,7 +21429,6 @@
 2109121440 ./media-video/xine-ui/xine-ui-0.99.12.ebuild
 2110171409 ./media-video/xvattr/xvattr-1.3-r3.ebuild
 2107180709 ./media-video/xvid4conf/xvid4conf-1.12.ebuild
-2109240940 ./media-video/yle-dl/yle-dl-20210917.ebuild
 2201041109 ./media-video/yle-dl/yle-dl-20211213.ebuild
 2112041709 ./media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild
 2112260340 ./media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild
@@ -21798,7 +21812,7 @@
 2112310709 ./net-analyzer/wireshark/wireshark-3.6.0-r1.ebuild
 2201040809 ./net-analyzer/wireshark/wireshark-3.6.1.ebuild
 2201040809 ./net-analyzer/wireshark/wireshark-9999.ebuild
-2201091609 ./net-analyzer/wireshark/wireshark-3.4.11.ebuild
+2201101210 ./net-analyzer/wireshark/wireshark-3.4.11.ebuild
 2103160309 ./net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
 2011270309 ./net-analyzer/xprobe/xprobe-0.3-r1.ebuild
 2011271109 ./net-analyzer/yersinia/yersinia-0.8.2.ebuild
@@ -21837,7 +21851,7 @@
 2011261339 ./net-dialup/mwavem/mwavem-2.0-r2.ebuild
 1911180139 ./net-dialup/neocon/neocon-20110228.ebuild
 2007121739 ./net-dialup/openl2tp/openl2tp-1.8-r2.ebuild
-2201041609 ./net-dialup/picocom/picocom-3.1.ebuild
+2201110540 ./net-dialup/picocom/picocom-3.1.ebuild
 2106122209 ./net-dialup/ppp-scripts/ppp-scripts-0.ebuild
 2107131239 ./net-dialup/ppp/ppp-2.4.9-r4.ebuild
 2112061840 ./net-dialup/ppp/ppp-2.4.9-r5.ebuild
@@ -21949,6 +21963,7 @@
 2011201709 ./net-firewall/firehol/firehol-3.1.6-r2.ebuild
 2101030009 ./net-firewall/firehol/firehol-3.1.7.ebuild
 2112280509 ./net-firewall/firewalld/firewalld-1.0.2.ebuild
+2201110210 ./net-firewall/firewalld/firewalld-1.0.3.ebuild
 2005212209 ./net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
 2110200709 ./net-firewall/fwbuilder/fwbuilder-6.0.0_rc1.ebuild
 2107310240 ./net-firewall/fwknop/fwknop-2.6.10-r2.ebuild
@@ -21976,9 +21991,7 @@
 2109100309 ./net-firewall/ufw/ufw-0.36.ebuild
 2104161439 ./net-firewall/xtables-addons/xtables-addons-3.13.ebuild
 2104161439 ./net-firewall/xtables-addons/xtables-addons-3.18.ebuild
-2108181339 ./net-fs/autofs/autofs-5.1.6-r2.ebuild
-2110170839 ./net-fs/autofs/autofs-5.1.7-r1.ebuild
-2201060509 ./net-fs/autofs/autofs-5.1.8-r1.ebuild
+2201102310 ./net-fs/autofs/autofs-5.1.8-r1.ebuild
 2101310343 ./net-fs/btfs/btfs-2.22.ebuild
 2101310343 ./net-fs/btfs/btfs-2.23.ebuild
 2111011109 ./net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild
@@ -22108,7 +22121,7 @@
 2111252340 ./net-im/qtox/qtox-1.17.3.ebuild
 2107160109 ./net-im/ricochet/ricochet-1.1.4.ebuild
 2007281739 ./net-im/ricochet/ricochet-9999.ebuild
-2112310009 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.4.ebuild
+2201101440 ./net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
 2111161940 ./net-im/sendxmpp-amm/sendxmpp-amm-9999.ebuild
 2201071209 ./net-im/sendxmpp-amm/sendxmpp-amm-1.1.1.ebuild
 2111020109 ./net-im/sendxmpp/sendxmpp-1.24.ebuild
@@ -22130,8 +22143,8 @@
 2112091040 ./net-im/telegram-desktop-bin/telegram-desktop-bin-3.3.0.ebuild
 2201060009 ./net-im/telegram-desktop-bin/telegram-desktop-bin-3.4.3.ebuild
 2111161340 ./net-im/telegram-desktop/telegram-desktop-3.1.8.ebuild
-2201070309 ./net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
 2201072010 ./net-im/telegram-desktop/telegram-desktop-3.4.3.ebuild
+2201101210 ./net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
 2111141709 ./net-im/telepathy-connection-managers/telepathy-connection-managers-2-r2.ebuild
 2112222210 ./net-im/telepathy-logger/telepathy-logger-0.8.2-r1.ebuild
 2112190440 ./net-im/telepathy-mission-control/telepathy-mission-control-5.16.6.ebuild
@@ -22157,9 +22170,8 @@
 2111080609 ./net-irc/eggdrop/eggdrop-1.9.1.ebuild
 2106302209 ./net-irc/emech/emech-3.0.99_p3-r1.ebuild
 2111080609 ./net-irc/epic5/epic5-2.0.1-r1.ebuild
-2106290809 ./net-irc/ergo/ergo-2.7.0-r1.ebuild
 2111201209 ./net-irc/ergo/ergo-2.8.0.ebuild
-2201091040 ./net-irc/ergo/ergo-2.9.0.ebuild
+2201101640 ./net-irc/ergo/ergo-2.9.1.ebuild
 2111221639 ./net-irc/hexchat/hexchat-2.14.3-r101.ebuild
 2111221639 ./net-irc/hexchat/hexchat-2.16.0.ebuild
 2111221639 ./net-irc/hexchat/hexchat-9999.ebuild
@@ -22321,10 +22333,9 @@
 2109252239 ./net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild
 2112260340 ./net-libs/libbloom/libbloom-1.5-r2.ebuild
 2112260340 ./net-libs/libbloom/libbloom-1.6.ebuild
-2104161439 ./net-libs/libbtbb/libbtbb-2018.08.1.ebuild
 2104161439 ./net-libs/libbtbb/libbtbb-2018.12.1.ebuild
-2104161439 ./net-libs/libbtbb/libbtbb-2020.12.1.ebuild
-2104161439 ./net-libs/libbtbb/libbtbb-9999.ebuild
+2201101910 ./net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
+2201101910 ./net-libs/libbtbb/libbtbb-9999.ebuild
 2011160239 ./net-libs/libcapi/libcapi-3.0.7-r1.ebuild
 2112030439 ./net-libs/libcork/libcork-0.15.0-r2.ebuild
 2112030439 ./net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
@@ -22565,7 +22576,7 @@
 2201072010 ./net-libs/usrsctp/usrsctp-0.9.5.0.ebuild
 2102270739 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2112070009 ./net-libs/webkit-gtk/webkit-gtk-2.32.4.ebuild
-2201081609 ./net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+2201110310 ./net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
 2106222139 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild
 2112272110 ./net-libs/xdp-tools/xdp-tools-1.2.0.ebuild
 2103041409 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
@@ -22840,6 +22851,7 @@
 2107310240 ./net-misc/exabgp/exabgp-4.2.11-r1.ebuild
 2110252039 ./net-misc/exabgp/exabgp-4.2.11-r2.ebuild
 2111292109 ./net-misc/exabgp/exabgp-4.2.16.ebuild
+2201102140 ./net-misc/exabgp/exabgp-4.2.17.ebuild
 2012311940 ./net-misc/fakeidentd/fakeidentd-2.6-r1.ebuild
 2006211509 ./net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild
 1808051739 ./net-misc/felix/felix-3.1.3.ebuild
@@ -23250,7 +23262,7 @@
 2112202210 ./net-misc/xmrig/xmrig-6.16.0.ebuild
 2112202210 ./net-misc/xmrig/xmrig-6.16.1.ebuild
 2112202210 ./net-misc/xmrig/xmrig-9999.ebuild
-2201092340 ./net-misc/xmrig/xmrig-6.16.2.ebuild
+2201101410 ./net-misc/xmrig/xmrig-6.16.2.ebuild
 2104161439 ./net-misc/yandex-disk/yandex-disk-0.1.5.1039_p1.ebuild
 2112240210 ./net-misc/you-get/you-get-0.4.1545.ebuild
 2112231640 ./net-misc/you-get/you-get-0.4.1555.ebuild
@@ -23481,6 +23493,7 @@
 2111241440 ./net-proxy/haproxy/haproxy-2.5.9999.ebuild
 2112071110 ./net-proxy/haproxy/haproxy-2.0.26.ebuild
 2112241140 ./net-proxy/haproxy/haproxy-2.4.10.ebuild
+2201101140 ./net-proxy/haproxy/haproxy-2.2.19.ebuild
 2101310343 ./net-proxy/hatop/hatop-0.8.0.ebuild
 2111251340 ./net-proxy/hatop/hatop-0.8.1.ebuild
 2104172239 ./net-proxy/havp/havp-0.92a-r3.ebuild
@@ -23539,7 +23552,7 @@
 2108010139 ./net-vpn/libreswan/libreswan-4.3-r2.ebuild
 2108010139 ./net-vpn/libreswan/libreswan-4.4-r4.ebuild
 2108261039 ./net-vpn/libreswan/libreswan-4.4-r5.ebuild
-2201092340 ./net-vpn/libreswan/libreswan-4.5.ebuild
+2201101210 ./net-vpn/libreswan/libreswan-4.5.ebuild
 1808142109 ./net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.198.ebuild
 2009161109 ./net-vpn/logmein-hamachi/logmein-hamachi-2.1.0.203.ebuild
 2004170509 ./net-vpn/mullvad-netns/mullvad-netns-0.2.ebuild
@@ -23573,7 +23586,6 @@
 2201061240 ./net-vpn/openvpn/openvpn-2.5.2-r2.ebuild
 2201061240 ./net-vpn/openvpn/openvpn-9999.ebuild
 2008111439 ./net-vpn/pptpd/pptpd-1.4.0-r3.ebuild
-2102181309 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
 2112240810 ./net-vpn/protonvpn-cli/protonvpn-cli-2.2.11-r1.ebuild
 2201031709 ./net-vpn/riseup-vpn/riseup-vpn-0.21.11.ebuild
 2106180139 ./net-vpn/strongswan/strongswan-5.9.2-r1.ebuild
@@ -24417,7 +24429,7 @@
 2112052139 ./sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
 2112220710 ./sci-geosciences/qgis/qgis-3.22.2.ebuild
 2112080940 ./sci-geosciences/qmapshack/qmapshack-1.16.0.ebuild
-2201092340 ./sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
+2201101210 ./sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.0.0e-r1.ebuild
 2103020309 ./sci-geosciences/readosm/readosm-1.1.0a.ebuild
 2111050109 ./sci-geosciences/routino/routino-3.3.3.ebuild
@@ -24524,7 +24536,7 @@
 1912132109 ./sci-libs/gaul-devel/gaul-devel-0.1849-r2.ebuild
 2112061840 ./sci-libs/gdal/gdal-3.3.3.ebuild
 2112220710 ./sci-libs/gdal/gdal-3.4.0.ebuild
-2201041439 ./sci-libs/gdal/gdal-3.4.1.ebuild
+2201110240 ./sci-libs/gdal/gdal-3.4.1.ebuild
 2111060709 ./sci-libs/geos/geos-3.10.1.ebuild
 2101061839 ./sci-libs/geos/geos-3.8.1.ebuild
 2103072309 ./sci-libs/geos/geos-3.9.0-r2.ebuild
@@ -24536,7 +24548,7 @@
 2111021910 ./sci-libs/givaro/givaro-4.1.1-r2.ebuild
 2201040109 ./sci-libs/gmsh/gmsh-4.8.4.ebuild
 2110240739 ./sci-libs/gsl/gsl-2.7.ebuild
-2201081539 ./sci-libs/gsl/gsl-2.7.1-r1.ebuild
+2201110210 ./sci-libs/gsl/gsl-2.7.1-r1.ebuild
 2109200110 ./sci-libs/gts/gts-20121130.ebuild
 2110121009 ./sci-libs/h5hut/h5hut-1.99.13-r1.ebuild
 2103282139 ./sci-libs/h5part/h5part-1.6.6.ebuild
@@ -24609,7 +24621,7 @@
 1704142159 ./sci-libs/libpdb++/libpdb++-040728-r1.ebuild
 2104161439 ./sci-libs/libpdb/libpdb-991112-r1.ebuild
 2112161109 ./sci-libs/libqalculate/libqalculate-3.21.0.ebuild
-2201090440 ./sci-libs/libqalculate/libqalculate-3.22.0.ebuild
+2201101410 ./sci-libs/libqalculate/libqalculate-3.22.0.ebuild
 2108042109 ./sci-libs/libsc/libsc-2.3.1-r1.ebuild
 2111120739 ./sci-libs/libsc/libsc-2.3.3.ebuild
 2108042109 ./sci-libs/libsc/libsc-9999.ebuild
@@ -24911,7 +24923,7 @@
 2103301239 ./sci-mathematics/yafu/yafu-1.34.3-r1.ebuild
 2110200610 ./sci-mathematics/z3/z3-4.8.11b.ebuild
 2112241210 ./sci-mathematics/z3/z3-4.8.14.ebuild
-2201090440 ./sci-mathematics/z3/z3-4.8.13.ebuild
+2201110210 ./sci-mathematics/z3/z3-4.8.13.ebuild
 2112040609 ./sci-mathematics/lean/lean-3.35.1-r2.ebuild
 2112040609 ./sci-mathematics/lean/lean-3.9999.ebuild
 2201080610 ./sci-mathematics/lean/lean-3.37.0.ebuild
@@ -26172,10 +26184,8 @@
 2112170610 ./sys-apps/flatpak/flatpak-1.12.2-r1.ebuild
 2012021839 ./sys-apps/fwts/fwts-20.11.00.ebuild
 2112271740 ./sys-apps/fwupd-efi/fwupd-efi-1.1.ebuild
-2107172140 ./sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
-2111122209 ./sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
-2111122209 ./sys-apps/fwupd/fwupd-1.7.1.ebuild
 2112271740 ./sys-apps/fwupd/fwupd-1.7.2-r1.ebuild
+2201101740 ./sys-apps/fwupd/fwupd-1.7.3.ebuild
 2107270739 ./sys-apps/fxload/fxload-20081013-r1.ebuild
 2109030510 ./sys-apps/gawk/gawk-5.1.0.ebuild
 2110292009 ./sys-apps/gawk/gawk-5.1.1-r1.ebuild
@@ -26208,12 +26218,11 @@
 2108300510 ./sys-apps/groff/groff-1.22.4.ebuild
 2002100339 ./sys-apps/gscanbus/gscanbus-0.8.ebuild
 1912110241 ./sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
-2112241140 ./sys-apps/haveged/haveged-1.9.14-r1.ebuild
 2112242140 ./sys-apps/haveged/haveged-1.9.15.ebuild
-2112241140 ./sys-apps/haveged/haveged-1.9.8c-r1.ebuild
 2201090510 ./sys-apps/haveged/haveged-1.9.17.ebuild
 2007171109 ./sys-apps/hd-idle/hd-idle-1.05-r1.ebuild
 2109230439 ./sys-apps/hdparm/hdparm-9.62.ebuild
+2201110610 ./sys-apps/hdparm/hdparm-9.63.ebuild
 2106190040 ./sys-apps/heirloom-tools/heirloom-tools-070715-r4.ebuild
 2105142339 ./sys-apps/help2man/help2man-1.48.3.ebuild
 2112100110 ./sys-apps/help2man/help2man-1.48.5.ebuild
@@ -26255,11 +26264,11 @@
 2108281510 ./sys-apps/ipmicfg/ipmicfg-1.33.0.210528.ebuild
 2112260340 ./sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
 2112260340 ./sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
-2112260340 ./sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+2201101240 ./sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
 1912111540 ./sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
 1912111540 ./sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
 2005071739 ./sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
-2009171709 ./sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
+2201101240 ./sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
 2109062309 ./sys-apps/iproute2/iproute2-5.13.0-r1.ebuild
 2109011039 ./sys-apps/iproute2/iproute2-5.14.0.ebuild
 2109011039 ./sys-apps/iproute2/iproute2-9999.ebuild
@@ -26489,11 +26498,12 @@
 2009200309 ./sys-apps/syslog-notify/syslog-notify-0.2.ebuild
 1810211839 ./sys-apps/systemd-readahead/systemd-readahead-216.ebuild
 2112150139 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
+2201110710 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
 2112072340 ./sys-apps/systemd/systemd-249.6-r1.ebuild
 2112250410 ./sys-apps/systemd/systemd-249.7.ebuild
-2112260210 ./sys-apps/systemd/systemd-250-r1.ebuild
 2112260210 ./sys-apps/systemd/systemd-9999.ebuild
-2201050139 ./sys-apps/systemd/systemd-250.1.ebuild
+2201110410 ./sys-apps/systemd/systemd-249.7-r1.ebuild
+2201110410 ./sys-apps/systemd/systemd-250.2.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-3.00-r1.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-3.01.ebuild
@@ -26781,8 +26791,8 @@
 2005311039 ./sys-boot/palo/palo-9999.ebuild
 2006061709 ./sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
 2109110209 ./sys-boot/plymouth/plymouth-0.9.5-r1.ebuild
-2112260610 ./sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
 2112260610 ./sys-boot/plymouth/plymouth-9999.ebuild
+2201110840 ./sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
 2012120139 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild
 2101251739 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201201.ebuild
 2103061039 ./sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20210108.ebuild
@@ -26852,7 +26862,7 @@
 2112201210 ./sys-cluster/k3s/k3s-1.20.12.ebuild
 2112201210 ./sys-cluster/k3s/k3s-1.21.8.ebuild
 2112201210 ./sys-cluster/k3s/k3s-1.22.5-r1.ebuild
-2201100210 ./sys-cluster/k3s/k3s-1.23.1.ebuild
+2201101740 ./sys-cluster/k3s/k3s-1.23.1.ebuild
 2006252309 ./sys-cluster/k9scli/k9scli-0.20.5.ebuild
 2007141909 ./sys-cluster/k9scli/k9scli-0.21.2.ebuild
 2010040639 ./sys-cluster/k9scli/k9scli-0.22.1.ebuild
@@ -26974,7 +26984,7 @@
 2111060939 ./sys-cluster/minikube/minikube-1.24.0.ebuild
 2106110339 ./sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
 2110300209 ./sys-cluster/mpich/mpich-3.0.4-r2.ebuild
-2112181140 ./sys-cluster/mpich/mpich-3.4.3.ebuild
+2201110210 ./sys-cluster/mpich/mpich-3.4.3.ebuild
 2110300209 ./sys-cluster/mpich2/mpich2-1.5-r2.ebuild
 1712240039 ./sys-cluster/native-mpi/native-mpi-0.ebuild
 2108072239 ./sys-cluster/nomad/nomad-1.0.9.ebuild
@@ -27132,7 +27142,7 @@
 2112020409 ./sys-devel/gcc/gcc-11.2.0.ebuild
 2201070409 ./sys-devel/gcc/gcc-11.2.1_p20211127.ebuild
 2201070409 ./sys-devel/gcc/gcc-11.2.1_pre9999.ebuild
-2201070409 ./sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+2201101640 ./sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2201022110 ./sys-devel/gdb/gdb-10.2-r1.ebuild
 2201022110 ./sys-devel/gdb/gdb-11.1.ebuild
@@ -27323,7 +27333,7 @@
 2112251610 ./sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
 2112310609 ./sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild
 2002112051 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
-2009181139 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
+2201110540 ./sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
 2109280109 ./sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
 2107310240 ./sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
 2011140009 ./sys-fs/clamfs/clamfs-1.2.0.ebuild
@@ -27399,7 +27409,7 @@
 2104212209 ./sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
 2104212209 ./sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
 2109280109 ./sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
-2201091440 ./sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
+2201110210 ./sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
 2012271409 ./sys-fs/iprutils/iprutils-2.4.18.1.ebuild
 2111062339 ./sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
 2108031409 ./sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -27514,17 +27524,17 @@
 2112100340 ./sys-kernel/genkernel/genkernel-4.2.5.ebuild
 2112100410 ./sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
 2112100340 ./sys-kernel/genkernel/genkernel-9999.ebuild
-2111221409 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild
-2111240239 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild
-2112260240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
-2112260240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
-2112260240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
-2112292209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild
-2112292209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
-2112292209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild
-2201060339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild
-2201060339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild
-2201060339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild
+2201110810 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild
 2111221409 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.14.21.ebuild
 2112270710 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.88.ebuild
 2112270710 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.11.ebuild
@@ -27556,6 +27566,7 @@
 2201100140 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.168.ebuild
 2201100140 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.169.ebuild
 2201100140 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.170.ebuild
+2201101240 ./sys-kernel/gentoo-sources/gentoo-sources-5.16.0.ebuild
 2111150239 ./sys-kernel/git-sources/git-sources-5.16_rc1.ebuild
 2111220239 ./sys-kernel/git-sources/git-sources-5.16_rc2.ebuild
 2111290209 ./sys-kernel/git-sources/git-sources-5.16_rc3.ebuild
@@ -27601,6 +27612,7 @@
 2112260040 ./sys-kernel/linux-headers/linux-headers-5.15-r1.ebuild
 2201010939 ./sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild
 2201010709 ./sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild
+2201110040 ./sys-kernel/linux-headers/linux-headers-5.16.ebuild
 2109300209 ./sys-kernel/linux-next/linux-next-9999.ebuild
 2112020309 ./sys-kernel/mips-sources/mips-sources-4.14.256.ebuild
 2112020309 ./sys-kernel/mips-sources/mips-sources-4.19.219.ebuild
@@ -27656,6 +27668,7 @@
 2201100140 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.90.ebuild
 2201100140 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.13.ebuild
 2201100140 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.170.ebuild
+2201101210 ./sys-kernel/vanilla-sources/vanilla-sources-5.16.0.ebuild
 2111010440 ./sys-kernel/zen-sources/zen-sources-5.14.15.ebuild
 2112191739 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
@@ -27862,7 +27875,7 @@
 2107081610 ./sys-power/bbswitch/bbswitch-9999.ebuild
 2112212209 ./sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
 2107021539 ./sys-power/cpupower/cpupower-5.4.ebuild
-2201092340 ./sys-power/cpupower/cpupower-5.12.ebuild
+2201110210 ./sys-power/cpupower/cpupower-5.12.ebuild
 2009221209 ./sys-power/dptfxtract/dptfxtract-1.4.3.ebuild
 1901132309 ./sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
 2201051309 ./sys-power/iasl/iasl-20200326.ebuild
@@ -28023,7 +28036,7 @@
 2107270309 ./virtual/imagemagick-tools/imagemagick-tools-0.ebuild
 2108291210 ./virtual/imap-c-client/imap-c-client-2.ebuild
 2105131709 ./virtual/inetd/inetd-0.ebuild
-2108180439 ./virtual/jack/jack-2.ebuild
+2201101540 ./virtual/jack/jack-2.ebuild
 2107161009 ./virtual/jdk/jdk-1.8.0-r6.ebuild
 2107160939 ./virtual/jdk/jdk-11-r2.ebuild
 2110162109 ./virtual/jdk/jdk-17.ebuild
@@ -28186,8 +28199,7 @@
 2108241439 ./virtual/tmpfiles/tmpfiles-0-r1.ebuild
 2109270139 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
 2108150539 ./virtual/udev/udev-217-r3.ebuild
-2108110511 ./virtual/w3m/w3m-0.ebuild
-2106300139 ./virtual/w3m/w3m-1.ebuild
+2201110540 ./virtual/w3m/w3m-1.ebuild
 1912222309 ./virtual/wine/wine-0-r7.ebuild
 2105131709 ./virtual/yacc/yacc-0.ebuild
 1708230039 ./www-apache/anyterm/anyterm-1.1.29-r1.ebuild
@@ -28395,7 +28407,7 @@
 2112171239 ./www-client/firefox-bin/firefox-bin-95.0.1.ebuild
 2112180939 ./www-client/firefox/firefox-95.0.1-r1.ebuild
 2112191509 ./www-client/firefox/firefox-91.4.0-r1.ebuild
-2112311439 ./www-client/google-chrome-beta/google-chrome-beta-97.0.4692.71.ebuild
+2201102310 ./www-client/google-chrome-beta/google-chrome-beta-98.0.4758.48.ebuild
 2112171209 ./www-client/google-chrome-unstable/google-chrome-unstable-98.0.4758.9.ebuild
 2201051209 ./www-client/google-chrome/google-chrome-97.0.4692.71.ebuild
 2104302139 ./www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -28471,8 +28483,8 @@
 2107020739 ./www-misc/wsmake/wsmake-0.6.4-r1.ebuild
 2008250009 ./www-plugins/browserpass/browserpass-3.0.7.ebuild
 2112171209 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-98.0.4758.9_alpha.ebuild
-2112311439 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild
 2201051209 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71.ebuild
+2201102310 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-98.0.4758.48_beta.ebuild
 2106202109 ./www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
 2012261209 ./www-plugins/lightspark/lightspark-0.8.3.ebuild
@@ -28651,14 +28663,14 @@
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
 2112161109 ./x11-base/xwayland/xwayland-21.1.4.ebuild
 2112020309 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
-2112281509 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
-2112282309 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
-2201010309 ./x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
+2201110040 ./x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
 2101101939 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2201040009 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2201040009 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -28736,7 +28748,7 @@
 2201022110 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
 2109232339 ./x11-libs/libX11/libX11-1.7.2.ebuild
 2201011839 ./x11-libs/libX11/libX11-1.7.3.ebuild
-2105290309 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+2201101610 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2201011839 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
 2201021639 ./x11-libs/libXaw/libXaw-1.0.14.ebuild
 2201031539 ./x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -28750,7 +28762,7 @@
 2108020739 ./x11-libs/libXfont2/libXfont2-9999.ebuild
 2201060309 ./x11-libs/libXfont2/libXfont2-2.0.5.ebuild
 2201021639 ./x11-libs/libXft/libXft-2.3.4.ebuild
-2111180910 ./x11-libs/libXi/libXi-1.8.ebuild
+2201101610 ./x11-libs/libXi/libXi-1.8.ebuild
 2201031539 ./x11-libs/libXinerama/libXinerama-1.1.4-r1.ebuild
 2201011909 ./x11-libs/libXmu/libXmu-1.1.3.ebuild
 2201021639 ./x11-libs/libXpm/libXpm-3.5.13.ebuild
@@ -28764,7 +28776,7 @@
 2201060309 ./x11-libs/libXv/libXv-1.0.11-r2.ebuild
 2107042209 ./x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
 2107260209 ./x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
-2111180910 ./x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+2201101610 ./x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
 2101061509 ./x11-libs/libast/libast-0.7-r2.ebuild
 2104130239 ./x11-libs/libclxclient/libclxclient-3.9.2.ebuild
 2012231444 ./x11-libs/libcryptui/libcryptui-3.12.2-r1.ebuild
@@ -29034,8 +29046,8 @@
 2107211809 ./x11-misc/pcmanfm/pcmanfm-1.3.2-r1.ebuild
 2002112051 ./x11-misc/peksystray/peksystray-0.4.0.ebuild
 2106072009 ./x11-misc/picom/picom-8-r1.ebuild
-2110110139 ./x11-misc/picom/picom-8.2-r2.ebuild
 2106120909 ./x11-misc/picom/picom-9999.ebuild
+2201110540 ./x11-misc/picom/picom-8.2-r2.ebuild
 2103162239 ./x11-misc/piedock/piedock-1.6.9.ebuild
 2107172140 ./x11-misc/polybar/polybar-3.5.6.ebuild
 2111011310 ./x11-misc/polybar/polybar-3.5.7.ebuild
@@ -29840,7 +29852,6 @@
 2112201210 ./app-containers/containerd/containerd-1.4.11.ebuild
 2201061139 ./app-containers/containerd/containerd-1.5.9.ebuild
 2201072139 ./app-containers/containerd/containerd-1.4.12.ebuild
-2112201210 ./app-containers/containers-storage/containers-storage-1.30.0.ebuild
 2112312209 ./app-containers/containers-storage/containers-storage-1.37.0.ebuild
 2112201210 ./app-containers/cri-o/cri-o-1.21.0.ebuild
 2112201210 ./app-containers/cri-o/cri-o-1.21.4.ebuild
@@ -30825,14 +30836,11 @@
 2201041510 metadata/md5-cache/app-accessibility/espeakup-0.80
 2201061240 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
 2201061240 metadata/md5-cache/app-accessibility/emacspeak-9999
-2201091144 metadata/md5-cache/app-accessibility/Manifest.gz
 2201091144 metadata/md5-cache/app-accessibility/accerciser-3.38.0
 2201091144 metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
 2201091144 metadata/md5-cache/app-accessibility/at-spi2-core-2.40.2
 2201091144 metadata/md5-cache/app-accessibility/at-spi2-core-2.40.3
 2201091144 metadata/md5-cache/app-accessibility/at-spi2-core-2.42.0
-2201091144 metadata/md5-cache/app-accessibility/brltty-6.1
-2201091144 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2201091144 metadata/md5-cache/app-accessibility/caribou-0.4.21-r3
 2201091144 metadata/md5-cache/app-accessibility/caribou-0.4.21-r4
 2201091144 metadata/md5-cache/app-accessibility/espeakup-0.90
@@ -30841,6 +30849,9 @@
 2201091110 metadata/md5-cache/app-accessibility/kontrast-21.12.1
 2201091144 metadata/md5-cache/app-accessibility/orca-40.0
 2201091144 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
+2201110340 metadata/md5-cache/app-accessibility/Manifest.gz
+2201110340 metadata/md5-cache/app-accessibility/brltty-6.1
+2201110340 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2107101839 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r2
 2107101809 metadata/md5-cache/app-admin/aerospike-amc-community-5.0.0
 2104031909 metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -31199,7 +31210,6 @@
 2101061609 metadata/md5-cache/app-arch/deb2targz-1-r3
 2011141839 metadata/md5-cache/app-arch/duff-0.5.2
 2109132339 metadata/md5-cache/app-arch/dump-0.4.47-r1
-2101061609 metadata/md5-cache/app-arch/fastjar-0.98-r3
 2103050309 metadata/md5-cache/app-arch/gtk-splitter-2.2.1-r2
 2011141839 metadata/md5-cache/app-arch/libpar2-0.4
 2107021539 metadata/md5-cache/app-arch/lzop-1.04
@@ -31309,7 +31319,6 @@
 2201050010 metadata/md5-cache/app-arch/tarlz-0.21
 2201061240 metadata/md5-cache/app-arch/engrampa-1.24.2
 2201061240 metadata/md5-cache/app-arch/tar-1.34
-2201091910 metadata/md5-cache/app-arch/Manifest.gz
 2201091144 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2201091144 metadata/md5-cache/app-arch/brotli-1.0.9-r3
 2201091144 metadata/md5-cache/app-arch/brotli-9999
@@ -31326,6 +31335,7 @@
 2201091144 metadata/md5-cache/app-arch/unrpa-2.3.0
 2201091144 metadata/md5-cache/app-arch/vimball-0.5.1
 2201091144 metadata/md5-cache/app-arch/vimball-9999
+2201101239 metadata/md5-cache/app-arch/Manifest.gz
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
@@ -31567,7 +31577,6 @@
 2201021453 metadata/md5-cache/app-crypt/asekey-3.7
 2201021453 metadata/md5-cache/app-crypt/bsign-0.4.5-r1
 2201021453 metadata/md5-cache/app-crypt/ccid-1.4.35
-2201021453 metadata/md5-cache/app-crypt/ccid-1.4.36
 2201021453 metadata/md5-cache/app-crypt/chntpw-140201
 2201021453 metadata/md5-cache/app-crypt/ckpass-0.2-r1
 2201021453 metadata/md5-cache/app-crypt/codecrypt-1.8-r2
@@ -31694,7 +31703,6 @@
 2201051309 metadata/md5-cache/app-crypt/johntheripper-1.8.0-r1
 2201061240 metadata/md5-cache/app-crypt/trousers-0.3.14-r3
 2201061240 metadata/md5-cache/app-crypt/trousers-0.3.15
-2201091144 metadata/md5-cache/app-crypt/Manifest.gz
 2201091144 metadata/md5-cache/app-crypt/acme-1.21.0
 2201091144 metadata/md5-cache/app-crypt/acme-1.22.0
 2201091144 metadata/md5-cache/app-crypt/acme-9999
@@ -31719,7 +31727,6 @@
 2201091144 metadata/md5-cache/app-crypt/heimdal-7.7.0-r3
 2201091144 metadata/md5-cache/app-crypt/libsecret-0.20.4-r1
 2201091144 metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r1
-2201091144 metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2
 2201091144 metadata/md5-cache/app-crypt/pius-3.0.0-r1
 2201091110 metadata/md5-cache/app-crypt/qca-2.3.4
 2201091144 metadata/md5-cache/app-crypt/seahorse-40.0-r1
@@ -31729,10 +31736,13 @@
 2201091144 metadata/md5-cache/app-crypt/tpm2-pkcs11-1.7.0
 2201091144 metadata/md5-cache/app-crypt/tpm2-tools-5.2
 2201091144 metadata/md5-cache/app-crypt/yubikey-manager-4.0.5-r1
-2201091144 metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
 2201091144 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
 2201091144 metadata/md5-cache/app-crypt/yubioath-desktop-5.0.5
 2201091144 metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r1
+2201110540 metadata/md5-cache/app-crypt/Manifest.gz
+2201110540 metadata/md5-cache/app-crypt/ccid-1.4.36
+2201110210 metadata/md5-cache/app-crypt/mit-krb5-1.19.2-r2
+2201110540 metadata/md5-cache/app-crypt/yubikey-manager-4.0.7
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -32896,7 +32906,6 @@
 2201061240 metadata/md5-cache/app-emacs/blogmax-20170321
 2201061240 metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
 2201061240 metadata/md5-cache/app-emacs/ebuild-mode-1.53
-2201061240 metadata/md5-cache/app-emacs/ebuild-mode-1.54
 2201061240 metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
 2201061240 metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r1
 2201061240 metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2
@@ -32934,8 +32943,9 @@
 2201061240 metadata/md5-cache/app-emacs/yasnippet-0.14.0
 2201061240 metadata/md5-cache/app-emacs/zenburn-20110907-r1
 2201061240 metadata/md5-cache/app-emacs/zenirc-2.112-r1
-2201091144 metadata/md5-cache/app-emacs/Manifest.gz
 2201091144 metadata/md5-cache/app-emacs/pymacs-0.26-r2
+2201102240 metadata/md5-cache/app-emacs/Manifest.gz
+2201102240 metadata/md5-cache/app-emacs/ebuild-mode-1.54-r1
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 2110200512 metadata/md5-cache/app-emulation/bochs-9999
@@ -33515,7 +33525,6 @@
 2110071139 metadata/md5-cache/app-misc/libdatovka-0.2.0
 2004032241 metadata/md5-cache/app-misc/mencal-3.0
 2106291109 metadata/md5-cache/app-misc/neofetch-7.1.0
-2110161809 metadata/md5-cache/app-misc/neofetch-7.1.0-r1
 2108031439 metadata/md5-cache/app-misc/neofetch-9999
 1710212038 metadata/md5-cache/app-misc/nullmodem-0.0.6-r1
 1702282309 metadata/md5-cache/app-misc/perltrash-0.3-r1
@@ -33547,8 +33556,6 @@
 2104040239 metadata/md5-cache/app-misc/vit-1.3
 2102211039 metadata/md5-cache/app-misc/when-1.1.40
 2110312244 metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
-2111282040 metadata/md5-cache/app-misc/fmawk-1.2
-2111282040 metadata/md5-cache/app-misc/fmawk-9999
 2112081340 metadata/md5-cache/app-misc/note-1.3.26
 2112112311 metadata/md5-cache/app-misc/dasel-1.15.0
 2112112311 metadata/md5-cache/app-misc/faq-0.0.6
@@ -33610,7 +33617,6 @@
 2201021453 metadata/md5-cache/app-misc/ddate-0.2.2_p20160627
 2201021453 metadata/md5-cache/app-misc/ddccontrol-0.4.4_p20200630
 2201021453 metadata/md5-cache/app-misc/ddccontrol-db-20190826_p20200613
-2201021453 metadata/md5-cache/app-misc/ddcui-0.1.2
 2201021453 metadata/md5-cache/app-misc/delay-1.6-r2
 2201021453 metadata/md5-cache/app-misc/detachtty-11.0.0
 2201021453 metadata/md5-cache/app-misc/detachtty-9-r1
@@ -33780,7 +33786,6 @@
 2201021453 metadata/md5-cache/app-misc/tpipe-1.6-r1
 2201021453 metadata/md5-cache/app-misc/tprint-1.1.0-r1
 2201021453 metadata/md5-cache/app-misc/transfolio-1.0.1-r1
-2201021453 metadata/md5-cache/app-misc/tty-clock-2.3
 2201021453 metadata/md5-cache/app-misc/ttyload-0.5.3
 2201021453 metadata/md5-cache/app-misc/ttyload-0.5.3-r1
 2201021453 metadata/md5-cache/app-misc/ttyrec-1.0.8-r2
@@ -33807,7 +33812,6 @@
 2201021453 metadata/md5-cache/app-misc/zygrib-8.0.1-r2
 2201041510 metadata/md5-cache/app-misc/actkbd-0.2.8-r2
 2201041510 metadata/md5-cache/app-misc/blink1-1.98-r2
-2201041510 metadata/md5-cache/app-misc/ddcutil-0.9.9-r2
 2201041339 metadata/md5-cache/app-misc/emelfm2-0.9.1-r5
 2201041510 metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r14
 2201041510 metadata/md5-cache/app-misc/g15daemon-1.9.5.3-r15
@@ -33829,7 +33833,6 @@
 2201061240 metadata/md5-cache/app-misc/smtm-1.6.10-r2
 2201062309 metadata/md5-cache/app-misc/mime-types-2.1.53
 2201071339 metadata/md5-cache/app-misc/broot-1.9.1
-2201091910 metadata/md5-cache/app-misc/Manifest.gz
 2201091144 metadata/md5-cache/app-misc/anki-2.1.15-r1
 2201091144 metadata/md5-cache/app-misc/asciicast-tools-0.0_pre20190410
 2201091144 metadata/md5-cache/app-misc/asciinema-2.0.2-r1
@@ -33915,6 +33918,19 @@
 2201091144 metadata/md5-cache/app-misc/yq-2.12.0
 2201091144 metadata/md5-cache/app-misc/yq-2.13.0
 2201091144 metadata/md5-cache/app-misc/yq-2.9.2-r1
+2201110810 metadata/md5-cache/app-misc/Manifest.gz
+2201102010 metadata/md5-cache/app-misc/ddccontrol-0.6.0
+2201101940 metadata/md5-cache/app-misc/ddccontrol-db-20210812
+2201101509 metadata/md5-cache/app-misc/ddcui-0.1.2-r1
+2201101509 metadata/md5-cache/app-misc/ddcui-0.2.0
+2201101509 metadata/md5-cache/app-misc/ddcutil-0.9.9-r3
+2201101509 metadata/md5-cache/app-misc/ddcutil-1.2.1
+2201101840 metadata/md5-cache/app-misc/fmawk-1.2
+2201101840 metadata/md5-cache/app-misc/fmawk-1.3
+2201101840 metadata/md5-cache/app-misc/fmawk-9999
+2201101410 metadata/md5-cache/app-misc/neofetch-7.1.0-r1
+2201110810 metadata/md5-cache/app-misc/solaar-1.1.1
+2201110540 metadata/md5-cache/app-misc/tty-clock-2.3
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 2111100039 metadata/md5-cache/app-mobilephone/dfu-util-0.11
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
@@ -34250,7 +34266,6 @@
 2012311940 metadata/md5-cache/app-text/convmv-2.04
 1803271139 metadata/md5-cache/app-text/convmv-2.05
 2012171209 metadata/md5-cache/app-text/convmv-2.05-r1
-2107012139 metadata/md5-cache/app-text/cpdf-2.3.1
 2012311940 metadata/md5-cache/app-text/diction-1.14
 2104031909 metadata/md5-cache/app-text/ding-1.8.1
 2110312244 metadata/md5-cache/app-text/ding-1.9
@@ -34603,7 +34618,6 @@
 2201071710 metadata/md5-cache/app-text/libnumbertext-1.0.8
 2201071710 metadata/md5-cache/app-text/poppler-22.01.0
 2201071710 metadata/md5-cache/app-text/poppler-9999
-2201091810 metadata/md5-cache/app-text/Manifest.gz
 2201091144 metadata/md5-cache/app-text/asciidoc-10.1.1-r2
 2201091144 metadata/md5-cache/app-text/asciidoc-9.0.5-r1
 2201091144 metadata/md5-cache/app-text/asciidoc-9.1.0
@@ -34702,6 +34716,8 @@
 2201091144 metadata/md5-cache/app-text/zathura-pdf-poppler-9999
 2201091144 metadata/md5-cache/app-text/zathura-ps-0.2.6
 2201091144 metadata/md5-cache/app-text/zathura-ps-9999
+2201110340 metadata/md5-cache/app-text/Manifest.gz
+2201110340 metadata/md5-cache/app-text/cpdf-2.3.1
 2107230839 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
 2107230839 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
 2107230839 metadata/md5-cache/app-vim/airline-0.11
@@ -35216,7 +35232,6 @@
 2201071209 metadata/md5-cache/dev-cpp/json11-1.0.0
 2201072009 metadata/md5-cache/dev-cpp/ms-gsl-3.1.0
 2201072009 metadata/md5-cache/dev-cpp/range-v3-0.11.0
-2201100039 metadata/md5-cache/dev-cpp/Manifest.gz
 2201091144 metadata/md5-cache/dev-cpp/abseil-cpp-20200923.3
 2201091144 metadata/md5-cache/dev-cpp/abseil-cpp-20210324.2
 2201091144 metadata/md5-cache/dev-cpp/abseil-cpp-20211102.0
@@ -35242,10 +35257,12 @@
 2201092210 metadata/md5-cache/dev-cpp/libglademm-2.6.7-r3
 2201092210 metadata/md5-cache/dev-cpp/libxmlpp-2.40.1-r2
 2201091144 metadata/md5-cache/dev-cpp/mm-common-1.0.3
-2201091240 metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5
-2201091144 metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1
-2201091144 metadata/md5-cache/dev-cpp/pangomm-2.48.1
-2201091144 metadata/md5-cache/dev-cpp/pangomm-2.50.0
+2201110740 metadata/md5-cache/dev-cpp/Manifest.gz
+2201110740 metadata/md5-cache/dev-cpp/nlohmann_json-3.10.5
+2201110210 metadata/md5-cache/dev-cpp/pangomm-2.42.2-r1
+2201110210 metadata/md5-cache/dev-cpp/pangomm-2.46.2
+2201110210 metadata/md5-cache/dev-cpp/pangomm-2.48.1
+2201110210 metadata/md5-cache/dev-cpp/pangomm-2.50.0
 2109302039 metadata/md5-cache/dev-db/citus-10.1.3
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
@@ -35329,7 +35346,6 @@
 2201021453 metadata/md5-cache/dev-db/libodbc++-0.2.5-r3
 2201021453 metadata/md5-cache/dev-db/libzdb-3.1-r1
 2201021453 metadata/md5-cache/dev-db/libzdb-3.2.2
-2201021453 metadata/md5-cache/dev-db/lmdb-0.9.29
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.38-r2
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.39-r1
 2201022110 metadata/md5-cache/dev-db/mariadb-10.2.40
@@ -35377,7 +35393,6 @@
 2201021453 metadata/md5-cache/dev-db/mysql-connector-c-8.0.25
 2201021453 metadata/md5-cache/dev-db/mysql-connector-c-8.0.25-r1
 2201021453 metadata/md5-cache/dev-db/mysql-connector-c-8.0.26
-2201021453 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
 2201021453 metadata/md5-cache/dev-db/mysql-init-scripts-2.3-r3
 2201021453 metadata/md5-cache/dev-db/mysql-super-smack-1.3-r4
 2201021453 metadata/md5-cache/dev-db/ocp-0.2
@@ -35469,7 +35484,6 @@
 2201070839 metadata/md5-cache/dev-db/mydumper-0.11.3.5
 2201071309 metadata/md5-cache/dev-db/oracle-instantclient-19.11.0.0.0
 2201070839 metadata/md5-cache/dev-db/sqldeveloper-21.4.1.349.1822
-2201091144 metadata/md5-cache/dev-db/Manifest.gz
 2201091144 metadata/md5-cache/dev-db/barman-2.12
 2201091144 metadata/md5-cache/dev-db/kdb-3.2.0-r1
 2201091144 metadata/md5-cache/dev-db/mongodb-4.2.15-r1
@@ -35493,6 +35507,9 @@
 2201091144 metadata/md5-cache/dev-db/postgresql-14.1
 2201091144 metadata/md5-cache/dev-db/postgresql-9.6.24
 2201091144 metadata/md5-cache/dev-db/postgresql-9999
+2201110810 metadata/md5-cache/dev-db/Manifest.gz
+2201101840 metadata/md5-cache/dev-db/lmdb-0.9.29
+2201110810 metadata/md5-cache/dev-db/mysql-connector-c-8.0.27
 2106290046 metadata/md5-cache/dev-dotnet/dotnet-sdk-bin-5.0.301
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2106210925 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
@@ -36671,8 +36688,6 @@
 2201022110 metadata/md5-cache/dev-java/boot-bin-2.8.3
 2201022110 metadata/md5-cache/dev-java/brotli-dec-0.1.2
 2201022110 metadata/md5-cache/dev-java/browserlauncher2-1.3-r2
-2201022110 metadata/md5-cache/dev-java/bsf-2.4.0-r2
-2201022110 metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
 2201021453 metadata/md5-cache/dev-java/byaccj-1.15-r2
 2201022110 metadata/md5-cache/dev-java/c3p0-0.9.5.1
 2201022110 metadata/md5-cache/dev-java/cdi-api-1.2
@@ -36711,7 +36726,6 @@
 2201022110 metadata/md5-cache/dev-java/dnsjava-2.1.8
 2201022110 metadata/md5-cache/dev-java/dom4j-1.6.1-r8
 2201022110 metadata/md5-cache/dev-java/dom4j-1.6.1-r9
-2201022110 metadata/md5-cache/dev-java/dom4j-2.1.3
 2201022110 metadata/md5-cache/dev-java/easymock-3.3.1-r1
 2201022110 metadata/md5-cache/dev-java/ecj-gcj-4.4.2
 2201022110 metadata/md5-cache/dev-java/eclipse-ecj-4.10
@@ -36781,7 +36795,6 @@
 2201022110 metadata/md5-cache/dev-java/jakarta-activation-1.2.2
 2201022110 metadata/md5-cache/dev-java/jakarta-activation-api-1.2.2
 2201022110 metadata/md5-cache/dev-java/jakarta-activation-api-2.0.1-r1
-2201022110 metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
 2201022110 metadata/md5-cache/dev-java/jakarta-oro-2.0.8-r5
 2201022110 metadata/md5-cache/dev-java/jakarta-regexp-1.3-r5
 2201022110 metadata/md5-cache/dev-java/jakarta-regexp-1.4-r2
@@ -36845,8 +36858,6 @@
 2201022110 metadata/md5-cache/dev-java/jnr-constants-0.10.3
 2201022110 metadata/md5-cache/dev-java/jnr-ffi-2.0.2-r1
 2201022110 metadata/md5-cache/dev-java/jnr-ffi-2.2.8
-2201022110 metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
-2201022110 metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
 2201022110 metadata/md5-cache/dev-java/jnr-x86asm-1.0.2-r2
 2201022110 metadata/md5-cache/dev-java/joda-convert-1.3.1-r1
 2201022110 metadata/md5-cache/dev-java/joda-convert-2.2.2
@@ -36904,8 +36915,6 @@
 2201022110 metadata/md5-cache/dev-java/nanoxml-2.2.3-r4
 2201022110 metadata/md5-cache/dev-java/netty-buffer-4.0.36
 2201022110 metadata/md5-cache/dev-java/netty-common-4.0.36
-2201022110 metadata/md5-cache/dev-java/netty-common-4.0.36-r1
-2201022110 metadata/md5-cache/dev-java/netty-transport-4.0.36
 2201022110 metadata/md5-cache/dev-java/objenesis-test-3.2
 2201021453 metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8
 2201021453 metadata/md5-cache/dev-java/openjdk-bin-11.0.13_p8-r1
@@ -36982,7 +36991,6 @@
 2201022110 metadata/md5-cache/dev-java/swingx-beaninfo-1.6.4
 2201022110 metadata/md5-cache/dev-java/swingx-ws-1.0_p20110515-r1
 2201022110 metadata/md5-cache/dev-java/swt-4.10-r2
-2201022110 metadata/md5-cache/dev-java/testng-6.9.10
 2201022110 metadata/md5-cache/dev-java/tijmp-0.8-r1
 2201022110 metadata/md5-cache/dev-java/tomcat-jstl-impl-1.2.5-r1
 2201022110 metadata/md5-cache/dev-java/tomcat-jstl-spec-1.2.5-r1
@@ -37071,19 +37079,28 @@
 2201080009 metadata/md5-cache/dev-java/slf4j-nop-1.7.30
 2201080009 metadata/md5-cache/dev-java/tomcat-servlet-api-4.1.40
 2201080009 metadata/md5-cache/dev-java/tomcat-servlet-api-6.0.53-r1
-2201091240 metadata/md5-cache/dev-java/Manifest.gz
 2201091210 metadata/md5-cache/dev-java/jackrabbit-webdav-2.10.1-r2
 2201081340 metadata/md5-cache/dev-java/jackrabbit-webdav-2.21.7
 2201091144 metadata/md5-cache/dev-java/java-config-2.3.1
 2201091144 metadata/md5-cache/dev-java/java-config-9999
 2201091144 metadata/md5-cache/dev-java/javatoolkit-0.6.7
 2201091240 metadata/md5-cache/dev-java/jna-5.10.0
-2201091144 metadata/md5-cache/dev-java/jython-2.7.0-r4
-2201091210 metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
 2201091210 metadata/md5-cache/dev-java/objenesis-3.2
 2201081640 metadata/md5-cache/dev-java/reflections-0.9.10-r1
 2201081539 metadata/md5-cache/dev-java/tomcat-servlet-api-10.0.14
 2201081539 metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.56
+2201110210 metadata/md5-cache/dev-java/Manifest.gz
+2201102240 metadata/md5-cache/dev-java/bsf-2.4.0-r2
+2201102240 metadata/md5-cache/dev-java/bsh-2.0_beta6-r1
+2201102240 metadata/md5-cache/dev-java/dom4j-2.1.3
+2201110210 metadata/md5-cache/dev-java/jakarta-activation-api-2.1.0
+2201102240 metadata/md5-cache/dev-java/jnr-netdb-1.1.4-r1
+2201102240 metadata/md5-cache/dev-java/jnr-posix-3.0.10-r1
+2201102240 metadata/md5-cache/dev-java/jython-2.7.0-r4
+2201102240 metadata/md5-cache/dev-java/netty-buffer-4.0.36-r1
+2201102240 metadata/md5-cache/dev-java/netty-common-4.0.36-r1
+2201102240 metadata/md5-cache/dev-java/netty-transport-4.0.36
+2201102240 metadata/md5-cache/dev-java/testng-6.9.10
 2108150239 metadata/md5-cache/dev-lang/cfortran-4.4-r3
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
@@ -37940,7 +37957,6 @@
 2201021453 metadata/md5-cache/dev-libs/squareball-9999
 2201021453 metadata/md5-cache/dev-libs/starpu-1.2.6-r1
 2201021453 metadata/md5-cache/dev-libs/starpu-1.3.8
-2201021453 metadata/md5-cache/dev-libs/starpu-1.3.9
 2201021453 metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
 2201021453 metadata/md5-cache/dev-libs/tinyxml2-7.1.0
 2201021453 metadata/md5-cache/dev-libs/tinyxml2-8.0.0
@@ -37995,7 +38011,6 @@
 2201021453 metadata/md5-cache/dev-libs/utfcpp-3.1.1
 2201022309 metadata/md5-cache/dev-libs/utfcpp-3.1.2
 2201021453 metadata/md5-cache/dev-libs/utfcpp-9999
-2201021453 metadata/md5-cache/dev-libs/uthash-2.3.0
 2201021453 metadata/md5-cache/dev-libs/uulib-0.5.20-r1
 2201021453 metadata/md5-cache/dev-libs/vc-1.4.1-r1
 2201021453 metadata/md5-cache/dev-libs/vc-1.4.2
@@ -38075,7 +38090,6 @@
 2201072009 metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
 2201072339 metadata/md5-cache/dev-libs/uriparser-0.9.6
 2201091144 metadata/md5-cache/dev-libs/Ice-3.6.5-r2
-2201092239 metadata/md5-cache/dev-libs/Manifest.gz
 2201091144 metadata/md5-cache/dev-libs/aml-0.2.0
 2201091144 metadata/md5-cache/dev-libs/aml-0.2.1
 2201091144 metadata/md5-cache/dev-libs/aml-9999
@@ -38092,7 +38106,6 @@
 2201091144 metadata/md5-cache/dev-libs/boxfort-0.0.1_pre20200902-r1
 2201091144 metadata/md5-cache/dev-libs/boxfort-0.1.1
 2201091144 metadata/md5-cache/dev-libs/capstone-4.0.2-r2
-2201092239 metadata/md5-cache/dev-libs/cl-1.2.4-r1
 2201091144 metadata/md5-cache/dev-libs/criterion-2.4_pre20210114
 2201091144 metadata/md5-cache/dev-libs/criterion-2.4_pre20211218
 2201091144 metadata/md5-cache/dev-libs/distorm3-3.5.2
@@ -38267,6 +38280,11 @@
 2201091144 metadata/md5-cache/dev-libs/weston-9999
 2201091144 metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
 2201091144 metadata/md5-cache/dev-libs/zziplib-0.13.72
+2201110540 metadata/md5-cache/dev-libs/Manifest.gz
+2201110210 metadata/md5-cache/dev-libs/cl-1.2.4-r1
+2201110040 metadata/md5-cache/dev-libs/libgusb-0.3.10
+2201110210 metadata/md5-cache/dev-libs/starpu-1.3.9
+2201110540 metadata/md5-cache/dev-libs/uthash-2.3.0
 2106291109 metadata/md5-cache/dev-lisp/asdf-3.1.5
 2201022110 metadata/md5-cache/dev-lisp/abcl-1.8.0
 2201021453 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -38359,7 +38377,6 @@
 2110141309 metadata/md5-cache/dev-ml/bos-0.1.6
 2110251709 metadata/md5-cache/dev-ml/bos-0.2.0-r1
 2111042109 metadata/md5-cache/dev-ml/bos-0.2.1
-2107012139 metadata/md5-cache/dev-ml/calendar-2.04
 2011180439 metadata/md5-cache/dev-ml/camldbm-1.0
 2104181009 metadata/md5-cache/dev-ml/camldbm-1.2
 2110150609 metadata/md5-cache/dev-ml/camlp4-4.05_p1-r1
@@ -38368,328 +38385,47 @@
 2110172240 metadata/md5-cache/dev-ml/camlp4-4.11_p1-r2
 2110150609 metadata/md5-cache/dev-ml/camlp4-4.12-r1
 2110150609 metadata/md5-cache/dev-ml/camlp4-4.13-r1
-2107012139 metadata/md5-cache/dev-ml/camlp5-7.11-r1
-2110060409 metadata/md5-cache/dev-ml/camlp5-8.00.02
-2107012139 metadata/md5-cache/dev-ml/camlpdf-2.3.1
-2107012139 metadata/md5-cache/dev-ml/camlzip-1.10
-2110060409 metadata/md5-cache/dev-ml/camlzip-1.11
-2107012139 metadata/md5-cache/dev-ml/cmdliner-1.0.4
 2110141309 metadata/md5-cache/dev-ml/dose3-5.0.1_p16-r4
 2104161439 metadata/md5-cache/dev-ml/dune-1.11.4
 2104161439 metadata/md5-cache/dev-ml/dune-2.1.0
 2107212339 metadata/md5-cache/dev-ml/dune-2.9.0
-2107012139 metadata/md5-cache/dev-ml/easy-format-1.2.0
-2107012139 metadata/md5-cache/dev-ml/extlib-1.7.7
-2110141309 metadata/md5-cache/dev-ml/extlib-1.7.8
 2109121240 metadata/md5-cache/dev-ml/facile-1.1.3
 2107202139 metadata/md5-cache/dev-ml/findlib-1.9.1
-2107012139 metadata/md5-cache/dev-ml/fmt-0.8.9-r1
 2110141309 metadata/md5-cache/dev-ml/fpath-0.7.2
 2110140009 metadata/md5-cache/dev-ml/fpath-0.7.3
-2107012139 metadata/md5-cache/dev-ml/jsonm-1.0.1
 2103140409 metadata/md5-cache/dev-ml/lablgtk-2.18.10
-2111071009 metadata/md5-cache/dev-ml/labltk-8.06.10
-2111071009 metadata/md5-cache/dev-ml/labltk-8.06.11
-2107012139 metadata/md5-cache/dev-ml/labltk-8.06.7
-2107012139 metadata/md5-cache/dev-ml/labltk-8.06.9
-2107012139 metadata/md5-cache/dev-ml/menhir-20190924
-2110150609 metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
 2106030409 metadata/md5-cache/dev-ml/mtime-1.1.0
 2110140009 metadata/md5-cache/dev-ml/mtime-1.2.0
-2107012139 metadata/md5-cache/dev-ml/num-1.3-r1
-2107012139 metadata/md5-cache/dev-ml/ocaml-augeas-0.5
 2010280709 metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
-2107272039 metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
 2104210539 metadata/md5-cache/dev-ml/ocaml-doc-4.04
-2107012139 metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
 2109201339 metadata/md5-cache/dev-ml/ocamlbuild-0.11.0
-2107012139 metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
-2107012139 metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
-2110111839 metadata/md5-cache/dev-ml/ocamlnet-4.1.9
-2107012139 metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
 2110141109 metadata/md5-cache/dev-ml/ocamlweb-1.41-r1
-2107012139 metadata/md5-cache/dev-ml/ocurl-0.9.1
 2111060709 metadata/md5-cache/dev-ml/opam-core-2.0.10
 2107241809 metadata/md5-cache/dev-ml/opam-core-2.0.8-r1
-2107280609 metadata/md5-cache/dev-ml/opam-core-2.0.9
 2110030039 metadata/md5-cache/dev-ml/opam-core-2.1.0
 2111060709 metadata/md5-cache/dev-ml/opam-core-2.1.1
-2107012139 metadata/md5-cache/dev-ml/opam-file-format-2.1.0
 2111060709 metadata/md5-cache/dev-ml/opam-installer-2.0.10
 2104040939 metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
 2110022239 metadata/md5-cache/dev-ml/opam-installer-2.0.8-r2
 2110141309 metadata/md5-cache/dev-ml/opam-installer-2.0.8-r3
-2107280609 metadata/md5-cache/dev-ml/opam-installer-2.0.9
 2104040939 metadata/md5-cache/dev-ml/react-1.2.1-r1
 2104210539 metadata/md5-cache/dev-ml/reactiveData-0.2.1
 2110141309 metadata/md5-cache/dev-ml/rresult-0.5.0
 2110140639 metadata/md5-cache/dev-ml/rresult-0.6.0
 2111040039 metadata/md5-cache/dev-ml/rresult-0.7.0
-2107012139 metadata/md5-cache/dev-ml/topkg-1.0.3
-2107012139 metadata/md5-cache/dev-ml/uchar-0.0.2
 2109181539 metadata/md5-cache/dev-ml/uucp-13.0.0-r2
 2110060409 metadata/md5-cache/dev-ml/uucp-14.0.0
 2106030409 metadata/md5-cache/dev-ml/uuidm-0.9.7
 2110150709 metadata/md5-cache/dev-ml/uunf-13.0.0-r1
 2111092309 metadata/md5-cache/dev-ml/uunf-14.0.0
-2110150709 metadata/md5-cache/dev-ml/uutf-1.0.1
-2110290909 metadata/md5-cache/dev-ml/uutf-1.0.2
 2104210539 metadata/md5-cache/dev-ml/xml-light-2.2-r3
-2111201339 metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
-2112050639 metadata/md5-cache/dev-ml/ocaml-process-0.2.1
 2112052139 metadata/md5-cache/dev-ml/ocaml-doc-4.05
-2112090110 metadata/md5-cache/dev-ml/logs-0.7.0-r1
 2112102040 metadata/md5-cache/dev-ml/dune-2.9.1
 2112100440 metadata/md5-cache/dev-ml/mtime-1.3.0
-2112110610 metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
-2112170410 metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
-2112170410 metadata/md5-cache/dev-ml/alcotest-1.4.0
-2112170410 metadata/md5-cache/dev-ml/alcotest-1.5.0
-2112170410 metadata/md5-cache/dev-ml/async-0.14.0
-2112170410 metadata/md5-cache/dev-ml/async_extra-0.14.0
-2112170410 metadata/md5-cache/dev-ml/async_kernel-0.14.0
-2112170410 metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
-2112170410 metadata/md5-cache/dev-ml/async_unix-0.14.0
-2112170410 metadata/md5-cache/dev-ml/base-0.14.0
-2112170410 metadata/md5-cache/dev-ml/base-0.14.1
-2112170410 metadata/md5-cache/dev-ml/base_bigstring-0.14.0
-2112170410 metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
-2112170410 metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
-2112170410 metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
-2112170410 metadata/md5-cache/dev-ml/bin_prot-0.14.0
-2112170410 metadata/md5-cache/dev-ml/biniou-1.2.1
-2112170410 metadata/md5-cache/dev-ml/cairo2-0.6.1-r1
-2112170410 metadata/md5-cache/dev-ml/cairo2-0.6.2-r1
-2112170410 metadata/md5-cache/dev-ml/calendars-1.0.0
-2112170410 metadata/md5-cache/dev-ml/camomile-1.0.2
-2112170410 metadata/md5-cache/dev-ml/charinfo_width-1.1.0
-2112170410 metadata/md5-cache/dev-ml/cinaps-0.14.0
-2112170410 metadata/md5-cache/dev-ml/cinaps-0.15.0
-2112170410 metadata/md5-cache/dev-ml/cinaps-0.15.1
-2112170410 metadata/md5-cache/dev-ml/core-0.14.0-r3
-2112170410 metadata/md5-cache/dev-ml/core-0.14.1
-2112170410 metadata/md5-cache/dev-ml/core_bench-0.14.0
-2112170410 metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
-2112170410 metadata/md5-cache/dev-ml/core_kernel-0.14.2
-2112170410 metadata/md5-cache/dev-ml/cppo-1.6.7
-2112170410 metadata/md5-cache/dev-ml/cppo-1.6.8
-2112170410 metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
-2112170410 metadata/md5-cache/dev-ml/csexp-1.3.2-r1
-2112170410 metadata/md5-cache/dev-ml/csexp-1.5.1
-2112170410 metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
-2112170410 metadata/md5-cache/dev-ml/dose3-6.1-r1
-2112170410 metadata/md5-cache/dev-ml/dose3-7.0.0
-2112170410 metadata/md5-cache/dev-ml/dune-build-info-2.9.1
-2112170410 metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
-2112170410 metadata/md5-cache/dev-ml/dune-configurator-2.8.4
-2112170410 metadata/md5-cache/dev-ml/dune-configurator-2.9.0
-2112170410 metadata/md5-cache/dev-ml/dune-configurator-2.9.1
-2112170410 metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
-2112170410 metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
-2112170410 metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
-2112170410 metadata/md5-cache/dev-ml/dune-private-libs-2.9.1
-2112170410 metadata/md5-cache/dev-ml/dune-site-2.9.1
-2112170410 metadata/md5-cache/dev-ml/duration-0.1.3
-2112170410 metadata/md5-cache/dev-ml/fieldslib-0.14.0
-2112170410 metadata/md5-cache/dev-ml/fix-20211125
-2112170410 metadata/md5-cache/dev-ml/gen-0.5.3-r1
-2112170410 metadata/md5-cache/dev-ml/graphics-5.1.1-r1
-2112170410 metadata/md5-cache/dev-ml/graphics-5.1.2
-2112170410 metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
-2112170410 metadata/md5-cache/dev-ml/integers-0.4.0
-2112170410 metadata/md5-cache/dev-ml/integers-0.5.1
-2112170410 metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
-2112170410 metadata/md5-cache/dev-ml/jst-config-0.14.0
-2112170410 metadata/md5-cache/dev-ml/jst-config-0.14.1
-2112170410 metadata/md5-cache/dev-ml/lablgtk-3.1.1
-2112170410 metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
-2112170410 metadata/md5-cache/dev-ml/lambda-term-3.1.0
-2112170410 metadata/md5-cache/dev-ml/lwt-5.3.0-r1
-2112170410 metadata/md5-cache/dev-ml/lwt-5.4.2-r1
-2112170410 metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1
-2112170410 metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
-2112170410 metadata/md5-cache/dev-ml/markup-1.0.0
-2112170410 metadata/md5-cache/dev-ml/markup-1.0.2
-2112170410 metadata/md5-cache/dev-ml/mccs-1.1.13
-2112170410 metadata/md5-cache/dev-ml/menhir-20210419-r1
-2112170410 metadata/md5-cache/dev-ml/menhir-20211012
-2112170410 metadata/md5-cache/dev-ml/merlin-3.4.2-r1
-2112170410 metadata/md5-cache/dev-ml/merlin-4.1-r2
-2112170410 metadata/md5-cache/dev-ml/merlin-4.2
-2112170410 metadata/md5-cache/dev-ml/merlin-4.3.1
-2112170410 metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
-2112170410 metadata/md5-cache/dev-ml/mew-0.1.0-r1
-2112170410 metadata/md5-cache/dev-ml/mew_vi-0.5.0
-2112170410 metadata/md5-cache/dev-ml/mirage-clock-3.1.0
-2112170410 metadata/md5-cache/dev-ml/mmap-1.1.0
-2112170410 metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
-2112170410 metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
-2112170410 metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
-2112170410 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
-2112170410 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3
-2112170410 metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
-2112170410 metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
-2112170410 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
-2112170410 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
-2112170410 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
-2112170410 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
-2112170410 metadata/md5-cache/dev-ml/ocaml-sha-1.15.1
-2112170410 metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
-2112170410 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
-2112170410 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
-2112170410 metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0
-2112170410 metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
-2112170410 metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
-2112170410 metadata/md5-cache/dev-ml/octavius-1.2.2
-2112170410 metadata/md5-cache/dev-ml/opam-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-2.0.8-r1
-2112170410 metadata/md5-cache/dev-ml/opam-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-client-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-client-2.0.8
-2112170410 metadata/md5-cache/dev-ml/opam-client-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-client-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-client-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-file-format-2.1.2
-2112170410 metadata/md5-cache/dev-ml/opam-file-format-2.1.3
-2112170410 metadata/md5-cache/dev-ml/opam-format-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
-2112170410 metadata/md5-cache/dev-ml/opam-format-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-format-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-format-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-installer-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-installer-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-repository-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-repository-2.0.8
-2112170410 metadata/md5-cache/dev-ml/opam-repository-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-repository-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-repository-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-solver-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-solver-2.0.8
-2112170410 metadata/md5-cache/dev-ml/opam-solver-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-solver-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-solver-2.1.1
-2112170410 metadata/md5-cache/dev-ml/opam-state-2.0.10
-2112170410 metadata/md5-cache/dev-ml/opam-state-2.0.8
-2112170410 metadata/md5-cache/dev-ml/opam-state-2.0.9
-2112170410 metadata/md5-cache/dev-ml/opam-state-2.1.0
-2112170410 metadata/md5-cache/dev-ml/opam-state-2.1.1
-2112170410 metadata/md5-cache/dev-ml/ounit2-2.2.3
-2112170410 metadata/md5-cache/dev-ml/ounit2-2.2.4
-2112170410 metadata/md5-cache/dev-ml/parmap-1.2
-2112170410 metadata/md5-cache/dev-ml/parmap-1.2.1
-2112170410 metadata/md5-cache/dev-ml/parmap-1.2.3
-2112170410 metadata/md5-cache/dev-ml/parsexp-0.14.0
-2112170410 metadata/md5-cache/dev-ml/parsexp-0.14.1
-2112170410 metadata/md5-cache/dev-ml/patience_diff-0.14.0
-2112170410 metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
-2112170410 metadata/md5-cache/dev-ml/pprint-20211129
-2112170410 metadata/md5-cache/dev-ml/ppx_assert-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_base-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_bench-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_cold-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_compare-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
-2112170410 metadata/md5-cache/dev-ml/ppx_deriving-5.2
-2112170410 metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
-2112170410 metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
-2112170410 metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_expect-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_expect-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_fail-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_hash-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_here-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_jane-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_let-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
-2112170410 metadata/md5-cache/dev-ml/ppx_optional-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
-2112170410 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
-2112170410 metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ppx_stable-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_string-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_tools-6.2
-2112170410 metadata/md5-cache/dev-ml/ppx_tools-6.3
-2112170410 metadata/md5-cache/dev-ml/ppx_tools-6.4
-2112170410 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
-2112170410 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
-2112170410 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
-2112170410 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
-2112170410 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
-2112170410 metadata/md5-cache/dev-ml/ppxfind-1.4
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.18.0
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
-2112170410 metadata/md5-cache/dev-ml/ppxlib-0.24.0
-2112170410 metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
-2112170410 metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
-2112170410 metadata/md5-cache/dev-ml/qcheck-0.18
-2112170410 metadata/md5-cache/dev-ml/qtest-2.11.2
-2112170410 metadata/md5-cache/dev-ml/re-1.10.3
-2112170410 metadata/md5-cache/dev-ml/re-1.9.0
-2112170410 metadata/md5-cache/dev-ml/reason-3.7.0-r1
-2112170410 metadata/md5-cache/dev-ml/result-1.5
-2112170410 metadata/md5-cache/dev-ml/sedlex-2.3-r1
-2112170410 metadata/md5-cache/dev-ml/seq-0.2
-2112170410 metadata/md5-cache/dev-ml/seq-0.2.2
-2112170410 metadata/md5-cache/dev-ml/sexplib-0.14.0
-2112170410 metadata/md5-cache/dev-ml/sexplib0-0.14.0
-2112170410 metadata/md5-cache/dev-ml/spawn-0.13.0
-2112170410 metadata/md5-cache/dev-ml/splittable_random-0.14.0
-2112170410 metadata/md5-cache/dev-ml/stdio-0.14.0
-2112170410 metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
-2112170410 metadata/md5-cache/dev-ml/textutils-0.14.0
-2112170410 metadata/md5-cache/dev-ml/time_now-0.14.0
-2112170410 metadata/md5-cache/dev-ml/timezone-0.14.0
-2112170410 metadata/md5-cache/dev-ml/trie-1.0.0
-2112170410 metadata/md5-cache/dev-ml/typerep-0.14.0
-2112170410 metadata/md5-cache/dev-ml/unidecode-0.4.0
-2112170410 metadata/md5-cache/dev-ml/utop-2.8.0
-2112170410 metadata/md5-cache/dev-ml/utop-2.9.0
-2112170410 metadata/md5-cache/dev-ml/variantslib-0.14.0
-2112170410 metadata/md5-cache/dev-ml/yojson-1.7.0
-2112170410 metadata/md5-cache/dev-ml/zed-3.1.0
-2112200239 metadata/md5-cache/dev-ml/fmt-0.9.0
-2112191409 metadata/md5-cache/dev-ml/opam-2.0.8-r2
-2112191409 metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
-2112191409 metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
-2112191409 metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
-2112191409 metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
-2112191409 metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
-2112260340 metadata/md5-cache/dev-ml/jingoo-1.4.2
-2201021453 metadata/md5-cache/dev-ml/camlbz2-0.7.0
 2201021453 metadata/md5-cache/dev-ml/camlidl-1.05-r1
 2201021453 metadata/md5-cache/dev-ml/cudf-0.9-r2
 2201021453 metadata/md5-cache/dev-ml/lablgl-1.06-r1
-2201021453 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
-2201021453 metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
-2201021453 metadata/md5-cache/dev-ml/ocplib-simplex-0.4
-2201031239 metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
-2201021453 metadata/md5-cache/dev-ml/zarith-1.12
-2201071439 metadata/md5-cache/dev-ml/batteries-3.4.0
 2201072309 metadata/md5-cache/dev-ml/findlib-1.8.1-r2
-2201072339 metadata/md5-cache/dev-ml/num-1.4-r3
-2201100109 metadata/md5-cache/dev-ml/Manifest.gz
-2201091409 metadata/md5-cache/dev-ml/camlp5-7.12
-2201091409 metadata/md5-cache/dev-ml/camlp5-7.13
-2201091409 metadata/md5-cache/dev-ml/camlp5-7.14
-2201091409 metadata/md5-cache/dev-ml/camlp5-8.00
-2201091409 metadata/md5-cache/dev-ml/camlp5-8.00.01
 2201081609 metadata/md5-cache/dev-ml/dune-2.7.1
 2201081609 metadata/md5-cache/dev-ml/dune-2.8.2
 2201081609 metadata/md5-cache/dev-ml/dune-2.8.4
@@ -38699,9 +38435,291 @@
 2201091144 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1.9999
 2201091144 metadata/md5-cache/dev-ml/llvm-ocaml-13.0.1_rc1
 2201091144 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.0.9999
-2201100109 metadata/md5-cache/dev-ml/luv-0.5.10-r3
-2201091340 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
-2201090510 metadata/md5-cache/dev-ml/ocurl-0.9.2
+2201110410 metadata/md5-cache/dev-ml/Manifest.gz
+2201102040 metadata/md5-cache/dev-ml/alcotest-1.2.3-r3
+2201102040 metadata/md5-cache/dev-ml/alcotest-1.4.0
+2201102040 metadata/md5-cache/dev-ml/alcotest-1.5.0
+2201102040 metadata/md5-cache/dev-ml/async-0.14.0
+2201102040 metadata/md5-cache/dev-ml/async_extra-0.14.0
+2201102040 metadata/md5-cache/dev-ml/async_kernel-0.14.0
+2201102040 metadata/md5-cache/dev-ml/async_rpc_kernel-0.14.0-r1
+2201102040 metadata/md5-cache/dev-ml/async_unix-0.14.0
+2201102040 metadata/md5-cache/dev-ml/base-0.14.0
+2201102040 metadata/md5-cache/dev-ml/base-0.14.1
+2201102040 metadata/md5-cache/dev-ml/base_bigstring-0.14.0
+2201102040 metadata/md5-cache/dev-ml/base_quickcheck-0.14.0-r1
+2201102040 metadata/md5-cache/dev-ml/base_quickcheck-0.14.1-r1
+2201110340 metadata/md5-cache/dev-ml/batteries-3.4.0
+2201102040 metadata/md5-cache/dev-ml/bigarray-compat-1.0.0
+2201102040 metadata/md5-cache/dev-ml/bin_prot-0.14.0
+2201102040 metadata/md5-cache/dev-ml/biniou-1.2.1
+2201102040 metadata/md5-cache/dev-ml/cairo2-0.6.1-r1
+2201102040 metadata/md5-cache/dev-ml/cairo2-0.6.2-r1
+2201110340 metadata/md5-cache/dev-ml/calendar-2.04
+2201102040 metadata/md5-cache/dev-ml/calendars-1.0.0
+2201110340 metadata/md5-cache/dev-ml/camlbz2-0.7.0
+2201110340 metadata/md5-cache/dev-ml/camlp5-7.11-r1
+2201110340 metadata/md5-cache/dev-ml/camlp5-7.12
+2201110340 metadata/md5-cache/dev-ml/camlp5-7.13
+2201110340 metadata/md5-cache/dev-ml/camlp5-7.14
+2201110340 metadata/md5-cache/dev-ml/camlp5-8.00
+2201110340 metadata/md5-cache/dev-ml/camlp5-8.00.01
+2201110340 metadata/md5-cache/dev-ml/camlp5-8.00.02
+2201110340 metadata/md5-cache/dev-ml/camlpdf-2.3.1
+2201110340 metadata/md5-cache/dev-ml/camlzip-1.10
+2201110340 metadata/md5-cache/dev-ml/camlzip-1.11
+2201102040 metadata/md5-cache/dev-ml/camomile-1.0.2
+2201102040 metadata/md5-cache/dev-ml/charinfo_width-1.1.0
+2201102040 metadata/md5-cache/dev-ml/cinaps-0.14.0
+2201102040 metadata/md5-cache/dev-ml/cinaps-0.15.0
+2201102040 metadata/md5-cache/dev-ml/cinaps-0.15.1
+2201110340 metadata/md5-cache/dev-ml/cmdliner-1.0.4
+2201102040 metadata/md5-cache/dev-ml/core-0.14.0-r3
+2201102040 metadata/md5-cache/dev-ml/core-0.14.1
+2201102040 metadata/md5-cache/dev-ml/core_bench-0.14.0
+2201102040 metadata/md5-cache/dev-ml/core_kernel-0.14.1-r3
+2201102040 metadata/md5-cache/dev-ml/core_kernel-0.14.2
+2201102040 metadata/md5-cache/dev-ml/cppo-1.6.7
+2201102040 metadata/md5-cache/dev-ml/cppo-1.6.8
+2201102040 metadata/md5-cache/dev-ml/cryptokit-1.16.1-r1
+2201102040 metadata/md5-cache/dev-ml/csexp-1.3.2-r1
+2201102040 metadata/md5-cache/dev-ml/csexp-1.5.1
+2201102040 metadata/md5-cache/dev-ml/dose3-6.0.1_p2-r1
+2201102040 metadata/md5-cache/dev-ml/dose3-6.1-r1
+2201102040 metadata/md5-cache/dev-ml/dose3-7.0.0
+2201102040 metadata/md5-cache/dev-ml/dune-build-info-2.9.1
+2201102040 metadata/md5-cache/dev-ml/dune-configurator-2.8.2-r1
+2201102040 metadata/md5-cache/dev-ml/dune-configurator-2.8.4
+2201102040 metadata/md5-cache/dev-ml/dune-configurator-2.9.0
+2201102040 metadata/md5-cache/dev-ml/dune-configurator-2.9.1
+2201102040 metadata/md5-cache/dev-ml/dune-private-libs-2.8.2-r1
+2201102040 metadata/md5-cache/dev-ml/dune-private-libs-2.8.4
+2201102040 metadata/md5-cache/dev-ml/dune-private-libs-2.9.0
+2201102040 metadata/md5-cache/dev-ml/dune-private-libs-2.9.1
+2201102040 metadata/md5-cache/dev-ml/dune-site-2.9.1
+2201102040 metadata/md5-cache/dev-ml/duration-0.1.3
+2201110340 metadata/md5-cache/dev-ml/easy-format-1.2.0
+2201110340 metadata/md5-cache/dev-ml/extlib-1.7.7
+2201110340 metadata/md5-cache/dev-ml/extlib-1.7.8
+2201102040 metadata/md5-cache/dev-ml/fieldslib-0.14.0
+2201102040 metadata/md5-cache/dev-ml/fix-20211125
+2201110340 metadata/md5-cache/dev-ml/fmt-0.8.9-r1
+2201110340 metadata/md5-cache/dev-ml/fmt-0.9.0
+2201102040 metadata/md5-cache/dev-ml/gen-0.5.3-r1
+2201102040 metadata/md5-cache/dev-ml/graphics-5.1.1-r1
+2201102040 metadata/md5-cache/dev-ml/graphics-5.1.2
+2201102040 metadata/md5-cache/dev-ml/gsl-ocaml-1.24.3-r1
+2201102040 metadata/md5-cache/dev-ml/integers-0.4.0
+2201102040 metadata/md5-cache/dev-ml/integers-0.5.1
+2201102040 metadata/md5-cache/dev-ml/jane-street-headers-0.14.0
+2201102040 metadata/md5-cache/dev-ml/jingoo-1.4.2
+2201110340 metadata/md5-cache/dev-ml/jsonm-1.0.1
+2201102040 metadata/md5-cache/dev-ml/jst-config-0.14.0
+2201102040 metadata/md5-cache/dev-ml/jst-config-0.14.1
+2201102040 metadata/md5-cache/dev-ml/lablgtk-3.1.1
+2201102040 metadata/md5-cache/dev-ml/lablgtk-sourceview-3.1.1
+2201110340 metadata/md5-cache/dev-ml/labltk-8.06.10
+2201110340 metadata/md5-cache/dev-ml/labltk-8.06.11
+2201110340 metadata/md5-cache/dev-ml/labltk-8.06.7
+2201110340 metadata/md5-cache/dev-ml/labltk-8.06.9
+2201102040 metadata/md5-cache/dev-ml/lambda-term-3.1.0
+2201110340 metadata/md5-cache/dev-ml/logs-0.7.0-r1
+2201102040 metadata/md5-cache/dev-ml/luv-0.5.10-r3
+2201102040 metadata/md5-cache/dev-ml/lwt-5.3.0-r1
+2201102040 metadata/md5-cache/dev-ml/lwt-5.4.2-r1
+2201102040 metadata/md5-cache/dev-ml/lwt_log-1.1.1-r1
+2201102040 metadata/md5-cache/dev-ml/lwt_ssl-1.1.3
+2201102040 metadata/md5-cache/dev-ml/markup-1.0.0
+2201102040 metadata/md5-cache/dev-ml/markup-1.0.2
+2201102040 metadata/md5-cache/dev-ml/mccs-1.1.13
+2201110340 metadata/md5-cache/dev-ml/menhir-20190924
+2201102040 metadata/md5-cache/dev-ml/menhir-20210419-r1
+2201102040 metadata/md5-cache/dev-ml/menhir-20211012
+2201102040 metadata/md5-cache/dev-ml/merlin-3.4.2-r1
+2201102040 metadata/md5-cache/dev-ml/merlin-4.1-r2
+2201102040 metadata/md5-cache/dev-ml/merlin-4.2
+2201102040 metadata/md5-cache/dev-ml/merlin-4.3.1
+2201110340 metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
+2201102040 metadata/md5-cache/dev-ml/merlin-extend-0.6-r1
+2201102040 metadata/md5-cache/dev-ml/mew-0.1.0-r1
+2201102040 metadata/md5-cache/dev-ml/mew_vi-0.5.0
+2201102040 metadata/md5-cache/dev-ml/mirage-clock-3.1.0
+2201102040 metadata/md5-cache/dev-ml/mmap-1.1.0
+2201110340 metadata/md5-cache/dev-ml/num-1.3-r1
+2201110340 metadata/md5-cache/dev-ml/num-1.4-r3
+2201110340 metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+2201102040 metadata/md5-cache/dev-ml/ocaml-base64-3.5.0
+2201102040 metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.3
+2201102040 metadata/md5-cache/dev-ml/ocaml-compiler-libs-0.12.4
+2201110340 metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
+2201110340 metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
+2201110340 metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
+2201102040 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.2
+2201102040 metadata/md5-cache/dev-ml/ocaml-fileutils-0.6.3
+2201110340 metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
+2201102040 metadata/md5-cache/dev-ml/ocaml-gettext-0.4.2
+2201102040 metadata/md5-cache/dev-ml/ocaml-gettext-camomile-0.4.2
+2201102040 metadata/md5-cache/dev-ml/ocaml-gettext-stub-0.4.2-r1
+2201110340 metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+2201110340 metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
+2201102040 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-1.8.0
+2201102040 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.1.0
+2201102040 metadata/md5-cache/dev-ml/ocaml-migrate-parsetree-2.2.0
+2201110340 metadata/md5-cache/dev-ml/ocaml-process-0.2.1
+2201102040 metadata/md5-cache/dev-ml/ocaml-sha-1.15.1
+2201102040 metadata/md5-cache/dev-ml/ocaml-sqlite3-5.0.2
+2201102040 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.10
+2201102040 metadata/md5-cache/dev-ml/ocaml-ssl-0.5.9
+2201102040 metadata/md5-cache/dev-ml/ocaml-stdint-0.7.0
+2201101340 metadata/md5-cache/dev-ml/ocamlbuild-0.14.0-r1
+2201110340 metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
+2201102040 metadata/md5-cache/dev-ml/ocamlgraph-2.0.0-r1
+2201110340 metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+2201110340 metadata/md5-cache/dev-ml/ocamlnet-4.1.9
+2201110340 metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+2201102040 metadata/md5-cache/dev-ml/ocplib-endian-1.1-r1
+2201110340 metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+2201102040 metadata/md5-cache/dev-ml/octavius-1.2.2
+2201110340 metadata/md5-cache/dev-ml/ocurl-0.9.1
+2201110340 metadata/md5-cache/dev-ml/ocurl-0.9.2
+2201102040 metadata/md5-cache/dev-ml/opam-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-2.0.8-r1
+2201102040 metadata/md5-cache/dev-ml/opam-2.0.8-r2
+2201110410 metadata/md5-cache/dev-ml/opam-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-2.1.1
+2201102040 metadata/md5-cache/dev-ml/opam-client-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-client-2.0.8
+2201102040 metadata/md5-cache/dev-ml/opam-client-2.0.8-r1
+2201110410 metadata/md5-cache/dev-ml/opam-client-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-client-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-client-2.1.1
+2201110410 metadata/md5-cache/dev-ml/opam-core-2.0.9
+2201110340 metadata/md5-cache/dev-ml/opam-file-format-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-file-format-2.1.2
+2201102040 metadata/md5-cache/dev-ml/opam-file-format-2.1.3
+2201102040 metadata/md5-cache/dev-ml/opam-format-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-format-2.0.8-r2
+2201102040 metadata/md5-cache/dev-ml/opam-format-2.0.8-r3
+2201110410 metadata/md5-cache/dev-ml/opam-format-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-format-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-format-2.1.1
+2201110410 metadata/md5-cache/dev-ml/opam-installer-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-installer-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-installer-2.1.1
+2201102040 metadata/md5-cache/dev-ml/opam-repository-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-repository-2.0.8
+2201102040 metadata/md5-cache/dev-ml/opam-repository-2.0.8-r1
+2201110410 metadata/md5-cache/dev-ml/opam-repository-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-repository-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-repository-2.1.1
+2201102040 metadata/md5-cache/dev-ml/opam-solver-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-solver-2.0.8
+2201102040 metadata/md5-cache/dev-ml/opam-solver-2.0.8-r1
+2201110410 metadata/md5-cache/dev-ml/opam-solver-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-solver-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-solver-2.1.1
+2201102040 metadata/md5-cache/dev-ml/opam-state-2.0.10
+2201102040 metadata/md5-cache/dev-ml/opam-state-2.0.8
+2201102040 metadata/md5-cache/dev-ml/opam-state-2.0.8-r1
+2201110410 metadata/md5-cache/dev-ml/opam-state-2.0.9
+2201102040 metadata/md5-cache/dev-ml/opam-state-2.1.0
+2201102040 metadata/md5-cache/dev-ml/opam-state-2.1.1
+2201102040 metadata/md5-cache/dev-ml/ounit2-2.2.3
+2201102040 metadata/md5-cache/dev-ml/ounit2-2.2.4
+2201102040 metadata/md5-cache/dev-ml/parmap-1.2
+2201102040 metadata/md5-cache/dev-ml/parmap-1.2.1
+2201102040 metadata/md5-cache/dev-ml/parmap-1.2.3
+2201102040 metadata/md5-cache/dev-ml/parsexp-0.14.0
+2201102040 metadata/md5-cache/dev-ml/parsexp-0.14.1
+2201102040 metadata/md5-cache/dev-ml/patience_diff-0.14.0
+2201102040 metadata/md5-cache/dev-ml/pcre-ocaml-7.4.6-r2
+2201102040 metadata/md5-cache/dev-ml/pprint-20211129
+2201102040 metadata/md5-cache/dev-ml/ppx_assert-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_base-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_bench-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_bin_prot-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_cold-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_compare-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_custom_printf-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_derivers-1.2.1
+2201102040 metadata/md5-cache/dev-ml/ppx_deriving-5.2
+2201102040 metadata/md5-cache/dev-ml/ppx_deriving-5.2.1
+2201102040 metadata/md5-cache/dev-ml/ppx_deriving_yojson-3.6.1
+2201102040 metadata/md5-cache/dev-ml/ppx_enumerate-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_expect-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_expect-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_fail-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_fields_conv-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_fixed_literal-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_hash-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_here-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_inline_test-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_jane-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_js_style-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_let-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_module_timer-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_optcomp-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_optcomp-0.14.3
+2201102040 metadata/md5-cache/dev-ml/ppx_optional-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_pipebang-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.2-r1
+2201102040 metadata/md5-cache/dev-ml/ppx_sexp_conv-0.14.3
+2201102040 metadata/md5-cache/dev-ml/ppx_sexp_message-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_sexp_value-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ppx_stable-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_string-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_tools-6.2
+2201102040 metadata/md5-cache/dev-ml/ppx_tools-6.3
+2201102040 metadata/md5-cache/dev-ml/ppx_tools-6.4
+2201102040 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.1-r1
+2201102040 metadata/md5-cache/dev-ml/ppx_typerep_conv-0.14.2
+2201102040 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1
+2201102040 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.1-r1
+2201102040 metadata/md5-cache/dev-ml/ppx_variants_conv-0.14.2
+2201102040 metadata/md5-cache/dev-ml/ppxfind-1.4
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.18.0
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.20.0-r1
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.21.0-r3
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.22.0-r3
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.22.2-r2
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.23.0-r1
+2201102040 metadata/md5-cache/dev-ml/ppxlib-0.24.0
+2201102040 metadata/md5-cache/dev-ml/protocol_version_header-0.14.0
+2201102040 metadata/md5-cache/dev-ml/ptmap-2.0.5-r1
+2201102040 metadata/md5-cache/dev-ml/qcheck-0.18
+2201102040 metadata/md5-cache/dev-ml/qtest-2.11.2
+2201102040 metadata/md5-cache/dev-ml/re-1.10.3
+2201102040 metadata/md5-cache/dev-ml/re-1.9.0
+2201102040 metadata/md5-cache/dev-ml/reason-3.7.0-r1
+2201102040 metadata/md5-cache/dev-ml/result-1.5
+2201102040 metadata/md5-cache/dev-ml/sedlex-2.3-r1
+2201102040 metadata/md5-cache/dev-ml/seq-0.2
+2201102040 metadata/md5-cache/dev-ml/seq-0.2.2
+2201102040 metadata/md5-cache/dev-ml/sexplib-0.14.0
+2201102040 metadata/md5-cache/dev-ml/sexplib0-0.14.0
+2201102040 metadata/md5-cache/dev-ml/spawn-0.13.0
+2201102040 metadata/md5-cache/dev-ml/splittable_random-0.14.0
+2201102040 metadata/md5-cache/dev-ml/stdio-0.14.0
+2201102040 metadata/md5-cache/dev-ml/stdlib-shims-0.2.0
+2201102040 metadata/md5-cache/dev-ml/stdlib-shims-0.3.0
+2201102040 metadata/md5-cache/dev-ml/textutils-0.14.0
+2201102040 metadata/md5-cache/dev-ml/time_now-0.14.0
+2201102040 metadata/md5-cache/dev-ml/timezone-0.14.0
+2201110340 metadata/md5-cache/dev-ml/topkg-1.0.3
+2201102040 metadata/md5-cache/dev-ml/trie-1.0.0
+2201102040 metadata/md5-cache/dev-ml/typerep-0.14.0
+2201110340 metadata/md5-cache/dev-ml/uchar-0.0.2
+2201102040 metadata/md5-cache/dev-ml/unidecode-0.4.0
+2201102040 metadata/md5-cache/dev-ml/utop-2.8.0
+2201102040 metadata/md5-cache/dev-ml/utop-2.9.0
+2201110340 metadata/md5-cache/dev-ml/uutf-1.0.1
+2201110340 metadata/md5-cache/dev-ml/uutf-1.0.2
+2201102040 metadata/md5-cache/dev-ml/variantslib-0.14.0
+2201102040 metadata/md5-cache/dev-ml/yojson-1.7.0
+2201110340 metadata/md5-cache/dev-ml/zarith-1.12
+2201102040 metadata/md5-cache/dev-ml/zed-3.1.0
 2109022141 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2109022141 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -39543,8 +39561,6 @@
 2201061240 metadata/md5-cache/dev-perl/ExtUtils-MakeMaker-CPANfile-0.90.0
 2201061240 metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0-r1
 2201061240 metadata/md5-cache/dev-perl/ExtUtils-Typemaps-Default-1.50.0-r1
-2201061240 metadata/md5-cache/dev-perl/FCGI-0.820.0
-2201061240 metadata/md5-cache/dev-perl/FCGI-Client-0.90.0
 2201061240 metadata/md5-cache/dev-perl/FCGI-ProcManager-0.280.0-r1
 2201061240 metadata/md5-cache/dev-perl/Fatal-Exception-0.50.0-r3
 2201061240 metadata/md5-cache/dev-perl/Feed-Find-0.120.0
@@ -40563,8 +40579,10 @@
 2201061240 metadata/md5-cache/dev-perl/tkispell-0.200.0
 2201061240 metadata/md5-cache/dev-perl/txt2html-2.530.0
 2201091144 metadata/md5-cache/dev-perl/Inline-Python-0.560.0-r1
-2201091440 metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1
-2201091440 metadata/md5-cache/dev-perl/Manifest.gz
+2201101109 metadata/md5-cache/dev-perl/FCGI-0.820.0
+2201101109 metadata/md5-cache/dev-perl/FCGI-Client-0.90.0
+2201101440 metadata/md5-cache/dev-perl/Mail-AuthenticationResults-2.202.109.150-r1
+2201101440 metadata/md5-cache/dev-perl/Manifest.gz
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2003261841 metadata/md5-cache/dev-php/File_Iterator-1.4.3
 2003261841 metadata/md5-cache/dev-php/File_Iterator-2.0.2
@@ -41079,10 +41097,8 @@
 2201091144 metadata/md5-cache/dev-python/argcomplete-2.0.0
 2201091144 metadata/md5-cache/dev-python/argh-0.26.2-r2
 2201091144 metadata/md5-cache/dev-python/argon2-cffi-21.1.0-r1
-2201091144 metadata/md5-cache/dev-python/argon2-cffi-21.2.0
 2201091144 metadata/md5-cache/dev-python/argon2-cffi-21.3.0
 2201091144 metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r1
-2201091144 metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
 2201091144 metadata/md5-cache/dev-python/argparse-manpage-1.5-r1
 2201091144 metadata/md5-cache/dev-python/argparse-manpage-2
 2201091144 metadata/md5-cache/dev-python/arpeggio-1.10.2
@@ -41280,8 +41296,6 @@
 2201091144 metadata/md5-cache/dev-python/croniter-1.1.0
 2201091144 metadata/md5-cache/dev-python/cryptography-3.4.7-r2
 2201091144 metadata/md5-cache/dev-python/cryptography-36.0.0
-2201091144 metadata/md5-cache/dev-python/css-parser-1.0.6
-2201091144 metadata/md5-cache/dev-python/css-parser-1.0.7
 2201091144 metadata/md5-cache/dev-python/csscompressor-0.9.5
 2201091144 metadata/md5-cache/dev-python/cssselect-1.1.0-r1
 2201091144 metadata/md5-cache/dev-python/cssselect2-0.4.1
@@ -41396,8 +41410,6 @@
 2201091144 metadata/md5-cache/dev-python/doctest-ignore-unicode-0.1.2
 2201091144 metadata/md5-cache/dev-python/docutils-0.16-r1
 2201091144 metadata/md5-cache/dev-python/docutils-0.17.1
-2201091144 metadata/md5-cache/dev-python/docutils-0.18
-2201091144 metadata/md5-cache/dev-python/docutils-0.18.1
 2201091144 metadata/md5-cache/dev-python/docutils-glep-1.2
 2201091144 metadata/md5-cache/dev-python/dogpile-cache-1.1.4
 2201091144 metadata/md5-cache/dev-python/doit-0.33.1
@@ -41447,7 +41459,6 @@
 2201100810 metadata/md5-cache/dev-python/fastjsonschema-2.15.3
 2201091144 metadata/md5-cache/dev-python/feedgenerator-2.0.0
 2201091144 metadata/md5-cache/dev-python/feedparser-6.0.8
-2201091144 metadata/md5-cache/dev-python/fido2-0.9.3
 2201091144 metadata/md5-cache/dev-python/fields-5.0.0-r2
 2201091144 metadata/md5-cache/dev-python/filelock-3.4.0
 2201091144 metadata/md5-cache/dev-python/filelock-3.4.2
@@ -41521,7 +41532,6 @@
 2201091144 metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha0
 2201091144 metadata/md5-cache/dev-python/funcy-1.16
 2201091144 metadata/md5-cache/dev-python/funcy-1.17
-2201091144 metadata/md5-cache/dev-python/furo-2021.10.9
 2201091144 metadata/md5-cache/dev-python/fuse-python-1.0.4
 2201091144 metadata/md5-cache/dev-python/fusepy-3.0.1
 2201091144 metadata/md5-cache/dev-python/future-0.18.2-r1
@@ -41870,8 +41880,6 @@
 2201091144 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.0
 2201091144 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.10.3
 2201091144 metadata/md5-cache/dev-python/mkdocs-git-revision-date-localized-plugin-0.11.1
-2201091144 metadata/md5-cache/dev-python/mkdocs-material-8.0.5
-2201091144 metadata/md5-cache/dev-python/mkdocs-material-8.1.0
 2201091144 metadata/md5-cache/dev-python/mkdocs-material-8.1.3
 2201091144 metadata/md5-cache/dev-python/mkdocs-material-8.1.4
 2201091144 metadata/md5-cache/dev-python/mkdocs-material-extensions-1.0.3
@@ -41926,8 +41934,6 @@
 2201091144 metadata/md5-cache/dev-python/namespace-ruamel-1
 2201091144 metadata/md5-cache/dev-python/namespace-sphinxcontrib-1.0
 2201091144 metadata/md5-cache/dev-python/namespace-zope-1-r1
-2201091144 metadata/md5-cache/dev-python/natsort-7.2.0
-2201091144 metadata/md5-cache/dev-python/natsort-8.0.1
 2201091144 metadata/md5-cache/dev-python/natsort-8.0.2
 2201091144 metadata/md5-cache/dev-python/nautilus-python-1.2.3-r1
 2201091144 metadata/md5-cache/dev-python/nbclassic-0.3.3
@@ -42076,7 +42082,6 @@
 2201091144 metadata/md5-cache/dev-python/pikepdf-4.3.1
 2201091144 metadata/md5-cache/dev-python/pilkit-2.0
 2201091144 metadata/md5-cache/dev-python/pillow-8.4.0
-2201091144 metadata/md5-cache/dev-python/pillow-9.0.0
 2201091144 metadata/md5-cache/dev-python/pip-21.3.1-r1
 2201091144 metadata/md5-cache/dev-python/pipenv-2021.11.23
 2201091144 metadata/md5-cache/dev-python/pipenv-2021.11.9
@@ -42333,7 +42338,6 @@
 2201091144 metadata/md5-cache/dev-python/pyroute2-0.5.14
 2201091144 metadata/md5-cache/dev-python/pyrqlite-2.1.1
 2201091144 metadata/md5-cache/dev-python/pyrsistent-0.18.0
-2201091144 metadata/md5-cache/dev-python/pyscard-2.0.2
 2201091144 metadata/md5-cache/dev-python/pyscreenshot-3.0
 2201091144 metadata/md5-cache/dev-python/pyserial-3.5
 2201091144 metadata/md5-cache/dev-python/pyside2-5.15.2-r1
@@ -42378,8 +42382,6 @@
 2201091144 metadata/md5-cache/dev-python/pytest-flake8-1.0.7
 2201091144 metadata/md5-cache/dev-python/pytest-flakes-4.0.3
 2201091144 metadata/md5-cache/dev-python/pytest-flakes-4.0.4
-2201091144 metadata/md5-cache/dev-python/pytest-forked-1.3.0-r1
-2201091144 metadata/md5-cache/dev-python/pytest-forked-1.4.0
 2201091144 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
 2201091144 metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
 2201091144 metadata/md5-cache/dev-python/pytest-html-3.1.1
@@ -42420,8 +42422,6 @@
 2201091144 metadata/md5-cache/dev-python/pytest-trio-0.7.0
 2201091144 metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
 2201091144 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
-2201091144 metadata/md5-cache/dev-python/pytest-xdist-2.4.0
-2201091144 metadata/md5-cache/dev-python/pytest-xdist-2.5.0
 2201091144 metadata/md5-cache/dev-python/pytest-xprocess-0.18.1
 2201091144 metadata/md5-cache/dev-python/pytest-xvfb-2.0.0-r1
 2201091144 metadata/md5-cache/dev-python/python-augeas-1.1.0
@@ -42572,8 +42572,6 @@
 2201091144 metadata/md5-cache/dev-python/rdflib-5.0.0
 2201091144 metadata/md5-cache/dev-python/rdflib-6.0.2
 2201091144 metadata/md5-cache/dev-python/re-assert-1.1.0
-2201091144 metadata/md5-cache/dev-python/readme_renderer-30.0
-2201091144 metadata/md5-cache/dev-python/readme_renderer-31.0
 2201091144 metadata/md5-cache/dev-python/readme_renderer-32.0
 2201091144 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.4
 2201091144 metadata/md5-cache/dev-python/rebulk-3.1.0
@@ -42748,8 +42746,6 @@
 2201091144 metadata/md5-cache/dev-python/sphinx-jinja-1.2.1-r1
 2201091144 metadata/md5-cache/dev-python/sphinx-jinja-1.4.0
 2201091144 metadata/md5-cache/dev-python/sphinx-multiversion-0.2.4
-2201091144 metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
-2201091144 metadata/md5-cache/dev-python/sphinx-notfound-page-0.8
 2201091144 metadata/md5-cache/dev-python/sphinx-panels-0.6.0
 2201091144 metadata/md5-cache/dev-python/sphinx-prompt-1.5.0
 2201091144 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
@@ -42805,7 +42801,6 @@
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-1.4.26-r1
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-1.4.27
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-1.4.27-r3
-2201091144 metadata/md5-cache/dev-python/sqlalchemy-1.4.28
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-1.4.29
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-migrate-0.13.0
 2201091144 metadata/md5-cache/dev-python/sqlalchemy-rqlite-1.1
@@ -42991,8 +42986,6 @@
 2201091144 metadata/md5-cache/dev-python/watchdog-2.1.6
 2201091144 metadata/md5-cache/dev-python/watchgod-0.7
 2201100710 metadata/md5-cache/dev-python/wcag-contrast-ratio-0.9
-2201091144 metadata/md5-cache/dev-python/wcmatch-8.2
-2201091144 metadata/md5-cache/dev-python/wcmatch-8.3
 2201091144 metadata/md5-cache/dev-python/wcwidth-0.2.5-r1
 2201091144 metadata/md5-cache/dev-python/weasyprint-53.3
 2201091144 metadata/md5-cache/dev-python/weasyprint-53.4
@@ -43032,7 +43025,6 @@
 2201091144 metadata/md5-cache/dev-python/xapp-2.2.1
 2201091144 metadata/md5-cache/dev-python/xarray-0.19.0
 2201091144 metadata/md5-cache/dev-python/xarray-0.20.1
-2201091144 metadata/md5-cache/dev-python/xarray-0.20.2
 2201091144 metadata/md5-cache/dev-python/xcffib-0.11.1
 2201091144 metadata/md5-cache/dev-python/xdoctest-0.15.10
 2201091144 metadata/md5-cache/dev-python/xlrd-2.0.1
@@ -43075,11 +43067,38 @@
 2201091144 metadata/md5-cache/dev-python/zstd-1.5.0.4
 2201091144 metadata/md5-cache/dev-python/zstd-1.5.1.0
 2201091144 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2201101009 metadata/md5-cache/dev-python/Manifest.gz
 2201100939 metadata/md5-cache/dev-python/berkeleydb-18.1.4
 2201101009 metadata/md5-cache/dev-python/prettytable-3.0.0
 2201101009 metadata/md5-cache/dev-python/pytest-lazy-fixture-0.6.3
 2201100939 metadata/md5-cache/dev-python/rdflib-6.1.1
+2201102310 metadata/md5-cache/dev-python/GitPython-3.1.26
+2201110710 metadata/md5-cache/dev-python/Manifest.gz
+2201110010 metadata/md5-cache/dev-python/argon2-cffi-21.2.0
+2201110010 metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0
+2201102310 metadata/md5-cache/dev-python/cfn-lint-0.56.4
+2201102310 metadata/md5-cache/dev-python/css-parser-1.0.7
+2201102310 metadata/md5-cache/dev-python/docutils-0.18.1
+2201102310 metadata/md5-cache/dev-python/enrich-1.2.7
+2201110540 metadata/md5-cache/dev-python/fido2-0.9.3
+2201110010 metadata/md5-cache/dev-python/furo-2021.10.9
+2201102310 metadata/md5-cache/dev-python/mkdocs-material-8.1.0
+2201102310 metadata/md5-cache/dev-python/natsort-8.0.1
+2201102240 metadata/md5-cache/dev-python/pillow-9.0.0
+2201102310 metadata/md5-cache/dev-python/pycountry-22.1.10
+2201102310 metadata/md5-cache/dev-python/pylama-8.3.7
+2201110540 metadata/md5-cache/dev-python/pyscard-2.0.2
+2201102310 metadata/md5-cache/dev-python/pytest-forked-1.4.0
+2201102310 metadata/md5-cache/dev-python/pytest-xdist-2.5.0
+2201102310 metadata/md5-cache/dev-python/readme_renderer-31.0
+2201102310 metadata/md5-cache/dev-python/responses-0.17.0
+2201110010 metadata/md5-cache/dev-python/rq-1.10.1-r1
+2201102340 metadata/md5-cache/dev-python/sentry-sdk-1.5.2
+2201102310 metadata/md5-cache/dev-python/sphinx-autodoc-typehints-1.15.1
+2201110010 metadata/md5-cache/dev-python/sphinx-notfound-page-0.7.1
+2201102310 metadata/md5-cache/dev-python/sphinx-notfound-page-0.8
+2201110210 metadata/md5-cache/dev-python/sqlalchemy-1.4.28
+2201101440 metadata/md5-cache/dev-python/wcmatch-8.3
+2201110710 metadata/md5-cache/dev-python/xarray-0.20.2
 2201021453 metadata/md5-cache/dev-qt/qt-creator-4.15.1
 2201021453 metadata/md5-cache/dev-qt/qt-creator-6.0.0
 2201021453 metadata/md5-cache/dev-qt/qt-creator-9999
@@ -45948,7 +45967,6 @@
 2112132239 metadata/md5-cache/dev-util/log4shelldetect-0.0.4
 2112130009 metadata/md5-cache/dev-util/stripe-mock-0.116.0
 2112160939 metadata/md5-cache/dev-util/dialog-1.3.20211214
-2112170410 metadata/md5-cache/dev-util/patdiff-0.14.0-r1
 2112160309 metadata/md5-cache/dev-util/uglifyjs-3.14.5
 2112210039 metadata/md5-cache/dev-util/clair-2.1.3
 2112210039 metadata/md5-cache/dev-util/clair-2.1.4
@@ -46267,7 +46285,6 @@
 2201021453 metadata/md5-cache/dev-util/strace-5.12-r1
 2201021453 metadata/md5-cache/dev-util/strace-5.14-r1
 2201021453 metadata/md5-cache/dev-util/strace-5.15
-2201021453 metadata/md5-cache/dev-util/strace-9999
 2201021453 metadata/md5-cache/dev-util/stressapptest-1.0.9
 2201021453 metadata/md5-cache/dev-util/stubgen-2.08
 2201021453 metadata/md5-cache/dev-util/sysdig-0.27.0
@@ -46623,8 +46640,13 @@
 2201091144 metadata/md5-cache/dev-util/wstool-9999
 2201091144 metadata/md5-cache/dev-util/yamllint-1.26.3
 2201091144 metadata/md5-cache/dev-util/ydiff-1.2
-2201100939 metadata/md5-cache/dev-util/Manifest.gz
 2201100939 metadata/md5-cache/dev-util/rizin-0.3.4
+2201110040 metadata/md5-cache/dev-util/Manifest.gz
+2201101640 metadata/md5-cache/dev-util/byacc-20220109
+2201102040 metadata/md5-cache/dev-util/patdiff-0.14.0-r1
+2201101640 metadata/md5-cache/dev-util/strace-5.16
+2201101640 metadata/md5-cache/dev-util/strace-9999
+2201110040 metadata/md5-cache/dev-util/umockdev-0.17.2
 2106291109 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
@@ -46688,7 +46710,6 @@
 2201021453 metadata/md5-cache/dev-vcs/tig-2.5.4-r1
 2201021453 metadata/md5-cache/dev-vcs/tig-9999
 2201021453 metadata/md5-cache/dev-vcs/topgit-0.19.13
-2201100109 metadata/md5-cache/dev-vcs/Manifest.gz
 2201091144 metadata/md5-cache/dev-vcs/breezy-3.2.1-r1
 2201091144 metadata/md5-cache/dev-vcs/git-2.32.0-r1
 2201091144 metadata/md5-cache/dev-vcs/git-2.33.1
@@ -46733,8 +46754,6 @@
 2201091144 metadata/md5-cache/dev-vcs/repo-2.14
 2201091144 metadata/md5-cache/dev-vcs/repo-2.15
 2201091144 metadata/md5-cache/dev-vcs/repo-2.17
-2201091144 metadata/md5-cache/dev-vcs/stgit-1.1
-2201091144 metadata/md5-cache/dev-vcs/stgit-1.4
 2201091144 metadata/md5-cache/dev-vcs/subversion-1.14.1
 2201091144 metadata/md5-cache/dev-vcs/svneverever-1.5.0
 2201091144 metadata/md5-cache/dev-vcs/svneverever-1.6.0
@@ -46744,6 +46763,9 @@
 2201091144 metadata/md5-cache/dev-vcs/tortoisehg-5.9.1
 2201091144 metadata/md5-cache/dev-vcs/tortoisehg-5.9.3
 2201091144 metadata/md5-cache/dev-vcs/tortoisehg-9999
+2201110740 metadata/md5-cache/dev-vcs/Manifest.gz
+2201110210 metadata/md5-cache/dev-vcs/git-2.35.0_rc0
+2201110210 metadata/md5-cache/dev-vcs/stgit-1.4
 2110312244 metadata/md5-cache/games-action/assault-android-cactus+-200507
 2110312244 metadata/md5-cache/games-action/badland-121-r1
 2106201609 metadata/md5-cache/games-action/barrage-1.0.5
@@ -47717,7 +47739,6 @@
 2201021453 metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
 2201021453 metadata/md5-cache/gnome-extra/gnome-commander-1.12.1
 2201021453 metadata/md5-cache/gnome-extra/gnome-commander-1.12.2
-2201021453 metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
 2201021453 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
 2201021453 metadata/md5-cache/gnome-extra/gnome-search-tool-3.6.0
 2201021453 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-40
@@ -47758,7 +47779,6 @@
 2201021453 metadata/md5-cache/gnome-extra/zenity-3.32.0
 2201061240 metadata/md5-cache/gnome-extra/office-runner-1.0.3
 2201071509 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-37
-2201092310 metadata/md5-cache/gnome-extra/Manifest.gz
 2201091144 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r4
 2201091144 metadata/md5-cache/gnome-extra/cinnamon-4.8.6
 2201091144 metadata/md5-cache/gnome-extra/cinnamon-5.0.6
@@ -47829,6 +47849,8 @@
 2201091144 metadata/md5-cache/gnome-extra/sushi-3.38.1
 2201091144 metadata/md5-cache/gnome-extra/sushi-41.0
 2201091144 metadata/md5-cache/gnome-extra/zenity-3.41.0
+2201101210 metadata/md5-cache/gnome-extra/Manifest.gz
+2201101210 metadata/md5-cache/gnome-extra/gnome-commander-1.12.3.1
 2201021453 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2201021453 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
 2201021453 metadata/md5-cache/gnustep-apps/affiche-0.6.0-r4
@@ -48668,7 +48690,6 @@
 2201091110 metadata/md5-cache/kde-misc/zanshin-21.12.1
 2112140209 metadata/md5-cache/kde-plasma/plasma-meta-5.23.4
 2201041839 metadata/md5-cache/kde-plasma/plasma-meta-5.23.5
-2201091144 metadata/md5-cache/kde-plasma/Manifest.gz
 2201091110 metadata/md5-cache/kde-plasma/bluedevil-5.23.4-r1
 2201091110 metadata/md5-cache/kde-plasma/bluedevil-5.23.5
 2201091110 metadata/md5-cache/kde-plasma/breeze-5.23.4-r1
@@ -48764,8 +48785,6 @@
 2201091110 metadata/md5-cache/kde-plasma/plymouth-kcm-5.23.5
 2201091110 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.4
 2201091110 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.23.5
-2201091110 metadata/md5-cache/kde-plasma/powerdevil-5.23.4
-2201091110 metadata/md5-cache/kde-plasma/powerdevil-5.23.5
 2201091110 metadata/md5-cache/kde-plasma/sddm-kcm-5.23.4
 2201091110 metadata/md5-cache/kde-plasma/sddm-kcm-5.23.5
 2201091110 metadata/md5-cache/kde-plasma/systemsettings-5.23.4
@@ -48774,6 +48793,9 @@
 2201091110 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.23.5
 2201091110 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.4
 2201091110 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.23.5
+2201101509 metadata/md5-cache/kde-plasma/Manifest.gz
+2201101509 metadata/md5-cache/kde-plasma/powerdevil-5.23.4-r1
+2201101509 metadata/md5-cache/kde-plasma/powerdevil-5.23.5-r1
 2107211809 metadata/md5-cache/lxde-base/lxappearance-0.6.3-r2
 2107230909 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
@@ -48903,7 +48925,6 @@
 2201021453 metadata/md5-cache/mail-filter/rblcheck-1.5-r2
 2201021453 metadata/md5-cache/mail-filter/rspamd-2.7-r103
 2201021453 metadata/md5-cache/mail-filter/rspamd-3.0-r3
-2201021453 metadata/md5-cache/mail-filter/rspamd-3.1
 2201021453 metadata/md5-cache/mail-filter/rspamd-9999
 2201021453 metadata/md5-cache/mail-filter/sigh-1607.1.6-r1
 2201021453 metadata/md5-cache/mail-filter/spamassassin-3.4.5-r1
@@ -48912,12 +48933,13 @@
 2201021453 metadata/md5-cache/mail-filter/sqlgrey-1.8.0
 2201061240 metadata/md5-cache/mail-filter/razor-2.85-r3
 2201061240 metadata/md5-cache/mail-filter/spamassassin-botnet-0.8-r1
-2201091144 metadata/md5-cache/mail-filter/Manifest.gz
 2201091144 metadata/md5-cache/mail-filter/afew-3.0.1
 2201091144 metadata/md5-cache/mail-filter/courier-pythonfilter-3.0.2-r1
 2201091144 metadata/md5-cache/mail-filter/pyzor-1.0.0_p20200523
 2201091144 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r3
 2201091144 metadata/md5-cache/mail-filter/spf-engine-2.9.2-r4
+2201102110 metadata/md5-cache/mail-filter/Manifest.gz
+2201102110 metadata/md5-cache/mail-filter/rspamd-3.1-r1
 2110170109 metadata/md5-cache/mail-mta/msmtp-1.8.16
 2110230009 metadata/md5-cache/mail-mta/msmtp-1.8.18
 2111042239 metadata/md5-cache/mail-mta/msmtp-1.8.19
@@ -49435,7 +49457,6 @@
 2201021453 metadata/md5-cache/media-gfx/valentina-9999
 2201021453 metadata/md5-cache/media-gfx/viewer-0.8.0-r1
 2201021453 metadata/md5-cache/media-gfx/w3mimgfb-0.9.1
-2201021453 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521
 2201021453 metadata/md5-cache/media-gfx/wings-2.2.6.1
 2201021453 metadata/md5-cache/media-gfx/xli-1.17.0-r5
 2201021453 metadata/md5-cache/media-gfx/xloadimage-4.1-r12
@@ -49458,7 +49479,6 @@
 2201061240 metadata/md5-cache/media-gfx/jpeg2ps-1.9-r2
 2201061409 metadata/md5-cache/media-gfx/optipng-0.7.7-r1
 2201070209 metadata/md5-cache/media-gfx/libimagequant-2.15.1
-2201100409 metadata/md5-cache/media-gfx/Manifest.gz
 2201091144 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_beta
 2201091144 metadata/md5-cache/media-gfx/ahoviewer-2.0.0_pre20211126
 2201091144 metadata/md5-cache/media-gfx/alembic-1.8.3-r1
@@ -49563,6 +49583,9 @@
 2201091144 metadata/md5-cache/media-gfx/yafaray-3.4.1
 2201091144 metadata/md5-cache/media-gfx/yafaray-3.5.1-r1
 2201091144 metadata/md5-cache/media-gfx/zbar-0.23.1
+2201110140 metadata/md5-cache/media-gfx/Manifest.gz
+2201110040 metadata/md5-cache/media-gfx/gphoto2-2.5.28
+2201110140 metadata/md5-cache/media-gfx/waifu2x-ncnn-vulkan-20210521
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 2110030209 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.5.1
 2109230439 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
@@ -49618,7 +49641,6 @@
 2112061809 metadata/md5-cache/media-libs/lsp-plugins-1.1.29
 2112092340 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6.1
 2112110740 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6.2
-2112101240 metadata/md5-cache/media-libs/libsidplayfp-2.3.1
 2112220839 metadata/md5-cache/media-libs/exiftool-12.30
 2112260340 metadata/md5-cache/media-libs/libpagemaker-0.0.4
 2112300209 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.6.3
@@ -49856,7 +49878,6 @@
 2201021453 metadata/md5-cache/media-libs/libraw-0.20.2
 2201021453 metadata/md5-cache/media-libs/libreplaygain-477-r1
 2201021453 metadata/md5-cache/media-libs/librosprite-0.1.3-r2
-2201021453 metadata/md5-cache/media-libs/libsamplerate-0.2.2
 2201021453 metadata/md5-cache/media-libs/libsamplerate-9999
 2201021453 metadata/md5-cache/media-libs/libsbsms-2.3.0
 2201021453 metadata/md5-cache/media-libs/libsdl-1.2.15_p20210224
@@ -49879,7 +49900,6 @@
 2201021453 metadata/md5-cache/media-libs/libvisio-0.1.7
 2201021453 metadata/md5-cache/media-libs/libvisio-9999
 2201021453 metadata/md5-cache/media-libs/libvisual-0.4.0-r3
-2201021453 metadata/md5-cache/media-libs/libvorbis-1.3.7
 2201021453 metadata/md5-cache/media-libs/libwebp-1.1.0
 2201021453 metadata/md5-cache/media-libs/libwebp-1.2.0
 2201021453 metadata/md5-cache/media-libs/libwebp-1.2.1
@@ -49913,7 +49933,6 @@
 2201021453 metadata/md5-cache/media-libs/openjpeg-2.4.0
 2201021453 metadata/md5-cache/media-libs/opensubdiv-3.4.4-r1
 2201021453 metadata/md5-cache/media-libs/opensubdiv-3.4.4-r2
-2201021453 metadata/md5-cache/media-libs/opus-1.3.1-r2
 2201021453 metadata/md5-cache/media-libs/osl-1.12.0.2
 2201021453 metadata/md5-cache/media-libs/pcaudiolib-1.1
 2201021453 metadata/md5-cache/media-libs/phat-0.4.1-r1
@@ -50025,11 +50044,8 @@
 2201080039 metadata/md5-cache/media-libs/freetype-2.11.0-r2
 2201080039 metadata/md5-cache/media-libs/freetype-2.11.1
 2201080039 metadata/md5-cache/media-libs/freetype-9999
-2201072010 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
 2201072010 metadata/md5-cache/media-libs/rnnoise-0.4.1_p20210122
 2201072010 metadata/md5-cache/media-libs/tg_owt-0_pre20210914
-2201072010 metadata/md5-cache/media-libs/tg_owt-0_pre20211207
-2201100040 metadata/md5-cache/media-libs/Manifest.gz
 2201091144 metadata/md5-cache/media-libs/alsa-lib-1.2.4
 2201091144 metadata/md5-cache/media-libs/alsa-lib-1.2.5.1
 2201091144 metadata/md5-cache/media-libs/alsa-lib-1.2.6
@@ -50112,7 +50128,6 @@
 2201091110 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
 2201091144 metadata/md5-cache/media-libs/libsixel-1.10.3
 2201091144 metadata/md5-cache/media-libs/libsixel-1.8.6
-2201091144 metadata/md5-cache/media-libs/libsndfile-1.0.31
 2201091144 metadata/md5-cache/media-libs/libsndfile-9999
 2201091144 metadata/md5-cache/media-libs/lilv-0.24.12
 2201091144 metadata/md5-cache/media-libs/lv2-1.18.2
@@ -50124,7 +50139,6 @@
 2201091144 metadata/md5-cache/media-libs/mlt-7.2.0-r1
 2201091144 metadata/md5-cache/media-libs/mlt-7.4.0
 2201091144 metadata/md5-cache/media-libs/mutagen-1.45.1
-2201081539 metadata/md5-cache/media-libs/netpbm-10.86.27
 2201091144 metadata/md5-cache/media-libs/oidn-1.3.0-r1
 2201091144 metadata/md5-cache/media-libs/oidn-1.4.1-r1
 2201091144 metadata/md5-cache/media-libs/oidn-1.4.2
@@ -50169,6 +50183,16 @@
 2201091144 metadata/md5-cache/media-libs/waffle-9999
 2201091144 metadata/md5-cache/media-libs/webrtc-audio-processing-1.0
 2201081640 metadata/md5-cache/media-libs/xine-lib-1.2.9999
+2201110740 metadata/md5-cache/media-libs/Manifest.gz
+2201110740 metadata/md5-cache/media-libs/libgphoto2-2.5.28
+2201101609 metadata/md5-cache/media-libs/libsamplerate-0.2.2
+2201101440 metadata/md5-cache/media-libs/libsidplayfp-2.3.1
+2201101609 metadata/md5-cache/media-libs/libsndfile-1.0.31
+2201101210 metadata/md5-cache/media-libs/libtgvoip-2.4.4_p20211129
+2201101609 metadata/md5-cache/media-libs/libvorbis-1.3.7
+2201110210 metadata/md5-cache/media-libs/netpbm-10.86.27
+2201101609 metadata/md5-cache/media-libs/opus-1.3.1-r2
+2201101210 metadata/md5-cache/media-libs/tg_owt-0_pre20211207
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -50884,7 +50908,6 @@
 2201021453 metadata/md5-cache/media-sound/din-51.1.1
 2201021453 metadata/md5-cache/media-sound/din-52
 2201021453 metadata/md5-cache/media-sound/drumstick-2.4.1
-2201021453 metadata/md5-cache/media-sound/drumstick-2.5.0
 2201021453 metadata/md5-cache/media-sound/dvda-author-10.06-r1
 2201021453 metadata/md5-cache/media-sound/easytag-2.4.3-r2
 2201021453 metadata/md5-cache/media-sound/erec-2.2.0.1-r1
@@ -51011,8 +51034,6 @@
 2201021453 metadata/md5-cache/media-sound/qmmp-9999
 2201021453 metadata/md5-cache/media-sound/qsampler-0.9.4
 2201021453 metadata/md5-cache/media-sound/qsampler-9999
-2201021453 metadata/md5-cache/media-sound/qsynth-0.9.4
-2201021453 metadata/md5-cache/media-sound/qsynth-9999
 2201021453 metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
 2201021453 metadata/md5-cache/media-sound/qtgain-1.0.0
 2201021453 metadata/md5-cache/media-sound/qtractor-0.9.24
@@ -51022,7 +51043,6 @@
 2201021453 metadata/md5-cache/media-sound/rcenter-0.6.2
 2201021453 metadata/md5-cache/media-sound/rexima-1.4-r1
 2201021453 metadata/md5-cache/media-sound/rosegarden-21.06.1
-2201021453 metadata/md5-cache/media-sound/rosegarden-21.12
 2201021453 metadata/md5-cache/media-sound/rplay-3.3.2-r4
 2201021453 metadata/md5-cache/media-sound/schismtracker-20210525
 2201021453 metadata/md5-cache/media-sound/schismtracker-20211116
@@ -51035,7 +51055,6 @@
 2201021453 metadata/md5-cache/media-sound/snapcast-0.25.0-r1
 2201021453 metadata/md5-cache/media-sound/snd-17.4-r2
 2201021453 metadata/md5-cache/media-sound/sndfile-tools-9999
-2201021453 metadata/md5-cache/media-sound/sndio-1.8.0
 2201021453 metadata/md5-cache/media-sound/sndio-9999
 2201021453 metadata/md5-cache/media-sound/sndpeek-1.41-r1
 2201021453 metadata/md5-cache/media-sound/sooperlooper-1.7.4
@@ -51105,7 +51124,6 @@
 2201061240 metadata/md5-cache/media-sound/wildmidi-0.4.3
 2201061240 metadata/md5-cache/media-sound/wildmidi-0.4.4
 2201071839 metadata/md5-cache/media-sound/hydrogen-1.1.1
-2201091710 metadata/md5-cache/media-sound/Manifest.gz
 2201091144 metadata/md5-cache/media-sound/a2jmidid-9
 2201091144 metadata/md5-cache/media-sound/a2jmidid-9999
 2201091144 metadata/md5-cache/media-sound/apetag-1.12-r3
@@ -51193,6 +51211,14 @@
 2201091144 metadata/md5-cache/media-sound/whipper-0.10.0
 2201091144 metadata/md5-cache/media-sound/whipper-0.9.0
 2201091144 metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r1
+2201101609 metadata/md5-cache/media-sound/Manifest.gz
+2201101210 metadata/md5-cache/media-sound/amsynth-1.12.4
+2201101440 metadata/md5-cache/media-sound/drumstick-2.5.0
+2201101210 metadata/md5-cache/media-sound/qsynth-0.9.4
+2201101210 metadata/md5-cache/media-sound/qsynth-0.9.5
+2201101210 metadata/md5-cache/media-sound/qsynth-9999
+2201101440 metadata/md5-cache/media-sound/rosegarden-21.12
+2201101609 metadata/md5-cache/media-sound/sndio-1.8.0
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -51409,7 +51435,6 @@
 2201061240 metadata/md5-cache/media-video/acidrip-0.14-r4
 2201061240 metadata/md5-cache/media-video/motion-4.3.2-r1
 2201061240 metadata/md5-cache/media-video/ushare-1.1a_p20210221
-2201091240 metadata/md5-cache/media-video/Manifest.gz
 2201091144 metadata/md5-cache/media-video/aravis-0.7.2
 2201091144 metadata/md5-cache/media-video/aravis-0.8.5
 2201091144 metadata/md5-cache/media-video/aravis-9999
@@ -51462,8 +51487,8 @@
 2201091144 metadata/md5-cache/media-video/wireplumber-0.4.5-r4
 2201091144 metadata/md5-cache/media-video/wireplumber-0.4.6-r1
 2201091144 metadata/md5-cache/media-video/wireplumber-9999
-2201091144 metadata/md5-cache/media-video/yle-dl-20210917
 2201091144 metadata/md5-cache/media-video/yle-dl-20211213
+2201101940 metadata/md5-cache/media-video/Manifest.gz
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 2101201239 metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -51802,7 +51827,6 @@
 2201061240 metadata/md5-cache/net-analyzer/gnome-nettool-3.8.1
 2201061240 metadata/md5-cache/net-analyzer/nuttcp-8.1.4
 2201091144 metadata/md5-cache/net-analyzer/2ping-4.5.1
-2201091609 metadata/md5-cache/net-analyzer/Manifest.gz
 2201080939 metadata/md5-cache/net-analyzer/bwping-2.4
 2201091144 metadata/md5-cache/net-analyzer/carl-0.9-r5
 2201091144 metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -51854,10 +51878,11 @@
 2201091144 metadata/md5-cache/net-analyzer/wapiti-3.0.5
 2201091144 metadata/md5-cache/net-analyzer/wapiti-9999
 2201091144 metadata/md5-cache/net-analyzer/wireshark-3.4.10
-2201091609 metadata/md5-cache/net-analyzer/wireshark-3.4.11
 2201091144 metadata/md5-cache/net-analyzer/wireshark-3.6.0-r1
 2201091144 metadata/md5-cache/net-analyzer/wireshark-3.6.1
 2201091144 metadata/md5-cache/net-analyzer/wireshark-9999
+2201101210 metadata/md5-cache/net-analyzer/Manifest.gz
+2201101210 metadata/md5-cache/net-analyzer/wireshark-3.4.11
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2106122209 metadata/md5-cache/net-dialup/ppp-scripts-0
 2109022141 metadata/md5-cache/net-dialup/sendpage-1.1.0-r4
@@ -51888,7 +51913,6 @@
 2201041510 metadata/md5-cache/net-dialup/accel-ppp-9999
 2201041510 metadata/md5-cache/net-dialup/linux-atm-2.5.2-r1
 2201041510 metadata/md5-cache/net-dialup/openl2tp-1.8-r2
-2201041609 metadata/md5-cache/net-dialup/picocom-3.1
 2201041510 metadata/md5-cache/net-dialup/ppp-2.4.9-r4
 2201041510 metadata/md5-cache/net-dialup/ppp-2.4.9-r5
 2201041510 metadata/md5-cache/net-dialup/speedtouch-usb-3.0.1.2-r3
@@ -51896,11 +51920,12 @@
 2201061240 metadata/md5-cache/net-dialup/rp-pppoe-3.15
 2201061240 metadata/md5-cache/net-dialup/rp-pppoe-3.15-r1
 2201061240 metadata/md5-cache/net-dialup/wvdial-1.61
-2201091144 metadata/md5-cache/net-dialup/Manifest.gz
 2201091144 metadata/md5-cache/net-dialup/freeradius-3.0.20-r3
 2201091144 metadata/md5-cache/net-dialup/freeradius-3.0.21-r3
 2201091144 metadata/md5-cache/net-dialup/freeradius-3.0.22-r2
 2201091144 metadata/md5-cache/net-dialup/freeradius-3.0.25
+2201110540 metadata/md5-cache/net-dialup/Manifest.gz
+2201110540 metadata/md5-cache/net-dialup/picocom-3.1
 1910111739 metadata/md5-cache/net-dns/dnscap-1.10.3
 2111081839 metadata/md5-cache/net-dns/dnssec-root-20181220-r1
 2101061809 metadata/md5-cache/net-dns/dnswalk-2.0.2
@@ -52016,7 +52041,6 @@
 2201041510 metadata/md5-cache/net-firewall/xtables-addons-3.18
 2201061240 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
 2201061240 metadata/md5-cache/net-firewall/fwknop-2.6.10-r2
-2201091144 metadata/md5-cache/net-firewall/Manifest.gz
 2201091144 metadata/md5-cache/net-firewall/firewalld-1.0.2
 2201091144 metadata/md5-cache/net-firewall/nftables-0.9.8-r1
 2201091144 metadata/md5-cache/net-firewall/nftables-0.9.9
@@ -52024,6 +52048,8 @@
 2201091144 metadata/md5-cache/net-firewall/nftables-1.0.1
 2201091144 metadata/md5-cache/net-firewall/nftables-9999
 2201091144 metadata/md5-cache/net-firewall/ufw-0.36
+2201110210 metadata/md5-cache/net-firewall/Manifest.gz
+2201110210 metadata/md5-cache/net-firewall/firewalld-1.0.3
 2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 2112112311 metadata/md5-cache/net-fs/mc-2021.03.06.22.16.44
 2112112311 metadata/md5-cache/net-fs/mc-2021.03.12.03.36.59
@@ -52042,8 +52068,6 @@
 2201021453 metadata/md5-cache/net-fs/s3fs-1.86
 2201021453 metadata/md5-cache/net-fs/s3fs-1.89
 2201021453 metadata/md5-cache/net-fs/smbtad-1.2.6
-2201041510 metadata/md5-cache/net-fs/autofs-5.1.6-r2
-2201041510 metadata/md5-cache/net-fs/autofs-5.1.7-r1
 2201041510 metadata/md5-cache/net-fs/cvmfs-2.8.1-r1
 2201041510 metadata/md5-cache/net-fs/cvmfs-2.8.2
 2201041510 metadata/md5-cache/net-fs/cvmfs-2.9.0
@@ -52051,9 +52075,7 @@
 2201041510 metadata/md5-cache/net-fs/nfs-utils-2.5.4-r3
 2201041510 metadata/md5-cache/net-fs/openafs-1.8.7
 2201041510 metadata/md5-cache/net-fs/openafs-1.8.8.1-r1
-2201060509 metadata/md5-cache/net-fs/autofs-5.1.8-r1
 2201061240 metadata/md5-cache/net-fs/smbnetfs-0.6.3
-2201091144 metadata/md5-cache/net-fs/Manifest.gz
 2201091144 metadata/md5-cache/net-fs/btfs-2.22
 2201091144 metadata/md5-cache/net-fs/btfs-2.23
 2201091144 metadata/md5-cache/net-fs/cifs-utils-6.13-r1
@@ -52062,6 +52084,8 @@
 2201091144 metadata/md5-cache/net-fs/samba-4.15.3-r1
 2201091144 metadata/md5-cache/net-fs/sshfs-3.7.0
 2201091144 metadata/md5-cache/net-fs/sshfs-3.7.1
+2201110140 metadata/md5-cache/net-fs/Manifest.gz
+2201102310 metadata/md5-cache/net-fs/autofs-5.1.8-r1
 2104200439 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2110312244 metadata/md5-cache/net-ftp/pureadmin-0.4-r3
 2012231444 metadata/md5-cache/net-ftp/tnftp-20141104
@@ -52113,7 +52137,6 @@
 2111291039 metadata/md5-cache/net-im/mattermost-desktop-bin-5.0.2
 2112091040 metadata/md5-cache/net-im/telegram-desktop-bin-3.3.0
 2112171639 metadata/md5-cache/net-im/signal-cli-bin-0.9.2
-2112310009 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.4
 2201021453 metadata/md5-cache/net-im/bitlbee-facebook-1.2.2
 2201021453 metadata/md5-cache/net-im/bitlbee-facebook-9999
 2201021453 metadata/md5-cache/net-im/bitlbee-steam-1.4.2
@@ -52168,7 +52191,6 @@
 2201061240 metadata/md5-cache/net-im/sendxmpp-1.24
 2201061240 metadata/md5-cache/net-im/zoom-5.4.53391.1108-r3
 2201071209 metadata/md5-cache/net-im/sendxmpp-amm-1.1.1
-2201100610 metadata/md5-cache/net-im/Manifest.gz
 2201091144 metadata/md5-cache/net-im/bitlbee-3.6-r1
 2201091144 metadata/md5-cache/net-im/bitlbee-9999
 2201091110 metadata/md5-cache/net-im/choqok-1.7.0
@@ -52188,7 +52210,6 @@
 2201091144 metadata/md5-cache/net-im/skype-dbus-mock-0_pre20181011
 2201091144 metadata/md5-cache/net-im/swift-4.0.2-r102
 2201091144 metadata/md5-cache/net-im/telegram-desktop-3.1.8
-2201091144 metadata/md5-cache/net-im/telegram-desktop-3.3.0
 2201091144 metadata/md5-cache/net-im/telegram-desktop-3.4.3
 2201091144 metadata/md5-cache/net-im/telepathy-logger-0.8.2-r1
 2201091144 metadata/md5-cache/net-im/telepathy-mission-control-5.16.6
@@ -52199,6 +52220,9 @@
 2201091144 metadata/md5-cache/net-im/yowsup-3.2.3_p20190905
 2201091740 metadata/md5-cache/net-im/zoom-5.8.6.739
 2201091740 metadata/md5-cache/net-im/zoom-5.9.1.1380
+2201101440 metadata/md5-cache/net-im/Manifest.gz
+2201101440 metadata/md5-cache/net-im/rocketchat-desktop-bin-3.7.5
+2201101210 metadata/md5-cache/net-im/telegram-desktop-3.3.0
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2109230439 metadata/md5-cache/net-irc/irssi-1.2.3
@@ -52222,7 +52246,6 @@
 2201021453 metadata/md5-cache/net-irc/atheme-services-7.2.11-r1
 2201021453 metadata/md5-cache/net-irc/dccserver-0.5-r1
 2201021453 metadata/md5-cache/net-irc/epic5-2.0.1-r1
-2201021453 metadata/md5-cache/net-irc/ergo-2.7.0-r1
 2201021453 metadata/md5-cache/net-irc/ergo-2.8.0
 2201021453 metadata/md5-cache/net-irc/ii-1.8
 2201021453 metadata/md5-cache/net-irc/ii-9999
@@ -52250,8 +52273,6 @@
 2201061240 metadata/md5-cache/net-irc/eggdrop-1.9.0
 2201061240 metadata/md5-cache/net-irc/eggdrop-1.9.1
 2201061240 metadata/md5-cache/net-irc/emech-3.0.99_p3-r1
-2201091144 metadata/md5-cache/net-irc/Manifest.gz
-2201091040 metadata/md5-cache/net-irc/ergo-2.9.0
 2201091144 metadata/md5-cache/net-irc/hexchat-2.14.3-r101
 2201091144 metadata/md5-cache/net-irc/hexchat-2.16.0
 2201091144 metadata/md5-cache/net-irc/hexchat-9999
@@ -52278,6 +52299,8 @@
 2201091144 metadata/md5-cache/net-irc/znc-1.8.2-r1
 2201091144 metadata/md5-cache/net-irc/znc-9999
 2201091144 metadata/md5-cache/net-irc/znc-palaver-1.2.1
+2201101640 metadata/md5-cache/net-irc/Manifest.gz
+2201101640 metadata/md5-cache/net-irc/ergo-2.9.1
 2101040209 metadata/md5-cache/net-libs/aqbanking-6.2.5
 2104060140 metadata/md5-cache/net-libs/courier-unicode-2.1
 2105161609 metadata/md5-cache/net-libs/courier-unicode-2.1-r1
@@ -52360,10 +52383,7 @@
 2201021453 metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1
 2201021453 metadata/md5-cache/net-libs/libbloom-1.5-r2
 2201021453 metadata/md5-cache/net-libs/libbloom-1.6
-2201021453 metadata/md5-cache/net-libs/libbtbb-2018.08.1
 2201021453 metadata/md5-cache/net-libs/libbtbb-2018.12.1
-2201021453 metadata/md5-cache/net-libs/libbtbb-2020.12.1
-2201021453 metadata/md5-cache/net-libs/libbtbb-9999
 2201021453 metadata/md5-cache/net-libs/libcapi-3.0.7-r1
 2201021453 metadata/md5-cache/net-libs/libcork-0.15.0-r2
 2201021453 metadata/md5-cache/net-libs/libcorkipset-1.1.1.20150311_p8
@@ -52546,7 +52566,6 @@
 2201070840 metadata/md5-cache/net-libs/tox-0.2.13
 2201070840 metadata/md5-cache/net-libs/tox-9999
 2201072010 metadata/md5-cache/net-libs/usrsctp-0.9.5.0
-2201092310 metadata/md5-cache/net-libs/Manifest.gz
 2201091144 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.4.0
 2201091144 metadata/md5-cache/net-libs/dleyna-connector-dbus-0.4.1
 2201091144 metadata/md5-cache/net-libs/dleyna-core-0.7.0
@@ -52626,10 +52645,13 @@
 2201091144 metadata/md5-cache/net-libs/telepathy-qt-0.9.8-r1
 2201091144 metadata/md5-cache/net-libs/telepathy-qt-9999
 2201091144 metadata/md5-cache/net-libs/webkit-gtk-2.32.4
-2201091144 metadata/md5-cache/net-libs/webkit-gtk-2.34.3
 2201091144 metadata/md5-cache/net-libs/xrootd-5.0.3-r1
 2201091144 metadata/md5-cache/net-libs/xrootd-5.3.1
 2201091144 metadata/md5-cache/net-libs/xrootd-5.4.0
+2201110310 metadata/md5-cache/net-libs/Manifest.gz
+2201101910 metadata/md5-cache/net-libs/libbtbb-2020.12.1-r1
+2201101910 metadata/md5-cache/net-libs/libbtbb-9999
+2201110310 metadata/md5-cache/net-libs/webkit-gtk-2.34.3
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 2108061839 metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
@@ -53314,7 +53336,6 @@
 2201091144 metadata/md5-cache/net-misc/streamlink-9999
 2201091144 metadata/md5-cache/net-misc/wget-1.21.1
 2201091144 metadata/md5-cache/net-misc/wget-1.21.2
-2201092340 metadata/md5-cache/net-misc/xmrig-6.16.2
 2201091144 metadata/md5-cache/net-misc/you-get-0.4.1545
 2201091144 metadata/md5-cache/net-misc/you-get-0.4.1555
 2201091144 metadata/md5-cache/net-misc/youtube-dl-2021.06.06
@@ -53322,7 +53343,9 @@
 2201091144 metadata/md5-cache/net-misc/youtube-dl-9999
 2201091144 metadata/md5-cache/net-misc/yt-dlp-2021.12.1-r1
 2201091144 metadata/md5-cache/net-misc/yt-dlp-2021.12.27
-2201101040 metadata/md5-cache/net-misc/Manifest.gz
+2201102140 metadata/md5-cache/net-misc/Manifest.gz
+2201102140 metadata/md5-cache/net-misc/exabgp-4.2.17
+2201101410 metadata/md5-cache/net-misc/xmrig-6.16.2
 2105111309 metadata/md5-cache/net-nds/gssproxy-0.8.4
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2109022141 metadata/md5-cache/net-nds/shelldap-1.5.1
@@ -53568,13 +53591,14 @@
 2201041639 metadata/md5-cache/net-proxy/squid-4.15-r2
 2201041639 metadata/md5-cache/net-proxy/squid-4.17
 2201061240 metadata/md5-cache/net-proxy/dante-1.4.1-r6
-2201091144 metadata/md5-cache/net-proxy/Manifest.gz
 2201091144 metadata/md5-cache/net-proxy/hatop-0.8.0
 2201091144 metadata/md5-cache/net-proxy/hatop-0.8.1
 2201091144 metadata/md5-cache/net-proxy/mitmproxy-7.0.3
 2201091144 metadata/md5-cache/net-proxy/mitmproxy-7.0.4
 2201091144 metadata/md5-cache/net-proxy/sshuttle-1.0.5
 2201091144 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
+2201101709 metadata/md5-cache/net-proxy/Manifest.gz
+2201101140 metadata/md5-cache/net-proxy/haproxy-2.2.19
 2201021453 metadata/md5-cache/net-voip/captagent-6.3.1
 2201021453 metadata/md5-cache/net-voip/yate-6.2.0
 2201021453 metadata/md5-cache/net-voip/yate-9999
@@ -53653,17 +53677,16 @@
 2201061240 metadata/md5-cache/net-vpn/openvpn-9999
 2201071839 metadata/md5-cache/net-vpn/strongswan-5.9.4-r1
 2201091144 metadata/md5-cache/net-vpn/6tunnel-0.13
-2201092340 metadata/md5-cache/net-vpn/Manifest.gz
-2201092340 metadata/md5-cache/net-vpn/libreswan-4.5
 2201091144 metadata/md5-cache/net-vpn/openconnect-8.10-r6
 2201091144 metadata/md5-cache/net-vpn/openconnect-9999
 2201091144 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.11-r1
-2201091144 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
 2201091144 metadata/md5-cache/net-vpn/riseup-vpn-0.21.11
 2201091144 metadata/md5-cache/net-vpn/tor-0.4.6.7
 2201091144 metadata/md5-cache/net-vpn/tor-0.4.6.8
 2201091144 metadata/md5-cache/net-vpn/tor-0.4.6.9
 2201091144 metadata/md5-cache/net-vpn/tor-0.4.7.3_alpha
+2201110810 metadata/md5-cache/net-vpn/Manifest.gz
+2201101210 metadata/md5-cache/net-vpn/libreswan-4.5
 2107291039 metadata/md5-cache/net-wireless/bladerf-firmware-2.4.0
 2107291039 metadata/md5-cache/net-wireless/bladerf-fpga-0.12.0
 2004041439 metadata/md5-cache/net-wireless/bluez-hcidump-2.5
@@ -54476,7 +54499,6 @@
 2201021453 metadata/md5-cache/sci-geosciences/viking-1.10
 2201021453 metadata/md5-cache/sci-geosciences/xtide-2.15.1
 2201091144 metadata/md5-cache/sci-geosciences/GeographicLib-1.52
-2201100010 metadata/md5-cache/sci-geosciences/Manifest.gz
 2201091144 metadata/md5-cache/sci-geosciences/folium-0.12.1
 2201091144 metadata/md5-cache/sci-geosciences/geocode-glib-3.26.2
 2201091144 metadata/md5-cache/sci-geosciences/geopy-2.2.0
@@ -54496,8 +54518,9 @@
 2201091144 metadata/md5-cache/sci-geosciences/qgis-3.22.1
 2201091144 metadata/md5-cache/sci-geosciences/qgis-3.22.2
 2201091144 metadata/md5-cache/sci-geosciences/qgis-9999
-2201092340 metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
 2201091144 metadata/md5-cache/sci-geosciences/routino-3.3.3
+2201101210 metadata/md5-cache/sci-geosciences/Manifest.gz
+2201101210 metadata/md5-cache/sci-geosciences/qmapshack-1.16.1
 2002230040 metadata/md5-cache/sci-libs/beagle-3.0.3-r1
 2107141939 metadata/md5-cache/sci-libs/ccolamd-2.9.6
 2110211309 metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
@@ -54786,7 +54809,6 @@
 2201050109 metadata/md5-cache/sci-libs/dealii-9.3.1-r4
 2201050109 metadata/md5-cache/sci-libs/dealii-9999
 2201052309 metadata/md5-cache/sci-libs/silo-4.11
-2201100410 metadata/md5-cache/sci-libs/Manifest.gz
 2201091144 metadata/md5-cache/sci-libs/blis-0.6.0
 2201091144 metadata/md5-cache/sci-libs/blis-0.8.1
 2201091144 metadata/md5-cache/sci-libs/bmrblib-1.0.4
@@ -54802,15 +54824,12 @@
 2201091144 metadata/md5-cache/sci-libs/eccodes-2.18.0
 2201091144 metadata/md5-cache/sci-libs/gdal-3.3.3
 2201091144 metadata/md5-cache/sci-libs/gdal-3.4.0
-2201091144 metadata/md5-cache/sci-libs/gdal-3.4.1
 2201091144 metadata/md5-cache/sci-libs/gmsh-4.8.4
-2201081539 metadata/md5-cache/sci-libs/gsl-2.7.1-r1
 2201091144 metadata/md5-cache/sci-libs/keras-2.7.0
 2201091144 metadata/md5-cache/sci-libs/keras-applications-1.0.8-r1
 2201091144 metadata/md5-cache/sci-libs/keras-preprocessing-1.1.2
 2201091144 metadata/md5-cache/sci-libs/kissfft-131.1.0
 2201091144 metadata/md5-cache/sci-libs/kissfft-9999
-2201090440 metadata/md5-cache/sci-libs/libqalculate-3.22.0
 2201091144 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r2
 2201091144 metadata/md5-cache/sci-libs/libsigrok-0.5.2-r3
 2201091144 metadata/md5-cache/sci-libs/libsigrok-9999
@@ -54849,8 +54868,11 @@
 2201091144 metadata/md5-cache/sci-libs/vtk-8.2.0-r6
 2201091144 metadata/md5-cache/sci-libs/vtk-9.0.3-r3
 2201091144 metadata/md5-cache/sci-libs/vtk-9.1.0
+2201110240 metadata/md5-cache/sci-libs/Manifest.gz
+2201110240 metadata/md5-cache/sci-libs/gdal-3.4.1
+2201110210 metadata/md5-cache/sci-libs/gsl-2.7.1-r1
+2201101410 metadata/md5-cache/sci-libs/libqalculate-3.22.0
 2101170739 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
-2107261439 metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
 2110312244 metadata/md5-cache/sci-mathematics/geogebra-bin-5.0.604.0-r2
@@ -54868,10 +54890,7 @@
 2111220639 metadata/md5-cache/sci-mathematics/octave-epstk-2.4
 2112061039 metadata/md5-cache/sci-mathematics/gp2c-0.0.12
 2112131739 metadata/md5-cache/sci-mathematics/lrcalc-2.1
-2112170410 metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1
 2112211810 metadata/md5-cache/sci-mathematics/lcalc-2.0.5
-2112280310 metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
-2112281709 metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1
 2112291709 metadata/md5-cache/sci-mathematics/cliquer-1.22
 2201021453 metadata/md5-cache/sci-mathematics/4ti2-1.6.7-r1
 2201021453 metadata/md5-cache/sci-mathematics/agda-2.6.1.2
@@ -54941,7 +54960,6 @@
 2201021453 metadata/md5-cache/sci-mathematics/primesieve-7.7
 2201021453 metadata/md5-cache/sci-mathematics/prng-3.0.2-r3
 2201021453 metadata/md5-cache/sci-mathematics/prover9-2009.11a
-2201021453 metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
 2201022110 metadata/md5-cache/sci-mathematics/rstudio-1.3.1093-r1
 2201021453 metadata/md5-cache/sci-mathematics/sha1-polyml-5.6_p1
 2201021453 metadata/md5-cache/sci-mathematics/singular-4.2.0_p1
@@ -54957,7 +54975,6 @@
 2201021453 metadata/md5-cache/sci-mathematics/twelf-1.7.1-r1
 2201021453 metadata/md5-cache/sci-mathematics/vampire-4.6.1
 2201021453 metadata/md5-cache/sci-mathematics/verit-2021.06.2
-2201021453 metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
 2201021453 metadata/md5-cache/sci-mathematics/why3-for-spark-2020
 2201021453 metadata/md5-cache/sci-mathematics/why3-for-spark-2021
 2201021453 metadata/md5-cache/sci-mathematics/wxmaxima-20.12.2
@@ -54971,7 +54988,6 @@
 2201061240 metadata/md5-cache/sci-mathematics/lean-3.35.1-r2
 2201061240 metadata/md5-cache/sci-mathematics/lean-3.9999
 2201080610 metadata/md5-cache/sci-mathematics/lean-3.37.0
-2201091144 metadata/md5-cache/sci-mathematics/Manifest.gz
 2201091144 metadata/md5-cache/sci-mathematics/cryptominisat-5.8.0
 2201091144 metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
 2201091144 metadata/md5-cache/sci-mathematics/cvc4-1.8
@@ -54999,8 +55015,15 @@
 2201091144 metadata/md5-cache/sci-mathematics/slepc-3.16.0
 2201091144 metadata/md5-cache/sci-mathematics/stp-2.3.3-r1
 2201091144 metadata/md5-cache/sci-mathematics/z3-4.8.11b
-2201091144 metadata/md5-cache/sci-mathematics/z3-4.8.13
 2201091144 metadata/md5-cache/sci-mathematics/z3-4.8.14
+2201110340 metadata/md5-cache/sci-mathematics/Manifest.gz
+2201102040 metadata/md5-cache/sci-mathematics/alt-ergo-2.4.1-r1
+2201110340 metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
+2201102040 metadata/md5-cache/sci-mathematics/easycrypt-1.0_pre20211210-r1
+2201110340 metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+2201102040 metadata/md5-cache/sci-mathematics/psmt2-frontend-0.4.0
+2201110340 metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
+2201110210 metadata/md5-cache/sci-mathematics/z3-4.8.13
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2104282209 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2106180939 metadata/md5-cache/sci-misc/netlogo-bin-6.0.2-r1
@@ -56316,9 +56339,7 @@
 2201021453 metadata/md5-cache/sys-apps/grepcidr-2.0
 2201021453 metadata/md5-cache/sys-apps/groff-1.22.4
 2201021453 metadata/md5-cache/sys-apps/gsmartcontrol-1.1.3
-2201021453 metadata/md5-cache/sys-apps/haveged-1.9.14-r1
 2201021453 metadata/md5-cache/sys-apps/haveged-1.9.15
-2201021453 metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
 2201021453 metadata/md5-cache/sys-apps/hdparm-9.62
 2201021453 metadata/md5-cache/sys-apps/heirloom-tools-070715-r4
 2201021453 metadata/md5-cache/sys-apps/highway-1.1.0
@@ -56339,11 +56360,9 @@
 2201021453 metadata/md5-cache/sys-apps/iotools-1.5
 2201021453 metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r1
 2201021453 metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r2
-2201021453 metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
 2201021453 metadata/md5-cache/sys-apps/ipmiutil-3.0.6
 2201021453 metadata/md5-cache/sys-apps/ipmiutil-3.0.9
 2201021453 metadata/md5-cache/sys-apps/ipmiutil-3.1.6
-2201021453 metadata/md5-cache/sys-apps/ipmiutil-3.1.7
 2201021453 metadata/md5-cache/sys-apps/iproute2-5.13.0-r1
 2201021453 metadata/md5-cache/sys-apps/iproute2-5.14.0
 2201021453 metadata/md5-cache/sys-apps/iproute2-5.15.0
@@ -56538,7 +56557,6 @@
 2201062309 metadata/md5-cache/sys-apps/shadow-4.9-r4
 2201071109 metadata/md5-cache/sys-apps/fd-8.3.1
 2201072039 metadata/md5-cache/sys-apps/hwinfo-21.80
-2201092110 metadata/md5-cache/sys-apps/Manifest.gz
 2201091144 metadata/md5-cache/sys-apps/accountsservice-0.6.55-r1
 2201091144 metadata/md5-cache/sys-apps/apparmor-utils-3.0.1
 2201091144 metadata/md5-cache/sys-apps/apparmor-utils-3.0.3
@@ -56570,9 +56588,6 @@
 2201091144 metadata/md5-cache/sys-apps/flatpak-1.10.5
 2201091144 metadata/md5-cache/sys-apps/flatpak-1.12.2
 2201091144 metadata/md5-cache/sys-apps/flatpak-1.12.2-r1
-2201091144 metadata/md5-cache/sys-apps/fwupd-1.5.9-r1
-2201091144 metadata/md5-cache/sys-apps/fwupd-1.6.4-r1
-2201091144 metadata/md5-cache/sys-apps/fwupd-1.7.1
 2201091144 metadata/md5-cache/sys-apps/fwupd-1.7.2-r1
 2201091144 metadata/md5-cache/sys-apps/fwupd-efi-1.1
 2201091144 metadata/md5-cache/sys-apps/gcp-0.2.1
@@ -56619,8 +56634,6 @@
 2201091144 metadata/md5-cache/sys-apps/selinux-python-9999
 2201091144 metadata/md5-cache/sys-apps/systemd-249.6-r1
 2201091144 metadata/md5-cache/sys-apps/systemd-249.7
-2201091144 metadata/md5-cache/sys-apps/systemd-250-r1
-2201091144 metadata/md5-cache/sys-apps/systemd-250.1
 2201091144 metadata/md5-cache/sys-apps/systemd-9999
 2201091144 metadata/md5-cache/sys-apps/systemd-tmpfiles-249.5
 2201091144 metadata/md5-cache/sys-apps/tuned-2.15.0-r1
@@ -56630,6 +56643,14 @@
 2201091144 metadata/md5-cache/sys-apps/util-linux-2.37.2-r3
 2201091144 metadata/md5-cache/sys-apps/util-linux-9999
 2201091144 metadata/md5-cache/sys-apps/x86info-1.30_p20190617
+2201110710 metadata/md5-cache/sys-apps/Manifest.gz
+2201101740 metadata/md5-cache/sys-apps/fwupd-1.7.3
+2201110610 metadata/md5-cache/sys-apps/hdparm-9.63
+2201101240 metadata/md5-cache/sys-apps/ipmitool-1.8.18_p20201004-r3
+2201101240 metadata/md5-cache/sys-apps/ipmiutil-3.1.7
+2201110410 metadata/md5-cache/sys-apps/systemd-249.7-r1
+2201110410 metadata/md5-cache/sys-apps/systemd-250.2
+2201110710 metadata/md5-cache/sys-apps/systemd-tmpfiles-249.7
 2109031439 metadata/md5-cache/sys-auth/docker_auth-1.3.1
 2109031439 metadata/md5-cache/sys-auth/docker_auth-1.4.0
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
@@ -56877,7 +56898,6 @@
 2201061240 metadata/md5-cache/sys-boot/os-prober-1.79-r1
 2201061240 metadata/md5-cache/sys-boot/os-prober-9999
 2201061240 metadata/md5-cache/sys-boot/plymouth-0.9.5-r1
-2201061240 metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225
 2201061240 metadata/md5-cache/sys-boot/plymouth-9999
 2201061240 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201022
 2201061240 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20201201
@@ -56886,9 +56906,10 @@
 2201061240 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20211029
 2201061240 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20211118
 2201061240 metadata/md5-cache/sys-boot/raspberrypi-firmware-9999
-2201091144 metadata/md5-cache/sys-boot/Manifest.gz
 2201091144 metadata/md5-cache/sys-boot/grub-9999
 2201091144 metadata/md5-cache/sys-boot/systemd-boot-249.6
+2201110840 metadata/md5-cache/sys-boot/Manifest.gz
+2201110840 metadata/md5-cache/sys-boot/plymouth-0.9.6_pre20211225
 2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
 2002230040 metadata/md5-cache/sys-cluster/fake-1.1.10
 2103132309 metadata/md5-cache/sys-cluster/libcircle-0.3.0
@@ -57033,7 +57054,6 @@
 2201021453 metadata/md5-cache/sys-cluster/minikube-1.24.0
 2201022110 metadata/md5-cache/sys-cluster/mpe2-1.0.6_p1-r2
 2201021453 metadata/md5-cache/sys-cluster/mpich-3.0.4-r2
-2201021453 metadata/md5-cache/sys-cluster/mpich-3.4.3
 2201021453 metadata/md5-cache/sys-cluster/mpich2-1.5-r2
 2201021453 metadata/md5-cache/sys-cluster/nomad-1.0.9
 2201021453 metadata/md5-cache/sys-cluster/nullmpi-0.7
@@ -57087,7 +57107,6 @@
 2201041510 metadata/md5-cache/sys-cluster/torque-4.1.7-r2
 2201041510 metadata/md5-cache/sys-cluster/torque-4.2.10-r2
 2201041510 metadata/md5-cache/sys-cluster/torque-6.0.4-r2
-2201100210 metadata/md5-cache/sys-cluster/Manifest.gz
 2201091144 metadata/md5-cache/sys-cluster/ceph-14.2.22-r1
 2201091144 metadata/md5-cache/sys-cluster/ceph-15.2.15-r2
 2201091144 metadata/md5-cache/sys-cluster/ceph-16.2.5
@@ -57108,7 +57127,6 @@
 2201091144 metadata/md5-cache/sys-cluster/glusterfs-9.4
 2201091144 metadata/md5-cache/sys-cluster/hpx-1.7.1-r1
 2201091144 metadata/md5-cache/sys-cluster/hpx-9999
-2201100210 metadata/md5-cache/sys-cluster/k3s-1.23.1
 2201091144 metadata/md5-cache/sys-cluster/pacemaker-2.0.5
 2201091144 metadata/md5-cache/sys-cluster/pacemaker-2.1.2
 2201091144 metadata/md5-cache/sys-cluster/rdma-core-30.0-r2
@@ -57123,6 +57141,9 @@
 2201091144 metadata/md5-cache/sys-cluster/rdma-core-9999
 2201091144 metadata/md5-cache/sys-cluster/sanlock-3.8.2
 2201091144 metadata/md5-cache/sys-cluster/sanlock-3.8.4
+2201110210 metadata/md5-cache/sys-cluster/Manifest.gz
+2201101740 metadata/md5-cache/sys-cluster/k3s-1.23.1
+2201110210 metadata/md5-cache/sys-cluster/mpich-3.4.3
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.64-r1
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2110200709 metadata/md5-cache/sys-devel/autoconf-2.71-r1
@@ -57258,10 +57279,8 @@
 2201062240 metadata/md5-cache/sys-devel/binutils-9999
 2201070409 metadata/md5-cache/sys-devel/gcc-11.2.1_p20211127
 2201070409 metadata/md5-cache/sys-devel/gcc-11.2.1_pre9999
-2201070409 metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
 2201062309 metadata/md5-cache/sys-devel/kgcc64-11.2.0
 2201062309 metadata/md5-cache/sys-devel/kgcc64-9.4.0
-2201091810 metadata/md5-cache/sys-devel/Manifest.gz
 2201091144 metadata/md5-cache/sys-devel/automake-1.16.3-r1
 2201091144 metadata/md5-cache/sys-devel/automake-1.16.4
 2201091144 metadata/md5-cache/sys-devel/automake-1.16.5
@@ -57297,6 +57316,8 @@
 2201091144 metadata/md5-cache/sys-devel/rust-std-1.54.0
 2201091144 metadata/md5-cache/sys-devel/rust-std-1.55.0
 2201091144 metadata/md5-cache/sys-devel/rust-std-1.56.1
+2201101640 metadata/md5-cache/sys-devel/Manifest.gz
+2201101640 metadata/md5-cache/sys-devel/gcc-12.0.0_pre9999
 2201021453 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2201021453 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
 2201021453 metadata/md5-cache/sys-fabric/infinipath-psm-3.2
@@ -57429,7 +57450,6 @@
 2201021453 metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4
 2201021453 metadata/md5-cache/sys-fs/atari-fdisk-0.7.1.5.4-r1
 2201021453 metadata/md5-cache/sys-fs/btrfsmaintenance-0.4.2
-2201021453 metadata/md5-cache/sys-fs/btrfsmaintenance-0.5
 2201021453 metadata/md5-cache/sys-fs/cachefilesd-0.10.10-r1
 2201021453 metadata/md5-cache/sys-fs/cachefilesd-0.10.9
 2201021453 metadata/md5-cache/sys-fs/compsize-1.3
@@ -57559,7 +57579,6 @@
 2201061240 metadata/md5-cache/sys-fs/lessfs-1.7.0-r2
 2201061240 metadata/md5-cache/sys-fs/zfs-auto-snapshot-1.2.4-r1
 2201061240 metadata/md5-cache/sys-fs/zfs-auto-snapshot-9999
-2201091440 metadata/md5-cache/sys-fs/Manifest.gz
 2201091144 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.1
 2201091144 metadata/md5-cache/sys-fs/android-file-transfer-linux-4.2
 2201091144 metadata/md5-cache/sys-fs/android-file-transfer-linux-9999
@@ -57573,7 +57592,6 @@
 2201091144 metadata/md5-cache/sys-fs/cryfs-0.10.3-r1
 2201091144 metadata/md5-cache/sys-fs/fuse-3.10.4
 2201091144 metadata/md5-cache/sys-fs/fuse-3.10.5
-2201091440 metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
 2201091144 metadata/md5-cache/sys-fs/mergerfs-tools-0_p20210502-r2
 2201090440 metadata/md5-cache/sys-fs/mtools-4.0.37
 2201091144 metadata/md5-cache/sys-fs/ubi_reader-0.7.0
@@ -57588,6 +57606,9 @@
 2201091144 metadata/md5-cache/sys-fs/zfs-2.0.7
 2201091144 metadata/md5-cache/sys-fs/zfs-2.1.2-r1
 2201091144 metadata/md5-cache/sys-fs/zfs-9999
+2201110540 metadata/md5-cache/sys-fs/Manifest.gz
+2201110540 metadata/md5-cache/sys-fs/btrfsmaintenance-0.5
+2201110210 metadata/md5-cache/sys-fs/inotify-tools-3.21.9.6
 2003261841 metadata/md5-cache/sys-kernel/installkernel-gentoo-1
 2104060140 metadata/md5-cache/sys-kernel/installkernel-gentoo-2
 2106161909 metadata/md5-cache/sys-kernel/installkernel-gentoo-3
@@ -57612,14 +57633,6 @@
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-9999
 2201021453 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.7
 2201021453 metadata/md5-cache/sys-kernel/genkernel-4.0.10
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168
-2201021453 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169
 2201041510 metadata/md5-cache/sys-kernel/cryptodev-1.11
 2201041510 metadata/md5-cache/sys-kernel/cryptodev-1.12
 2201041510 metadata/md5-cache/sys-kernel/cryptodev-9999
@@ -57629,9 +57642,6 @@
 2201041510 metadata/md5-cache/sys-kernel/kpatch-0.6.3-r1
 2201041510 metadata/md5-cache/sys-kernel/kpatch-0.7.1-r1
 2201041510 metadata/md5-cache/sys-kernel/kpatch-9999
-2201060339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90
-2201060339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13
-2201060339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170
 2201070540 metadata/md5-cache/sys-kernel/git-sources-5.16_rc1
 2201070540 metadata/md5-cache/sys-kernel/git-sources-5.16_rc2
 2201070540 metadata/md5-cache/sys-kernel/git-sources-5.16_rc3
@@ -57684,7 +57694,6 @@
 2201070540 metadata/md5-cache/sys-kernel/rt-sources-5.4.161_p67
 2201070540 metadata/md5-cache/sys-kernel/zen-sources-5.14.15
 2201070540 metadata/md5-cache/sys-kernel/zen-sources-5.15.10
-2201100140 metadata/md5-cache/sys-kernel/Manifest.gz
 2201091144 metadata/md5-cache/sys-kernel/bliss-initramfs-8.1.0-r1
 2201091144 metadata/md5-cache/sys-kernel/bliss-initramfs-9.3.0
 2201091144 metadata/md5-cache/sys-kernel/genkernel-4.2.5
@@ -57746,6 +57755,21 @@
 2201100140 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.90
 2201100140 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.13
 2201100140 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.170
+2201110810 metadata/md5-cache/sys-kernel/Manifest.gz
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.88
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.89
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.90
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.14.21-r1
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.11
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.12
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.13
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.168
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.169
+2201110810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.170
+2201101240 metadata/md5-cache/sys-kernel/gentoo-sources-5.16.0
+2201110040 metadata/md5-cache/sys-kernel/linux-headers-5.16
+2201101210 metadata/md5-cache/sys-kernel/vanilla-sources-5.16.0
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 2106231354 metadata/md5-cache/sys-libs/fortify-headers-9999
 2104180939 metadata/md5-cache/sys-libs/freeipmi-1.5.7
@@ -57977,10 +58001,10 @@
 2201051309 metadata/md5-cache/sys-power/iasl-20200717
 2201091144 metadata/md5-cache/sys-power/acpilight-1.2-r1
 2201091144 metadata/md5-cache/sys-power/acpilight-1.2-r3
-2201092340 metadata/md5-cache/sys-power/cpupower-5.12
 2201091144 metadata/md5-cache/sys-power/switcheroo-control-2.4
-2201101040 metadata/md5-cache/sys-power/Manifest.gz
 2201101040 metadata/md5-cache/sys-power/thermald-2.4.7
+2201110210 metadata/md5-cache/sys-power/Manifest.gz
+2201110210 metadata/md5-cache/sys-power/cpupower-5.12
 2110161809 metadata/md5-cache/sys-process/bashtop-0.9.25
 2107212209 metadata/md5-cache/sys-process/cronbase-0.3.7-r8
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
@@ -58226,8 +58250,6 @@
 2108241439 metadata/md5-cache/virtual/tmpfiles-0-r1
 2109270139 metadata/md5-cache/virtual/ttf-fonts-1-r1
 2108150539 metadata/md5-cache/virtual/udev-217-r3
-2108110511 metadata/md5-cache/virtual/w3m-0
-2106300139 metadata/md5-cache/virtual/w3m-1
 1912222309 metadata/md5-cache/virtual/wine-0-r7
 2105131709 metadata/md5-cache/virtual/yacc-0
 2111220609 metadata/md5-cache/virtual/dotnet-sdk-6.0
@@ -58242,7 +58264,6 @@
 2201021453 metadata/md5-cache/virtual/acl-0-r2
 2201021453 metadata/md5-cache/virtual/fam-0-r1
 2201021453 metadata/md5-cache/virtual/glu-9.0-r2
-2201021453 metadata/md5-cache/virtual/jack-2
 2201021453 metadata/md5-cache/virtual/jpeg-100
 2201021453 metadata/md5-cache/virtual/jpeg-compat-62
 2201021453 metadata/md5-cache/virtual/krb5-0-r1
@@ -58278,10 +58299,12 @@
 2201060339 metadata/md5-cache/virtual/dist-kernel-5.15.13
 2201060339 metadata/md5-cache/virtual/dist-kernel-5.4.170
 2201062139 metadata/md5-cache/virtual/perl-CPAN-2.290.0
-2201100140 metadata/md5-cache/virtual/Manifest.gz
 2201100140 metadata/md5-cache/virtual/linux-sources-3-r6
 2201091144 metadata/md5-cache/virtual/python-cffi-1
 2201091144 metadata/md5-cache/virtual/python-greenlet-1.0-r2
+2201110540 metadata/md5-cache/virtual/Manifest.gz
+2201101540 metadata/md5-cache/virtual/jack-2
+2201110540 metadata/md5-cache/virtual/w3m-1
 2109031840 metadata/md5-cache/www-apache/libapreq2-2.15-r1
 2109031840 metadata/md5-cache/www-apache/libapreq2-2.16
 2109031840 metadata/md5-cache/www-apache/mod_authnz_external-9999
@@ -58499,7 +58522,6 @@
 2201041510 metadata/md5-cache/www-client/firefox-bin-91.4.0
 2201041510 metadata/md5-cache/www-client/firefox-bin-95.0.1
 2201051209 metadata/md5-cache/www-client/google-chrome-97.0.4692.71
-2201050010 metadata/md5-cache/www-client/google-chrome-beta-97.0.4692.71
 2201050010 metadata/md5-cache/www-client/google-chrome-unstable-98.0.4758.9
 2201050010 metadata/md5-cache/www-client/microsoft-edge-beta-97.0.1072.41
 2201050010 metadata/md5-cache/www-client/microsoft-edge-dev-98.0.1100.3
@@ -58517,7 +58539,6 @@
 2201060109 metadata/md5-cache/www-client/opera-beta-83.0.4254.14
 2201060109 metadata/md5-cache/www-client/opera-developer-84.0.4284.0
 2201062339 metadata/md5-cache/www-client/microsoft-edge-97.0.1072.55
-2201091310 metadata/md5-cache/www-client/Manifest.gz
 2201091144 metadata/md5-cache/www-client/chromium-96.0.4664.110
 2201091144 metadata/md5-cache/www-client/chromium-97.0.4692.71
 2201091144 metadata/md5-cache/www-client/chromium-98.0.4758.9
@@ -58539,6 +58560,8 @@
 2201091144 metadata/md5-cache/www-client/seamonkey-2.53.9-r1
 2201091144 metadata/md5-cache/www-client/seamonkey-2.53.9.1-r1
 2201091310 metadata/md5-cache/www-client/vivaldi-5.0.2497.35
+2201102310 metadata/md5-cache/www-client/Manifest.gz
+2201102310 metadata/md5-cache/www-client/google-chrome-beta-98.0.4758.48
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 2103251709 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
@@ -58574,11 +58597,11 @@
 2201021453 metadata/md5-cache/www-plugins/lightspark-0.8.4
 2201021453 metadata/md5-cache/www-plugins/lightspark-0.8.5
 2201051209 metadata/md5-cache/www-plugins/chrome-binary-plugins-97.0.4692.71
-2201050010 metadata/md5-cache/www-plugins/chrome-binary-plugins-97.0.4692.71_beta
 2201050010 metadata/md5-cache/www-plugins/chrome-binary-plugins-98.0.4758.9_alpha
 2201050010 metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
-2201091144 metadata/md5-cache/www-plugins/Manifest.gz
 2201091144 metadata/md5-cache/www-plugins/passff-host-1.2.3-r1
+2201102310 metadata/md5-cache/www-plugins/Manifest.gz
+2201102310 metadata/md5-cache/www-plugins/chrome-binary-plugins-98.0.4758.48_beta
 2012311940 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2112112311 metadata/md5-cache/www-servers/caddy-2.0.0
 2201021453 metadata/md5-cache/www-servers/adsf-1.4.3
@@ -58783,17 +58806,17 @@
 2201041510 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 2201041510 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2201041339 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-390.147
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10
-2201061240 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20
-2201091144 metadata/md5-cache/x11-drivers/Manifest.gz
 2201091144 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
 2201091144 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r1
+2201110040 metadata/md5-cache/x11-drivers/Manifest.gz
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-390.147
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-460.91.03-r2
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.16
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-470.94
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-495.44-r2
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r10
+2201110040 metadata/md5-cache/x11-drivers/nvidia-drivers-495.46-r20
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.0.34
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.19
 2108090910 metadata/md5-cache/x11-libs/c++-gtk-utils-2.2.20
@@ -58838,7 +58861,6 @@
 2201022110 metadata/md5-cache/x11-libs/libSM-1.2.3-r1
 2201021453 metadata/md5-cache/x11-libs/libX11-1.7.2
 2201021453 metadata/md5-cache/x11-libs/libX11-1.7.3
-2201021453 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
 2201021453 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
 2201021639 metadata/md5-cache/x11-libs/libXaw-1.0.14
 2201021453 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
@@ -58848,7 +58870,6 @@
 2201021453 metadata/md5-cache/x11-libs/libXext-1.3.4
 2201021453 metadata/md5-cache/x11-libs/libXfont2-9999
 2201021639 metadata/md5-cache/x11-libs/libXft-2.3.4
-2201021453 metadata/md5-cache/x11-libs/libXi-1.8
 2201021453 metadata/md5-cache/x11-libs/libXmu-1.1.3
 2201021639 metadata/md5-cache/x11-libs/libXpm-3.5.13
 2201021453 metadata/md5-cache/x11-libs/libXpresent-1.0.0-r1
@@ -58860,7 +58881,6 @@
 2201021453 metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
 2201021453 metadata/md5-cache/x11-libs/libXvMC-1.0.12-r1
 2201021453 metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
-2201021453 metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
 2201021453 metadata/md5-cache/x11-libs/libclxclient-3.9.2
 2201021453 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
 2201021453 metadata/md5-cache/x11-libs/libdlo-0.1.2-r1
@@ -58939,7 +58959,6 @@
 2201070139 metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0-r2
 2201070139 metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r3
 2201070139 metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r3
-2201091310 metadata/md5-cache/x11-libs/Manifest.gz
 2201091144 metadata/md5-cache/x11-libs/colord-gtk-0.2.0
 2201091144 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6
 2201091144 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6-r1
@@ -58973,6 +58992,10 @@
 2201091144 metadata/md5-cache/x11-libs/vte-0.66.2
 2201091144 metadata/md5-cache/x11-libs/xapps-2.2.1
 2201091144 metadata/md5-cache/x11-libs/xapps-2.2.4
+2201101609 metadata/md5-cache/x11-libs/Manifest.gz
+2201101609 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
+2201101609 metadata/md5-cache/x11-libs/libXi-1.8
+2201101609 metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -59309,7 +59332,6 @@
 2201061240 metadata/md5-cache/x11-misc/viewglob-2.0.4-r1
 2201061240 metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
 2201080039 metadata/md5-cache/x11-misc/rofi-1.7.2
-2201091910 metadata/md5-cache/x11-misc/Manifest.gz
 2201091144 metadata/md5-cache/x11-misc/alacarte-3.36.0
 2201091144 metadata/md5-cache/x11-misc/alacarte-3.42.0
 2201091144 metadata/md5-cache/x11-misc/arandr-0.1.10-r2
@@ -59336,7 +59358,6 @@
 2201091144 metadata/md5-cache/x11-misc/mozo-1.24.1
 2201091144 metadata/md5-cache/x11-misc/mugshot-0.4.3
 2201091144 metadata/md5-cache/x11-misc/picom-8-r1
-2201091144 metadata/md5-cache/x11-misc/picom-8.2-r2
 2201091144 metadata/md5-cache/x11-misc/picom-9999
 2201091144 metadata/md5-cache/x11-misc/polybar-3.5.6
 2201091144 metadata/md5-cache/x11-misc/polybar-3.5.7
@@ -59367,6 +59388,8 @@
 2201091144 metadata/md5-cache/x11-misc/zim-0.74.1
 2201091144 metadata/md5-cache/x11-misc/zim-0.74.2
 2201091144 metadata/md5-cache/x11-misc/zim-0.74.3
+2201110540 metadata/md5-cache/x11-misc/Manifest.gz
+2201110540 metadata/md5-cache/x11-misc/picom-8.2-r2
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -59943,7 +59966,6 @@
 2201091144 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
 2112201210 metadata/md5-cache/app-containers/cadvisor-0.36.0
 2112201210 metadata/md5-cache/app-containers/containerd-1.4.11
-2112201210 metadata/md5-cache/app-containers/containers-storage-1.30.0
 2112201210 metadata/md5-cache/app-containers/cri-o-1.21.0
 2112201210 metadata/md5-cache/app-containers/cri-o-1.21.4
 2112201210 metadata/md5-cache/app-containers/cri-o-1.22.1
@@ -60003,7 +60025,6 @@
 2201072139 metadata/md5-cache/app-containers/docker-20.10.12-r1
 2201072139 metadata/md5-cache/app-containers/docker-cli-20.10.12
 2201072139 metadata/md5-cache/app-containers/runc-1.0.3
-2201092239 metadata/md5-cache/app-containers/Manifest.gz
 2201091144 metadata/md5-cache/app-containers/crun-0.19.1-r1
 2201091144 metadata/md5-cache/app-containers/crun-1.2
 2201091144 metadata/md5-cache/app-containers/crun-1.3
@@ -60014,6 +60035,7 @@
 2201092239 metadata/md5-cache/app-containers/flannel-0.16.1
 2201091144 metadata/md5-cache/app-containers/sen-0.6.1_p20200905
 2201092210 metadata/md5-cache/app-containers/snapd-2.54.2
+2201101809 metadata/md5-cache/app-containers/Manifest.gz
 2112190139 metadata/md5-cache/sec-keys/openpgp-keys-adamspiers-20210426
 2112190139 metadata/md5-cache/sec-keys/openpgp-keys-alexbarton-20210416
 2112190139 metadata/md5-cache/sec-keys/openpgp-keys-bcl-20210128
@@ -60050,4 +60072,4 @@
 2201020139 metadata/md5-cache/sec-keys/openpgp-keys-gentoo-release-20220101
 2201061409 metadata/md5-cache/sec-keys/Manifest.gz
 2201061409 metadata/md5-cache/sec-keys/openpgp-keys-kovidgoyal-20220106
-2201101040 metadata/md5-cache/Manifest.gz
+2201110840 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 22d3a24f1e53..1601ab28cc3b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jan 2022 08:00:01 +0000
+Tue, 11 Jan 2022 06:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 8c590a7da4c7..6bfce5a8b188 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-5fda374225e808a75c2e1842d1dc03f44f587551 1641800009 2022-01-10T07:33:29+00:00
+d80cfec8a88da6bbfd86841e9c6bf06760ea22f0 1641878095 2022-01-11T05:14:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 719984abefd0..6caf907f9892 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1641800401 Mon 10 Jan 2022 07:40:01 AM UTC
+1641879302 Tue 11 Jan 2022 05:35:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e42fb3e12047..846413f7b840 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 10 Jan 2022 07:39:17 +0000
+Tue, 11 Jan 2022 05:39:18 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d10146547b45..e5dd29ef48b2 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 108e2da68f82..ab77410c26b7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -7,7 +7,7 @@ DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30
 DIST wireshark-3.6.0.tar.xz 39687684 BLAKE2B 17af7046662087a18d0708ab0b5bc00bd4d43db848e14217e046dd551e57decd0a258f67c7fd82e1e10e0dceb249618e41ded5a6cd2e0a79d2ee5b7bf397cea7 SHA512 7c8afdee8957eb794030e0818a686c0efabc8ad9547449f434fc7299c7b7e624347698fdc7a42afac150eb86c8ca3d1d6360c29525bb35946619c4636f721094
 DIST wireshark-3.6.1.tar.xz 39632140 BLAKE2B 49a7385946001a3b4a9890751cfea678c8aefcf8180e1a3008085a453d34e458d60d071975eeb585b92c6d9a210b732cc9fdb4fd952f1a9d74decad79c145fe0 SHA512 8b036d623010a5c4ece22de869847b3d999dac1c1e874e957c091a65c18351d9a1cc400828a70caf3c9f9900f8971dc585a5fafb7b08d446cd5d1d68938b0e81
 EBUILD wireshark-3.4.10.ebuild 7361 BLAKE2B 65370daecce9dffe999ef0099dea5aedd5e7b4a28689c0cfb76847be380ac1d7b0ff09433bc446c3ea0a545bedce0d8ddb259d7d55c2f4492ed4e8dd4f48aa9f SHA512 03549a3ae6ec4e00c16c4d48f016801a848aa8d7d7913c0800c8376d74b31117deeacf442cc901f5c938b82673eec887b00ff695414d9d2873388b79d0995c12
-EBUILD wireshark-3.4.11.ebuild 7460 BLAKE2B 28cd9ce750b3c184220e6466bacdaedd9236e24a28d1baabafafb656e204ccf098ce58e54f19ffbb23e289ac7066bdd87814bcdf34ff96724abb393733547798 SHA512 2ba1fe0a97ec5e82797e3130dc09e784147b79979ebeb9835dd1774d66edb71a929847ea9085ef88bf9c89a25f38aa310b126107a356051e06d50f6affbf2411
+EBUILD wireshark-3.4.11.ebuild 7458 BLAKE2B 363ae8e38119cc1fab1da1e3d6048648d3d2292ac884872b83c9cce88394b4060abb3f2014799975c4b58ec8e8556c49ee97fb034c6757ccd76c7525c04d85cc SHA512 d434cf292543408131b06c360718efeeee4062eded238708561d613cc7f5043b863c6bf7d02b8db458f9cf21147d699b5d86870117aaeec51097b603bb784e61
 EBUILD wireshark-3.6.0-r1.ebuild 7239 BLAKE2B 71572576c94fdd09acd7eef362b055e3379544533d153a2076e05cec90dbaec98cd152969507723c49ea7fcd5bdc4f46743ef6d334d2393aa46d4a55ec4962ab SHA512 498b426faf4c297950e8aecf71b1409dfb0de1ed2a8f345d386d6c7b91860ea11107637ec55a54a76a8872eb7cc4dcb8c54c69f420078252953fffcc9f085830
 EBUILD wireshark-3.6.1.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
 EBUILD wireshark-9999.ebuild 7263 BLAKE2B 7a54fbd432604ec99bfafc9b5d55b471f1fd79b6747d220c2da5756b0757deb2b99916afed180b84eb74212c9d7e67d4cb03f6b8fd270101bfd20840fb9f6f28 SHA512 5765ffe3414b42e2ae3a55246d0d1e98aed8d6bf97de8e6c868e93f2bfd9c498a85f346a58739a4e2c5d0716f466b804f13bc8267f1b3dd99e5bd59e87464686
diff --git a/net-analyzer/wireshark/wireshark-3.4.11.ebuild b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
index 274997e1e66d..509b6ba57993 100644
--- a/net-analyzer/wireshark/wireshark-3.4.11.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.11.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index b1fc8d09eb50..67b782de2608 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/picocom/Manifest b/net-dialup/picocom/Manifest
index ea2dbaf0733b..c03968520a8d 100644
--- a/net-dialup/picocom/Manifest
+++ b/net-dialup/picocom/Manifest
@@ -1,3 +1,3 @@
 DIST picocom-3.1.tar.gz 121686 BLAKE2B e7f478e7d00e791fb2ea7248ff31e480d05c5c1fe35941f85689a5df19646175e3c698222e430786874c0508c44a0c1f8ecc4b69c889a40e7411c7b54c67249a SHA512 ff1888494ae0e24a151e19ac3abcdbb499e42eb1abcea401a7c6c3b532be3d64ddd81a511641d1ce0119dc5da3d2804ce8eaff262a9d578bfe8e22fdf6e55ad1
-EBUILD picocom-3.1.ebuild 794 BLAKE2B 20086968fd8d6aacdfd1eff211e1cd42d53ab6e62a5ea6d392e19d76aac612276c68398423e8eedf84015250e1e1f7fbe35869c3180f79045c7e53b6ba1fe76a SHA512 a564ea609bd67d3b15ce2672708395b275b60865e82b4a8711455c9821d5a534713ae55077bb90b83804cf7c1aedc6ae2729f19e258a9db100a5e0b80133aeec
+EBUILD picocom-3.1.ebuild 801 BLAKE2B 9e2ef949bc3f736ea305b9ff69782cc4da1736a2c0e82370522d88efa30a531b5b52015c7b53aec565b7cb824687059b22ae91f30ee980ee82b190f3dbe1aa3f SHA512 e05c72adb7bbc7c99dadf0ed96f07a98c7aa936cf70dbdc47ffbda6c50f5740aef3f3aa7057fce41f1a9da3a82a22e50a2aa55270aca0147ed086ab7771c9955
 MISC metadata.xml 336 BLAKE2B e6f0f075ee10d90adb3debe521afaa7205975b459014179fa938967e3e253b756b296fd7274b0efa7f421923e20eb3b745fdd20fef75668668946f723deb8be4 SHA512 0aab2d629ce1fa60db9b3132a48740279a3702578a5672aa3bbf7ffaced4c823bd980b15bdb7630071517f846145c068982f079f0df269a84dc5d4f652b12f6d
diff --git a/net-dialup/picocom/picocom-3.1.ebuild b/net-dialup/picocom/picocom-3.1.ebuild
index 3640ad63dc90..675fe9f9aaa6 100644
--- a/net-dialup/picocom/picocom-3.1.ebuild
+++ b/net-dialup/picocom/picocom-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/npat-efault/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 src_compile() {
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index c6b5d81a5b17..e1662a6024c6 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 82e34be8a389..c6e0905d87e4 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,4 +1,6 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 DIST firewalld-1.0.2.tar.gz 1307963 BLAKE2B 11a7710981ba39f4bcb8431558e5b558a60d77fb1aa3fe4c5febc37f2eab754a6608e4820b6318c963bb6290a9b26ae9e162d9e46277c34dfdacac46ba938b21 SHA512 fbb60a6f52e5be26051303769b6521a6c775d450ab6704f2d63fe38dc6194976ad36f1d924380d09012f41ab6dab1f6f78c5a859fbfe00c52cdff40d82e62283
+DIST firewalld-1.0.3.tar.gz 1310433 BLAKE2B c414a347ca1008e010bf8393e45ffff38b5845fde7cc53b810276e46d67c6302cfe93a59665ad6ebc533b3ae04908f9089546b109888f60f0c798f3cac62a30d SHA512 0ba423e8c294d143f31bbdac13553e58cd0a3429812b555829c34f411478c26cffcc40095218539155e9ed7fe7e360fb8dd85a572a8ad9d5650b0cc206fe42a1
 EBUILD firewalld-1.0.2.ebuild 4867 BLAKE2B 5e97f6a478175dc881495f101a0512903605f1c00eefe3a92df8ab911201f59f6d8a4f5424f85b3bfbf3022ecfb90e07aa6e94dbba6dae75de39d105f912a589 SHA512 15530ee582d0299945269fd321ef75d7a45366d94f09c82073a423cc60583ab926da8ee0a07cfdcc92011e96192a8092e77877f90a02693d57dcb3d9ab40c802
+EBUILD firewalld-1.0.3.ebuild 4866 BLAKE2B 6df55d8766851c6100a8612a6416cd39a3f239bc4269d785b92d6e1776d53a257cc982019e39edc505665da9cb7772bca800f6029cfa5f587dd7f133061a4c4a SHA512 d78b1b35aa8145c2e0b3fd662b5b8c5cf77fb0cb23cb7b4109eab667f6355c73893a4e00eb9b911c259a908e445559668f14f66ef6af0989b2fc7181273036d4
 MISC metadata.xml 587 BLAKE2B f4a873c64f1760c1d28f09886573b638053e23bc2562674b4c21b81414c66271ff8c168d3a98f402bb0d2a3f8982b29cbd77817f0eac346f0774b51ed014113d SHA512 47bd8f14d0eeae00a59fc0507dd178f4420381a8ba197535936acba3aae0344614f003647636c0361c5cc0ef86d2653d7ca175cdeb2d5fdbc8869c3e633df6ba
diff --git a/net-firewall/firewalld/firewalld-1.0.3.ebuild b/net-firewall/firewalld/firewalld-1.0.3.ebuild
new file mode 100644
index 000000000000..510d602c75ab
--- /dev/null
+++ b/net-firewall/firewalld/firewalld-1.0.3.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools bash-completion-r1 gnome2-utils linux-info plocale python-single-r1 systemd xdg-utils
+
+DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
+HOMEPAGE="https://firewalld.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="gui +nftables +iptables"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!!net-firewall/gshield
+	iptables? (
+		net-firewall/iptables[ipv6]
+		net-firewall/ebtables
+		net-firewall/ipset
+		nftables? ( net-firewall/nftables[xtables(+)] )
+	)
+	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gui? (
+			x11-libs/gtk+:3
+			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		)
+		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
+	')"
+DEPEND="${RDEPEND}
+	dev-libs/glib:2"
+BDEPEND=">=dev-util/intltool-0.35
+	sys-devel/gettext"
+
+RESTRICT="test" # bug 650760
+
+# Testsuite's Makefile.am calls missing(!)
+# ... but this seems to be consistent with the autoconf docs?
+# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
+QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
+
+PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
+
+pkg_setup() {
+	# See bug #830132 for the huge list
+	# We can probably narrow it down a bit but it's rather fragile
+	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER
+	~NETFILTER_ADVANCED
+	~NETFILTER_INGRESS
+	~NF_NAT_MASQUERADE
+	~NF_NAT_REDIRECT
+	~NF_TABLES_INET
+	~NF_TABLES_IPV4
+	~NF_TABLES_IPV6
+	~NF_CONNTRACK
+	~NF_CONNTRACK_BROADCAST
+	~NF_CONNTRACK_NETBIOS
+	~NF_CONNTRACK_TFTP
+	~NF_CT_NETLINK
+	~NF_CT_NETLINK_HELPER
+	~NF_DEFRAG_IPV4
+	~NF_DEFRAG_IPV6
+	~NF_NAT
+	~NF_NAT_TFTP
+	~NF_REJECT_IPV4
+	~NF_REJECT_IPV6
+	~NF_SOCKET_IPV4
+	~NF_SOCKET_IPV6
+	~NF_TABLES
+	~NF_TABLES_SET
+	~NF_TPROXY_IPV4
+	~NF_TPROXY_IPV6
+	~IP_NF_FILTER
+	~IP_NF_IPTABLES
+	~IP_NF_MANGLE
+	~IP_NF_NAT
+	~IP_NF_RAW
+	~IP_NF_SECURITY
+	~IP_NF_TARGET_MASQUERADE
+	~IP_NF_TARGET_REJECT
+	~IP6_NF_FILTER
+	~IP6_NF_IPTABLES
+	~IP6_NF_MANGLE
+	~IP6_NF_NAT
+	~IP6_NF_RAW
+	~IP6_NF_SECURITY
+	~IP6_NF_TARGET_MASQUERADE
+	~IP6_NF_TARGET_REJECT
+	~IP_SET
+	~NETFILTER_CONNCOUNT
+	~NETFILTER_NETLINK
+	~NETFILTER_NETLINK_OSF
+	~NETFILTER_NETLINK_QUEUE
+	~NETFILTER_SYNPROXY
+	~NETFILTER_XTABLES
+	~NETFILTER_XT_CONNMARK
+	~NETFILTER_XT_MATCH_CONNTRACK
+	~NETFILTER_XT_MATCH_MULTIPORT
+	~NETFILTER_XT_MATCH_STATE
+	~NETFILTER_XT_NAT
+	~NETFILTER_XT_TARGET_MASQUERADE
+	~NFT_COMPAT
+	~NFT_COUNTER
+	~NFT_CT
+	~NFT_FIB
+	~NFT_FIB_INET
+	~NFT_FIB_IPV4
+	~NFT_FIB_IPV6
+	~NFT_HASH
+	~NFT_LIMIT
+	~NFT_LOG
+	~NFT_MASQ
+	~NFT_NAT
+	~NFT_NET
+	~NFT_OBJREF
+	~NFT_QUEUE
+	~NFT_QUOTA
+	~NFT_REDIR
+	~NFT_REJECT
+	~NFT_REJECT_INET
+	~NFT_REJECT_IPV4
+	~NFT_REJECT_IPV6
+	~NFT_SOCKET
+	~NFT_SYNPROXY
+	~NFT_TPROXY
+	~NFT_TUNNEL
+	~NFT_XFRM"
+
+	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944
+	if kernel_is -lt 4 19; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	plocale_find_changes "po" "" ".po"
+	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
+}
+
+src_configure() {
+	python_setup
+
+	local econf_args=(
+		--enable-systemd
+		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
+		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
+		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
+		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
+		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
+		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
+		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	# Get rid of junk
+	rm -rf "${D}/etc/sysconfig/" || die
+
+	# For non-gui installs we need to remove GUI bits
+	if ! use gui; then
+		rm -rf "${D}/etc/xdg/autostart" || die
+		rm -f "${D}/usr/bin/firewall-applet" || die
+		rm -f "${D}/usr/bin/firewall-config" || die
+		rm -rf "${D}/usr/share/applications" || die
+		rm -rf "${D}/usr/share/icons" || die
+	fi
+
+	newinitd "${FILESDIR}"/firewalld.init firewalld
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 78a6604d5a45..42e6f33ea94f 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 94f69cfc30f1..0fad3841c9c6 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,17 +1,8 @@
-AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc
-AUX autofs-5.1.6-musl.patch 215 BLAKE2B 885442f26b482ec28734452d3a987759d761c8d21a4e1457fe9c04be928422473f9a1743b0355c5616486e74bd457faf170eb12b7bb3f790b33314205968f20a SHA512 643fb4453d89269cb2252c9e23f09da657fde4f0c14b8933b950e03c14b8723ec848ec2d5a44da4980895ff6d1cb63c3dfc6074de629a694a370410b270b3886
-AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6
-AUX autofs-5.1.7-glibc-2.34.patch 3439 BLAKE2B 9ad024413e1bbb0c2d953ee9355dc6ac6fbf13d4475a14f9183c5092c4850441a7b7f1809452c96d0020b4fb4105f6724e3f04b817ad5b143b9074662f35a87b SHA512 e22fa260123823fa6109d8b2737877a39e15c696ab1e506a8bdeb2a1feebaec965a577a645c9e9edd19547a2b2237e06191f91107b8025b985b7f4f3137685fa
-AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed
 AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4
 AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
-DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
-DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
 DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
 DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
-EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d
-EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d
-EBUILD autofs-5.1.8-r1.ebuild 3265 BLAKE2B 331e79abeb6ec778ac7ab0511955c50e6d44a8c95f938216cb19ba00e6b3d82d9c746694cb8070e80f51b0e7f10275423309f63364c4a293bb3ebf60e334a28b SHA512 2ac85218bfab07a00ebae135636d3459f785ca1ff91cc32cf2ff4ece315c09922dc9ca04be711d249c6fb97f606362dfd831c50e6a1f2911f629abca87b25ccd
+EBUILD autofs-5.1.8-r1.ebuild 3259 BLAKE2B 27a122bfcf7bf55d31b3e4651c3c5af068d38e3c09a40257003dd1ede60d8e5c19cf5df3d4cc97d7135e64c176a9fbfabbd1c9a5cd2612f5147de7517dad4ed8 SHA512 cc35dc82f3a51748fbdcf47c6358abb559bf3b811e6a10715fa86273112bd31aa4c980de2b21b748dcd5bd07b0d761249b15d4033029297fd2a8e422f166ed7d
 MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d
diff --git a/net-fs/autofs/autofs-5.1.6-r2.ebuild b/net-fs/autofs/autofs-5.1.6-r2.ebuild
deleted file mode 100644
index 616efb49c330..000000000000
--- a/net-fs/autofs/autofs-5.1.6-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
-	net-libs/libnsl:=
-	>=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc.patch"
-	"${FILESDIR}/${P}-musl.patch"
-	"${FILESDIR}/${P}-pid.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK
-
-	if kernel_is -ge 4 18; then
-		CONFIG_CHECK="~AUTOFS_FS"
-	else
-		CONFIG_CHECK="~AUTOFS4_FS"
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
-	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
-
-	# Install samples including autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	export DONTSTRIP=1
-	default
-}
-
-src_install() {
-	default
-	rmdir "${D}"/run
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.7-r1.ebuild b/net-fs/autofs/autofs-5.1.7-r1.ebuild
deleted file mode 100644
index dc05275932e3..000000000000
--- a/net-fs/autofs/autofs-5.1.7-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
-	net-libs/libnsl:=
-	>=sys-apps/util-linux-2.20
-	dmalloc? ( dev-libs/dmalloc[threads] )
-	ldap? ( >=net-nds/openldap-2.0
-		sasl? (
-			dev-libs/cyrus-sasl
-			dev-libs/libxml2
-			virtual/krb5
-		)
-	)
-	systemd? ( sys-apps/systemd )
-	libtirpc? ( net-libs/libtirpc )
-	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
-	libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glibc.patch"
-	"${FILESDIR}/${PN}-5.1.6-musl.patch"
-	"${FILESDIR}/${PN}-5.1.6-pid.patch"
-	"${FILESDIR}/${PN}-5.1.7-glibc-2.34.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	local CONFIG_CHECK
-
-	if kernel_is -ge 4 18; then
-		CONFIG_CHECK="~AUTOFS_FS"
-	else
-		CONFIG_CHECK="~AUTOFS4_FS"
-	fi
-
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
-	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
-
-	# Install samples including autofs.service
-	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
-	default
-}
-
-src_configure() {
-	# bug #483716
-	tc-export AR
-	# --with-confdir is for bug #361481
-	# --with-mapdir is for bug #385113
-	local myeconfargs=(
-		--with-confdir=/etc/conf.d
-		--with-mapdir=/etc/autofs
-		$(use_with dmalloc)
-		$(use_with ldap openldap)
-		$(use_with libtirpc)
-		$(use_with sasl)
-		$(use_enable mount-locking)
-		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
-		--without-hesiod
-		--disable-ext-env
-		--enable-sloppy-mount # bug #453778
-		--enable-force-shutdown
-		--enable-ignore-busy
-		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
-	)
-
-	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	export DONTSTRIP=1
-	default
-}
-
-src_install() {
-	default
-	rmdir "${D}"/run
-
-	if kernel_is -lt 2 6 30; then
-		# kernel patches
-		docinto patches
-		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
-	fi
-	newinitd "${FILESDIR}"/autofs5.initd autofs
-	insinto etc/autofs
-	newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
-	if kernel_is -lt 2 6 30; then
-		elog "This version of ${PN} requires a kernel with autofs4 supporting"
-		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
-		elog "been installed into"
-		elog "${EROOT}/usr/share/doc/${P}/patches."
-		elog "For further instructions how to patch the kernel, please refer to"
-		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
-		elog
-	fi
-	elog "If you plan on using autofs for automounting remote NFS mounts,"
-	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
-	elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index d3260d26b3e2..94722954432a 100644
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/autofs/files/autofs-5.1.6-glibc.patch b/net-fs/autofs/files/autofs-5.1.6-glibc.patch
deleted file mode 100644
index 338d885ae1e1..000000000000
--- a/net-fs/autofs/files/autofs-5.1.6-glibc.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/daemon/lookup.c b/daemon/lookup.c
-index 60a48f3..bbd65e0 100644
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -937,7 +937,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -1113,7 +1113,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
- 	if (!S_ISREG(st.st_mode))
- 		return NULL;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = "program";
- 	else
- 		type = "file";
-diff --git a/include/automount.h b/include/automount.h
-index 4fd0ba9..7b855a7 100644
---- a/include/automount.h
-+++ b/include/automount.h
-@@ -13,6 +13,7 @@
- #include <limits.h>
- #include <time.h>
- #include <syslog.h>
-+#include <sys/procfs.h>
- #include <sys/types.h>
- #include <pthread.h>
- #include <sched.h>
-@@ -142,6 +143,16 @@ struct autofs_point;
- #define UMOUNT_RETRIES		8
- #define EXPIRE_RETRIES		3
- 
-+#ifndef __SWORD_TYPE
-+#if __WORDSIZE == 32
-+# define __SWORD_TYPE		int
-+#elif __WORDSIZE == 64
-+# define __SWORD_TYPE		long int
-+#else
-+#error
-+#endif
-+#endif
-+
- static u_int32_t inline hash(const char *key, unsigned int size)
- {
- 	u_int32_t hashval;
-diff --git a/include/nsswitch.h b/include/nsswitch.h
-index d3e4027..8376113 100644
---- a/include/nsswitch.h
-+++ b/include/nsswitch.h
-@@ -24,6 +24,10 @@
- #include <netdb.h>
- #include "list.h"
- 
-+#ifndef _PATH_NSSWITCH_CONF
-+#define _PATH_NSSWITCH_CONF "/dev/null"
-+#endif
-+
- #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
- 
- enum nsswitch_status {
-diff --git a/include/rpc_subs.h b/include/rpc_subs.h
-index 6e35eed..7ba4b93 100644
---- a/include/rpc_subs.h
-+++ b/include/rpc_subs.h
-@@ -18,7 +18,7 @@
- 
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
--#include <nfs/nfs.h>
-+#include <linux/nfs.h>
- #include <linux/nfs2.h>
- #include <linux/nfs3.h>
- 
-diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
-index fadd2ea..cf109de 100644
---- a/modules/lookup_multi.c
-+++ b/modules/lookup_multi.c
-@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
- 				continue;
- 			}
- 
--			if (st.st_mode & __S_IEXEC)
-+			if (st.st_mode & S_IEXEC)
- 				type = src_prog;
- 			else
- 				type = src_file;
-@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
- 					continue;
- 				}
- 
--				if (st.st_mode & __S_IEXEC)
-+				if (st.st_mode & S_IEXEC)
- 					type = src_prog;
- 				else
- 					type = src_file;
diff --git a/net-fs/autofs/files/autofs-5.1.6-musl.patch b/net-fs/autofs/files/autofs-5.1.6-musl.patch
deleted file mode 100644
index bdcc0db9a9f3..000000000000
--- a/net-fs/autofs/files/autofs-5.1.6-musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/automount.h
-+++ b/include/automount.h
-@@ -25,6 +25,9 @@
- #include "list.h"
- 
- #include <linux/auto_fs4.h>
-+#ifndef __GLIBC__
-+#include <bits/reg.h>
-+#endif
- 
- #include "defaults.h"
- #include "state.h"
diff --git a/net-fs/autofs/files/autofs-5.1.6-pid.patch b/net-fs/autofs/files/autofs-5.1.6-pid.patch
deleted file mode 100644
index 1766c34e989e..000000000000
--- a/net-fs/autofs/files/autofs-5.1.6-pid.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/log.h b/include/log.h
-index 69eed96..14051cc 100644
---- a/include/log.h
-+++ b/include/log.h
-@@ -46,6 +46,8 @@ extern void log_crit(unsigned, const char* msg, ...);
- extern void log_debug(unsigned int, const char* msg, ...);
- extern void logmsg(const char* msg, ...);
- 
-+#include <unistd.h> /* Required for pid_t */
-+
- extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
- 
- #define debug(opt, msg, args...)	\
-
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
deleted file mode 100644
index 8b0ddd75eb23..000000000000
--- a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-https://src.fedoraproject.org/rpms/autofs/raw/rawhide/f/autofs-5.1.7-use-default-stack-size-for-threads.patch
-https://bugzilla.redhat.com/show_bug.cgi?id=1984813
-https://bugs.gentoo.org/803938
-
-autofs-5.1.7 - use default stack size for threads
-
-From: Ian Kent <raven@themaw.net>
-
-autofs uses PTHREAD_STACK_MIN to set the stack size for threads it
-creates.
-
-In two cases it is used to reduce the stack size for long running
-service threads while it's used to allocate a larger stack for worker
-threads that can have larger memory requirements.
-
-In recent glibc releases PTHREAD_STACK_MIN is no longer a constant
-which can lead to unexpectedly different stack sizes on different
-architectures and the autofs assumption it's a constant causes a
-compile failure.
-
-The need to alter the stack size was due to observed stack overflow
-which was thought to be due the thread stack being too small for autofs
-and glibc alloca(3) usage.
-
-Quite a bit of that alloca(3) usage has been eliminated from autofs now,
-particularly those that might be allocating largish amounts of storage,
-and there has been a lot of change in glibc too so using the thread
-default stack should be ok.
-
-Signed-off-by: Ian Kent <raven@themaw.net>
---- a/daemon/automount.c
-+++ b/daemon/automount.c
-@@ -84,7 +84,6 @@ static size_t kpkt_len;
- /* Attributes for creating detached and joinable threads */
- pthread_attr_t th_attr;
- pthread_attr_t th_attr_detached;
--size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144;
- 
- struct master_readmap_cond mrc = {
- 	PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0};
-@@ -2620,34 +2619,6 @@ int main(int argc, char *argv[])
- 		exit(1);
- 	}
- 
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
--	if (pthread_attr_setstacksize(
--			&th_attr_detached, detached_thread_stack_size)) {
--		logerr("%s: failed to set stack size thread attribute!",
--		       program);
--		if (start_pipefd[1] != -1) {
--			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
--			close(start_pipefd[1]);
--		}
--		release_flag_file();
--		macro_free_global_table();
--		exit(1);
--	}
--#endif
--
--	if (pthread_attr_getstacksize(
--			&th_attr_detached, &detached_thread_stack_size)) {
--		logerr("%s: failed to get detached thread stack size!",
--		       program);
--		if (start_pipefd[1] != -1) {
--			res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
--			close(start_pipefd[1]);
--		}
--		release_flag_file();
--		macro_free_global_table();
--		exit(1);
--	}
--
- 	info(logging, "Starting automounter version %s, master map %s",
- 		version, master_list->name);
- 	info(logging, "using kernel protocol version %d.%02d",
---- a/daemon/state.c
-+++ b/daemon/state.c
-@@ -1177,12 +1177,8 @@ int st_start_handler(void)
- 	status = pthread_attr_init(pattrs);
- 	if (status)
- 		pattrs = NULL;
--	else {
-+	else
- 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
--		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
--#endif
--	}
- 
- 	status = pthread_create(&thid, pattrs, st_queue_handler, NULL);
- 
---- a/lib/alarm.c
-+++ b/lib/alarm.c
-@@ -270,12 +270,8 @@ int alarm_start_handler(void)
- 	status = pthread_attr_init(pattrs);
- 	if (status)
- 		pattrs = NULL;
--	else {
-+	else
- 		pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED);
--#ifdef _POSIX_THREAD_ATTR_STACKSIZE
--		pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4);
--#endif
--	}
- 
- 	status = pthread_condattr_init(&condattrs);
- 	if (status)
diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc.patch b/net-fs/autofs/files/autofs-5.1.7-glibc.patch
deleted file mode 100644
index 2a0f415fbee7..000000000000
--- a/net-fs/autofs/files/autofs-5.1.7-glibc.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff --git a/daemon/lookup.c b/daemon/lookup.c
-index 2fea0c0..3b3aa3e 100644
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
- 		return NSS_STATUS_NOTFOUND;
- 	}
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
- 		return NSS_STATUS_NOTFOUND;
- 	}
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
- 	if (!S_ISREG(st.st_mode))
- 		return NULL;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = "program";
- 	else
- 		type = "file";
-diff --git a/include/automount.h b/include/automount.h
-index 1ae4078..c2e8dba 100644
---- a/include/automount.h
-+++ b/include/automount.h
-@@ -13,6 +13,7 @@
- #include <limits.h>
- #include <time.h>
- #include <syslog.h>
-+#include <sys/procfs.h>
- #include <sys/types.h>
- #include <pthread.h>
- #include <sched.h>
-@@ -42,6 +43,16 @@
- #include <dmalloc.h>
- #endif
- 
-+#ifndef __SWORD_TYPE
-+#if __WORDSIZE == 32
-+# define __SWORD_TYPE		int
-+#elif __WORDSIZE == 64
-+# define __SWORD_TYPE		long int
-+#else
-+#error
-+#endif
-+#endif
-+
- #define ENABLE_CORES	1
- 
- /* We MUST have the paths to mount(8) and umount(8) */
-diff --git a/include/nsswitch.h b/include/nsswitch.h
-index d3e4027..8376113 100644
---- a/include/nsswitch.h
-+++ b/include/nsswitch.h
-@@ -24,6 +24,10 @@
- #include <netdb.h>
- #include "list.h"
- 
-+#ifndef _PATH_NSSWITCH_CONF
-+#define _PATH_NSSWITCH_CONF "/dev/null"
-+#endif
-+
- #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
- 
- enum nsswitch_status {
-diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
-index fadd2ea..cf109de 100644
---- a/modules/lookup_multi.c
-+++ b/modules/lookup_multi.c
-@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
- 				continue;
- 			}
- 
--			if (st.st_mode & __S_IEXEC)
-+			if (st.st_mode & S_IEXEC)
- 				type = src_prog;
- 			else
- 				type = src_file;
-@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
- 					continue;
- 				}
- 
--				if (st.st_mode & __S_IEXEC)
-+				if (st.st_mode & S_IEXEC)
- 					type = src_prog;
- 				else
- 					type = src_file;
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index c9be6dde23a7..0370baa83e31 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/rocketchat-desktop-bin/Manifest b/net-im/rocketchat-desktop-bin/Manifest
index e90f46f8b6c3..ae8530266351 100644
--- a/net-im/rocketchat-desktop-bin/Manifest
+++ b/net-im/rocketchat-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST rocketchat-3.7.4.x86_64.rpm 72045096 BLAKE2B a802cc5201f74061345bfcb7fa04ede24f945fd8ad1f15a24647f6f987c8f6473af6cfc858d742d54cce58219b0bc6e6f34f7d1c0827daa223166502793d01fb SHA512 817dd1fdaf6aa9d343b6557e613f691c158ae262fdb7b6d7029b64808c693f0b7db325be4815e6dff3b417f67484d14c543f370ca00339d6d4551af6fe5360f1
-EBUILD rocketchat-desktop-bin-3.7.4.ebuild 1074 BLAKE2B c550bb783cf67c5e7d18896258360e4d6621fd8439aac7742f99b4792a667b9061eecc29ff9b0798febe809e785a952c2f8deaf5c2589bc551f053042a6d7fa2 SHA512 cd5e05036880fa65d35ae2cd109b88c6a8a5824bc3ec13d37538e804cf0cf309bd3ef8d7f990c8a63f85fbdcc30c4a510a1aef61face5364a86eddec09515913
+DIST rocketchat-3.7.5.x86_64.rpm 72083048 BLAKE2B 136b0a1051d52b5a9c3c5d66eba8e0cde809bf5086bf6d0dbeb1dc319cbe73ff26c5d33f0a0e989b18c18f38406dedcad344f14ba532953679c7da53aebf4d74 SHA512 48fb9ce3602e7b3ebd2e049975941795cd00a1c89987b267988357af48bdaad958f2c1976c848a7be7e29f4726619531fbb6994cab927d39f13f50f182519818
+EBUILD rocketchat-desktop-bin-3.7.5.ebuild 1074 BLAKE2B c5b5c736b5ddb211485f8ce499b7f90ef4e5aefbf0b69701665b91016330a24c760bad4b16029eca52a80a13ad94139fe1da8f601ddf8026b71305ab5c30a250 SHA512 5aee5a90e44d77212dc4b06876315ffcc8096bfa9379a68c7c2095f6d378b4f418a8ee3854718cffca76407db607fb0e83135ea425ebe5390762ac77bf982af2
 MISC metadata.xml 434 BLAKE2B 2253702089149978e030c97d8a21ef29c0870683e6896d105e9000e77d32d3c66c3482c2b0d2ecbbac6bc281a85be9267918f4d5691ea6c5cf6fab3ebc80db96 SHA512 9cba4c7855c123b866f6a24e99320ddb3b6a450fd5f37eadf364bd92e1e58fe7e0c3f4a6892bb26f0142869d983fe12f5b3753b1960763ffe63a0c8d0d54ebe0
diff --git a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.4.ebuild b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
similarity index 96%
rename from net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.4.ebuild
rename to net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
index 46fc3d26d958..4a153a7e3205 100644
--- a/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.4.ebuild
+++ b/net-im/rocketchat-desktop-bin/rocketchat-desktop-bin-3.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 0b45ebbccc68..f7231828f768 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -5,6 +5,6 @@ DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584
 DIST tdesktop-3.3.0-full.tar.gz 38662573 BLAKE2B f6cba2be02faccde77c510742dc57680a2731cd3b2bc4a2d680f6cda7fd1a634e2fa0406855a491241434daa080e782f561e5e472dcc42a8b8376c16e038b6af SHA512 ff0ac1abe264f19812c2e0b40d4861caddd6c01a3f863ccb68de9c5227282872b2bde878dcf751d7d04d36c6e0e77912619ac7863d54f25f739f3744e9bca53a
 DIST tdesktop-3.4.3-full.tar.gz 40647558 BLAKE2B 220a7b29dbc7a48d53e53fe9609dba804e5fe536feebc1225fd5400a8eec703e64f65decb8b503ed77e843c011c8b5fd12916534d4a1ecbc84724f277dcc301a SHA512 6b27eb14570b55fb14c77f1d557591985a4791712897c2e144196c54c2a98b10c7ece9dac7d039a6bb56f39e3062e4fbfbb60f6822e52b76f927bbf419d88a6b
 EBUILD telegram-desktop-3.1.8.ebuild 4358 BLAKE2B a305bba1349c0bc884014cd50c06308d831f7fc27e2b4aea0136a303f1eedaeb67631a6b27dc5860614cc6018c1e692833c272ea7ce7d29e00b0768c76dd44f4 SHA512 917c1ecd3c35ef953d3b71f5f1e3adaf74ea8aaa203e550dc775dfc1eb418675f5fc1aae08eebe4e0f5fc62edf64beb9e2ae6bee8fbfd73870cbcf66d5647ef9
-EBUILD telegram-desktop-3.3.0.ebuild 4623 BLAKE2B 6380d63dd1b17ae0df2bd5baa7cd729feaae20a6f6c92dea66701aa72def4bba869d1c2d0a01039986cc24bc55a3a0c34bb1e763108ca226681ed5d5959bab73 SHA512 64a0fa5894fa5400ab3d95ce5892b9f16bb7f8bd1bca0e1e468f4278634ca31477b0567bfb984dd52eb51c54a6049a13eb736d040d4740f6298179e979d1ed99
+EBUILD telegram-desktop-3.3.0.ebuild 4622 BLAKE2B 20240a1921bcc98a34d685a93a0c66944420a8fc74770dbc5b3484e47ce02d146fa7184a16987184077019ee7ca3cb2c2e47586bbd09b2ce4617ea54fbc63a97 SHA512 6e98b3e166b918875bd73c0cae2eb6af507970d50cc8dd03555471fa35c954a6ece49de310934863f06fa726538241aaba6c3cb307fae7fd74457e884aa024ea
 EBUILD telegram-desktop-3.4.3.ebuild 4752 BLAKE2B 4817101e22311ee0414d2065522ba83cbacc1a877217a9403d6b5e70b096ecc51f25376bb151d5d8c77cc9a9f305c7d3af3dfb4fda7178aedca0194a6cf5f06e SHA512 909d08dd26ed182f1700b98a7675be52d31a3978ef274afefbf310709c8d0b934729f62bb05746833ce0995fb24eb5160715da2d4f013aab0a9eafcf33d7eba2
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
index 08ff83d0ea96..04a19cbd9bfe 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${
 
 LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="+dbus enchant +hunspell screencast +spell wayland +X"
 REQUIRED_USE="
 	spell? (
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 36cf4f2d6976..40b8edc059e9 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 85dc30585fc6..f55325c3d9c4 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,9 +1,7 @@
 AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
 AUX ergo.initd 382 BLAKE2B 916ef2bc1371e4f62328b22f4072d5c2a39249bfa53e59d6e8877d2ad8a92ed333dae806d65269a343351a93f5d995383c01f65291cc2f24db0ebba0e4fb24f1 SHA512 0b2c1cc5e12458e02efd7e5a6e80f301ce96163c68f1e7e5311dded5c6c99b5ea4a9d707c2f549b56ee77fa4b5758a4d66ce78602011bc30a8ef48d762bd5de4
-DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7 SHA512 ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
 DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28 SHA512 4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
-DIST ergo-2.9.0.tar.gz 3248868 BLAKE2B 5834a0708be1bd595f1c089dcb6d3fae2ca6b7315266cc9296ee28ad5524b0ecc8f8943fcbe3ff1c134cb94fe9a215aa05a13808f1db16e13b443442cdcc31cb SHA512 802bac210987e8671965537511db76bb8ed0f12b38d244c187030c380467f345ce72666c86a6c7c2b98a0b9fb99db3c66a7af31176d90e1dd7b9e9b52a27b59d
-EBUILD ergo-2.7.0-r1.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349 SHA512 5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a
 EBUILD ergo-2.8.0.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
-EBUILD ergo-2.9.0.ebuild 1497 BLAKE2B 93612d2ad9a5612ec7fa3751263c7487632eacb4b0365cc910f95b91be0b116b691caa7532542cee12fe5bb81d706089a4249297cf3dd400c64924a2402cd113 SHA512 1612b0a936d787e5ea9cd09d531367052a5b63ff11231a06b5475c45ee53a3e077bc3cd398f260d0d331c489be8af98f3f91c6dff84b7c81211ec61e6d0317d7
+EBUILD ergo-2.9.1.ebuild 1499 BLAKE2B ae51cc22d1a6f2c9996ec8e17e2c5a624764cdaaecbf7413257f39b52ac0ff8e91a929ee93f81889ee8ccd87afb500a3d6915543ce4e72014fb01511ce81517a SHA512 67034caddae3e7b84ed44700a0cc4d47d2307a35f5aa73a7f7b63d872c93e1652a4e3321830d4b392394b43f577c4e3e44a88ec068bb8b6df80813a9b9f736c8
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.7.0-r1.ebuild b/net-irc/ergo/ergo-2.7.0-r1.ebuild
deleted file mode 100644
index edff5c53fda6..000000000000
--- a/net-irc/ergo/ergo-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
-
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-	acct-user/oragono
-	acct-group/oragono
-"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	go build -mod=vendor . || die
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	newinitd "${FILESDIR}"/ergo.initd ergo
-	newconfd "${FILESDIR}"/ergo.confd ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/ergo/ergo-2.9.0.ebuild b/net-irc/ergo/ergo-2.9.1.ebuild
similarity index 94%
rename from net-irc/ergo/ergo-2.9.0.ebuild
rename to net-irc/ergo/ergo-2.9.1.ebuild
index f6c97f4a9b0c..b68c0cb2089c 100644
--- a/net-irc/ergo/ergo-2.9.0.ebuild
+++ b/net-irc/ergo/ergo-2.9.1.ebuild
@@ -49,8 +49,8 @@ src_install() {
 	insinto /etc/ergo
 	doins default.yaml
 
-	newinitd "${FILESDIR}"/ergo.initd ergo
-	newconfd "${FILESDIR}"/ergo.confd ergo
+	newinitd distrib/openrc/ergo.initd ergo
+	newconfd distrib/openrc/ergo.confd ergo
 
 	keepdir /var/lib/ergo
 	fowners oragono:oragono /var/lib/ergo
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index be9222fc8e2e..0c54bfb41567 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 3d44b238a7b5..aeaf7932fe80 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,8 +1,6 @@
-DIST libbtbb-2018-08-R1.tar.gz 310542 BLAKE2B 0ae945c530c476caadfd7786f34eca4d7efd71c2f27a37c7b0242a1d3fba80e985c76a0635a354184aa80039ca8ac11f59778f550cbe9bb7e8a535723396cab0 SHA512 63fa995b51f2246b6f27d8aa1bd7a5c0276414df9d13d432d9a1a7ad78ac06e4c67fe3dcf00cf1634f11d6e999f13633591a3347d4e533fff4f131f8deee922e
 DIST libbtbb-2018-12-R1.tar.gz 310437 BLAKE2B 8fec246e05c47df424840f159d97bbb8c6554b2ce72344b63602cb034eb712bf8ee9f280e7bbb5104dc0b9788818ea14cf53d09af0938b1bc1dcede5463b36ce SHA512 5c41bb4f0fdeedc1064de973daa4d396f73ff10b6e28266a43f029cbfa8a7f2db5e3b764410efb50ef79c56ba1fac0d242bb547c0a883d0dc3c06cc9e993332c
 DIST libbtbb-2020-12-R1.tar.gz 308434 BLAKE2B 0f802f3c5eef0c434d0468a72104cf63e6bf5f29467e1606d2892751cd8b4824639e3847c0b8305ace926667434e668d75b6d4544e8e026b07872bafbb09c90b SHA512 a3dc2c8d27e4b85aae4847ac39f871ecf800ebf911aacd01682da6c50b13f3247c7d683bce855f2cf59b56a29c661223a2c22e98a8d86e8edaccd57af282bac6
-EBUILD libbtbb-2018.08.1.ebuild 3470 BLAKE2B 6084d483155c28553328fca02da898c9e37ff4a9d01b82c6aa86a75157c95b130d93a1384042f41cdeefe4e4a77e50dd391598ae50668903302f07a4ac75b109 SHA512 d24a516eb987b1d23812980e937856bba04f20f8dbcf9ab8980f528068d7b9aae2c9464f988f0d89e072b1c3bff27263095ca24428bf583549e479292c769617
 EBUILD libbtbb-2018.12.1.ebuild 3467 BLAKE2B 3a525773dac747916a2824a792ba82a7b536d02f437ad54df462ef025d87f485a4509705ce49c0af624ad108b32888019b083a321dc4ba30340551737ecea320 SHA512 98b8925a4b828464897d868682f1d3642c17761cbb17f1fd584df7141b2ee6f503e845463110c5aac507e62e63c86109b2287818ee14ee175949e7a5a3d8ea64
-EBUILD libbtbb-2020.12.1.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
-EBUILD libbtbb-9999.ebuild 3404 BLAKE2B 0960f98c48cc5505ced0faf31ecc0d43f71db64cecad00737818a6202721e2bf323b531b892876ce5d28adb537f323366c9e2e393db7098f3b7c76176ca1096c SHA512 2812a860a5d8c70922efb2b91f55db79dd28913a3962c398698cdcf980b365f8430272fcfe528fa1c2600be1946a6033fc2504f735e9edf1f1df026682780791
+EBUILD libbtbb-2020.12.1-r1.ebuild 748 BLAKE2B 328e0187f9f8464d61e0d57bc6b17943f9ba8cd6d81d3bba5c4a7a354ef9fd1b307bab56ef58ab71e0a1ac0721566dcd66350a42dd0cb2c0761699f182dd7f9c SHA512 fe0f2ab74855bb46dba810e6377d6b2506450e7fcbf9772d3921af6f381843cff55d298210fef693b7a83ba559c5c5fd546cc37401a5a45e47b254ddc985730f
+EBUILD libbtbb-9999.ebuild 748 BLAKE2B 328e0187f9f8464d61e0d57bc6b17943f9ba8cd6d81d3bba5c4a7a354ef9fd1b307bab56ef58ab71e0a1ac0721566dcd66350a42dd0cb2c0761699f182dd7f9c SHA512 fe0f2ab74855bb46dba810e6377d6b2506450e7fcbf9772d3921af6f381843cff55d298210fef693b7a83ba559c5c5fd546cc37401a5a45e47b254ddc985730f
 MISC metadata.xml 505 BLAKE2B abc72cf649277ff23c66e4a63937d41760065c2a6a8c589f988122ca5ea1990bd1389b635e018c7ce51186f1955dc567fec5785510dd5c724dd473f27f62d9df SHA512 d2da37b4a13d9806114e31b19be4ac0f8d623075059a550eeaeae3635f46490c4dd9e4ec1ab37bb34f7cb8d69ffe649706053faeadc39ebde630dead67874766
diff --git a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild b/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
deleted file mode 100644
index 23524a6f4e36..000000000000
--- a/net-libs/libbtbb/libbtbb-2018.08.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DENABLE_PYTHON=OFF
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
-	)
-	cmake-utils_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake-utils_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake-utils_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake-utils_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
new file mode 100644
index 000000000000..9085d00e99ef
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2020.12.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+	inherit git-r3
+else
+	MY_PV=${PV/\./-}
+	MY_PV=${MY_PV/./-R}
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="static-libs"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PYTHON=OFF
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+	)
+	cmake_src_configure
+}
diff --git a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild b/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
deleted file mode 100644
index edbf18eed8ff..000000000000
--- a/net-libs/libbtbb/libbtbb-2020.12.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
-	inherit git-r3
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_prepare
-		done
-	fi
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	local mycmakeargs=(
-		-DENABLE_PYTHON=OFF
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
-	)
-	cmake_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_install
-		done
-	fi
-}
diff --git a/net-libs/libbtbb/libbtbb-9999.ebuild b/net-libs/libbtbb/libbtbb-9999.ebuild
index edbf18eed8ff..9085d00e99ef 100644
--- a/net-libs/libbtbb/libbtbb-9999.ebuild
+++ b/net-libs/libbtbb/libbtbb-9999.ebuild
@@ -1,150 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
-DESCRIPTION="A library to decode Bluetooth baseband packets"
-HOMEPAGE="http://libbtbb.sourceforge.net/"
+DESCRIPTION="Library to decode Bluetooth baseband packets"
+HOMEPAGE="https://github.com/greatscottgadgets/libbtbb"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
 	inherit git-r3
 else
 	MY_PV=${PV/\./-}
 	MY_PV=${MY_PV/./-R}
-	S=${WORKDIR}/${PN}-${MY_PV}
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-IUSE="static-libs wireshark-plugins"
-
-RDEPEND="
-	wireshark-plugins? (
-		>=net-analyzer/wireshark-1.8.3-r1:=
-	)
-"
-DEPEND="${RDEPEND}
-	wireshark-plugins? ( dev-libs/glib
-			virtual/pkgconfig )"
-
-get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
-
-which_plugins() {
-	if has_version '>=net-analyzer/wireshark-2.2.0'; then
-		plugins=""
-	elif has_version '>=net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btbredr"
-	elif has_version '<net-analyzer/wireshark-1.12.0'; then
-		plugins="btbb btle btsm"
-	fi
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_prepare
-
-	if use wireshark-plugins; then
-		which_plugins
-		for i in ${plugins}
-		do
-			sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_prepare
-		done
-	fi
-}
+IUSE="static-libs"
 
 src_configure() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
 	local mycmakeargs=(
 		-DENABLE_PYTHON=OFF
 		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DBUILD_ROOT="${ED}"
 	)
 	cmake_src_configure
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			local mycmakeargs=(
-			-DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
-			)
-			cmake_src_configure
-		done
-	fi
-}
-
-src_compile() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_compile
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_compile
-		done
-	fi
-}
-
-src_test() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_test
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_test
-		done
-	fi
-}
-
-src_install() {
-	CMAKE_USE_DIR="${S}"
-	BUILD_DIR="${S}"_build
-	cmake_src_install
-
-	if use wireshark-plugins; then
-		for i in ${plugins}
-		do
-			if has_version '>=net-analyzer/wireshark-2.0';  then
-				CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
-			else
-				CMAKE_USE_DIR="${S}"/wireshark/plugins-legacy/${i}
-			fi
-			BUILD_DIR="${WORKDIR}"/${i}_build
-			cmake_src_install
-		done
-	fi
 }
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d1390dd230ac..0dc13ba13712 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,8 +1,9 @@
 AUX 2.28.2-opengl-without-X-fixes.patch 1704 BLAKE2B ae6e830a7a0d58ae43e19f235290225982c98b8aba1fd58836ebd588c1df4465f92eec8adbc12d410928b559dc2e50bf928d3b15f3d63b644d7c3aa59456954a SHA512 f424fcf62c308f47c322a7322189cbdeab0cced46d1855c0727748996fe0253c5ce1e65819142f75b8435b330a7193c11569f4257cd9522d334153c0e58a1edd
+AUX 2.34.3-jumbo-fix.patch 2430 BLAKE2B 0896f652262284cee74bec5f84f9bf8a88884f8c4182cbbc72dc59de5778856807772ecc92b9eb75c40eb021b0732ef81435e8894b46c8c10d833474e8c077c6 SHA512 c131daff77815eda541a376dc8904cffe7a75d9eb00fdf07ae872072aaa09493c2d01ae94122a0e6f43bdd8c8ba9aceb01821fb56b803c1b5f894d0e08abad53
 AUX 2.34.3-non-jumbo-fix.patch 1056 BLAKE2B 4d229c01fbfae518725bb802c0fd907a1dc8bd4edd41be2b48075471f31ec84b6f9bae1b97294f46a42ba77a081e3705be3ad49177de28791a495f19ddb4f51e SHA512 1ace5a3c1e775f258c67c59987a0c84ebc7cadd007cc0b79b282712b354cdaf9eb4dd6ef75b85b234ad3b16079ac8dbf2890921165854fc2da51f79cbd5f0e79
 AUX 2.34.3-opengl-without-X-fixes.patch 1436 BLAKE2B 231cdc9a428342d7fe98a1c1fb230b345f29b6a2d45da02cfa674dae1ceffbbcf5d62a77e903f690b59eb49ad7a3e50dffc190ea57bfa953f10fccfeb6dd4dfd SHA512 1af17f79d2a60cdd5337ca5a571787fb2cc1abc7d3f392b6640edc88856e2f8fc3e77625fdfd600d9ba9376a18ec379151d064d5f7ad1b2bfed0db2e0330e2ee
 DIST webkitgtk-2.32.4.tar.xz 23327956 BLAKE2B 13762828c39ea55dcdc65be6561fd1ce33fa8c83c1750807fa56a05adfa3604992d0c532ca0466295e6b0e0174dbbda93ebd8082b1ad06b597b54ad8e3a69bd6 SHA512 c2d72850097da72a82faab0a1218b312668b88bc8b67fcd62f08368c71d46bc833e08b3e095eb286beeae59ee88ac74c8393caee8a4ec5a8e90e02425e43350b
 DIST webkitgtk-2.34.3.tar.xz 24996976 BLAKE2B 03e9d15e956eddb516e7d1c74b2b0adc99659e6121aaa7795fe8d5348b25b909ed08dc6f85ec26a8058331ffbfd2e9e3f7f6e8effe0353270c7bd419171492a0 SHA512 f3d0ad2e051fc177e1a478908ad806e0a094ac7ab1d9e40049a67e868974278dd5fa84d911bed2eb356022fbe020d985370c69af70efa0e223221e9be607efbc
 EBUILD webkit-gtk-2.32.4.ebuild 9133 BLAKE2B c7d7e364939545a9529cded1349892d28a215a128630d697d17cd8c906ee31bc1e626bc8251d50b8df28f4e8364fdb1776bc39345e8b8be3b9b26b6431c89509 SHA512 8933e6b923c347740ffe1c280ed42c9435ffdc399c0fc216bec09f3afafedbcc13150998102794738219f151353149e561dfe5f637f96026c3aa3961e0ae09a8
-EBUILD webkit-gtk-2.34.3.ebuild 8264 BLAKE2B d4d998ab713358579a861da86e658ad263d4bc58a7777c7959f8d4522b303386b6b35f637dc7ac604b4767c697c1f02a93c74e78df06e4741fdc537540d627b6 SHA512 a8ece9a70dea075b83f1ef895e8bcc205e771c839675710a741f6f377f0f81f9732a670da880402a7bea116c431d76373918b0de99dd10f50d4b40253417a9b7
+EBUILD webkit-gtk-2.34.3.ebuild 8322 BLAKE2B 2cba0898f4f405e87c14be32daef97bd384ea9092f14de3d3834e4b219c9c0af2f536d443d10d729278a243e9f5d23bd55929140b77f573278f86cdb3a05fbb5 SHA512 4bb56065ad0816fe0c38ac12298952791d931acba4cea8b11335ad4379a609d6cea7699e8e2d49ba512219965a03f26b22def6a2d07c23391a4b32319af6b238
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
new file mode 100644
index 000000000000..97c5c0c8e4b6
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-jumbo-fix.patch
@@ -0,0 +1,70 @@
+From b60c2e4d1770660280d97cae9e82f3040ab97229 Mon Sep 17 00:00:00 2001
+From: "philn@webkit.org"
+ <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sat, 11 Sep 2021 11:34:42 +0000
+Subject: [PATCH] [GLIB] MediaSession is not enabled
+ https://bugs.webkit.org/show_bug.cgi?id=217991 <rdar://problem/70740119>
+
+leio: Extracted to include only the side-effect of fixing unity builds on
+some machine configurations.
+Thanks-To gen2dev
+---
+ Source/WebCore/platform/PlatformScreen.h            | 6 ++++++
+ Source/WebCore/platform/graphics/ImageFrame.h       | 6 ++++++
+ Source/WebCore/platform/graphics/ImageOrientation.h | 6 ++++++
+ 3 files changed, 18 insertions(+)
+
+diff --git a/Source/WebCore/platform/PlatformScreen.h b/Source/WebCore/platform/PlatformScreen.h
+index d3f12a6538b8..d47d193e8bee 100644
+--- a/Source/WebCore/platform/PlatformScreen.h
++++ b/Source/WebCore/platform/PlatformScreen.h
+@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen;
+ typedef struct CGColorSpace *CGColorSpaceRef;
+ #endif
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ class DestinationColorSpace;
+diff --git a/Source/WebCore/platform/graphics/ImageFrame.h b/Source/WebCore/platform/graphics/ImageFrame.h
+index 9843aac40eb4..92e1d4486c5f 100644
+--- a/Source/WebCore/platform/graphics/ImageFrame.h
++++ b/Source/WebCore/platform/graphics/ImageFrame.h
+@@ -33,6 +33,12 @@
+ #include "NativeImage.h"
+ #include <wtf/Seconds.h>
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ class ImageFrame {
+diff --git a/Source/WebCore/platform/graphics/ImageOrientation.h b/Source/WebCore/platform/graphics/ImageOrientation.h
+index d990a3dc555f..5de271e52352 100644
+--- a/Source/WebCore/platform/graphics/ImageOrientation.h
++++ b/Source/WebCore/platform/graphics/ImageOrientation.h
+@@ -30,6 +30,12 @@
+ #include "FloatSize.h"
+ #include <wtf/EnumTraits.h>
+ 
++// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values.
++// As a workaround, we explicitly undef them here.
++#if defined(None)
++#undef None
++#endif
++
+ namespace WebCore {
+ 
+ struct ImageOrientation {
+-- 
+2.32.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index 66ff477c7c80..aa79d69ea210 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -159,6 +159,7 @@ pkg_setup() {
 src_prepare() {
 	eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
 	eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
+	eapply "${FILESDIR}"/2.34.3-jumbo-fix.patch # bug 830638
 	cmake_src_prepare
 	gnome2_src_prepare
 }
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index edf2c43ef489..39dec38bff96 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index abdb65f18176..413d1d4ac725 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -11,7 +11,9 @@ AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
 DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
 DIST exabgp-4.2.16.tar.gz 2933071 BLAKE2B bc66ece537cb175811233d26f3445e1bb3f7d4f8950bf0839ced014430db17a4df614661448f275fb3a890bb2af6b2459f938f830c82f03a586829e7fe31caca SHA512 06731612df6f0f6623e8ad58c3b52fc4b5dee6b4bb3bb29cee272a4061ef087e2f98739a75cd07ae51e66fb633069926899882e6bab801010ad1db3333666471
+DIST exabgp-4.2.17.tar.gz 2933104 BLAKE2B 5751888232479c24aa4f66ef357821178c7a5564c0522adb8abf26057eb222ecfbb33caa6d9b71219b79fa309a0c4051b6098015c2362ad9c02e59326ee2bfac SHA512 2000856f540dcaed12dfaf54b689f6b04670f0ec8f19ec7a811ea8e54663afec68a7ae97ed79a001cc09ed42e6a1c5bd2d94ae0c3e3c8bde2da446cf00d66374
 EBUILD exabgp-4.2.11-r1.ebuild 1299 BLAKE2B b15271c374199edaa379240a18c56e5dc485714874a547f5436855454e4f4e6e8a4020620d7896b2dd19ca05e419ee66eadae0c715729b9d21b1c28445fa4ec6 SHA512 cfef1786caad92e870e52f7ca300b24c63d05049c9a4d3a057c7c5523bd94de3d291422b2346a6a5b8ef17137604577ca60bd00df76688018cb66b618aa1f0aa
 EBUILD exabgp-4.2.11-r2.ebuild 1489 BLAKE2B 3fc3ec8288a013c49f517b862411102035cae79d7d7d25d196a65913e4fd444f5e0890bb8b27b98889db8a73eb7aeb575b0bf38907e5886631f0be7787f0e16c SHA512 4c441e47f710a7582e44237e5447e27241ccebe4d95b580e73f3f020dbdd9ef33b60fd28a19c4409664e213f7f1452e893ddd1171d1760ce196586aad5e9b5fa
 EBUILD exabgp-4.2.16.ebuild 1489 BLAKE2B d24ad3b13c0c2257842bd5da941299ed5842e91ea834e1638035e77d48205a9ebfe79be40db9d173458d6c5b4430202c51f6ed0e19601b682aad72985e691462 SHA512 1a65970beb3fda0632b1a592e3eff764759ac99d70bcade37f96b3c5f2e1631949374fd0697d749617a203b97a5b43e232a88037e9c3e7251fed70eded845207
+EBUILD exabgp-4.2.17.ebuild 1489 BLAKE2B 69e14edfaaf3be4a1c6fca72b1d95074f3df9390a7f03884cafd14de372e75dc8bd6fd56cb7e2b61fdcd47dc212c537d05a87596bc4afb492e65f35a005e1bc4 SHA512 c340cf30a5d93531b2b31d055a3988b0a0359b49e526f3d9b7be10df04946808619a71da9c7408f5de32496b3a83cbd7e44e0176d589a6872a8a097e0b87b0fe
 MISC metadata.xml 344 BLAKE2B 20bfa14279184ddbcd77773d12fb120d9182b2eab6f5e99c044229efcad49de8861f50ac3560cf85d79aec6fa67c54fef8b1a3a5fffef7c2ae9c36d1eb134bb4 SHA512 f10156cff443ec23883c09dcf78b83d2ea44c9730214b9197e2efdc56f3df0b934ed6db5eed258c5ca89886ec13049f9ef904972043a602606cc2529e8912d19
diff --git a/net-misc/exabgp/exabgp-4.2.17.ebuild b/net-misc/exabgp/exabgp-4.2.17.ebuild
new file mode 100644
index 000000000000..0bac38485f18
--- /dev/null
+++ b/net-misc/exabgp/exabgp-4.2.17.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit tmpfiles systemd distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-group/exabgp
+	acct-user/exabgp
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/exabgp-4.2.7-paths.patch"
+	"${FILESDIR}/exabgp-4.2.10-ip-path.patch"
+	"${FILESDIR}/exabgp-4.2.11-healthcheck-allow-disable-metric.patch"
+	"${FILESDIR}/exabgp-4.2.11-healthcheck-fix-log-crash.patch"
+	"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
+)
+
+python_test() {
+	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
+	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
+	systemd_dounit etc/systemd/*
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	keepdir /etc/exabgp
+
+	doman doc/man/*.?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index ca4dc24119cf..999538899be6 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -9,6 +9,6 @@ EBUILD xmrig-6.15.2.ebuild 1331 BLAKE2B 8ee8edaf12c04ec64e64520e57e08c64f7f262a1
 EBUILD xmrig-6.15.3.ebuild 1333 BLAKE2B 218caecf6e9d293841b0a72bb306cdaab67abaf294a3e47fe749eefc6f0e6ec59af992beb22e1fa9809cfd9972af8361209a25eaaa855c9d01c5fd46a5208053 SHA512 01d5d0c9a57bd8c70beefabb81c033ee27599d4e9d5a492c53388910f8ea6b89a84aab666ff202d72b07b20faa65894afd5093a77903d75b9fd4a1662ed47ceb
 EBUILD xmrig-6.16.0.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
 EBUILD xmrig-6.16.1.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
-EBUILD xmrig-6.16.2.ebuild 1340 BLAKE2B 14d5069096f7d4ea3f9e9ed69b4e7681179f30366036f99c948a40d51c75aeb93d690290b3d5074cf9d55d05619c9a0ddc2b63d58aaa6c24c789b12378e13384 SHA512 8b4d8da9075891367cd852a266566859cd5edf7e66866755fc5ca3dc36b1e698d39386f22ca0acdd87bc19c593368f634071b30164003729addcd32ae36f19e0
+EBUILD xmrig-6.16.2.ebuild 1339 BLAKE2B ad28a6034a46772341dee70ca2d80fa2a22aab881684d1eaa329bbcddd8198e654ca2ee989faa7e99126aab73b118c5d1f795c96ef18e500b95b9b7316109af5 SHA512 c4bf53ffce5855eaec0ec9f0e093e713ee5ab7f2efba9e8b9762d49e54bbfd619d05118655b0229e38d7d98c0f49864ab4db61b945e874e1da1181e1241611f4
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B 5bef2d6de415e33f42a4d70914b9d70833b9ea68cd4d816fc590ce442b9e03163d631779008b0e0f27db4df08642e121966bed553a3f7253606906745a6e3de6 SHA512 dc6d46794247ba287ffdfab91643d93096f89ef39a49650ec65310c4c71295da994491a263992c1f6cddfbd350a42c8223327fb51bd47c873ac4ce7c302b91af
 MISC metadata.xml 1033 BLAKE2B 9f8e1d1a6e6cc807536149bec4b2b2531a49f1915a3628e5ae9b55f5fd4c85a924403807bc34a8c1a065282c8e5c27cf2f87bae4a90d3b182f5a3a058407a601 SHA512 4e47c4fea9083f5bcfdd53d2a53f04fca9a5cb088b71d28d960d3fbf21a91e153fb99a738a986d7bff6ced690a86333801d3f27d2e6ca69b4445a2fba5a17b62
diff --git a/net-misc/xmrig/xmrig-6.16.2.ebuild b/net-misc/xmrig/xmrig-6.16.2.ebuild
index bbdc75edbec2..1b72caa1898c 100644
--- a/net-misc/xmrig/xmrig-6.16.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.16.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d13a763b96bf..4731eb565c8a 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 839e127d8b4f..b726af0f56dd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,6 +4,7 @@ DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B cd85d233623f2791bff8ada00d9ac4ea3743e
 DIST haproxy-2.0.26.tar.gz 2713209 BLAKE2B 9d33cc57d9b1761844fda05981ccddc4de6823a0c101b6fadf8ce2dbd0b1a76f2b4c2b6d5f9b656eabfc40af2dc750b81b922149583669f3e7001ba60525f488 SHA512 eae97096a66038fe8d5bd86b6a15ae679142593d3cb27ec0fd495fc16b926e58c9a25a6c050a310c450c7c167ac20fad46c60f31fe58dc1a1da11d987e8eed17
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67 SHA512 174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.18.tar.gz 2940789 BLAKE2B e932c53b67052a2696a00cc9e0ee79ca2c7bdc5ba51bbb6c5bf3e7d5ef8bcf3c4e0f6524d40bcbc3342f86c3ddec6e27a0a2ad329ee5ad510260dc2f24b3913b SHA512 255b5d5984578a8d018b80e213ff2bca583de30d835aa3de345fabb05c229277d18007251b441dfdbf863e0297a2fa6e08e41b7b57dd76eba7f2e50879ae2cfa
+DIST haproxy-2.2.19.tar.gz 2941835 BLAKE2B 9bb7d75b598b075de56c4647d954c1aa8e277de49f9938eb7e759b65ac59b6802561a29a206caaf6076d2d6111b1b0b39b7c60584e4389273d22525be28895e8 SHA512 bd27f6fa3555a8d1c0f9ea91132ea474e54a176847e090f3e2296dbc8e9e98ef3dbcc4440abccf5d65c8b8afae33e8e5e5472002a9abaa63de3eed4056e519f8
 DIST haproxy-2.4.10.tar.gz 3605085 BLAKE2B c42bd0241b9bb6d5fd5d566871f9ade943530175cdaa399d1a9583d25efafb0e7fb067143d5bc99d0705b0264691efc57021adecbd5bfe5dbe42d1eebdae60c8 SHA512 116739dbef44164e9e7bf56855bebcb09a7678df688a607539aebde330844d4ae110b9e9e2f75b70ed7147d51154566968972d19ee6d45936bb3d0ed79c7d348
 DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8 SHA512 a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
 DIST haproxy-2.5.0.tar.gz 3803196 BLAKE2B 271661f685f4aa885e3cab75c4a0abeb9751a7cb4ceec3a71f475e75b635f8452857dcaa7b010c8d0621becb3ff7f5d49af8d7d758b30829ae99e153ebc85b56 SHA512 70068962a434e9ba4b2d7595b929aec618ee62d51935c9836f2617e639416e50077495bbf08dabbe7dd49f2d4e3942e55a96a5de33a7846377972fbc3eedc1d0
@@ -12,6 +13,7 @@ EBUILD haproxy-2.0.26.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c272
 EBUILD haproxy-2.0.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.2.17.ebuild 5486 BLAKE2B 2ecd95883ad3d19c067d07493bf9cfa254fed562798002d8640d9ca754f2f4c415b58aed405547107332ff9ca8404e2e95319735874e455a98087d8d236c5500 SHA512 4d77e92faebc06ecf562e52a02cf1b11b1ca77bef89347680372d4f9cadf1fd6e7c2f737582232630f981adb43be40ab222543794f82c11d656550953da4eb08
 EBUILD haproxy-2.2.18.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
+EBUILD haproxy-2.2.19.ebuild 5490 BLAKE2B 236bbab38c660af5389f0f91ea178c04b5d29add2e49f0de8e0be1a73fcb260fe0540b6a9ba4d76db580ff4855c10835403060df58204897ba5dd1bc7ecc2ebe SHA512 0c0f365b72d16924823ce5aafa6d568e62535b70b09b7a08241a5138b66f8ab0fcf38fcef6ad8f9d2ad73e2555f484453af2944de4dae51f0db1d217bf2d8a84
 EBUILD haproxy-2.2.9999.ebuild 5490 BLAKE2B 45ea05b024fc7ec5091ac02d463c93bcb1c2724ad10d9932c51e1f442fab6dd8d679f52ce9063b38b301ac0debeffb71fee36c921394e35c88d1111165db3eed SHA512 edca75adabb740058a2699efc0dc1706499b10249b7079ff646ae402b89bb47194c55a546e18c6e8e7afdd9f394744bdde09bea130b31d8f871aa4d951d3d838
 EBUILD haproxy-2.4.10.ebuild 5709 BLAKE2B c070ea3251365e3608ea3434e789400cc6be5ac7f617be53f3064d4d0e7b631c39d165b43240ffb66f73cff47971fb60e1e291324ca3cce5ffd17f24e1baf5c2 SHA512 065053f7ed59729308da473cd55324ac43e799c43c6d7a1af0c96ef5dd7476cfc54f4fb1ce517fd8601584704c55d98e339e30d8f80771b295084f49f60def4a
 EBUILD haproxy-2.4.4.ebuild 5705 BLAKE2B 9fbf9a8c3104e5fc2562d80a821fcc23e2d092eebce50f4ff91740affe4a5a03ab51c737f32e491aa1c807b7c81c85b19c03981bc56ca21d6de6b74246a50d29 SHA512 993f85aa9f17a9d268eb41e54afd92f8425ebc200c3734e128ff32984904ce1e93bf640a2848f80a4fca847583d2b3d9ee5f6091dc8f9ea25c8f4ac8d1a41503
diff --git a/net-proxy/haproxy/haproxy-2.2.19.ebuild b/net-proxy/haproxy/haproxy-2.2.19.ebuild
new file mode 100644
index 000000000000..3f411c90b78f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.19.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	lua? ( ${LUA_REQUIRED_USE} )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	crypt? ( virtual/libcrypt:= )
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre2:=
+		pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	slz? ( dev-libs/libslz:= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	lua? ( ${LUA_DEPS} )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test ${PV} -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test ${PV} -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index ad63bf82ea3a..2fa25c863978 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/libreswan/Manifest b/net-vpn/libreswan/Manifest
index 5dff56c0f480..ee06591bd6f0 100644
--- a/net-vpn/libreswan/Manifest
+++ b/net-vpn/libreswan/Manifest
@@ -8,5 +8,5 @@ EBUILD libreswan-3.32-r4.ebuild 3191 BLAKE2B 256ae0b37e6efc53174ba4b1e5dce166ec4
 EBUILD libreswan-4.3-r2.ebuild 3297 BLAKE2B 0349de254a56a9a375f734981326b46a8798a553842fb0030344f09ea797a4cba421dd29bba2a7af7116cac27c5f0290161a694539989c9148daf46610102262 SHA512 8eb0e3189d38b9432d8a879faa96a98536f034743194ceb27ec282562693bd547e4da8bcf162f6e6d0674c555854fcae355f1f7c4b31d1f4fbdfe675fea02342
 EBUILD libreswan-4.4-r4.ebuild 3298 BLAKE2B d580c97b4da77e574ab25a8b163942c302f19c22823799ba780bf9340f34a0cffe7ed2a6cf800891dafebbe564cda92a7b6399a1a4bf9dcfbdbfd028f8bc61fb SHA512 0c075d4992460e9731e183780e11d99f3dc303fff2410b90c019f08c2b317c8a0b6e2ac444044c5570d6578e91275ee0fca57c5a3793fa31d0d9a95ef110a87b
 EBUILD libreswan-4.4-r5.ebuild 3320 BLAKE2B d4561524d0b71852a80ea3e43461afd081e41098c950819e40f5cded38e6933f93304fdab3936f30817b418a3ce1343ce536b75f25d50442d900dc9eaeef973b SHA512 37f35d7df3106394edf664f023a22c6133c5d89bc8262249dbb58f065e8f46c39e7940056642d4bc363841abe0fc7143f89608cfe0e491af8504fae592edac6c
-EBUILD libreswan-4.5.ebuild 3321 BLAKE2B 7d82fbfd46cb019d2509b6ced7a4e93a62938d6c31a7f3f33ba0a5d70f196e9fb40cdd55f6b03cff532a868eea3163275294bdc71cd11dc15cf566dab8bb2261 SHA512 68d3ab9cb68ce30681c1b20032b46b26140f6e4e4d62f537cd76f110eafbe8ca8b7516cd659bd9e8bfebed30ee0259d1c8aa68b8b74947c38e94733b128665a3
+EBUILD libreswan-4.5.ebuild 3320 BLAKE2B eace0fea2828dd0734fcd1d3bfc0a5cef72f12ac03f6954cde4a27a6ae8d2d12be388331cfc09d82d9e6b10965d9d95fb5d8d1d0425235618740dd8a6fb25739 SHA512 1f2b745471019daf23d76cf77f0a17bc3c2a52ee340727dfa2b3cd627e6d895397643dd5052dcdfe511c94950580bc40f71c0e0d358ada933bb972641d787842
 MISC metadata.xml 320 BLAKE2B 0c27b16d57b404aa7307e58f0fe31a368595acf482fca1efcb5f2ebf3b98487cbe9f77b10862820443c2dc13d98664bf4bf5944abf9ca5dec393af2e1eb19668 SHA512 b313c55f0d9de7f3ff3d5a8fb7b0d010b3240388fb0b808b7108c7d2f43d926896a13e64ac365bf4a6156d429857c99809f0d034298b2bb6e55c4b0bc56e36ab
diff --git a/net-vpn/libreswan/libreswan-4.5.ebuild b/net-vpn/libreswan/libreswan-4.5.ebuild
index 86cb2867d62c..6e63e0b26f56 100644
--- a/net-vpn/libreswan/libreswan-4.5.ebuild
+++ b/net-vpn/libreswan/libreswan-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.libreswan.org/${P}.tar.gz"
 
 LICENSE="GPL-2 BSD-4 RSA DES"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="caps curl dnssec ldap networkmanager pam seccomp selinux systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/protonvpn-cli/Manifest b/net-vpn/protonvpn-cli/Manifest
index 29a073de33ae..7aacdbb62f5b 100644
--- a/net-vpn/protonvpn-cli/Manifest
+++ b/net-vpn/protonvpn-cli/Manifest
@@ -1,5 +1,3 @@
 DIST protonvpn-cli-2.2.11.tar.gz 641106 BLAKE2B 916560e32716e1d29dbfa3ae513df3976dbe4bb667ad9b541f96caefba89636f74f2c13dc8b7d08b22dcc90b380904aa497cc529af8c6ca5865fad67f885acd9 SHA512 95d1681ccdd91ad43d4b0e4976c10e0d9c99bc6264fe9324a59d3495235a8439450574a18ed38c86dc4513cf754684328f2d060389e0a49bd61b5ce81356cfcb
-DIST protonvpn-cli-2.2.6.tar.gz 640528 BLAKE2B 546fbea204b9809035dae7c8e29094ad09ab70aea7eeb3e80c5c554c642a48d2823ff9aef04a5253ded9d131e560e5216d4f3985abd8f55d0a1a453760aaa296 SHA512 553cc6fa1ddadb50318b4430de6fb743d44078ca0b64b8c3ef86ed43d5b274fc527d0dd94eee882157dc7823611d305047df62ba8ea1c415affc5a0abf581ed3
 EBUILD protonvpn-cli-2.2.11-r1.ebuild 746 BLAKE2B fb95129694fb39f479eb2b0f5f23d7af5767de40a6bd511dfdc2be59d841208cae5f9d450382c48fed6c388ddc69c9cd07ac4748c6dd782670cd63842432597b SHA512 87d9acff8a1de48f8306d1314034cb7a649713f4f906d671fcc4b8c65a9c089663a552a0675952563be5d88ad02db478de3136b37050fc59927f594e3f9f17a8
-EBUILD protonvpn-cli-2.2.6.ebuild 725 BLAKE2B 1f8954c156b802ab37bc6abb0222688cf5f225dbfc2e87d3e965a2b236951f8ca7321995712dd80252a01665446357cf4566767552e22fa15621c0398d6a5a24 SHA512 97b62a78bef8ad5ffbfae05a8bf10d6eecbc1b174d9bf4710e7d7917aef6a1bc94b818a59483affc4e0aacd6e04b5efb0576f9a151dae1961df310752d1ddaa8
 MISC metadata.xml 367 BLAKE2B 89d5f6cdcf9023b4c400d5f699d1509b5cf90976d4406e13e8b17c1b2e599b6936a35d9155dba46c8d2cc9c06e35d83549fb4ac47cf8dc56892a6b94d4f1b146 SHA512 b0de06efe1a8258b2118a12949926fc8f8723775a932814701fdd13c632d51b3515de0a995813d43e467f8891bf62050e53196b2ca56a148c9f1dfef13eb1495
diff --git a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild b/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
deleted file mode 100644
index 94370134e8e6..000000000000
--- a/net-vpn/protonvpn-cli/protonvpn-cli-2.2.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A VPN command-line tool from protonvpn - python rewrite"
-HOMEPAGE="https://protonvpn.com https://github.com/ProtonVPN/protonvpn-cli-ng"
-SRC_URI="https://github.com/ProtonVPN/linux-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/pythondialog:0[${PYTHON_USEDEP}]
-	net-vpn/openvpn"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/linux-cli-${PV}"
-
-DOCS=( CHANGELOG.md README.md USAGE.md )
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 4e94f63412ce..dc2fd885d0bf 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index ca55ef5ebc8e..6206aae25213 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -26,7 +26,8 @@ video_cards_radeon
 video_cards_radeonsi
 
 # James Le Cuirot <chewi@gentoo.org> (2021-10-02)
-# Keywording aside, m68k CPUs are probably too slow for PulseAudio and PipeWire.
+# Keywording aside, m68k CPUs are too slow for PulseAudio, PipeWire, JACK.
+jack
 pipewire
 pulseaudio
 
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 6548a518da5e..8b1a489be4ad 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -134,11 +134,11 @@ PYTHON_SINGLE_TARGET="python3_9"
 
 # Michał Górny <mgorny@gentoo.org> (2013-08-10)
 # Moved from portage's make.globals.
-# 1) do not uninstall kernel modules and therefore allow replacing them,
+# 1) do not uninstall kernel modules/dtbs and therefore allow replacing them,
 # 2,3) removed wrt bug #663170,
 # 4) protect /var/{run,lock} symlinks for bug 519620
-COLLISION_IGNORE="/lib/modules/*"
-UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock"
+COLLISION_IGNORE="/boot/dtbs/* /lib/modules/*"
+UNINSTALL_IGNORE="/boot/dtbs/* /lib/modules/* /var/run /var/lock"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2013-08-23)
 # Make emerge messages default to English as per Council decision
diff --git a/profiles/package.mask b/profiles/package.mask
index 570cdf228f28..84ee355c8c88 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -239,10 +239,6 @@ perl-core/version
 >=dev-java/log4j-api-java9-2.15.0
 >=dev-java/log4j-api-2.15.0
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-12-11)
-# Package without consumers. Bug #732792.  Removal in 30 days.
-app-arch/fastjar
-
 # Conrad Kostecki <conikost@gentoo.org> (2021-12-04)
 # Masking newer versions for both packages,
 # as they cannot be compiled due upstream change.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 636e3cdcd8d1..b1ce146684a8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7735,7 +7735,6 @@ sys-apps/flashrom:stlinkv3-spi - Enable SPI programmer using STLINK-V3
 sys-apps/flashrom:tools - Install ich_descriptor_tool, a tool for reading descriptor-mode SPI-flash images for Intel chipsets
 sys-apps/flashrom:usbblaster-spi - Enable support for Altera USB-Blaster dongles
 sys-apps/flashrom:wiki - Enable wiki informations, like supported devices etc.
-sys-apps/fwupd:agent - Enable update notification agent
 sys-apps/fwupd:amt - Build and install Intel AMT plugin
 sys-apps/fwupd:archive - Use app-arch/libarchive for archives support
 sys-apps/fwupd:dell - Enable Dell-specific support
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index c6d1a0cc4be2..350261e52e76 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index daefe1b91575..435f165b4e13 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1,5 +1,5 @@
 DIST qmapshack-1.16.0.tar.gz 54233332 BLAKE2B 8507018e65072856455e500aae59db146f68b7a1cf5eb2311ee3526044f8fafcec0034ac4f7a473c95ac71bcad8eb057bfc6724f3c80caff51aadba9e16fc412 SHA512 768fe7331d2bc2f2bbadd8c9296012e718f52863c4dfc29f000a5417ccf83297791333be9a20b9d49dcc7b92a779184503e8315b1f7ca258efc9f539ef7262f4
 DIST qmapshack-1.16.1.tar.gz 54433326 BLAKE2B 58d3fff752187418552cba1d89b3ebd0082af379204b3c0b79cb8f8096cd422d3a9d347f7b91379868b37092469c5ef6187e67bfb7d0c3c07e18a65df0b488f1 SHA512 cd6c1818c2468a4654222d165bfa7278dea01890d4065a359942ce16ee1c643b54f86a94a30632bc414a1ec22e04ea340109fc89ca6c340eb717f8e86468e281
 EBUILD qmapshack-1.16.0.ebuild 967 BLAKE2B 86b7bf4ab46ca6c1a5d4fd923c09574464dea8c6a3d8ed4e45d660b295e93af3ab34274da97570ba622b63e541c5a732042ec9096f8e86462af9a83ca5b9fab5 SHA512 ad24da0b305c408af1bc7b3feade6b31db7088bbb54fd04d88c15b171cece3b18320cad2c3d4ada436d00b0ed63b18f92d0cdcb2045f95b85272ce034e863ee6
-EBUILD qmapshack-1.16.1.ebuild 968 BLAKE2B 5afed110c50a238156590ea87eb121765aa223c662443c43a76f33b1ea7f20b1a2c7c468a146bb2d59920f3d5e8ca0db67b0fc00931469ea145505a7eb28313f SHA512 1d18d1d48463818f0cb3bc852d229f4245beb96d6744eb4ff17c05b0f4260559c103adc3bcd82aec08803a8a67821007d789f43d5362b0638de2fffcb9232ea6
+EBUILD qmapshack-1.16.1.ebuild 967 BLAKE2B f16bc84dbf0432dae2f35ffa7d9f1b692d16066944401fdb4d72e6e2339fd5f8179fc53f94418c400a99f12bad9ded09e4cecbb95fe3ff43e9f97c85df0183d3 SHA512 e7252b082853b10bafd30a5a558b3e090206c078caacc9017b9bfbcfcb5128f3b48d535fa0387d5d365a94db9f57091a0f01035093adef5cd1c959e5cd23996e
 MISC metadata.xml 832 BLAKE2B d5194f18fd470325a3c98e268794bc01c4adc951a88f7548a52291cafbf010ded0e71beec3b902021e4b318eb5d21b35d2397475df948acec8f5683d003c576a SHA512 d5c8cc820bba367ace5ac27c714b735c22b456d71248cce2a4ed5c67eb80033c3690127887cb3a181628a836dc42c322508058363ec57b06ae823b43aaf63f2f
diff --git a/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
index 897d48ea321a..3065ccfdbdef 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Maproom/${PN}/archive/V_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5b9dd8650a0d..7c2e8154cf1e 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0b65f743aa19..eed6590aae6a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -4,10 +4,11 @@ AUX gdal-3.2.1-libdir.patch 20206 BLAKE2B 1b8c737246b25e8ea56855ec8cd41dc8bcc3ee
 AUX gdal-3.3.0-configure-geos-disable.patch 6509 BLAKE2B 1a22658e0f0bb83dc409c82d9b25dc8d6ae5ee7c5551c500ede654884071c48862c0392ef2b129c40546fed1af9ba7cb756a0fa4e05709481a851be8d87d2df1 SHA512 5da36ea9ced5826ddc748141ad098c2c2151a9ea68c561105eb41530c76cf6a9094a4683310949931cfac58c91511f6219240d7c18f0348e1e0841683c384c55
 AUX gdal-3.3.0-libdir.patch 19617 BLAKE2B c0fd86a2d79155ee17a8ae69ae59876b76d9a4a35c79b896d838edcd497f17bf35ddfd3ab6de8e792a87ae8c012a91b1d2f0351d47e89f7d7fcf88a72647d38a SHA512 ee74ee86b8249abfbbce6e114f3a5f1c79a30a86aeb45761ca8637ebcae0e0df4c4961b292fdd1f49865da6445a8afaf161d80c28849dde6adf72cc3ed092852
 AUX gdal-3.3.2-poppler-21.10.0.patch 1226 BLAKE2B 7475f40216fcf14417c5bb916b5508935e518e4428c8134099109b85af966935a83f807039ac2617f0a437ff1594ded0d403d447ceacdf53e77f74973bf866f1 SHA512 760f6ba7746496b2f72562ff3dad6067f67d1a612ecb713c1b9526dc335f4ecdcd97d406e8e6f395ad10b5a66a1febbe12579a52aab3d4518807999def361de4
+AUX gdal-3.4.1-poppler-22.01.0-c++17.patch 759 BLAKE2B bfb9cfc97fb56a18eda0f0d20e83f8e48ba44bab80fa7253c3883cac0a6a6460345745aaf4e63c750e4c0d8e3866c2978da382ea9889c9ff638b697e6398ad84 SHA512 bc95a835093b9b8bb3ed44d82a9c4b0fb987f1299d572e05f6791df2bd14c279853cfc877e41a012367bb4089b4e81ea359bc44d1ae11e67048063d2a1105a1a
 DIST gdal-3.3.3.tar.gz 19600111 BLAKE2B 2d4558062b35016372d6964884296878fdcef0afa83fb03b10cd902ce101ec52f551d48014d95b391d19b8db13d7ca1d639575b39e9421780f4212bef02dd51f SHA512 c49e4555e598e4182e6419758c31df08d46b8b061480f08be09d61e840057529bd833338eaa8c1ecfe1c6a0cc8cd6a073bf15fa6cdae003e4475485cf3851145
 DIST gdal-3.4.0.tar.gz 20008930 BLAKE2B b4dad7226d2cfee3bdcab9782d2d35355501c1dd830d247099f6a8030311b86e7620e90f7bba675bf49dc47d166ab586fabe45ba02d9d7e9a73829194da6b360 SHA512 e363258172cff9647804be11f28ebec1614ddfbfc6eed72d44700c23aea674267e413099555d25e784d567ea915b5fb9092ff74b98d890dfcb8aae56b0575eb6
 DIST gdal-3.4.1.tar.gz 20022859 BLAKE2B fe6da8b3f098839bc5da9e49932a7a8e172b5dcb79f34eaa5f82a336cab3666223ae6f354c7847d1090e312838cc2e121e357c914cca3375541ee8ed31746edc SHA512 dcfd5f5ceac633838db2a92af6f6eb1c9fca55216885f071c7d8df8fc119aa800b2854c6e5ae84cdeea531e7e61296ad4378d798107c19d80d2ba4e1094299bf
 EBUILD gdal-3.3.3.ebuild 7852 BLAKE2B 03a04b87e0099452c748d0400a4c21a9369a04f01948b298a39dd9a938c3b2264e00827b3cf0ca7d7719f35a90974c493fcc5a99efb111789c684249c58dcafd SHA512 28738878e2f1cb78f5ab1a25553e445563a4b17e555bf87808de1ff0d373b6b309ad561d6514e1b9b02f5391bb19c7f0519c31d490d4465f8eccef0f1cbc0945
 EBUILD gdal-3.4.0.ebuild 8033 BLAKE2B cf27f9b230f4fba647892383bd51112a9ba072424a834189569027faea7852476fc2f627837759d99c126d6307deacdf951ddaa2d88dcaf120ef4c8455ef2424 SHA512 9633034b855d9b640de491fc1e9c7d64eb149114787dcebfa76fec083b2772ba45e59cfb87154f35e4ce6544607fff515decc4bd4ce574c237f2ade914498361
-EBUILD gdal-3.4.1.ebuild 8033 BLAKE2B 0be979fe6c87eb39f5db25dcad069ef8458f49a5177301204831372f4dba0f86abb8ece3c599961a2b9f467e19d0f321b8e0cbd675ff4b3cb6ca31278d3f5121 SHA512 30c2c0a9feb6337e6004d8e0feabfff68ccde64b329dc4aa209305b196b735ffac73f577370f558fe5fe1895e722737768bd7a80b1bb87a83b2acabd73b5f9b8
+EBUILD gdal-3.4.1.ebuild 8079 BLAKE2B 5d664965e22d69fc00e59edf17d0cfa1ab5027d973cc87abee74a3d43fb9d6f87d54e0088d8b330ebd28de9f2e7f384efb7edb5181d44f2425da51cf98391cc0 SHA512 c2d00c07f4968ae9b21ab9c25d74d0f13a38cc7ef350a0e07b5b4574ff983f6810ac392a177fdb05dc2007ace125034b7dc2df6e7f87967e8c407ed87ae4b883
 MISC metadata.xml 1623 BLAKE2B af7c9d5cc3c16ffef6fa9ef5dd5cf54ffcd34229d1e82b90e310f9eeccf5a5b4fa2119112b5427b520ce6e964e368aef7313edb3837940bed4b960ced7714fc3 SHA512 ed206877adac0b8b190e0edfb04f48c435d698fd523a14d54a14638b908c9e9452b1a2d394046093f5aa86cb48c611790f56ae511807855eb80bfcd4cc1d425c
diff --git a/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
new file mode 100644
index 000000000000..dac3bd3776d9
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.4.1-poppler-22.01.0-c++17.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/830883
+https://github.com/OSGeo/gdal/commit/3f528f2b5f9244698c89d31b74155765538ef362
+
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 8 Jan 2022 14:25:09 +0100
+Subject: [PATCH] frmts/pdf/GNUmakefile: force c++17 with Poppler > 21 (fixes
+ #5071)
+
+--- a/frmts/pdf/GNUmakefile
++++ b/frmts/pdf/GNUmakefile
+@@ -11,6 +11,12 @@ LD_SHARED = $(LD) -bundle
+ endif
+ 
+ ifeq ($(HAVE_POPPLER),yes)
++# Poppler 2022.1 requires c++17
++ifeq ($(shell test $(POPPLER_MAJOR_VERSION) -gt 21; echo $$?),0)
++CXX := $(subst -std=c++11,,${CXX})
++CXX := $(subst -std=c++14,,${CXX})
++CXX := ${CXX} -std=c++17
++endif
+ CPPFLAGS +=  -DHAVE_POPPLER -DPOPPLER_MAJOR_VERSION=$(POPPLER_MAJOR_VERSION) -DPOPPLER_MINOR_VERSION=$(POPPLER_MINOR_VERSION)
+ endif
+ 
diff --git a/sci-libs/gdal/gdal-3.4.1.ebuild b/sci-libs/gdal/gdal-3.4.1.ebuild
index 620283cbc410..56d451eed723 100644
--- a/sci-libs/gdal/gdal-3.4.1.ebuild
+++ b/sci-libs/gdal/gdal-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 # subslot is libgdal.so.<SONAME>
 SLOT="0/30"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="armadillo +aux-xml curl cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_ssse3 debug doc fits geos gif gml hdf5 heif java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
@@ -91,6 +91,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
 	"${FILESDIR}/${PN}-3.3.0-libdir.patch"
+	"${FILESDIR}/${P}-poppler-22.01.0-c++17.patch"
 )
 
 src_prepare() {
diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest
index 09c03ec617e1..5cd9737cd090 100644
--- a/sci-libs/gsl/Manifest
+++ b/sci-libs/gsl/Manifest
@@ -1,6 +1,6 @@
 DIST gsl-2.7-cblas.patch.bz2 12073 BLAKE2B 71f2bdafdb1f42ca5c3515f8e39266242185218495705018d88e523be9bc776b39749156500cdc5746a16e481e9cfe2b79660e250eb1a70f3b18819d16fe11c5 SHA512 5b9b2a798079610d7d4981b83672cc978ed44b66aaf6e671794685f10bd4069764bb358870019dc0eec1e251639cde12aaa3598cae0e2fc050ea39c79435fe2f
 DIST gsl-2.7.1.tar.gz 7509209 BLAKE2B dd216c2fdb536e57b6e29613e46e1a05183fd18c47434039caac68fefffc0390cfe2f21eb117347d4bbdf9004de837ef2db02c17c01eaea4b615e3e45a4fd90f SHA512 3300a748b63b583374701d5ae2a9db7349d0de51061a9f98e7c145b2f7de9710b3ad58b3318d0be2a9a287ace4cc5735bb9348cdf48075b98c1f6cc1029df131
 DIST gsl-2.7.tar.gz 7508761 BLAKE2B a9da4df40ea57374880026a0586f2f218dbb0c9154cc661b3e7f5cd414311b95300e60faa2d7f4d3c6cdae5cfdf77cb8052075b56f51564aec2649cc4ad5f7f9 SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5
-EBUILD gsl-2.7.1-r1.ebuild 1488 BLAKE2B a8083efa4a68d667ac61d2f75d29c915284523f96415f7c74768ea07b5ce54dbe6dfb3d91fbace99f45e99f06fbaf6518762eb34b8a3837cf38ff22f627312e2 SHA512 217b3dcbf854aae947622cfdbe7bcf26d5f67be7048b65b8b579bc04903d18f86bf0ffffb8c766badba156829c6505972eccf7b3872dc9e30e0d0a64a6cde8a4
+EBUILD gsl-2.7.1-r1.ebuild 1487 BLAKE2B ea66fb94f1a2fd8de35a93cc55779466acb5fea3c38eb5bed87524aa1503526ff618fe4fb0e83401628e7ab3ac3468fe4b16165c6e7721e222b9288312b6c4dd SHA512 e345af890021ec80f07444a13f1f545bbe2676bb0a84835acc579158d57524cd8553f8f2a7318d6bce76cb1461c51537f1945b990cc3e2d82d12c2cbab8c6624
 EBUILD gsl-2.7.ebuild 1456 BLAKE2B b5fb1ef6587526b39804ce175d0f67a7917a0f48a90ff3585577b51ba7547b026e3518801fb66f43cff5c8228142189e65cfe5e1bf0ef7cdb3c166b9532b5231 SHA512 14e1f9ee0d3d7b3e9942082b143971426352011c27ff4cfdeb9e63294c68598e38b2ff8074f4431909b1d06603b8120288a4504981732c6e8beb2fb0e597dcf3
 MISC metadata.xml 1191 BLAKE2B 856a9a1b3195a76a6c1fffe65dbb94b90a135ce4290c33d772efca43be04f29db7efee5083ee997660c5831aa75773993423645a28e82072b3ceb877135d6810 SHA512 9cb110e5202df7ca123da18ffd0ac60d1d9d5577a29dacff001b24b0c0eae4f96851273d72956dd7b0b94c9fabd392ea13ae6aae54e801d118032d215ede59b2
diff --git a/sci-libs/gsl/gsl-2.7.1-r1.ebuild b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
index bc29c3a11356..be2b46d449a7 100644
--- a/sci-libs/gsl/gsl-2.7.1-r1.ebuild
+++ b/sci-libs/gsl/gsl-2.7.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 LICENSE="GPL-3"
 # Usually 0/${PV} but check
 SLOT="0/27"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="cblas-external +deprecated static-libs"
 
 RDEPEND="cblas-external? ( virtual/cblas:= )"
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index e7870512dbf3..de96a4a63e0d 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,5 +1,5 @@
 DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
-EBUILD libqalculate-3.22.0.ebuild 1776 BLAKE2B 4b8454321ad77c98b4b9a5a154ae54755e502f702f00c4825dba12a9ec410739c7ff8d28b142f26a6edc848b97ef3e307f2cb93350bfd1878d436d39dcbbf392 SHA512 a7a847704e30caa21bcfc53fe5a00f3f17b5fb92b65c5e3bf75efbf226b439f7002b82ce941705774c8919494e4212f5e6b47af3aca503e9c2a8e481fd62963a
+EBUILD libqalculate-3.22.0.ebuild 1775 BLAKE2B fed1cac3f14df25762147a2084dd5d22c567c0088ed3d2d81a19c3923359cfdc0a774758484fdfa3ee97f2a49fd1a682d63da6a4eb2168deb7defb49766e4bb2 SHA512 cc9ca2da917e0d1cd029795dfaf73fa5ee5d89a9eb5de589bc3dc57967b0cc6f966932aa8d315d610e87cfb1280a72cef46e2264ce29c0b6de3be741d4328b8d
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild
index c2543ef20bd2..2fc02de1fe5a 100644
--- a/sci-libs/libqalculate/libqalculate-3.22.0.ebuild
+++ b/sci-libs/libqalculate/libqalculate-3.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # SONAME changes pretty often on bumps. Check!
 SLOT="0/22"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="curl icu gnuplot readline test"
 RESTRICT="!test? ( test )"
 
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 16c295a3772d..da8bbe923e63 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 02a9cb5cbd4d..f119b13b8c70 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -2,6 +2,6 @@ DIST z3-4.8.11b.tar.gz 4801435 BLAKE2B 903a04246fe4dedc96fda653fa9e3a57a80b951d2
 DIST z3-4.8.13.tar.gz 5103999 BLAKE2B 5500bbc71e7a863092a36bdd2bc04f5a4435e9d8fdc62c7956aa2546ffa9e39344c9528bf802f6e4c211c799e873f2673dbf8b113599dcbb694ac040ada2e9a0 SHA512 c5e8f34525ed3b6b2935d7f01ce2f90f5dd99b4cdd035664b36c967fb1c7f3b05abed45c7288e2261723e73d68728ee91a0f67d92012d86b04598d7b54369c30
 DIST z3-4.8.14.tar.gz 5113598 BLAKE2B c6a82cec33e879123c33506897ac02be682d08a6432da0b11c6918f2664fd7249d8874ccb6f543907f789cc3b40b126465548abeabf4ac16d2ee791ce179742a SHA512 10170516ca472258d2f9df28cd036e43023a76a25f1e1670290c62f3890d935bf82770970054a5fd3a0f02559409e7ed4b18fb08347c040ff2f9e0918e152aab
 EBUILD z3-4.8.11b.ebuild 2610 BLAKE2B 62e0920d9e4ba69c65fff37bdc74c70f7177853f3b8ff61b2f4a50dd09d72d0f42ffcf71da152e2c5b80d1ff4e26b96d683f10a439c8a8270cc8f6dc50fb3faf SHA512 457a93cfee6bb224e5d1987a7ecaeba18f3f478ac26a222ed4c93e249225c46834d07800e9049931833e01d8ce1e5fadca09ab24df261fbc4b1165e1290845f9
-EBUILD z3-4.8.13.ebuild 2595 BLAKE2B b7bf0676545947fa7d3e046f2541bd09447f2fb674777f300cd2575ec8bebb15cf554e962fb802d71242a1abd3bda65ff87080723970358659bdf8b27c21b146 SHA512 d8b31d78f0bc01594047802b40b02ed10e7ebb4394ce267bc6e2143bc73292cacccf07dbd1ba0bf0e4bf636c41464c987844042a539100a4a988ff62b3e1a814
+EBUILD z3-4.8.13.ebuild 2594 BLAKE2B 672fa6fcbf0d98a092bbdd264d57dd8ca52a84fe9ae220eeb429697ec4eedd786764d412a4995d6bbc295c83bf0244934533f60b1d355c6ca600dabf0b0b455d SHA512 a5e24ea461889c39524412961cb77bcd40f5771ecec5a15a05293768435ef8261de0929c9387d6d79ef582f853dc66df6f73e4c57d70d30e19119167da89b17f
 EBUILD z3-4.8.14.ebuild 2599 BLAKE2B 7d4b057cf1b8a9853db7d5f482a7457cd55fe1e4c3bdaa727db86fa69d0d144ccb2de9e25e51f34c7edb7c3487e6b0f4a51a76890dc309820e8096e39d7d9f01 SHA512 3c40f3b590e1d46defc757c6133136693e5ee5129949dfd1f7dbf49bc7e0634c591c2ba6e0758b0a0e9b979425c9501864020e4e12cc685ce963d74d5b2b6889
 MISC metadata.xml 617 BLAKE2B f940ac3d7c159dadf4398164b749eaded84c12af5553a154d97fd9bfb939c72e3122e08e11c1c9764514f59a87695534daff6628bd15be4de834c7cfdb65d7f9 SHA512 758df481a60606de12c5a450162ee89fd2f68f842675b3bf280f024fcd61232228476ac889e60c09e42ebae01ad855b32ad77793ba7fa5714861ccc5ca52bfc7
diff --git a/sci-mathematics/z3/z3-4.8.13.ebuild b/sci-mathematics/z3/z3-4.8.13.ebuild
index 6651315d659b..66a173a9a933 100644
--- a/sci-mathematics/z3/z3-4.8.13.ebuild
+++ b/sci-mathematics/z3/z3-4.8.13.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/4.8"
 LICENSE="MIT"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dbcbf802769d..1705dab30613 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 30fd9c0e2b31..c4238b700c9c 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,11 +1,6 @@
-AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
-DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
-DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
 DIST fwupd-1.7.2.tar.gz 3922633 BLAKE2B aec40de0bbadba9a8688617bf2f1a79b8952b8a30ac011b3656a3dee312295250e370a09b4ea2fbf35992f0124a7aa78b6e17200dc57c768d75d9ce3a94f6f18 SHA512 9cf47d13e31eaf11e2ffddfd26a0fb23a18049bcd7a54a1cb4e96003db8134cf01bbe83e507b90d429df78e478cb3c97bdd3d2c0e194f02994ef4c5a15347521
-EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
-EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
-EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
+DIST fwupd-1.7.3.tar.gz 3964542 BLAKE2B ab098023663c6b33e02270e169d1f29f5e2d8531e6b7924ae98b2bc2cb36bd86958c301f99bbc6754f5b30737ae1ee9ec64eec67a8661960837497527e2e5995 SHA512 6192574b0b4cb839c724bca91c9ed3d6ee934140038873a8e596d852b272b38b31e690f94e83eb9e21c45eb71515ff50720511c721a58b28f8f434a2ccd58bc8
 EBUILD fwupd-1.7.2-r1.ebuild 4535 BLAKE2B 898b3f41ff92047a092f791d025bfcad4aa587eb4e0dea0f9093683e901defa1a24c3db04ab8ca2fa05d6d61a6342da40d26ab876a2c066392c98c65cdeac1c5 SHA512 fc1212806ddc26ac1472be2a182263eff6f28249bb72286b93cb41fdbaf6ea6584e4c85307f9e93083477c52b7369297ff4887c5de17291768038e657bb74331
-MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
+EBUILD fwupd-1.7.3.ebuild 4559 BLAKE2B 7358dd372d37fc08dcf2bb2b806082bd258a7663122f6742246757a550de015d5bbe0b3fed30d4d814f13171847c15659c9d18fb9a7b989e99aea606e589b4f5 SHA512 7ae2da5861050dd0e82691c18483310613005f6d8a0607468a04fa25c48b77159d785efab9cbf0645a0f3ef960cba53350a1b74efb8eec667a352dc20c58ef99
+MISC metadata.xml 1432 BLAKE2B 02b0b170e7d8ecd293457ed8e1f9fffe2aecb4bb4e1be91869b638445d98c9e5824baf0ef497fe19aced0c1b80d747e7c41643a159edbaf7bca6f845bb5baa18 SHA512 aa650a07d777ba5a3816f6f3fd6ff6fadea149b29a7c1633acec56149de99c072493965724d33d8a76ac0221bb665ee6bf2ddc35f61967798cedbe02f79bcfbb
diff --git a/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch
deleted file mode 100644
index 7fbaf392e074..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.5.7-logind_plugin.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- fwupd-1.5.7/plugins/logind/meson.build
-+++ fwupd-1.5.7/plugins/logind/meson.build
-@@ -1,4 +1,4 @@
--if get_option('systemd')
-+if get_option('systemd') or get_option('elogind')
- if host_machine.system() != 'linux'
-   error('linux is required for systemd')
- endif
diff --git a/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
deleted file mode 100644
index 24591b583e26..000000000000
--- a/sys-apps/fwupd/fwupd-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.7-logind_plugin.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	sed '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gnutls)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gusb)
-		$(meson_use gusb plugin_altos)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_pk)
-		-Dconsolekit="false"
-		-Dcurl="true"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-	)
-	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
deleted file mode 100644
index 72e4cba1d3a2..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
diff --git a/sys-apps/fwupd/fwupd-1.7.1.ebuild b/sys-apps/fwupd/fwupd-1.7.3.ebuild
similarity index 87%
rename from sys-apps/fwupd/fwupd-1.7.1.ebuild
rename to sys-apps/fwupd/fwupd-1.7.3.ebuild
index a5c8fc642ce5..701fe15adf53 100644
--- a/sys-apps/fwupd/fwupd-1.7.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit linux-info meson python-single-r1 vala xdg
+inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 BDEPEND="$(vala_depend)
 	virtual/pkgconfig
 	gtk-doc? ( dev-util/gtk-doc )
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
 	introspection? ( dev-libs/gobject-introspection )
 	man? (
 		app-text/docbook-sgml-utils
@@ -42,22 +43,14 @@ BDEPEND="$(vala_depend)
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
+	app-arch/xz-utils
+	>=dev-libs/glib-2.58:2
 	dev-libs/json-glib
-	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
 	>=net-libs/libsoup-2.51.92:2.4[introspection?]
 	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
 	archive? ( app-arch/libarchive:= )
 	dell? ( >=sys-libs/libsmbios-2.4.0 )
 	elogind? ( >=sys-auth/elogind-211 )
@@ -68,6 +61,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	lzma? ( app-arch/xz-utils )
 	modemmanager? ( net-misc/modemmanager[qmi] )
 	policykit? ( >=sys-auth/polkit-0.103 )
+	sqlite? ( dev-db/sqlite )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
@@ -117,10 +111,10 @@ src_configure() {
 		$(meson_use dell plugin_dell)
 		$(meson_use fastboot plugin_fastboot)
 		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
 		$(meson_use logitech plugin_logitech_bulkcontroller)
 		$(meson_use modemmanager plugin_modem_manager)
 		$(meson_use nvme plugin_nvme)
+		$(meson_use sqlite)
 		$(meson_use spi plugin_intel_spi)
 		$(meson_use synaptics plugin_synaptics_mst)
 		$(meson_use synaptics plugin_synaptics_rmi)
@@ -142,6 +136,7 @@ src_configure() {
 		-Defi_binary="false"
 		-Dsupported_build="true"
 		$(meson_use archive libarchive)
+		$(meson_use bash-completion bash_completion)
 		$(meson_use bluetooth bluez)
 		$(meson_use elogind)
 		$(meson_use gnutls)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 09178d3fd158..0016b0a19524 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Thomas Deutschmann</name>
 	</maintainer>
 	<use>
-		<flag name="agent">Enable update notification agent</flag>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>
 		<flag name="dell">Enable Dell-specific support</flag>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 170b3f8852d0..dc60a8ec9f62 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,12 +3,8 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.15.tar.gz 493789 BLAKE2B 08d956651e3e717bdaf42f957bca93d0f74049b38219b2d283c3b0e2dc49be0061c8a58b742c63cb1f8b03f8060ed9816735879d023c5dc606a0362e81b56f75 SHA512 405fe15e3711de503d4d28f5f67fc9f393da03eb80d2a5f6167c3539fda4f11f7e7b8e795a6770d6dfa3273ee887133898c1ca4b41d80c62e1997d8796f4325e
 DIST haveged-1.9.17.tar.gz 495429 BLAKE2B e1f89bc47a9920517ffe9040b4bfcf2fb25e8b7f7404b16fe526fc225550050d602446ccba7442cb68b797c1b12d6e93e1826cc847c27e1a6d3a04814c31b4cb SHA512 0db4fc287dc80b6d7fbe6e1b4a6fb73bcab9db6604b437ac127f4fb4aeef64867d7bb90b24b4286e5e46e85db8e85f4b5fc15f189a8fe1f071ec79c9b5f24095
-DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.14-r1.ebuild 1012 BLAKE2B a13a79a0348ef09079fd0bee5e2a5c90a065253f8c28ec586e2b15bc3e1fe8b594abb84336e92c3ab71d5de5a0617c98bfa7d6084e17e52608cf178efdf7025b SHA512 e6c083a00a025291cb4eada1ec5690ec76a8659c629d654d1179b7ef1e6818b1c0954def8858f1ea582a6b6b3f751c091c8896fdc6248a78e37e84a36a775ff5
 EBUILD haveged-1.9.15.ebuild 1012 BLAKE2B 4984b1d33da747d0ac7cf62dd9bc11c420daaa2f9296069e44ad018c0c6e1ab9d7f5a7ee3fee3213a39316eeda3a2eec02f46f9cee743c38020e9323d752436f SHA512 8b47e4fbe680c208027eacb76365b216a74364dee285d1da024763138f80cdbdc0f1062f258b6254dcf0d3e0a9bb0a0f81d088b5ccccbd09a6112ae5d3f4015c
 EBUILD haveged-1.9.17.ebuild 1018 BLAKE2B aa32a6115afc8ab03ca6d39ebceb3cf19a260f0ca8df76a4bedd19fc9b3afdb4dfe5192bdb220cfa8b72f5503bd41790b518c72084f9426e9965a549273440e3 SHA512 e2d5e54f5be8f4c1c336fddaff3f2ab62398dc7d54fdd1a0563a390a20628a34948b5672fec3facfd31b467962d4816f3c5ff034cb2a8cacde1e8268572904e8
-EBUILD haveged-1.9.8c-r1.ebuild 1065 BLAKE2B c3d29001c9f5256876f0e5ddd4590a19bce73ee9ab68c09459bd499bd88476a000e1731569e8e86ffbcbf3e96fa274e800b3911f3a4f313936f8d642ae49ecea SHA512 b2e11b2c7b4012717eaefd24ae30885c983964d28fa7c61931e5a7b6dab442989b383e6da6df897fcbdb3452331eacb709829552894b697d07f7b085c144dff8
 MISC metadata.xml 453 BLAKE2B 8e0b710e55e214dd0dfeed4222fbfd8eeb4fd363a2d0e8f3c1d3ac401d7bb68a7d608f5629f06fe46b2d368e221772a63a03641c6aa8c6e62b21aa0ed2ca2960 SHA512 46efe891a245b81f9d872fe8be2cf62beb8a7e39659ab6929f52a4936deb8e9b66c52d7575b741a1ddf3d158ce5ca1b1df8b3c6ffee97b15effc5b4ba8c4c23f
diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
deleted file mode 100644
index 6d3133dc452a..000000000000
--- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="https://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/haveged/haveged-1.9.8c-r1.ebuild b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild
deleted file mode 100644
index e43224c9bc51..000000000000
--- a/sys-apps/haveged/haveged-1.9.8c-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="https://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index eb0384f44995..2ceee535a109 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,5 +2,7 @@ AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e2
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369
+DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
 EBUILD hdparm-9.62.ebuild 980 BLAKE2B efb0726d73386d05a2ec18b14736b6f25592f8688c03be87840ec0c83f963ad7282ce42a7944da425e12f7c1e77f9771372bdea942854c932ce2d3ddc1391b74 SHA512 975faa5c62117f10feab032e416601e075e65ab6c44b828eefb9fe7465c6475c3593e4c0ca70c171198b7f0aeb922b7ac1c010b3fcb05498a6f5cf424ca8617b
+EBUILD hdparm-9.63.ebuild 988 BLAKE2B 3e75b1bec24ca6e6bb7855fe0ff819b121e3daa9b07aa4d80c394a44396a98b8431459a4ab666359598f8e0771279a6b5e10545e8b97de7f7fa65712f85ba91d SHA512 b0e81d86d5e3e8ed751362245013ac4d0b8dd8d3df8aa808a10996f93bbb85a9890bd82b5517af8ae19404fddbb19c379a8178ef6ab91a584a0eaceb79d82ba7
 MISC metadata.xml 327 BLAKE2B 9cd0640be1e5123d4bfa4c7de8fd6b9bf20cfe3a238d6e271ad979efe74540708e55b9af9b134092c2db90e68550e479f8a1cf2b5a3cee5bd7e2f0bc7f719960 SHA512 2d7160e374e48c59585903e354ae7d910cdb43916fc3285d076a0e77437a864b595f1713ad05fd9146aa43a6d0b36597a76e2a096ef27129a3727e899e27caab
diff --git a/sys-apps/hdparm/hdparm-9.63.ebuild b/sys-apps/hdparm/hdparm-9.63.ebuild
new file mode 100644
index 000000000000..92417f17b1bf
--- /dev/null
+++ b/sys-apps/hdparm/hdparm-9.63.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Utility to change hard drive performance parameters"
+HOMEPAGE="https://sourceforge.net/projects/hdparm/"
+SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
+
+LICENSE="BSD GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.60-build.patch
+)
+
+src_prepare() {
+	default
+	use static && append-ldflags -static
+}
+
+src_configure() {
+	tc-export CC
+	export STRIP=:
+}
+
+src_install() {
+	into /
+	dosbin hdparm contrib/idectl
+
+	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
+	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
+
+	doman hdparm.8
+	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
+	docinto wiper
+	dodoc wiper/{README.txt,wiper.sh}
+	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
+}
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 1fa9de4bb803..097c151aee12 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -10,5 +10,5 @@ DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc1
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
 EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4435 BLAKE2B 77a8db74628e550e535339166858f479648094d35f649e433992fe07de2089e1e0b48b99a7b8c5a29c9fe33a78bc113d7397e0a091380581ee4c3f00a62c8129 SHA512 eb1e6f5d26fbd3958cfca2d2c7cdc4cd8f3e553d0c793aa5ea6efb56740db3c6c04dc32c36f8e356ad4a79288dd2e4725a15cf93dc870e90ea6068bc374e6f0f
 EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6163 BLAKE2B 64167cd15bf34dd321f613c4036d33f3aa122e039ad39ec5e51643e11a6be99fd318da1f9d9ced88fe27f40078cb0010241e0c3e1f36c891bed530c33314c4de SHA512 debaa9a8d1a01b1f07273cb7828a27090001721268c7292c800ad4eb04a97e0112638897287e3066263dbcc16835134e6c5f44786ac9ffe97b46cf288ca3727f
-EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6255 BLAKE2B 4b3a32c6196899a8d0e103f2e943cb656911724973f1375721324596433eeb3191a0d44dc703f3a2372cbf3ee5269ef23d8c340511ccb5738cf18a960a8f7df1 SHA512 65a49f5dfd4db37df17bf9384ba638ef5a7744e1d3ce37ae072ef63cd3494edbd650e636b2743ce6a8fe214b956e7f4c3d632e87e2b4bf5b034aba9edca5dd9a
+EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6253 BLAKE2B 184c950dd051c8e92a63a8c3e888457c2a57d2e83b2cb2284fa5e596bc36dcf21f282d71f5dce1c607d7a87d977c520957a02a19cffcdcc21547a02a640fb8db SHA512 d6b3418f994b392d701434e8cf95a02b42364f1659fd73d23262ca586b09a97c2329833aa11f746c2ac73f220becc806d0c9286c214ddaa84ab359e6f104050d
 MISC metadata.xml 634 BLAKE2B 8f56c8e88bb4147ce99d881ccc9f3f9fba657be1bd9abdb9d646456e2f7deedd3f7ab484b5db339288021cf692e21ca9a0030cb884869676346dbd22cf60c41f SHA512 b2eb0b961fb7cedb0f293db8974e093a03d8b312123c36ce1d451b8a0b34508ad12a2c8ee0704649c30dfd6a8b1a03c7a021d55cb9da6983648747399982e801
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
index 1c0c8b005757..1f3ffafc715f 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ SRC_URI+="
 #IUSE="freeipmi openipmi status"
 IUSE="openbmc openipmi static"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index ebeb4cafdb0b..1bb2f8c102c2 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -10,5 +10,5 @@ DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2e
 EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb
 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
 EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c
-EBUILD ipmiutil-3.1.7.ebuild 1659 BLAKE2B 2c43307e31c6fe34abb3ee953a826d5069546ab9459ad45ab9588ff8a684619ea6f6a7f06827e5b735dc8226bcc922b41f1ca4f86c8283b47585351d5e1c1cf7 SHA512 0f4900a1069d2f29b848db879baaa30829122c49a6c5e027467261c908ecd31341bb89dfb1b04256c59df42811360d503a5060dd19a357ef9c5aa4d1074169a6
+EBUILD ipmiutil-3.1.7.ebuild 1657 BLAKE2B d40ba9d2aa612b8ef9c9e52c8d4c702bda5800f8f6042afd6b7f08e862ffc51247a41cff79c43b3595adb887b5ffc809cdb78536b5eda0d030acab1e4efc6099 SHA512 d5fe935fd756afbfda7af92cb84349693bc9f75855b2030d4218ed6336375459e9a3e70cf6320915f05fa694b55d3c3fa1495b965089d03b68e9815ce632f15b
 MISC metadata.xml 338 BLAKE2B 40d7beb740ad95ee34fd1dbbb656c7aaaa6e4e888f9b0509c21f9c0b9707de280b66ac4a77a31093787868d841aa2e04c759f09ea1cb8d82cff6b3c72edda706 SHA512 b821a3135b247648a326fd74cd0cb5a79dafbdc83af0e90530f32b8c31b3da90557349dd635d7a45cfde9b4c48477abdd8459e13f3229d3c62d005dcac97f684
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
index 5bf9b0440aa6..7403e510c6c4 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/openssl-1:0="
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index f8e907072b65..26eb9820868f 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,7 +1,10 @@
 AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475
 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
+DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
 DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
 DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
+DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
 EBUILD systemd-tmpfiles-249.5.ebuild 5968 BLAKE2B 72a4b96753da7d54754c79d2dd90c669987adfc1fae84a9bb4985cb953702db10d74e2cb4f6e7bb34d11afa43506c16f5a63b8e6b4f15e041c95d817f64931aa SHA512 2acbac61323d3d744e9e0ee9362cee06b8460ab8673cf07181e4a76a44a0b287516f634abe8fdea1ca2ee143364ee56e6e8f85ec8a1651a5d056c136bfe148b2
-MISC metadata.xml 361 BLAKE2B 51c4e3dcb18cea86f9508c51e534a670e92e81aefe8e04af436f279d3158999d6dd8836dd53abcd4b35cacfeffff829a4157d2a63ce08d4eea62791b6761feb4 SHA512 6645f474e642a386927ae353561fadda273327321705500ddb8de14ed53f94788d782680b4b765c5da0151395a9f3f3c9bea2726c05cb79e52ee26a6e033c63f
+EBUILD systemd-tmpfiles-249.7.ebuild 6093 BLAKE2B 2d681cbb88f4e70e57c2331c3e020d181192052a43c333623a71db50e8df9efa9e2ea712c1a8d03907d7afe56992b2782d1ddbb5fe71b4139f3d67ef4cb86316 SHA512 eec1364b15878d3e5179a6d700089e0b986254049206829d80aeb95881a80787df5c9fe473785eddca68c4f5d847837738907885d2551fb33848f3887d3cd853
+MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-apps/systemd-tmpfiles/metadata.xml b/sys-apps/systemd-tmpfiles/metadata.xml
index de4a6cef156b..31123d01cb4d 100644
--- a/sys-apps/systemd-tmpfiles/metadata.xml
+++ b/sys-apps/systemd-tmpfiles/metadata.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
+	<maintainer type="project">
+		<email>systemd@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
new file mode 100644
index 000000000000..a4607472c8fd
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
@@ -0,0 +1,260 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *.* ]]; then
+	MY_PN=systemd-stable
+else
+	 MY_PN=systemd
+fi
+
+MINKV="3.11"
+MUSL_PATCHSET="249.5-r1"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic meson python-any-r1
+
+DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+	)"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-apps/acl:0=
+	>=sys-apps/util-linux-2.30:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+	virtual/libcrypt:=
+	!sys-apps/opentmpfiles
+	!sys-apps/systemd
+"
+
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${EPREFIX} ]]; then
+		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
+	fi
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/systemd-249.7-CVE-2021-3997"
+
+	# musl patchset from:
+	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
+	# we share patch tarball with sys-fs/udev
+	if use elibc_musl; then
+		einfo "applying musl patches and workarounds"
+		eapply "${WORKDIR}/musl-patches"
+
+		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
+		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
+
+		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
+		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
+		# not a nice workaround, but it comes from debug messages and we don't really use this component.
+		append-cflags '-Wno-error=format'
+	fi
+
+	default
+
+	# https://bugs.gentoo.org/767403
+	python_fix_shebang src/test/*.py
+	python_fix_shebang test/*.py
+	python_fix_shebang tools/*.py
+}
+
+src_configure() {
+	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
+	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		gcrypt
+		glib
+		gshadow
+		gnutls
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		firstboot
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nscd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		oomd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysext
+		sysusers
+		timedated
+		timesyncd
+		tpm
+		qrencode
+		quotacheck
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
+		-Dacl=true
+		-Dtmpfiles=true
+		-Dstandalone-binaries=true # this and below option does the magic
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
+	# https://github.com/systemd/systemd/pull/16061 original implementation
+	# we just need to pass -Dstandalone-binaries=true and
+	# use <name>.standalone target below.
+	# check meson.build for if have_standalone_binaries condition per target.
+	local mytargets=(
+		systemd-tmpfiles.standalone
+		man/tmpfiles.d.5
+		man/systemd-tmpfiles.8
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	# lean and mean installation, single binary and man-pages
+	pushd "${BUILD_DIR}" > /dev/null || die
+	into /
+	newbin systemd-tmpfiles.standalone systemd-tmpfiles
+
+	doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+
+	popd > /dev/null || die
+
+	# service files adapter from opentmpfiles
+	newinitd "${FILESDIR}"/stmpfiles-dev.initd stmpfiles-dev
+	newinitd "${FILESDIR}"/stmpfiles-setup.initd stmpfiles-setup
+
+	# same content, but install as different file
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-dev
+	newconfd "${FILESDIR}"/stmpfiles.confd stmpfiles-setup
+}
+
+src_test() {
+	# 'meson test' will compile full systemd, but we can still outsmart it
+	"${EPYTHON}" test/test-systemd-tmpfiles.py \
+		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
+}
+
+# stolen from opentmpfiles ebuild
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+}
+
+pkg_postinst() {
+	if [[ -z $REPLACING_VERSIONS ]]; then
+		add_service stmpfiles-dev sysinit
+		add_service stmpfiles-setup boot
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 808a8eed4059..ecf5ccf1f5a3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,13 +6,13 @@ AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed8
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-250.tar.gz 11112823 BLAKE2B c75ac7f1fcf1a65c9c88b25dce78dd44a039025b52767c3a1de78fae7a89705ed8ba8986d18d674faa9bfac3380a1c847bde35292d16f90bf22d992a459ddc73 SHA512 7894ea63793dd0c6ae12f6acab04ba02e247e537c404693f69174bf4a10d85f01f51c4938912c9a43c35e526b3ae945a1774d45249b58b31a393332b6c01f4f8
+DIST systemd-249.7-CVE-2021-3997.tar.gz 8431 BLAKE2B 167ae8bfb3b653fa4a7a62eee164f2a7edf2f0fb312db8ed955634030c95dfdbd747821b4652620cd34a7af38fe0b77e48ed61096b5d076c3eb2f56371e191c8 SHA512 b17a60a0862743faee0153218792a77b5d06a44876e0c53c264e98d62786442c165f47136d7bc2857edcedc24e667c220a2e7d065e77f9a957804131acb26598
 DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
 DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47dbf8351af49f8cd898d9c16a967c6f3600c6feb293e9b03eab0423b860eef5b04b287185fb9827cb323429d0ab9fc6d809b2 SHA512 4daf8570621fdcda5c94d982908c64eddfeef989005f4fd79a10f199dbc6f366354177bb59dff34bcb14764fb4423a870ffabac1163849ec53592e29760105fc
-DIST systemd-stable-250.1.tar.gz 11116731 BLAKE2B 9c0a8d02deb12a359c8665ba4d8d7e9d2ddee3f819f47b4598269e8ee8180e2e01ab774caeca7a19e98d118aebea5a38a07e916db4155efa0c19ce54a2b7e979 SHA512 a40a83dae353de8cf816f3408f91b9f72dfa1f4bae195fb48c2756c0c316bf6cb0def1be550c0322456e4940690d90ff324ca6d91126d9b13cfe9954c42e0216
+DIST systemd-stable-250.2.tar.gz 11121031 BLAKE2B ddbb33648dbf0442e4258bf23ace04eac6d5ab6a2434537395b900b7bd4113a86199d6d559f8d76dcbede88484240a6593439acdcc7b1801857d13840c389c6c SHA512 2f734c1d1ea98ee3f1beb00689a0d56603cd981aa938bee1655445ddd4af3b2bb6472249fa158741edcb2259ee302b625e124c38b7d2ec00c53760d6b362d5bb
 EBUILD systemd-249.6-r1.ebuild 14730 BLAKE2B c40a2c8ba95cfb613f3260fc0ad4b21408c35a5e4d804d3f80df0934fa4a86276cfe19de8354189f5e1554deb75b6e73caa701d64995f97ff0d4f57a1b418ca4 SHA512 45196efcb82b33fe295e29aa37066a0b175ca603d62cbadd0ee655b22ec4b8a91c0edd1107d38320e292b885b2f83b9ae625fed21db3a24392c253b9d90685d0
+EBUILD systemd-249.7-r1.ebuild 14865 BLAKE2B c0174ba9e0ccb969df3b522555fa71485a2db5981af26aab70173ca55179cda0aaacf3708771eb9bfcc528ce75e6269204e7b7a06a23792e29da9c85711dd6ec SHA512 10906e78e025b120d6a5f1e1b2768a882ecd6b56575a6c40a2ce29b01b61d2f90ae11bf6eb67272c8a2589e2d677cb7cf549de58bd23acd3fa326901eb599a68
 EBUILD systemd-249.7.ebuild 14731 BLAKE2B 3aedadd028899d1a74cb841660f8fe1a59d78330cb7bd951388d87aa7197f94d2fbcec600a95a0a6d76c55d085178f7c5fdcd3374f49ee58d040e7ce66f1e73b SHA512 5b75ee51471cc21e3fbb4c77c4fd4f2580f4932964f90f787b51d72ec60785193a06ea72f0281fabc73aa514eca73b8ecefe6e7192decdcb091b449e47f302bb
-EBUILD systemd-250-r1.ebuild 15274 BLAKE2B 3d2add620e89c66e586503a78fec3f349028267e38d84dc2d07a8706f04e2a65f9f5764ef9a14358ce197095ef6a0abad2577c2062821fd76c833a09e29d27ac SHA512 a654338a354558d36f46b3ff6d5cb4fc3f068789a267dda300b9a4db14bd10dc9f9d9a13327f5c7dc20fea4f593e6ba026b83390cec4791672a4c22d9dcb4d03
-EBUILD systemd-250.1.ebuild 15236 BLAKE2B b5ec69d56db03c03887530773faa4a824cee21a493d9ccca74cc1d1a1948faaa2fcec3798932c5d50bf8e124faee2c910fa727313456807f9fde8f141efcff7f SHA512 d0b3dc2cf86aceff1a0de842fd10a48d9897006a62bc8c97f44309a5a60ca36880f75b78203fdef11c2e95ef7f50a9dbdfb7e16b9dbb6298a2fc1453a3e12c2c
+EBUILD systemd-250.2.ebuild 15236 BLAKE2B b5ec69d56db03c03887530773faa4a824cee21a493d9ccca74cc1d1a1948faaa2fcec3798932c5d50bf8e124faee2c910fa727313456807f9fde8f141efcff7f SHA512 d0b3dc2cf86aceff1a0de842fd10a48d9897006a62bc8c97f44309a5a60ca36880f75b78203fdef11c2e95ef7f50a9dbdfb7e16b9dbb6298a2fc1453a3e12c2c
 EBUILD systemd-9999.ebuild 15236 BLAKE2B 886bb6be8442cf7a137c8bad923802a79c39418bdc1940a6f5efa50f090de609921c3c009e5ad077f81f83c13c8567b0be7a4cfbeeb1819e71be1269d0acc667 SHA512 19144abfacf1484fb26bccccbed1704de52ba247af2c06a91348f4998ecbe4c788ffd141d32371420b798315561713499f79306f6cf5d4d88e1ce9579a64bd38
 MISC metadata.xml 2627 BLAKE2B b785769f4d2d029a935d8aa4da18d2366d283565a70db63b36eccbab4213edd3c0063a61fe58b313a37cd72fa4a848f4ba12dd3761f82b862a84a3b09ce06258 SHA512 ecbc947ffc3ad23afb6c07c60907d5cbb91053c4153c6661fa26f358710e3d7ca44ae4c3b0d229b428fbe5abb63f83175448e6fae8ec11c1cbe01c1a692c873b
diff --git a/sys-apps/systemd/systemd-250-r1.ebuild b/sys-apps/systemd/systemd-249.7-r1.ebuild
similarity index 91%
rename from sys-apps/systemd/systemd-250-r1.ebuild
rename to sys-apps/systemd/systemd-249.7-r1.ebuild
index 3b2c62053490..84bdcb174f3d 100644
--- a/sys-apps/systemd/systemd-250-r1.ebuild
+++ b/sys-apps/systemd/systemd-249.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/systemd-249.7-CVE-2021-3997.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
@@ -30,25 +31,20 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="
-	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
-	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
+
 REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	policykit? ( !hostnamed-fallback )
+	homed? ( cryptsetup pam )
+	importd? ( curl gcrypt lzma )
 	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
 
 MINKV="3.11"
 
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	virtual/libcrypt:=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
@@ -56,11 +52,15 @@ COMMON_DEPEND="
 	audit? ( >=sys-process/audit-2:0= )
 	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
 	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	fido2? ( dev-libs/libfido2:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
 	idn? ( net-dns/libidn2:= )
 	importd? (
 		app-arch/bzip2:0=
@@ -70,12 +70,12 @@ COMMON_DEPEND="
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
 	pkcs11? ( app-crypt/p11-kit:0= )
 	pcre? ( dev-libs/libpcre2 )
 	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
 	tpm? ( app-crypt/tpm2-tss:0= )
@@ -118,10 +118,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=acct-user/systemd-resolve-0-r1
 	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
-	hostnamed-fallback? (
-		acct-group/systemd-hostname
-		sys-apps/dbus-broker
-	)
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? (
 		!sys-apps/openrc[sysv-utils(-)]
@@ -237,7 +233,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
-		"${FILESDIR}"/250-fix-openssl.patch
+		"${WORKDIR}/systemd-249.7-CVE-2021-3997"
 	)
 
 	if ! use vanilla; then
@@ -288,8 +284,8 @@ multilib_src_configure() {
 		$(meson_native_use_bool fido2 libfido2)
 		$(meson_use gcrypt)
 		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		$(meson_native_use_bool homed)
 		$(meson_native_use_bool http microhttpd)
@@ -302,13 +298,13 @@ multilib_src_configure() {
 		$(meson_use lzma xz)
 		$(meson_use zstd)
 		$(meson_native_use_bool nat libiptc)
-		$(meson_native_use_bool openssl)
 		$(meson_use pam)
 		$(meson_native_use_bool pkcs11 p11kit)
 		$(meson_native_use_bool pcre pcre2)
 		$(meson_native_use_bool policykit polkit)
 		$(meson_native_use_bool pwquality)
 		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
 		$(meson_native_use_bool seccomp)
 		$(meson_native_use_bool selinux)
 		$(meson_native_use_bool tpm tpm2)
@@ -405,16 +401,6 @@ multilib_src_install_all() {
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
 	fi
 
-	# workaround for https://github.com/systemd/systemd/issues/13501
-	if use hostnamed-fallback; then
-		# this file requires dbus-broker
-		insinto /usr/share/dbus-1/system.d/
-		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
-
-		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
-		doins "${FILESDIR}/00-hostnamed-network-user.conf"
-	fi
-
 	gen_usr_ldscript -a systemd udev
 }
 
diff --git a/sys-apps/systemd/systemd-250.1.ebuild b/sys-apps/systemd/systemd-250.2.ebuild
similarity index 100%
rename from sys-apps/systemd/systemd-250.1.ebuild
rename to sys-apps/systemd/systemd-250.2.ebuild
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index f7ffe82c3cbb..f80c55779fee 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
index d6552a235a15..2fb6e7a4d787 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -3,6 +3,6 @@ DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da
 DIST plymouth-0.9.5.tar.xz 1186200 BLAKE2B 8fd073703773fcf7f3e26454c860f094fb4b3d712c56c9df6716ef11815a79f7d5b078ab6c6567b76421026d84a086f95865bf9f3e4ae6363cb1ffc2caa68537 SHA512 686220e8d5b1a8be298156786d979d0e3fb9e010b930d0e8082a2bb152cf07c1bf493d820c243838a1771ee859dc0b4723bd9f10ee434a94a096ce9236c36ce9
 DIST plymouth-5b91b9ed84cc91759c986634a4d64d474e6092cf.tar.gz 1132049 BLAKE2B 0e224aad93fef4039a1a023ece051a64e1fa854f29a814957673c7ba68eb3f2348ca075f59a17f7bad692152ddcc402b2246db413886ac73ad77a36a6fb2cb3c SHA512 3d81ce379d0a11af5b557bfe86e336a40e5abdbb6dbd6cd5e046ede9a46cf2782af75b8e32e3fb2232b8a22efee1890ecb47394742041d9dcb499b38476a814c
 EBUILD plymouth-0.9.5-r1.ebuild 2842 BLAKE2B eb780d50b0a0387d7f1ed07fab92940c941ad8b6f39519e4a44be1a607d1f0ac9a06c39a1c13f95f6ba39b52e88f4c759604f58717e14527af37422497b2bdd2 SHA512 6502ae41b78a7707380653f16eaf95626345373d7371b50b8ce83658ca0eaf1be2fb83deb1403d31bd47daddf2b6f788d8fe320f0c9989bc30c046a54068618f
-EBUILD plymouth-0.9.6_pre20211225.ebuild 2971 BLAKE2B 3445fbb4b78f1309332ee149e526e3a037b533ce6874933fcd3afa8b5bb9347e10c8c1e2fd2667a04f46ebff3295765c435d53fbd7a9ba94c26fa1e7adbeb472 SHA512 8193f9091fbb95f4771e08acc9cf7626be3b537af0e6f1276f01def003d45ac3f1c63db627a741b965abfc5510841950aafac4bdfe88a994174def0d1b6627de
+EBUILD plymouth-0.9.6_pre20211225.ebuild 2964 BLAKE2B 457a6def0224f2d532aeee8b0c3e5d74358783bc09258e82995ac40d5ad1a7887967eea325f9f76a83c23c1be673dac72fe6a395a1c5ca9aadaf964fc9dc69b9 SHA512 ea2e1cb875310fd2c6cba736517700a42a47d0eb10f5c901e02e8819904c5d8fed0ab4516c0e31790e20eb95ac85086c0ef599d562a913115f3e382c07e1520e
 EBUILD plymouth-9999.ebuild 2833 BLAKE2B 80536368b14223aef2a3bc29444dafe9e4a4f81067fecde31b5f703ba7f5de56304cf476613c75d942baf91dfcdfe44192d437f401acadd856083e9c8e079864 SHA512 2e86c5be326acd5d4fe974207a986f2822c6e2bac16dbd76a8e785277b3c854e6aa4f50ac51c6d5043e9e8a21d82acb849d0c73e3b4d2e5fc97fe48e288b62dd
 MISC metadata.xml 1077 BLAKE2B b8226140cc34ea498fb1792e89ed3976a54dbaf49989ec76900eb1619cf27a1a4568d88ff0d979d085286f197f6c125fb1dc6bcff294d94a979ba5816711f56e SHA512 6ed57ac55fa2011204c8bb1e2c41697c91bd89f30d272bf581d9c5cf8e387a4f26e958e46a0fa79bc802345c3053556d88da0b5999481b73f4ac0643a2c8f3c7
diff --git a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
index 6f1b09a81b37..0c17e6c5bc8b 100644
--- a/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.6_pre20211225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	PRE_RELEASE_SHA="5b91b9ed84cc91759c986634a4d64d474e6092cf"
 	SRC_URI="${SRC_URI} https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PRE_RELEASE_SHA}/${PN}-${PRE_RELEASE_SHA}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 	S="${WORKDIR}/${PN}-${PRE_RELEASE_SHA}"
 fi
 
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 06e9ccf9be51..3e5a274cc6b3 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 8a94fdef5eb7..c00bd6a15cc9 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -2623,5 +2623,5 @@ EBUILD k3s-1.19.16.ebuild 81600 BLAKE2B 43a7b5686b26467f6efde37e13230bac1e4a5b3d
 EBUILD k3s-1.20.12.ebuild 88830 BLAKE2B e80ddb420e8bc892cdcb08b6a8b9898c93ca2880cf956ea0864558520f8ab10bdc9de325072fd9cf1482cf6c3d212bf562d9353cbadb11d83fe5dd0e5e5764fd SHA512 9849be1da734ffd5f5304bd8f29924b99d4e349d05b0e12242456bc8ff22e2a2f796507733e33115291d74a9ffeb64c989c353e2ecf7c06932ecf22b47aaa667
 EBUILD k3s-1.21.8.ebuild 95853 BLAKE2B f9048cfff05fe2b553770dfb993adc428320ccb989d93090c1774f0ab1f75b08b3a962fe80b02b5c63fa1370806690c4252d0d3f35e27d8eab1930c7032e9c5e SHA512 095670e7e9169f3d663cad6cb43d96e5b7391bab0ef3417c7519477b5e9f4408c3a37132cca30c3a06eddadac012ed25860a6542f30678538092d24c39b510d2
 EBUILD k3s-1.22.5-r1.ebuild 92038 BLAKE2B 177d3afb5b1b098d0d1237c2187f77f15ecffdc6f5cd09c28992285ac8c759c199e8a815184e003a32ac5c61c95e907a8859bb8adf8815e430e90202a1e1b5d6 SHA512 076c1837501e579da4002a4bcae4fdaea2bf2a2941f3db6250bb95ece121a536fe27234f84fbdeb9e26e81a49a0808b59d530c3e825765c4dda4c5470b1f0ade
-EBUILD k3s-1.23.1.ebuild 95107 BLAKE2B c2db06adbae0e1e910f779a0dcc401a0e743c33e57a52b78bd874b34f1dc33ea54ba4d8cd6e5c839ee74328d50a990f7b79c5c9feee94a6fffc136b5a054565f SHA512 5638004b292538a6ae7a59d9ae2e245139b723e52352c67b1c8472fca6f989a499d448776d25333e88c0a0d6e11d3bf740a440eeaec41f0a8d0021e6225bed16
+EBUILD k3s-1.23.1.ebuild 95127 BLAKE2B 0597b32dff925e4b858e9b1e9721209152c0dccbe7faa06f8cfe3f3daa358f1080c7981d4bfee1a95b3f7e68c61ab146d127502303768db89362c20b992ef754 SHA512 1703169347f94b53ff2a78306719ef59642ecdac490057b791cd779a8888cffd7532dc923142a8594559475bf8435873ae0914d6886248ebc06337e257fdbd73
 MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.23.1.ebuild b/sys-cluster/k3s/k3s-1.23.1.ebuild
index f51a6aac6aa5..f8dbe64934e3 100644
--- a/sys-cluster/k3s/k3s-1.23.1.ebuild
+++ b/sys-cluster/k3s/k3s-1.23.1.ebuild
@@ -1775,6 +1775,7 @@ REQUIRED_USE="|| ( amd64 )"
 DEPEND="
 	app-misc/yq
 	net-firewall/conntrack-tools
+	sys-fs/btrfs-progs
 	rootless? ( app-containers/slirp4netns )
 "
 RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index be860c2f9085..905ba8cb4b7e 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -2,5 +2,5 @@ AUX mpich-3.3-add-external-libdir-parameter.patch 8605 BLAKE2B 56a6c60362da3004c
 DIST mpich-3.0.4.tar.gz 10921075 BLAKE2B 341aaac23277aed05a4448ea03d9caf1ee14cfe327a770c95d620fc1ee1ea7bfa6df36860aa44aad162eb6d630d35fdfb30ae9a866d67680ab71c7b4326c109c SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0
 DIST mpich-3.4.3.tar.gz 32853411 BLAKE2B 889f8d4077cd9e8a727e46431ad505b2a17d7391dec00910254d8dbdbc992e2df92efd355d290881fb3a73966bf3504b6942003f88041669c16a8aa142c2dab2 SHA512 d8455a3e7150dc720ba8a0660bfbbec364b62729f4a319928bb910644d20ee68d267baf9e9e2c322540a725e41858b416ed5fff001fb1f6aa45d1c08db8dad1a
 EBUILD mpich-3.0.4-r2.ebuild 2846 BLAKE2B b29ce6d73d7c8604c9be6416884915269169c6162f617772a9c7da8757d2c782c3b1b81572c46b5ccc834eb79da9ce14efd67e9e06f5ef5e2f9dd28e8570e407 SHA512 cb71bbcc08264a508721793f79842812e142e649b28cc84949e4c60e6723dd2eb642e0310609c9de0c2fc67a3bf9e40d352835e7b79bb600f452b13405b3b9f0
-EBUILD mpich-3.4.3.ebuild 4237 BLAKE2B 0bf5c303483b3ca07ee3442fc849b1d0a5e20fe03ac99095a7471ae025a09df8a5266ad0c0a4b0f14c83633e40a0a211d9d69120414446dd8bcfa34e60fdd607 SHA512 6c32397b812186b145e3e55b4b33aec3020c044ff6cf735bd8ee406cf548366da0ba31db30b7d55138dd46618767903215ce065ebbe1e6d13dd19905c06ba06b
+EBUILD mpich-3.4.3.ebuild 4234 BLAKE2B 70e8ffef4a706fc5084d3a029d4b71f73080d1f301dec8bf9fb11cc81da3e359885bcc75ee671e868131c52e8107c0cdd03d422fa33d9568a346e19d09b88a59 SHA512 57bc0adec54b7ebe3ea4e8650c4f7d5eef4b2cd4a61b8dfa5da0601c72657f3977c7fcdce4b057500777147dd9f86d3cc6754ffade59693696731894344a4bcf
 MISC metadata.xml 395 BLAKE2B 25cbe25bce4d76de586fdfb898e1925f047edeea1b9658f09db3c17f8c80056fea93a4a8f6bcd7d91d701ef7e94d5509f215290f97fbdff500b1e50c12f4814b SHA512 9f38dd49af31cad2d458ed8bcf674caf32ef12cfd93ec9548f6598cb8b54794bf7d1ba46a431172ee2938c5e66c8a54b5b238b0d48883f20f7e5b3148317d2d8
diff --git a/sys-cluster/mpich/mpich-3.4.3.ebuild b/sys-cluster/mpich/mpich-3.4.3.ebuild
index ddaf646f0454..cc87b22ddc67 100644
--- a/sys-cluster/mpich/mpich-3.4.3.ebuild
+++ b/sys-cluster/mpich/mpich-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="mpich2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx doc fortran mpi-threads +romio threads"
 REQUIRED_USE="mpi-threads? ( threads )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 92a0773ca742..ba447ed1d0f2 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 22aa36abf84a..d8e5d5b34793 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -13,6 +13,7 @@ DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa26
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
 DIST gcc-11.3.0-patches-3.tar.bz2 13567 BLAKE2B dba270d74b7a598e0108be0be7ff8cf01899d044ca4be9938cd5324465dc00c9e5cac4ffb4b6c1bdcdb824d75a7577eed63ae724c7e2887a19708992aca10f26 SHA512 7919b37900bbc2493564bc70f7911cf03efb857ff09c2b13280018fb54c48d8be42e35b649e69594a3ce61d51de847a8d4f75f794ce1dc50db3a700831b6a1e7
+DIST gcc-12.0.0-patches-2.tar.bz2 11564 BLAKE2B 5954ee8dd5edb30ecde54275d9ffd4d2f5671de82fe7789688d1220b181fbcdeed3d5305858d8af1fd016e627687ca6f2ebc76bb6b49e9b903e8d63c3de2baea SHA512 6299a1f46fc3f29934db7af20651c0c3e1266bef89b222fc9e3bc6a7e7cd2869301c5b227a4105157456474ae8a626ec550c15971bceb2f844476a9f5bc56284
 DIST gcc-6.5.0-patches-6.tar.bz2 15320 BLAKE2B fe6b60cd45d00187e4e41e607af6a1137481a6d8f4421a0ead7da9fd86d0cd19bf428e5d150e1de4e0616606f8d6c31738da24be8151c58f7760aa92432ea3d0 SHA512 87c2a6726373999472cbd6211e486864266c833d5a07f8fb02dd3054b7dd3f86aa86ea47b17928045ef6e46d82f429f879d6f69d8adf3b6f2956f4ac6b3f80f1
 DIST gcc-6.5.0.tar.xz 74355588 BLAKE2B 538595d32000b15a53577f0dc6b164d75791a8ccdf90500d5f667ff78378ef4ab9bedb8a590848907caf863bf1165ebe108b5e81eb4b54e85ced4002affde693 SHA512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 DIST gcc-7.5.0-patches-4.tar.bz2 13183 BLAKE2B 38a56910f01ef4172182d2145cef1df53b57eaa8f0655223cf54689e7ce12a264bfbb3735bde42b8a8594ab44031d9c48dc0d5303fab6537746f05e4d46b427a SHA512 28d3732d5351dabd1452ee0462865a0de00103d9ea66941e38499c532b34ee8beb150b0b32af58cde901e437b4c256593c29736a5e7df2575aa0d0c43b6cf6eb
@@ -28,7 +29,7 @@ EBUILD gcc-10.3.1_pre9999.ebuild 649 BLAKE2B 7c2d1e2d939433104d3fb01de2dbdb12b60
 EBUILD gcc-11.2.0.ebuild 466 BLAKE2B 9897dc608217b7fbfd44fc14446638d23f18c0516a19b73e317aaeb328f82ea89452bf93888628a7d22d0892f6ca0a959cfc6e620a5afb9b8ee7063a4a6a173d SHA512 425b789e1c7f495b2581e9aa6a435fa7c1c23b0e167c44e81451ef2e7896b35bdbe9772bdff7b78c9deb0e4f6357f956f28151072b35fbb233ec5f9e771bf458
 EBUILD gcc-11.2.1_p20211127.ebuild 777 BLAKE2B bc729fc7cda621c2ad6335d8c26c7684e95d59d4ad5854047c887590771c5fafd13fe0f1608651ca3bace1b6ccd151d1dfd6c489ffde7b420a135f795fba6fcb SHA512 ecec9ab3d4fa2b9e9ccd85a34fd9cf29dbfd086a5de450e2eb3a0bc286873197ec8257a1f92a965865e7a07dd35b7c7af18c56eda88c5ac61754e5f942fed5a1
 EBUILD gcc-11.2.1_pre9999.ebuild 916 BLAKE2B 7d4536513bc200681534568a22efc5a06cb8b246f775b7465034c47f43a0dcd0f25a4ebff9ca67c47425fe6d1528918afc00e36b2b60ce87c0163fc8b552c9db SHA512 d2c88b671880e600b867f25eb9b7ae0e5c0df748d1171ec8f28a3a661974a8b4145ffd2ad004480fbfa6217ceeb3933ca4af9d9da91eb24c7fcab822466e22c6
-EBUILD gcc-12.0.0_pre9999.ebuild 853 BLAKE2B 6520c289987f8be0fe391f9262bb35b3ea09e8649d18ec8c7ab6c990c282cdb0d2e952ed3b142f4629ec9e0dcd759936261917a03853888604fde009d818f17a SHA512 1796e67b502b6ca9ff2c9ea76171ab8002badd83dc2f6ef7f09057ae9b1ca9135b6163dd651a621fd499d00201aca2f29a3aa8482118ced360b543f344fc1be8
+EBUILD gcc-12.0.0_pre9999.ebuild 905 BLAKE2B d796e6c2fec816c6477c8729c83eeac56f133dea1e8e97d9d5112eb76c8eb58c8a99a73e16adf0934c368441371e726c771579a62d6230e1aebfa8a287e2d2c5 SHA512 4b3e663a14aa590d44624837ec8bfb03b3415da3b3578db9c4e4c69dddb592a88491a7993f78724b072294f6f702e102df1e2eada5513878f4bfd8913032305e
 EBUILD gcc-6.5.0-r4.ebuild 445 BLAKE2B 2f3d0d7d881671cb42296b53441f8c379bea95dcb83348fc9d993b1c586c828a82188ca39688a728a32e1d37f19a5bc5148e339654477c5383d90e29dc527ca3 SHA512 1c2fcee4393c001dfe1718ac6bc7ace20df0b77bfc9cf1c94683a60f3c0d42cf62b8e6afe4d8938937eef870083b7026491cc3c4952d67fa81894e543ec4653a
 EBUILD gcc-7.5.0-r2.ebuild 456 BLAKE2B 4d675d65bb34c51225f2f490409ed63f0f95a3f9bec9c1e034127ad0ac4fed7f104fc5febb761133873505807c6cc6b44b8ce8d51d0faef26843feed6cf1f933 SHA512 057ed372182d4bd5afb51459e0bc563fa05590feb5e0a859123a2d20d9f052cd23d2ac70923f58c827ebec3e419cfb6cb1d370feb58d39a02089fa3bd4d90921
 EBUILD gcc-8.5.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index 3571c4605330..d91ea5bdc31c 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=7
 
-PATCH_VER="3"
-PATCH_GCC_VER="11.3.0"
+PATCH_VER="2"
+PATCH_GCC_VER="12.0.0"
 MUSL_VER="1"
 MUSL_GCC_VER="11.2.0"
 
-EGIT_BRANCH=master
 inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=master
 
 # Don't keyword live ebuilds
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1fb6ff8cd7e4..24df87d0b218 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index b0f13bf13bac..c8e95b340d1a 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,5 +1,5 @@
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
 EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 21e7ca9e7ef23f8baaceb2058fb5308b8059e6f7e8a2280967280651558806a9fca93274a125a5e25b1257e43b57e12d4b577a48c1364ce6e1e96436fa994126 SHA512 17de5b583a6626c6f5fac7118354cd130f740daadd18a71272c9ce7e5b97b644e4be1312845ef2884baf607e9ff69cfdcf1cbce3762f1a33402b3bab4ee042ca
-EBUILD btrfsmaintenance-0.5.ebuild 2152 BLAKE2B 4aea7ed2ca290fa9122e8d2d838422bedab08ceb0cf62a6f9d40a6d38dd7c7bd245bc30ca3674321d4c5be5d0cd474e8699ff67bbb6a40289c33b2c55b41ab79 SHA512 7c097a8976a73e397e2a9bf98d65cfd74e663195a33c3828137caa1e290a649582114cd850ff9d4d8c75d27ce11fb14caf02d835aeee7849200c8e6090e69ae2
+EBUILD btrfsmaintenance-0.5.ebuild 2159 BLAKE2B 56d5f0fe134a38567b1ce7e51ed2766b087f4a6f6a422dbdcd77f3ded52f879f7d9fa95bffc9d502230cb6fc846172a097dcb913f792775b6a4cda3898220192 SHA512 e2a829c94594ddb616e81888fd148c0f47dce3a36050de305a6a0b83974fe992d1d1f4f8fc686253bfd6bc8fac470d6b766b5d62d71b2e5de3f7fd38e6f49331
 MISC metadata.xml 595 BLAKE2B e37fd5ba56f1d30747d847927e50b29314b84851c35cc911e0648af421b0130166300fbdf71ee316b32fdc91927a1f5c411eb18ff0cc2d3da67364d71da12af0 SHA512 92834a34c01a8b8a0feddf89d75f2eecfb45027157070e49de765ab61acfee6900a4fe7a12ed42b1204142a12a7309e5134ddfc69dfc8c108bc02a83e443d861
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
index 08c307ef9966..fb4f66f17a99 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index b6928a79e9e6..53315445483b 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -5,5 +5,5 @@ DIST inotify-tools-3.21.9.6.tar.gz 91668 BLAKE2B cfb279d69e650b275af03052f4f7652
 EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7
 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
 EBUILD inotify-tools-3.21.9.5.ebuild 945 BLAKE2B e351e97ad2996da6331e8621ae58dfc31928601c8682d4a7c26331e2b5b574074e5411d69e65a66d69e914f677f6b47346adc46ad6a67923f90c62528806bbd0 SHA512 7e4bcb5e609b2bd20af4ada32e9c8d7bd969f80973c09ef572427e2178a0504e3541e600ac913efd29548cd481793cea5a8e6961c5f761df16b6160f38c6e40c
-EBUILD inotify-tools-3.21.9.6.ebuild 944 BLAKE2B 1643fd35d0e911993a238516c53f500e1fee776dae3e48d44084a61174654aaa7a2c2628d3bcbbf88e7f6f5c985d0de0a1b2b4f17c8d9530117a8c23f6ef2781 SHA512 bf84c11afe2224137d7ba2c81745eac89fd0001e2ef019eef5ab4df55730fac9ed1ed530221fcf5a05701000806b74c41e4d34f518ac4600467096ba92a62a32
+EBUILD inotify-tools-3.21.9.6.ebuild 941 BLAKE2B 43e4f0b72121d9b063e3e6051207bab36e4846e06e91c0ca724c6b5789f3a3e4c6fb44a21ef4cd8693ba68d66e7a260a0a0e7e9517a33bed09d5d77d8e5e1684 SHA512 9dbf192a767cdbe46f1dbed4a7fee4547fbef2d8016368b8a76413c66ddc3ff98774900c674f6512a71acb4f4810327b7fb916ba899b439edba2e0582cdfdcf5
 MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
index a238b1fae1c7..cec6cf1ac1d1 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~riscv sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index a01c887cf0d9..1ce1375a25ce 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7e155b999438..5dc9dc9539e3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -61,15 +61,15 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-kernel-bin-5.10.88.ebuild 3071 BLAKE2B de53d6f1dee0c4d73e733c7c2b2495cc01f177331e36a4691a9dfe097ad53260b3830dca85805e94edf9062d33a54003df65a2548d448c232ca4c589a239c98a SHA512 6b1bcfc56a49f4ad3c58f97dbdf8778ea783a14304a221e50bf1fa3c1da3f81dda91eaf6a4c25d8a862a57b9e23841f9ae6c6620b1627337e65ebd954342784e
-EBUILD gentoo-kernel-bin-5.10.89.ebuild 3074 BLAKE2B 5ebad810a4a7ce0f54e8f4e87dbe60a075fe062a8c57fbf01b3386c96f00cafcc84397f27013724005c3aec48aff5e5f317e0ac061a84bca3fda27c31c8a74a5 SHA512 da29ab068f2dcd5ab030e7d859c34395ab6400afa3c1867f24e77ab42a212457beb0d475728ff6db6bf6e595ec8635dcdcbeab6666e4fa3b1f68daf30e1ecb3a
-EBUILD gentoo-kernel-bin-5.10.90.ebuild 3074 BLAKE2B d583dc6c0c3587ca72dd2841beaab688dbdd5cc8b84896d7058f27413a4b3391d783629b90f2cb69ae3c3a0c105e0e1bcf4c5a82207bad237cfb493298e4ab4b SHA512 25ba908ee68802cbcd2ca059a8754a40377e5a55081fefcc35f4a6e7663e0e2e48d4569f8a043abcd0be25536d37c2c988e279775f9548ee15dcdee0ba45f1c9
-EBUILD gentoo-kernel-bin-5.14.21-r1.ebuild 2542 BLAKE2B 8c9310e0bb5b7aa33857ca8ad7f9f409a2fbc5c7199fc265cb0f1506ec8c91b6f6991a973c9fbe618844d13500249bde12486f4919fe37138152db67ae764495 SHA512 2dd1de36511ea77a9eded09ec735ffd780febf8450fd2e89479c8e3f286df9f0f1cae163896b94af7c93b98eccddd8187be80c2bfafeb22a44fc4691034ab175
-EBUILD gentoo-kernel-bin-5.14.21.ebuild 2677 BLAKE2B a5897b13e2f407e1558f646d722ac614b384b575c9700e86934c659d4ec12d99c8d35ef1ffa5e2b7c67ae19d87884cce7e357d9de2e14680d2eb89455f80a905 SHA512 b627441a44ac28875a2b8d329d522277dd234e21f20fc2b2d31237b78b0c254443249911d754d62ba7300d59405dd66046eb88eb2a3bbd12425b73be4fbb24cc
-EBUILD gentoo-kernel-bin-5.15.11.ebuild 3072 BLAKE2B 783a5a7152a12d353bd5ff705df41cd3eb0d7dda53fb5933bad937eacbffa4affbf192db560ee26f661645599de585f644f130c7bdb2439bbb32fa76bcdf523d SHA512 76ea2f1dae3756a52870720d3bd68bbe6bfae6ae350334c7c6b734eed57c03c9b51de34842510e2975d698eab6dec57979fcb95b0871ecddd08e3f5fe52fd79d
-EBUILD gentoo-kernel-bin-5.15.12.ebuild 3074 BLAKE2B ba5ff603a73bfbf8936ee187e3ac80ab55b8ec47572ace99ca61aed396f9fa58abdee0e4bdaeb0fb20e44565e0f5857730d239458cb2edac2f9bbb877605f6e7 SHA512 67593f4b03188e9dc70a1d9335f784ebb27490bea85a01e9964dc527086f2051ad1bac050f36d633995cbf36c0f693d885bfdcb5199e141b9014a7304c48715c
-EBUILD gentoo-kernel-bin-5.15.13.ebuild 3074 BLAKE2B 695ee3d25a404ff369897604385e01ef158879b741b5d63245bb91deadeea1e09c43ce08cadb2a5f8f2e33b63850a0b0472de61b8cae62e1cfe73ee415d4c125 SHA512 c65166bb24b29c6ff071757f3f96c41713d9488730e28ab8c42999882a4f8d41a419a412a06300ceefd9014a10e12dcc9d113fe947912bead568874ad11f7205
-EBUILD gentoo-kernel-bin-5.4.168.ebuild 3071 BLAKE2B 024e66d6a8e07de89f3f38363a72af8d3b2074accb187445681a9bb7a1da3b04ec064d2b3e9b4d22d779e0c34a4fc49330c7f52c24ac6e6b344f9515343b45b1 SHA512 00f6bf6f2646f78dbe4294c78333c9fde591e299060c37fe3c25e04255cb670f62f2dc15c151feedbe906bf2112c3f6b8863322d01c5fa251f7a93cbae6d3127
-EBUILD gentoo-kernel-bin-5.4.169.ebuild 3074 BLAKE2B 92dab7b845a2c6483cf5ba5852b875ac9b18da69f9f2ed8d3630153cba4034d5a90f680c57b82ebf2999b914f8b00a5466639b67736d5c9286a42e92fb6bd94c SHA512 914cfc03044e04227a076c450582f9dba5221c02a0a1488e39f3e835637446190e4f5d6fa42bd282953fbd414bb18d62433dcd28006b52f1e230fd2902bf5009
-EBUILD gentoo-kernel-bin-5.4.170.ebuild 3074 BLAKE2B 875133c6de1762d0e4c50684427e5eff9fae0ccc466d772c84da5a3d66f13724810c419621d7531624a3bae56b0f7a64eabcf5460ac7dd786f310ac884cded96 SHA512 43e5864caf5edcc3924606c253c2a6fe7f0f08818951cf8f6dd49993982a7694ab8774064ec1976f5e499a2a9283ab2fcd26e2314ccb346f4815afb2f58c118e
+EBUILD gentoo-kernel-bin-5.10.88.ebuild 3168 BLAKE2B d8f2a216bcd561cfff077c3c85c591dfa6de30452563f8fd83cfd3ee20b21440310616a9f6d6990c07e607ebc499061a0d73825173ba8fd170f6244455404000 SHA512 07140c56ba384ff66fa4b2538441872327002c96e66ee69e141f52f91567a04ffa9ed574dda529ea0f0f828cdbfa723c4855e990e96bab17c24793cda03f71ff
+EBUILD gentoo-kernel-bin-5.10.89.ebuild 3171 BLAKE2B 41688e2d77b448053a280e7cc50981b01ed8d93190a709758713d127acc0a6a6bdbf210d179f4f84512b955dd3af19a86c209cc9ad90dfb3761a03937c06e619 SHA512 3ccacd1f416d9605e38a798669f6478978f23807506a69a3decef333f31a58f6b3735e707b3a71886639a11c4f09a4761b58ca21d1d57499b9908439db109110
+EBUILD gentoo-kernel-bin-5.10.90.ebuild 3171 BLAKE2B 41688e2d77b448053a280e7cc50981b01ed8d93190a709758713d127acc0a6a6bdbf210d179f4f84512b955dd3af19a86c209cc9ad90dfb3761a03937c06e619 SHA512 3ccacd1f416d9605e38a798669f6478978f23807506a69a3decef333f31a58f6b3735e707b3a71886639a11c4f09a4761b58ca21d1d57499b9908439db109110
+EBUILD gentoo-kernel-bin-5.14.21-r1.ebuild 2639 BLAKE2B e28b39e91714a0509dcc2cf1bd05209d183a0932587ee6897b3061fc18baf0ed42ecd7c8d753a9a5ef417f6eac707e43131b66d1d06e245f8e06ef7ed60a87ba SHA512 68c32e250c9fc57ec0fc768395cad550fd572e261d66a687d2c09964785df32ba2c6c2633019ee9b89b4108ac318c9d298bcc717cfe9051527a4f45a9a931fe4
+EBUILD gentoo-kernel-bin-5.14.21.ebuild 2774 BLAKE2B 7aecd35228fa31493c7344832ce04ec91198edd262ca831feaa4401f35446062b116b4a785e7ffd884c317d4fef1cfd8b9165956a850f5496fbc2d2ba03df77a SHA512 56ac5686b09055125fa1cea3c11f67a528e44a933545eb3542bce0246e7cd1b317651ba313e24adc8a2b56406f460d5b4ec04f2d2a75636293f117cd95025f53
+EBUILD gentoo-kernel-bin-5.15.11.ebuild 3169 BLAKE2B 32d84dd0fdcedfd384cdea28b010461c0c569cf11f1da9e2e941852c25ed8bbd1068a20883ccfbd2888719eca763d4e0b4284940dc4dda81eba62d0eeaa7824d SHA512 47229574658f06c173cc6009e6a683c0d8446c59e7846e899dac41cd891a81fc4d7a8e87bae947463db4b7beced2fb40531ae5ad85b46e1736b4a90218df7047
+EBUILD gentoo-kernel-bin-5.15.12.ebuild 3171 BLAKE2B bef9a4543f508dac87a01bfb9e4906fb93368d4cb80ad4574e61cd81d19ab2241150dced29a288cb505f239dd3a6e74263f0b397c6080688b179306cbcf722b8 SHA512 500e9e87f289edfa1385afc29c4c1a47aeab345455fd2b07e67a84fe251edec6871c5996d26df10035469cf0c59dd8d7d66ef5deec0ab8d60949ecda8035f664
+EBUILD gentoo-kernel-bin-5.15.13.ebuild 3171 BLAKE2B bef9a4543f508dac87a01bfb9e4906fb93368d4cb80ad4574e61cd81d19ab2241150dced29a288cb505f239dd3a6e74263f0b397c6080688b179306cbcf722b8 SHA512 500e9e87f289edfa1385afc29c4c1a47aeab345455fd2b07e67a84fe251edec6871c5996d26df10035469cf0c59dd8d7d66ef5deec0ab8d60949ecda8035f664
+EBUILD gentoo-kernel-bin-5.4.168.ebuild 3168 BLAKE2B 5dbcd24ff9a9665e7bc5828013915983242af56bdb1e605f20b0de394c614747a749204736be7f9b2c0274e9b69c9520d67ad4d0919a20c9296d8adf67360750 SHA512 0b1d113a27d039f552dade97a9718b94e5a18726befdb42d65936bd6f3de38f94cdf03f49a1776d458cec02d0d6626a3ebdcd054a2b8ba726f367315592568cc
+EBUILD gentoo-kernel-bin-5.4.169.ebuild 3171 BLAKE2B b21a7e24efc176f27c9fea010eed9dbc8c9c79c4eb506f65f26825be376a9f16e810e7dad5553c4c0160ca8d81c569c359c29200a9d54cb1043843bcf2f5db23 SHA512 19918b67f5b2d1f88c5da4df66ee5341c0c352251775da221c005a66f4cc5c9c5a2f31a08d8070f7bd8b6e110e705c93aa2de903fb5749b5ce781774778b3135
+EBUILD gentoo-kernel-bin-5.4.170.ebuild 3171 BLAKE2B b21a7e24efc176f27c9fea010eed9dbc8c9c79c4eb506f65f26825be376a9f16e810e7dad5553c4c0160ca8d81c569c359c29200a9d54cb1043843bcf2f5db23 SHA512 19918b67f5b2d1f88c5da4df66ee5341c0c352251775da221c005a66f4cc5c9c5a2f31a08d8070f7bd8b6e110e705c93aa2de903fb5749b5ce781774778b3135
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
index f54981556437..0f32c7eb097a 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.88.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild
index 443e9ff85119..75080d99ff99 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.89.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild
index c7d60886da7b..75080d99ff99 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.90.ebuild
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild
index b392a3e75a53..e7225ce6d082 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -101,6 +101,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild
index 550411ea18c7..605adbe12260 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.14.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -105,6 +105,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
index 118b14b8cb5b..2c935a393a94 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
index cac156079420..fc9dbc62cb30 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild
index a42b48150042..fc9dbc62cb30 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.13.ebuild
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
index 4ac8f62a02d9..b2772a9e8fe3 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.168.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild
index 932f75a40a77..5bdada88d281 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.169.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild
index 5c7e8978af15..5bdada88d281 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.170.ebuild
@@ -114,6 +114,11 @@ src_test() {
 src_install() {
 	mv lib usr "${ED}"/ || die
 
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 89191307d21d..6c1e91565525 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -52,6 +52,9 @@ DIST genpatches-5.15-14.extras.tar.xz 3852 BLAKE2B 09bb1bd3fffd353fe5454a0330006
 DIST genpatches-5.15-15.base.tar.xz 662744 BLAKE2B 8eed543eaa9a3c4778d4fb196877820305dd0fae7857c719fd68f04b2fe7fb0d6b7e19ae7a157adc7cd301f0e7f35e8c0fee7bf58f4104c0a802a6e2e2f6204c SHA512 f0253d9cc063a8d29f3796dfe1eba7109ba89340d1e4178149c4786e36bc01e12f00a48968b9109438ea349b1ca1f486ae35d0103c08577892fcb83befa514cf
 DIST genpatches-5.15-15.experimental.tar.xz 69396 BLAKE2B 924847ea024a087946b5840df8ebb8771f2facb5275a880e6599e92bca255c3366f38fe025f812bf31bc68e23927f394118e45255eec62753cbd898203bd6f67 SHA512 66de1e8ab3200448e7fbc35631846d241eb8e8e1ab21a4d96d3dd49d23b2c8ee17241a9f88e9a53e23babe30f3fb35b94cdf8ee89833c27cb9213521c29e3c57
 DIST genpatches-5.15-15.extras.tar.xz 3852 BLAKE2B 0329c5eb48a8a7abaa686d62fae617d2a4066577aeaebc787ed2547de293f7203576fbbe9075d6289c774a2c95f26c085b3011df84dbd1d36d6b652644db3656 SHA512 b5930766e7f7b0adbea14d44526f570e058d8121b14b548e50ce185c1c49a1c5d20d2cd9b21c196066b8291b782693cbe38cac9f822ec1c015729e3edbb787f6
+DIST genpatches-5.16-1.base.tar.xz 3920 BLAKE2B e5749033cbb870b0fb43733b388a7b34a92c91cd4414587d9a6fe9cdd0352f4edb775ce2ae44af339f1bc773998c6df51ebc04d7e66714b19bec1a76ed9c88fc SHA512 9ec28a2171d1e28bc33cb28ba4b7250a02c052cb0b45bafc57d400202862dbffdb183880e5843424dd55d4026af3ddf6fc8dce16c4d4c4595f6a9f22963527ca
+DIST genpatches-5.16-1.experimental.tar.xz 5424 BLAKE2B e7aba6c01787a462fa085fbcf9e2baba420febef423c3d9a87b208e5072c0be0082e89ebd29b23e48d8874d7b8fc68932f0c7a1d1d37cbca29c057d383cd62d1 SHA512 f4636b50f5de5249896f82b8f772ad5ecd84509afeaae00eced6a4e51862e8c3487159729997a8c9075f463e73bac1cda2d01eca3f29f2f561b2d4b974758af6
+DIST genpatches-5.16-1.extras.tar.xz 3780 BLAKE2B 59d482903c1eab9800ca9e9dad75bf4cc54d5676e44693f23a48e138bba8dea157f1ca9eb23fb081f8287fc62cc74746ec73504456d544958ef8d1f992fe9a33 SHA512 1271830d5c99c17ad7b00b9305f0cc9b02aafd3c798b8d1cee8eafd755191b30530f75207108b50429410ed581a1327cea5b866b150725399fba63eab9972235
 DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a982cd545579940431220f763b1f68280d007d344627b0d1cf4406e2a439b76d20497e1f4aa6d103bb5569f119bc5174c545f SHA512 faa28b056e48873b41b78b540afe7db3200020f85f1ae516f7949f3cef453eccae9b6b8631d594ba8b1dc1b4d6b55b1e9c9379c4880eb4697bed956b0217bef4
 DIST genpatches-5.4-172.experimental.tar.xz 16904 BLAKE2B 41c58ed17ac2fd9bf58b16420129a8aa21909d98075de22b80b3f89a737ff68165ec418c48d438b73f6585dfff6c6e5fcc1e047cf9dd49be1fb80f207497c669 SHA512 20337b06dc1d6f21e647dd84bcee2ab6f52824fca734fab8782be8536b265f38a9f27fe82ef4c47aed124ac31395ca5f9bd9c8850a6b6f4d5b95a727a7d39753
 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
@@ -67,6 +70,7 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-sources-4.14.259.ebuild 736 BLAKE2B 8e229976c59457840c6bb3a1f8406350653da6d5c7d2bfd180e4ed04641355a79ec25a0288965e8c3bbb6727cf0bf6fdcc8111803b2e4db1008a77d547bb7399 SHA512 862d683aaf3d0772d27b29764ebea3fd086db58db170cda4d342a58a5f938903056a4afbe1df0bc04f4605a0abcd2464bebeae1b22b3292aaed83a0d27999b47
 EBUILD gentoo-sources-4.14.260.ebuild 742 BLAKE2B 34909a54bc0a68322441218186288bf005483b69f22bb65ff235eb83ab41fa2c166acd3ce7421d5c9c9451e2447e45ddb0b41d0720a1923ddc554b03aacc923e SHA512 324b64395b5c9a20a0c2284e498cca151f5131e5d7adacff6c1958b6ec12c2737db60955b45113610e6bad749de68ada377939f7ca41207b74e3ad63283dde44
@@ -86,6 +90,7 @@ EBUILD gentoo-sources-5.10.90.ebuild 748 BLAKE2B d8dfadbf47001422c3c7b77c16fe93a
 EBUILD gentoo-sources-5.15.11.ebuild 741 BLAKE2B 635068e72d3aa9cce377918c024150cb25b31353da006149f486c185183ea5105f0abcc6bb5ad89c6dea4fddafe24e82e7a2efb0b92c5d1a880462816c9a5e15 SHA512 d224949e42826fd938a6e23834d3538022fcb675c0f650f7e659315f09ff9a2b585a981d5a452acc7d3376546cc0dfbb3bf63d7081df8a3bae526fbb4de0b329
 EBUILD gentoo-sources-5.15.12.ebuild 748 BLAKE2B 5a14fc5c66593fcb47630432395d5580d930ae5b78cab8ba58890420d33ec6d55a664b4157c380adf766116fd6ce45ea8fef00ae7e7f463f84e974ff3ac32f38 SHA512 07aab6429f4c30e96e1f2732d2afb0754cce0729fcbd8d313c294655c075c7e5b9a7238c8b60a7c1c73ee4efe73b8999b242d6349bb11c554488faf79dff8b3f
 EBUILD gentoo-sources-5.15.13.ebuild 748 BLAKE2B a2684d8c83c423e3bff9e9243bfa9708a1ea94841bbe2a49ec6bada46a2e472c3e50479e22f6c0f1799dec42168d09fa0c890f43b3be6ec2fa0d177c9675b5f8 SHA512 f9aec87a016ccdfc5e75130f348ceed80b7277517a2552db803c7afea7c75f7e3e3f3f597563127d96fb696bff7efd74963756a898f02a90b77722d40e88fafe
+EBUILD gentoo-sources-5.16.0.ebuild 741 BLAKE2B 173a99711cf7e2f80832dead06826d0a5196bf35d364b5445b0da5f60901cde8c4f71757c68780a2768d344dd516fc77a6136a0f3c8ab1639fcfec24b8ef49a7 SHA512 fab36547339b5d28de0b9553b1997a4159099a9b2959539d842e3afe88ff3bde955b4babbcf566ec0baffd06fb636b553aca59cf9f7aad5d0a4d5c4a687c466d
 EBUILD gentoo-sources-5.4.168.ebuild 736 BLAKE2B 0e791d3a8991d94a54f82c8ee6f39d4ba80a96fe20a3ef980dfe7d22d24fe84b1098b0fb6f30f89ecf0e0921a0ba56d81547e8fb37f44d8aa14effd7d306cc35 SHA512 32c6f171b43e73a497598b6e43e0d3716d1576f1618ec4e85cfa767a177c6db29d88463a29f5f8a80f615c7f976f370053d0498ebaa8231d497fbcf913dddc6d
 EBUILD gentoo-sources-5.4.169.ebuild 742 BLAKE2B 70b4d6a54163d54be3c3d8786adfec51e3c7c97a16b87949399eb2af7a128aedf92caeaa2c38b3080a8318ef4dff77339dcb59bb7f2c2594b737b178e7d4cdfd SHA512 4e859ea382b7a6d30cd54f047729a05d5668ec7bc9ddf04a8d91e69e8c99890ff15e00c3712d860824f4c30496151323f6c68c88d1f906aeeac961d58dde6c84
 EBUILD gentoo-sources-5.4.170.ebuild 742 BLAKE2B c8ea8090538e49a5e52e0a22717b7b926569d1bd6395e3203173a0454e6180e3bcde9637db9872e269a5d14cbed5fbfb2998615d62afe489040905637bc41c1b SHA512 07dcae467285479ba9100bdec6e7a1a04639860f75603b2dc727e19e0cde4101b73caa6be29a01a1adfd4de4039f58bdeff0339dff9bfb3b2a4875dcaa206d97
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.16.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.16.0.ebuild
new file mode 100644
index 000000000000..fde975435c92
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 0b132a1a0222..e01f71db2bf5 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -11,6 +11,7 @@ DIST gentoo-headers-5.12-1.tar.xz 3624 BLAKE2B 71206e81c9df3c26b93384231094f2e77
 DIST gentoo-headers-5.13-1.tar.xz 2164 BLAKE2B bd2a7454111961c29134087801c5bcf88c9d0ff9d066c87ba8e81b9004c89290ebec46508324f2062e52166c0e4f82a1a740a66e48140030ce8adc7f4b4c9ccd SHA512 9f7fc903c7ad5142322e83a15a356acfbddd0b8f67c998dd03d74c57816eca7eb54f4b8b02c31f92bb9cf63b3285ff98ad9fe09a5fb8f0864a88da2ec80d3da5
 DIST gentoo-headers-5.14-1.tar.xz 1496 BLAKE2B f58c7079fdc95a4f0add255b3aca6f39554349369930364d1d67df9a2020213c1dd3f24f00e1992877d69839a28183a2139c26ac52db42b9edfff7a2254ee333 SHA512 1c1052405e2ec7bc0b32ed3036d173ca8f471ea2997f52cd5915a5a0963c86ec263beb63615f14267cb473ec2e5d047fd78960718a6866b64f84b634a0062b07
 DIST gentoo-headers-5.15-1.tar.xz 1496 BLAKE2B 9d88ecc517e226580ba43cba1b5cc62232690ed219f9c5e2d26047de6dbc4056eaaf04c320b2758acb3cb08b44ec402c7185989e0c5ded40c44f7b4bb1d77328 SHA512 f31d5fb4b5264a8b9c060d4215462796240c2423f0872e55ba4e96904086264f55b54d00342aef625a8f710c2ebc2d731bcf79cd0362b398c84235ff949eb229
+DIST gentoo-headers-5.16-0.tar.xz 1508 BLAKE2B 8a98768f3f33ca2fa5f61dbcea39388f7faf13033dc4f64dab989b0ecf06a193b22f3e692ad4aa882e4ae1428daae127f0562c7e3416b381d6825beff239a71d SHA512 e48e50ccd79ef79d59b986931dd65881e8a72d0531ff5043897c862795acb54fd3c3c0667eaca572cebd835a8c3196b01348f3865855d06fd409c185970855ef
 DIST gentoo-headers-5.4-2.tar.xz 11352 BLAKE2B 0ff989dbfff9070c291efe1a8b925462770e71d0c3faeb2e53581dcce02abe45969ec293a7293b6d843f483927b15f4accc1f24ee4966483164e8f72727cfad8 SHA512 b460e4d00bdd9ec2ecf229f3b2dde7c6468f775399ba6a49fa0533c0688628c7b27d83835c21eab07407fd98c220043cd1b20e37cc4decbd08a3f2fd9cf6c2be
 DIST gentoo-headers-5.9-1.tar.xz 4304 BLAKE2B 5dda91dac529cf3afca220d0ec323f679eae00e850e127ca6fb7dd42313afe7d4e2b23860a5b58673c070456e1ebd6b0d48efd681a764eef1bab996de579fd11 SHA512 3522d25e4d13f703e69a7e8da1813b38c8977821363b56af1988d78c446087dea4c3499283a2fdef2dc000fde29b945abb821a01f53ac0ac6c2b551699b3b18c
 DIST gentoo-headers-base-3.18.tar.xz 3776668 BLAKE2B 837a675ecf05ec270549d0ba6b9dcb98fb0e40f22007ebfa3e430152b7149dcfa29c8bbe38c737add07f75642234f1633c1d5ae0170788e8d4f765faf00bbdbe SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535
@@ -24,6 +25,7 @@ DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275b
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
 EBUILD linux-headers-3.18.ebuild 1280 BLAKE2B cf237c19d9bb56d7e251c00a6b088a78080a78ba235bd942dcc0ffcb1149cbbb62d017a766dcc42ef718ec31737bdaa158abd1fa24c4ac472545a8cec702d5f2 SHA512 a2bf7fd2bb17eafab257ba2474646023dbfeff4ead108eff3aad4ee55e6a5fa0b2b54a179e77a51a39ec7ec441c770ef97aef589cf93376b6c8adcd2ebf2c41f
@@ -40,6 +42,7 @@ EBUILD linux-headers-5.13.ebuild 1102 BLAKE2B 9ccca73acfd898d26b1f3b891e1a12b7a9
 EBUILD linux-headers-5.14.ebuild 1151 BLAKE2B 3a2704581851089887f06ce7ac0dc02b2b5e88e7a2b81cc06e6147b269e982ba07630945c4393c27c22d075e44a340ce3c6b8e32f47cc2bffed728c7b15beec1 SHA512 46fc741184be80129e06591ef7d8afd92a34e5cc7be61e9d549d0a232345f025be835446dff01255f127ae97efedd460fbaee745bd2db4260dfc57c2a324d630
 EBUILD linux-headers-5.15-r1.ebuild 1330 BLAKE2B 43e4bd06e7105b8861c2ef54fa881f9c771803ca061eeceb5616ff8b87e638595759fe1c8f243f2aca9f5843b6b7203fa1f1ddf653211cbbad45139b6c06bbec SHA512 7f6ff43c762dd6ca19ebf7ddab6de1b583baf2f8f86f9da959e0588fbebc1b421bef9bfaebc77a62c1c2e53410e8745176a6bed902cfcd5eb021034941c14146
 EBUILD linux-headers-5.15-r3.ebuild 1397 BLAKE2B 1db3d00efdc8481182ddf33ffe5a11c44459d21331a5e10ed035eb277cd6cbf7086211e39c3275e30baac7f2d5ffafd2e3340f0df43dfa4e58cebc8b3750e157 SHA512 641d74493ad0346360b4a6d77c6d1c218be6f425bea99a168d5aa523636406f15315970e3dac0dec54516a5507a082fa3fd80f7f66531fb0bf91f13832262334
+EBUILD linux-headers-5.16.ebuild 1406 BLAKE2B 2f1186484e3ceb74d4a3bd2b848489a264807160d2e8e9c97065d084d602079890f62b54483dc6caf148be2b9473fa073d3866c252af4dd7f88a6deb4f2d006a SHA512 542265221e37538328cfcde500081296b4366881fd4f9acad9cb36b14c745ec09b17089c7d515f5e9b285ce51794d40bf76fda97af1f30f6fcf4701231dc9df4
 EBUILD linux-headers-5.4-r1.ebuild 1182 BLAKE2B 91171636ae50ea4ee53c11c0d9038426227187f7a377190c6d1b9bc08e27ddfa9fb356d19e1408d4750ce6a56e1bb586eabd77e99525c392cfe95a1dda74c01a SHA512 65bb3e3e2c222f81e46c9c9e674e6718f1f38657d52a209499e1271e6ecb173bf7f70dfc7a1e96089cda665f84284f5c53907e12b075ae4d32b676a4c57371c3
 EBUILD linux-headers-5.9.ebuild 1180 BLAKE2B 6fd5766c2545afc72cffef9004e428cf4c07c1f73a73c6f1d8241ae83e323890c639dc341e31eed93dbbe1841a52978153d48acaec562ce7abacad6f6e66a0f3 SHA512 6a50a05cdb78aefb84f2c627af7ebf5a1b2728bfe77cb71130cfa8340bfa471d71299afbeea0c07571250cb8dc14a66ee1c3834c112286927e87b71963c61fb6
 MISC metadata.xml 345 BLAKE2B a7d97a94b8b2b72cbd9c7cc730bd66c6e174a2c0bb8bfcff7c279a87000a4435afbb048ca2d9424b391a0b0f992d0afd5efb20c0504062de3dfd49968fec0e74 SHA512 e7a62638f5ba1072ae773781c890f708d90001c4d517e2ecce8fbb791914f2e6769e5a0db63ade82f7d644c1ec3e9b19aae773c496d9059879a4192b7f26ccae
diff --git a/sys-kernel/linux-headers/linux-headers-5.16.ebuild b/sys-kernel/linux-headers/linux-headers-5.16.ebuild
new file mode 100644
index 000000000000..56a633840c3b
--- /dev/null
+++ b/sys-kernel/linux-headers/linux-headers-5.16.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ETYPE="headers"
+H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa"
+inherit kernel-2 toolchain-funcs
+detect_version
+
+PATCH_PV=${PV} # to ease testing new versions against not existing patches
+PATCH_VER="0"
+PATCH_DEV="soap"
+SRC_URI="${KERNEL_URI}
+	${PATCH_VER:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/sys-kernel/linux-headers/gentoo-headers-${PATCH_PV}-${PATCH_VER}.tar.xz}"
+S="${WORKDIR}/linux-${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="app-arch/xz-utils
+	dev-lang/perl"
+
+# bug #816762
+RESTRICT="test"
+
+[[ -n ${PATCH_VER} ]] && PATCHES=( "${WORKDIR}"/${PATCH_PV} )
+
+src_unpack() {
+	# avoid kernel-2_src_unpack
+	default
+}
+
+src_prepare() {
+	if use elibc_musl ; then
+		# TODO: May need forward porting to newer versions
+		eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch
+		eapply "${FILESDIR}"/${PN}-5.15-remove-inclusion-sysinfo.h.patch
+	fi
+
+	# avoid kernel-2_src_prepare
+	default
+}
+
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
+src_install() {
+	kernel-2_src_install
+
+	find "${ED}" \( -name '.install' -o -name '*.cmd' \) -delete || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 1d366a99088d..289d8dd19dd2 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -4,6 +4,7 @@ DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
+DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-4.14.261.xz 4576736 BLAKE2B 66c1689017a9ff6240b2c580d960362795d667b74d22b04fbf786d407051d2f1ac07a68ef6708795c57507de3f7f22229c47723319235f8bc4bacabf765b66e8 SHA512 f60c95733b8c3d9a1111275bcdf86e9ea3932665af2a36c17f222fea3016103bd176dd5ac28701e414998233aee9cb73178568984c9e1ae25b65df1165a57e6e
 DIST patch-4.19.224.xz 4427084 BLAKE2B a70cf8607c2dcf8a20d67e46392f278895321fe1c63cf1ff7d76e614787f98b5491a54978f61e2c5bb65c52291db757b7d9b04ff7873952cdcf896f558b1c8a4 SHA512 79cbccc3996f49420ab3fd871bf3eb3fce45ca871127195c939d1f70b2c37043affcc6e6f7385ddb9018aa1928316918d2da6fb446d4df75f40d631637e621b7
@@ -18,5 +19,6 @@ EBUILD vanilla-sources-4.4.298.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf
 EBUILD vanilla-sources-4.9.296.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.10.90.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.15.13.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.16.0.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.4.170.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.16.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.16.0.ebuild
new file mode 100644
index 000000000000..39693afef068
--- /dev/null
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.16.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_SECURITY_UNSUPPORTED="1"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 9c73d18bc85b..c4f1b6805591 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 87021d564c48..803cec809bee 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -6,6 +6,6 @@ AUX cpupower-frequency-set.service.conf 41 BLAKE2B b1349f0dc39ee39e7c1442374bd92
 AUX init.d-r4 804 BLAKE2B b143305b3f117afa49967de098f54419d5f57b86dee7e7153b7adb02331a88d3b90a0a085ee189c0b6de70050de4a1249d481d23816764aad34d416f041f78b3 SHA512 7f6992b17376c0bedb403586e123200272d293b15819260cacd182c19ecdb2da635b177fe3d621ad8605a4ff046fd23669e67ea0bd8f00c9e4339d3ac72d2ddf
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD cpupower-5.12.ebuild 1668 BLAKE2B 19f8acdda5da5beb5f6fb4df32a4cef5afb691368fc7ba295c5ca873ecf50d285d94d8045646d8e9aeb43758575221ac5211fa1f71e8dd5c5c0ed57958bfa357 SHA512 99dee0acfb29e22e7a33c2252a253bc0df6f180b7900bd80ac13cc5b4884d1932f3932fcc7bdc42a4cba73fce2ab047723f84e1f0733923b03f507bb27b72ceb
+EBUILD cpupower-5.12.ebuild 1667 BLAKE2B 224f33c75a713c6ba64e75c58ebbeb61c76ea939ab3866f33924f7cb566f72aad23d95867d608d479f8d77202672b9e3818b39f28e284aa5c34f99715d590df3 SHA512 be528414367bcf6a3d38edd2b1df17bb637a03af03fd56b708961c3c013ecebcfeab327eb96cd36dccbb4892975f9b206a242d47a7caeaac9501b0c0f1492617
 EBUILD cpupower-5.4.ebuild 1708 BLAKE2B f4c31b98b98ffd07398ba6cc4c392fca3e07fd66fbe62fca312b3d8914fb6e67b6ff4e671c4213a2507f4e332f0b982d273d0c66eaf7f09fc7c0fed862b949f6 SHA512 7c2b8fe451477001a41403f065a069fe85ffdd945198ccaaf7a4193669e78ad27da1908adad114d8dce3d47825031e20e2cd7b40136e00b6a5050f2527442d64
 MISC metadata.xml 341 BLAKE2B ca3076a5e7ee2e834df8f12474fc7bf22bfdbcc8b2734760d2dc30977157dc97e4a0201a6946051fb487833d8891085682d3432c4e941f5ba0241b6fc49232f4 SHA512 a5db2151ec0dd4c0d084f64455406b27387058d61efe53d32718072dac198c0a877618b17350e95a4ae31fa65b672cd4b2f6a966ebe61ec5ec9fe2f6677a0311
diff --git a/sys-power/cpupower/cpupower-5.12.ebuild b/sys-power/cpupower/cpupower-5.12.ebuild
index 1a763e744a80..42004483e47a 100644
--- a/sys-power/cpupower/cpupower-5.12.ebuild
+++ b/sys-power/cpupower/cpupower-5.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v${PV%%.*}.x/linux-${PV}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0/0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d156afcae46f..cc1d670e5195 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/jack/Manifest b/virtual/jack/Manifest
index da69dc4075f5..4d7094bb55b1 100644
--- a/virtual/jack/Manifest
+++ b/virtual/jack/Manifest
@@ -1,2 +1,2 @@
-EBUILD jack-2.ebuild 513 BLAKE2B 75cc2d67f8dd0b92753bf8285d638fd3f53067c811a508a067f5734e8a6f57579af8036f7a37490d06ffb29968db13280b10cbbb5311176537f3ddb9874731b0 SHA512 c8bc22d5e7d70e70581dea0948579b59b2dea1ed6e94d2ea4e1224a9eecbfa8fb4c91a382a5ebc5c671840c4858e57d3a076a5e402afcf0c06aac002e7da3db5
+EBUILD jack-2.ebuild 507 BLAKE2B b492b0c28456f35f98b8ada643bbdf42430c46698a7bb3c98d61a6bdcdb4756a33171aaf83a934a2e80b08083adafe2127eb14fd40566fe115a63ba978f5df40 SHA512 44f4df0f1455fa716db7fa2ade7d8942ee8f928ef3c2c841da3e056709b5f1562e4e115cfd5bdfffeaeeeafc645671299711cbcaea23d933b8f66d2b8e0a782d
 MISC metadata.xml 284 BLAKE2B 00ac0798b5277d743834ec7211d08e632ca2b53ec988ed462b93460e1412e2814d5e5eca9eb8f5c32fd93ffb11fe8501d7cd95850cb34abe6f495464b04960b3 SHA512 a2642a6f1785c4d52c59d37baf509bfb25411722c09370c8ccb2323d8129b8031988949c4a373bdca48b8ee9e1ba9fea0e7ebbadc367a696acf53ff38e3b21e4
diff --git a/virtual/jack/jack-2.ebuild b/virtual/jack/jack-2.ebuild
index 356b824079f9..03ee186c4669 100644
--- a/virtual/jack/jack-2.ebuild
+++ b/virtual/jack/jack-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for JACK Audio Connection Kit"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 
 RDEPEND="
 	|| (
diff --git a/virtual/w3m/Manifest b/virtual/w3m/Manifest
index 27a20328b2a8..8aeafc1da365 100644
--- a/virtual/w3m/Manifest
+++ b/virtual/w3m/Manifest
@@ -1,3 +1,2 @@
-EBUILD w3m-0.ebuild 399 BLAKE2B 0c8a9911c79ef9ae9843180623f91af1ed68da9368dd609517afc6622d9a949b7a26075cd93be3e5d92bb89003ff39705775c2a4f764c1364bf0fa1553a150ca SHA512 663e0b182087c37100fb4cc0282c1a8b46401333525bb12dab4b80df30cbc9a0e35cf495399b8df34a3e001d5cb5166a472dd3f81e2f3fd46a13ac2e422e510c
-EBUILD w3m-1.ebuild 397 BLAKE2B 1547b5760226115279b815953fadf740413dff186d058ab9d3a6b3467314757237db9011fe5851c2049c277bf90869a955501ffa8a4e6238ebb6a826e9f1ca6a SHA512 88f3c4445634db0de84a7e45a8804d0fb8034dc810db84ea44dffd091733e858e98e26975e6a453ea1b345c6f85c94ada6094978a2d36fae12031b835c63f35d
+EBUILD w3m-1.ebuild 396 BLAKE2B e5d23742cb2e6a5e9f97bc426f20d2874e5ac9824cf7ecb7302173d7935004f45c8836ce91e83310efa35fa1a2b3e781758f2f112f28a0a3a0666e1e2b365a28 SHA512 a0bb7e6fd83db6828551ab9a74f060caff82f1b453d3027bef65642cfa8b38769cde9ac19d3cb11d58426e29e2bf259c437d0c666e8a62b8ddee0df759dc687c
 MISC metadata.xml 259 BLAKE2B 473457dc1808c494d8a08c731bc36bc3f6fd42ac730b0e7372e9749275ad413c56abc214d6b8d43c3e3f3d878a81e61d3ac1088b0606e99b449018828f056c4c SHA512 42603797647a4e2bdd69fc8548c0f035143c2a94b836763b39fc0dda770621970fbb233327c142107bca40f48b2b380fe97c6517e5fce633ba2c11f7a34402fc
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
deleted file mode 100644
index 485e957f4b7f..000000000000
--- a/virtual/w3m/w3m-0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Virtual for the w3m web browser"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-		www-client/w3m
-		www-client/w3mmee
-	)"
diff --git a/virtual/w3m/w3m-1.ebuild b/virtual/w3m/w3m-1.ebuild
index a62a6f56241d..17526c870c82 100644
--- a/virtual/w3m/w3m-1.ebuild
+++ b/virtual/w3m/w3m-1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Virtual for the w3m web browser"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="|| (
 		www-client/w3m
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index ad5f391320f7..97991344fd68 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 92d3f0ac5c71..745a2666f9a8 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_97.0.4692.71-1_amd64.deb 89843732 BLAKE2B 2c3f5503e39dab49bf40bcebd120a817e45a0bb4448b739c9b4de5c57942b687d30a073eec7dc20063a7768772cc7e2c58efe25130969146bc1dcb066c77a895 SHA512 0b14190d1168818a1d63995e0366a7efd4421bc44507969da03b42f8a0bc2d73f538be48c9137484a71043bb83cf9a2bb3c828593937883dfc68fa1668bcf3c8
-EBUILD google-chrome-beta-97.0.4692.71.ebuild 2715 BLAKE2B 2f8d64037e89699b67ba1ff4c047ede993b8df79fee8e2be24b2bee9d683c06b88626c58952e8662757ca94203265baada031d70b90f46ab67327088eb7bb632 SHA512 4f2344264e168f0d62e038222eb7f5e3ff81c71de4a2ee6dfe2272b84dfda06cf36dadf8ceab5c97061f2955b9d44ba92e863df7ffff4068576036043cdfbafe
+DIST google-chrome-beta_98.0.4758.48-1_amd64.deb 90905260 BLAKE2B e306a5391bb28fa50415aae35dcc1828d3a483efe540c379543724a82966559bf37542fee32647e949a635e5b61fe732309d5ae3cfac954d7cc9104dd60630d2 SHA512 5d2f758dd51384132f7d515a6c0187600fba9cfcfabb42a97cfd9fc9981803cba1c390a78307f63cfb3b650cef8e5867c9c10165a7a05657d7de5f9b27cf13a4
+EBUILD google-chrome-beta-98.0.4758.48.ebuild 2715 BLAKE2B d0467d2625f81a4c7cd4b59404687614416cdb7b6bdc4610d7ef66ad5cd3e5377a4543c0bb829460fee58c51d5cc946354b2521d19df4029930c37a8c1e72d79 SHA512 b7c0de638ba32471e3c1e46743219f6b265b6434a6ad704d70dc3b001ed317c1b2d52525faadf256c522c3101f8fa8c8f42dc33b2d6e15d6486a8cae972e3b18
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-97.0.4692.71.ebuild b/www-client/google-chrome-beta/google-chrome-beta-98.0.4758.48.ebuild
similarity index 98%
rename from www-client/google-chrome-beta/google-chrome-beta-97.0.4692.71.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-98.0.4758.48.ebuild
index 56dba81cca90..67e916a4dbcc 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-97.0.4692.71.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-98.0.4758.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2021 Gentoo Authors
+# Copyright 2011-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index b5a5aaeb40a7..447aa5026ee9 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 08e940e57a4a..ac8595a16d60 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_97.0.4692.71-1_amd64.deb 89843732 BLAKE2B 2c3f5503e39dab49bf40bcebd120a817e45a0bb4448b739c9b4de5c57942b687d30a073eec7dc20063a7768772cc7e2c58efe25130969146bc1dcb066c77a895 SHA512 0b14190d1168818a1d63995e0366a7efd4421bc44507969da03b42f8a0bc2d73f538be48c9137484a71043bb83cf9a2bb3c828593937883dfc68fa1668bcf3c8
+DIST google-chrome-beta_98.0.4758.48-1_amd64.deb 90905260 BLAKE2B e306a5391bb28fa50415aae35dcc1828d3a483efe540c379543724a82966559bf37542fee32647e949a635e5b61fe732309d5ae3cfac954d7cc9104dd60630d2 SHA512 5d2f758dd51384132f7d515a6c0187600fba9cfcfabb42a97cfd9fc9981803cba1c390a78307f63cfb3b650cef8e5867c9c10165a7a05657d7de5f9b27cf13a4
 DIST google-chrome-stable_97.0.4692.71-1_amd64.deb 89854380 BLAKE2B 781333d24dd3dc46855500173192ae6569d4c8f8d3b553044f3a7053c9cad074f8ce14deac2348cecd6b4f2f2b13cd8e27f0792b260c0f9ba95177f08590d6f0 SHA512 43baba6717274be06445b75e60dd581cdb1829c9bf21d4a6905a12d23d21afd5cb225c4cf001011b7107d04718806fa75da4d5c3c4933063aa2f130f853712ff
 DIST google-chrome-unstable_98.0.4758.9-1_amd64.deb 89832144 BLAKE2B 639635452a9e5f2bd70c33f16ca9f66ad390c4d48632b877c3661c7be0b69112194b563012e3cbbd43dd5476801c5aca38746094eaa5c378c4242fe6e1cc8ec2 SHA512 4405a921172e6625c6645b030268157b4d54111d9da206d3e565f3cc3d3d6f415e0113ab0632a7dd5af93ac97fe849d68def61c9ad043905a44f198a2856c899
 EBUILD chrome-binary-plugins-97.0.4692.71.ebuild 1162 BLAKE2B 410f79249c734b8ec4c60008f572fcf2559b0cc6d699e5fad4905cdfe4d6e8a1e1cd1d89bb55351a6505fa18b5ec48f9d33b3648e5b5b318b67cb2a87593e4e6 SHA512 3fe509f0fcffa0324f25445ded823f772548cb09dd4ca62a81cfa1755de2596ef6ae9fc93b3ffc0890fc72e4f477757572e58e07979f8fb87df82a1567bb9a5e
-EBUILD chrome-binary-plugins-97.0.4692.71_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
+EBUILD chrome-binary-plugins-98.0.4758.48_beta.ebuild 1163 BLAKE2B a8c9682d5378b23d38a59c6cab5adef76e7954d4fd4a333182e9b011f49b1c07c0467d7a57adec257b9abcb95881031c24a15d1670d6ed8cfb9d5df685b37c10 SHA512 65de0e0c7fb9c3c2be682b746732646daea1eddda581dad5fbc68140b3c89b3c9bd24469e429f0f5e0e13c5334d1c38c3cf15d04b9650d6716b6b3d29d0b5c5d
 EBUILD chrome-binary-plugins-98.0.4758.9_alpha.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-98.0.4758.48_beta.ebuild
similarity index 96%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-98.0.4758.48_beta.ebuild
index e11c8c2a2bb2..510260694061 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-98.0.4758.48_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2021 Gentoo Authors
+# Copyright 2012-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index e92b757902cf..9dccecdc6d80 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 1ae8163153c6..999a8f3ee4e7 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -50,12 +50,12 @@ DIST nvidia-xconfig-470.86.tar.bz2 108946 BLAKE2B 8711d46e18db89c94fe9986e3ea296
 DIST nvidia-xconfig-470.94.tar.gz 142577 BLAKE2B 0687d78a05d4b990bad18a27544874dc79fdef7a7d5e7f5393f10ad7e874cfe51b27919ab61e2c7670e0d89848f80f68660eac0294bab27f004b8c98b650a102 SHA512 88611ed7a0894c218ad536a9819182a1f94d85c24bc3ef1b2959134147ba8d623bf1b35bd8f30ad2367704b3846f23d84ebe5b94f08936ec97ed26ac63d40add
 DIST nvidia-xconfig-495.44.tar.bz2 108699 BLAKE2B 8027d9b14f16c792e0839746c549979017e52724a5826cad3b53cda0fa2638b6f7dfe72353e36b84084f4a56a004cd91f87ff1d1d9e542b5d760e47092268993 SHA512 624aa71f319d7d8e3383580eda5c6cfc986ef4c3a9c14493cd561cd3ba758763d79731bb7e7e03fc89d3b8a3a8b65cee324de1d9980b5725678ccd50cb26175e
 DIST nvidia-xconfig-495.46.tar.gz 142633 BLAKE2B 1df2a080dba81b3c9e984a1d2e7d49f3e8adf9f1afb28dfe6a41a9f54b03e4830d42851a16583703c2bf88f11989851aaf23fc8dad0d3b5f2f8c3885dbb5db7e SHA512 b60d65e421460e4bdad579b36a141e82b869d34ca21849bdc33a445466c1b8ab505ab4ab82d6801e05f85dcac286566ec792d8c7708ba511aebfebc29ec0447d
-EBUILD nvidia-drivers-390.147.ebuild 13646 BLAKE2B 6c7061118d42bd9528aff678f71e6cfcd006ea4695a0cd5604bada65c3ca5b873f558076203faa87b22a86b8ba717fd1bb3f3c448eca8828a85b192a316f3b44 SHA512 1f4715ca10f531cd9fc4e537a9dfc22f1381941106905c96ab31cbe5af62afcb034d81c7bfdbdf78b02a05217d24aaf67ebefe0cc9b2bf93bfd2088ef070ec15
-EBUILD nvidia-drivers-460.91.03-r2.ebuild 12894 BLAKE2B 3cc01a059252c7dd63e4340e260c1ba091319769b9d0138579d187cf092c8b3b9bfe0e5f8e51c1536656b8906e6d9b4358d1c8bc1e24e11fd0ea17c904cf0336 SHA512 5cfe126ae497f3c73e944c2b48fda7c49b5adbd0ac590328355a60d5066ef5c841969af140c7ebd28dd08fa749090d4869a49fd3949b1ff9b4fe5493bb05cbe4
-EBUILD nvidia-drivers-470.62.16.ebuild 14265 BLAKE2B 7d443fd095d866947a56f0005230ae85c0ec9294bf5694bde721dad3ee8b6f7d8b42c276e002709ea8d23a9c970ef51ce5c2fdf9ed77c99f866cb75303f35c35 SHA512 2556aa639265699c361dfb2bc5941ce7f87d15ccce0e3e3d1c72e8c1b4fad0755a07b57cbc13ff2ceae73a45a859f81b1dc8efe11ed57dbd73a405a229887d5b
-EBUILD nvidia-drivers-470.94.ebuild 14387 BLAKE2B a89c5d99f90ac8c9a6946cd5d2a30f9bc4c955f133478ab18be91914198063505813feefd8eb9ae40c0c8c03b60181f06e94f63fd076c92956fcb9e67faa744e SHA512 6449acef2f943e8804674f9db2c6bb3b0917d7dcb3aa4364da760aad2c4bf7e46f4b7fb194e389cedf05655155d70115ffe7d59a1726e986afb7e47011676ba6
-EBUILD nvidia-drivers-495.44-r2.ebuild 14465 BLAKE2B 5f466d76f22f33d9e0e2c5e8afbda2b6b01926cfbec0e180421125a264d79d091b52c8e53360d9b9dd70be87569f577afc50ef6d566d9ac3201e277f8f9ac9b0 SHA512 991251c5caaa408f64d7b9c984faa8aed3c6c20d267efc371ef6b3458cf6c419245379a62e31d816b422d69e8c76bba7b23bff17e96a048f8c8226a7b348934d
-EBUILD nvidia-drivers-495.46-r10.ebuild 15193 BLAKE2B 12b808239dd8fe0f3398e8c37fe0d3ff852f422c54bc3a1d37553597ac4f64e52836f57cc88de4093765ea48d533819a00b032411055f9c272fcb8f00a4d6251 SHA512 a5608f46791a7370d90fbf903963f0c9e6fdeee3552933e8e8704b018560024ea5e03c236192e645cf7b594d211a6dd686df67df5cd785282d2fe04b53b117f8
-EBUILD nvidia-drivers-495.46-r20.ebuild 15176 BLAKE2B 9d5b6d9b22b7cbd979fc783861eff787cd85813b99091872726f912300c58fa7f9504893a1fabaee7ef65ec1d5d8b4619db61d871a36da2d4cbe048c38d48ade SHA512 c281a2f5661f83d2f5a3117968dc55ffa4376fa65c49427a30f55a2e659f1b50cd7df6dd5b699446a16e29b424467a1527e5f8ea6bba4a48df3ab4cc2d063959
-EBUILD nvidia-drivers-495.46.ebuild 14392 BLAKE2B 5394a084f4c0c46c39f1447cc48c5219ea9eca3d88ed4ce980436bd563262cdb4c2394ad99b551ace18fea9551aef726235e2c8124fef8f773d01ae67972d333 SHA512 1b341595da4f6e1f6c97ef712673007ce172f72d785adcd48446d3bc29cebf2ce39a15678733c504e82c0de3d7365333c13c52168808530dd91d2c053e00588a
+EBUILD nvidia-drivers-390.147.ebuild 13650 BLAKE2B 3a58e0bd5f6c7f00eac1ccc21c9c1afd36e467d95ffef684b961c13ecb670c2d4035847d2627b32681da661820f0b2fc60a02d1363b08e801197a396993484c4 SHA512 2174c36844232b98ebc2c8a1af461193c5a31a395d731d96edd6d67b13aecf757e0278823a2abeffd35bd0db9c5c3d710d1a83a38075be988717481f33f526a2
+EBUILD nvidia-drivers-460.91.03-r2.ebuild 12898 BLAKE2B dbd2efeba59806437562aec069df5e5cfdc8c50afe1c06580430148639853c8ca072ecc52d5365dc09bc450c91a3ed3638d8fdddaa4b582560cbea45606e62ba SHA512 fcfc7243bf5416777aac3801e00fd2975e2dfbf3c576f79835502f713aa70a37d84e28bf4c8e44375a65dde1853e68c76344efb4290cb62e3bc87bf4ab165843
+EBUILD nvidia-drivers-470.62.16.ebuild 14269 BLAKE2B ed6dbfcdc904d46c7e4cc87455a7d0c1863ebc3ac86d57d2ef44cf6ed8834e7f2a833b4e1aba52d73a7a044b2e71a43e11563caff04b1dce95aae309e8de4a32 SHA512 10836a507ca29d52d17ec13c59f28ab44c45f2256e3fc47ef6024bce04ec837ab297253c27d291ec07956c5043f31ccd35c655cd08924a162d862c463fe1db97
+EBUILD nvidia-drivers-470.94.ebuild 14391 BLAKE2B adf2813c600fb45bf168c30595288bc4d9df105d31c1b26ae40817b8e3fb044a3a114b2bb01e0d5bf0d90b800dd87a0f4463c5567938a1b1ebe0a1d9506528c5 SHA512 6581ee919328939db81cdad9ab7e9c1e868c20046b9f6ba70cd8ae2b0c8b5cde183e48e89604c34777404f61bad84fd8abd532e45a36259f3e6146c0d81a82db
+EBUILD nvidia-drivers-495.44-r2.ebuild 14469 BLAKE2B cf65cbd924e5bffcaa15024d5992233fe69ba44ad09aa3470870b12834053dc2de74c2af50e5188335b0f57a32992a8bb2aa910d6b31b67b6d9b8cb5c7d70e7d SHA512 50d3ff734b176c7f40ee8a4396dd34efa0599e5758c5cadc9407e5f70ecdd110ebfdc3efa435cbeea3f5d56b7ff8e9d238ef0ca5ecd13ff2150d9708f0608a96
+EBUILD nvidia-drivers-495.46-r10.ebuild 15197 BLAKE2B 89596bbf98795819b91cde3bca5f3661c1298a59c658cce79cd69d2da6c09b0b3b3489512e5c2ee03bfb560716ff187b072400af4f2b3c3bf24b068b278654cc SHA512 e8d18be7ab7b846c1b417f6982a2075b655ec02be4e5c26248c718be44e0d98c48209014794d5183b268679d1266c766f0717e2388aa165f1f5afb730a0d990c
+EBUILD nvidia-drivers-495.46-r20.ebuild 15180 BLAKE2B 26f20f3a08c961b30270f10fa938d00dbe8688524a3cd08f411e044fab955fa85edf4089ff4a501b44c6c69dae58a27d284ddefdd16c4cbd96155a281d478759 SHA512 b520913037bb6725e1963ca119d800fe8ab4da274fb5bbfb1c2757b641b8c618dc37c1722784c93484be15537b08f1394ca0c2c390c7682abc93520e922f9d6a
+EBUILD nvidia-drivers-495.46.ebuild 14396 BLAKE2B f62df0b3e21a1e231d2c0ac3594367fb2357a8fa2b915589897bbf0465266c53af655645e324640950771b4fea40211fac50cecce72156ccccef0d8368da127d SHA512 4268509300091b51b0e49d5c92505145b8ad3e3979dc970c76b879b06f16ef7640c62339ff2c8e0ee967e7bf963e4b0563506b936f44601966b10dd7d63e9103
 MISC metadata.xml 1006 BLAKE2B 1dc4f01e5eae548e70fb0ef6f816910ae0d282c7a97e552de62354bef162895d60f87dc21306523e530325b55b646b1d4c16182a710c5bb01389521c36e408f4 SHA512 5db62ce94374226c20e67aa89c61c83b581affb7383b082076db69349d0a76aeca806593072d1ae2a9ac01d34955c826dd8145081988adee4069aadae654aff9
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
index 27bc1f65bc9b..91079696f2d2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -130,8 +130,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
index d04eeb51e29c..430cd3d9481a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.91.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -127,8 +127,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
index 6de4753fb633..439dc1557ce9 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -132,8 +132,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
index bba3a75169aa..f82e09b89d17 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.94.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -132,8 +132,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
index cb68478d1349..a8f44500097e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.44-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -134,8 +134,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of nvidia-drivers"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
index 9983bd4e0e6b..78b8be650a52 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -134,8 +134,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
index 6ef95b7be24f..694ae76105ad 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46-r20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -133,8 +133,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
index 38e290de75f8..5ccf1a12923c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-495.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -133,8 +133,8 @@ pkg_setup() {
 	if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
 		ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break this version of ${PN}"
 		ewarn "or was not tested with it. It is recommended to use one of:"
-		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}"
-		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}"
+		ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+		ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
 		ewarn "You are free to try or use /etc/portage/patches, but support will"
 		ewarn "not be given and issues wait until NVIDIA releases a fixed version."
 		ewarn
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index bf4829db7e91..3b3d112504ce 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
index 6defd42daa25..26aa8c0dd9c2 100644
--- a/x11-libs/libXScrnSaver/Manifest
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -1,3 +1,3 @@
 DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a
-EBUILD libXScrnSaver-1.2.3.ebuild 492 BLAKE2B 17a1975dfc8689362f89a436f7d5bcf1075eca1d5e3d1aeedd979edb766add90a911755474604cc4ac112b5978e25873dfcb6c1e63ef7db62954c15ad5d6388e SHA512 88672a2703780335e6497508079560e85a5ee273ded58ae036f16a05caccbfcc6592f54ee320478590e52f5bd94594dc21efa82915da10e827fea757dc31cedf
+EBUILD libXScrnSaver-1.2.3.ebuild 498 BLAKE2B 5b5981706bc90f52576ec96fc7fc4dda1f7e70bad2f1d85db94912fcd92f5277e1dda03f66f299a3d31d57319bbc5b90e142d1112719fe6b513069c6fadb02a8 SHA512 857ad5e0a332e84b445966ca7762b9abd9c7a5eacb006a632a9b3b668d21e939dd3ad3ec0e30cc85480bbbffbd0a76f3137f20e9dc7d23e6fcccffcd9a9abd83
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
index 874333c35650..183ea173d5cb 100644
--- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org XScrnSaver library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index eb29c70c30a9..4f91a1e033d3 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
-EBUILD libXi-1.8.ebuild 767 BLAKE2B 25b4b7f52b18726fe3ece90292afbfce8e2afcc8ea2dcb522558d37d427c3f5067053200e6645e2d03ba206cacb8d66773d28d000f6be887af40adb17a4399a0 SHA512 bfe06ad7507a618dd2007002d8dddecb7b25c887c3dacb5e8d935e8d419dfc4e22d789fd9fddadc3565460e28058bc502aa480cd10ec88167454816200f0e24e
+EBUILD libXi-1.8.ebuild 773 BLAKE2B 3b4f7a09875406a177dfa427384586635362d5e2aed9cbd64c63bddfb54ab33a6057ef8822d9b94a32238246059f5d6bbe710a54c6888ce88ac4237b3c526751 SHA512 86bbf260a9604dece0aadde5f2ef405ca24d3ef7bacbeaf73cc9055ffd29a927e7fa22eb35ab1c2ed4ad8346bf56aa8e7b725579156920091ab2f4a4ed6ce9ae
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXi/libXi-1.8.ebuild b/x11-libs/libXi/libXi-1.8.ebuild
index 6c73c17f2432..48c264c756f5 100644
--- a/x11-libs/libXi/libXi-1.8.ebuild
+++ b/x11-libs/libXi/libXi-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index 8a3c0c250dbb..ab2a8b291198 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r2.ebuild 510 BLAKE2B 870a771d38704a6b0a36515a10dfe8f2605e73576e9acb04fb5774b9ed999837b4d0201c400786991ce30ce099a7ab10feca474625cf286dc49d63d95fc8ee6f SHA512 355e9e18f07c356b554209cd722001f2fcb623ef95cb2e98fd7fa52f25851a848752472bea3af5fb22e848251399fc95d89092da780a7aae6e1ec9950e0a1642
+EBUILD libXxf86vm-1.1.4-r2.ebuild 516 BLAKE2B 980d8c60c903975181dbabb852d1e48a0f0b7446c49d6b1f29fce35ce7b92da43105e83b589cfe63b61160ada6f3b75d5ad87e7b4f370358b3062433f2dbbe8f SHA512 c0d3d9cbf7aecdc1ee2343fb12ee0a33d3c6cb37cfe7fdda7f2a215df614ac70abfcb7838d4210b6428b984d079fb9fa875bc12c1da3176b16fd7b4c80493ac3
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index ec377af61680..554d4979d1c5 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xxf86vm library"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-base/xorg-proto
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index edcb63acabde..9cf817801cb8 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
index e2a3c185541b..a52000c10db5 100644
--- a/x11-misc/picom/Manifest
+++ b/x11-misc/picom/Manifest
@@ -1,6 +1,6 @@
 DIST picom-8.2.tar.gz 242653 BLAKE2B 1c76ad4b3152d47155f957f8f1e75447ec8e30d05bc5fb9bf09c890552168cc3c607c8980b262b18cd5f3dc2654a3416cad20cb7fe829eaef8380783d1847c82 SHA512 bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
 DIST picom-8.tar.gz 242059 BLAKE2B cfeec7f40eaa43c115bd326abeaa547553f7bdd22a2e6b2a96f46d87c164b0e9403a876f069077e3b85d11af685aadb0cff2a4e7df2cf87646f2552f9c1a01df SHA512 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
 EBUILD picom-8-r1.ebuild 1526 BLAKE2B b016d3cbaa1b37d83866fc56923fe5d5d0c9d98f84b7ffaf61420cc929b902f2ff19c33f4a4f9b5220451c4124feca2e31aa53e48c9689510a1a92a12f6cfe25 SHA512 965f59726b168898fef69380c6d397632f19a9fcd7fb9b6458af815270700edd709ed845a37d59cf2b8329a6ccefd113516a03c2a57042b421c7b2c635f295ad
-EBUILD picom-8.2-r2.ebuild 1571 BLAKE2B 1a34b3747029521a437961651515852a0848e7b2eae64fedad08e33c08ae88c00c9165b500b5add7893a7b7fc430ccde5374b26130d716c38a1ce79677f4dd55 SHA512 9a705ae1291d4db41373465f3462badff819c1412f172d36b3ea10fdb3bb0c3f2851b027bcc3be187ce9fd5bc5e53b603e5fc0077816cdee62242433d4b036af
+EBUILD picom-8.2-r2.ebuild 1578 BLAKE2B 48e668b21513720af93703cce7049d30d26346dded57115f9e8322dfc38e54f479d21e1a811eb2d447abeb6c60a2a7932a9971843af4bee3c2cdb6ae740660e2 SHA512 559063fce7ff4a4a7c4dd07d2f604df379ff7d7a9cad58d99ab988df96723678d68bfee40ec7ecd800544f783779d7fda9cf2387655d3bfb2b16e8e5a13522c9
 EBUILD picom-9999.ebuild 1516 BLAKE2B 35d49008bffd1956f30f1038a23f4a34b242e5690fb84013ee2b968265b07522221720093a1b43eb01dbcdd6467bdc8cfb2ab66178b8b3d3f78072b2b4b1e69e SHA512 f51ef9e05acfd8d6e1dee42eccd6b029edc076395db79cf1e8235a696c856d322d53267d0dc68b5ccfe0ae2a8a1496409182a8c710acd8b3f048e6048f63c937
 MISC metadata.xml 678 BLAKE2B a2e430318134d3080d018d14913dce148151db13f6e59ed2c8b3c4b10c07e0fc16c2b7e9fbd95c0e849739753b1b3572c1d96418fd19955b2c6def2c655444da SHA512 7a172584db948430c11f8b682a918bb0d49d454ab835592047aafa9cf06f418fe0e3bfb2704f6a5ba45998a64096085dc23a2c0379c6f582a63d36f9ebb8e1b7
diff --git a/x11-misc/picom/picom-8.2-r2.ebuild b/x11-misc/picom/picom-8.2-r2.ebuild
index 8c0a8512f14d..d1eb0ff6f95b 100644
--- a/x11-misc/picom/picom-8.2-r2.ebuild
+++ b/x11-misc/picom/picom-8.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="+config-file dbus +doc +drm opengl pcre test"
 
 REQUIRED_USE="test? ( dbus )" # avoid "DBus support not compiled in!"