Sync with portage [Tue Jan 11 09:13:38 MSK 2022].

2 years ago · 172e81a3d9
parent 62eb0983ea
commit 172e81a3d9
955 changed files with 5724 additions and 4790 deletions
--- a/30
+++ b/30
@ -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-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/fastjar/Manifest
+++ b/app-arch/fastjar/Manifest
@ -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
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@ -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
-)
--- a/app-arch/fastjar/files/0.98-traversal.patch
+++ b/app-arch/fastjar/files/0.98-traversal.patch
@ -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",
--- a/app-arch/fastjar/metadata.xml
+++ b/app-arch/fastjar/metadata.xml
@ -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>
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- 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
--- a/app-containers/containers-storage/containers-storage-1.30.0.ebuild
+++ b/app-containers/containers-storage/containers-storage-1.30.0.ebuild
@ -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
-}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- 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
--- a/app-emacs/ebuild-mode/ebuild-mode-1.54-r1.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."
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.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)
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- 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
--- a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
+++ b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
@ -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'))
--- a/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch
+++ b/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch
@ -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);
--- 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
@ -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 */
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- 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
--- a/app-misc/ddccontrol-db/ddccontrol-db-20210812.ebuild
+++ 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)
+}
--- 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
--- a/app-misc/ddccontrol/ddccontrol-0.6.0.ebuild
+++ 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
+}
--- 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
--- a/app-misc/ddcui/ddcui-0.1.2-r1.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
--- a/app-misc/ddcui/ddcui-0.2.0.ebuild
+++ 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
+}
--- 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
--- a/app-misc/ddcutil/ddcutil-0.9.9-r3.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"
--- a/app-misc/ddcutil/ddcutil-1.2.1.ebuild
+++ 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
+}
--- 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
--- 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
--- a/app-misc/fmawk/fmawk-1.3.ebuild
+++ 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
+}
--- 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
--- 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
--- 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"
--- 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
--- a/app-misc/solaar/solaar-1.1.1.ebuild
+++ 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
+}
--- 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
--- 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}"
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- 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
--- 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() {
--- 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
--- 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
--- a/dev-cpp/pangomm/pangomm-2.46.2.ebuild
+++ 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
+}
--- 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
--- 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
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- 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
--- a/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
+++ b/dev-db/lmdb/files/lmdb-fix-cursor-delete.patch
@ -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)
--- 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=""
--- 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
--- 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
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- 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
--- a/dev-java/ant-ivy/files/1.4.1-javadoc.patch
+++ b/dev-java/ant-ivy/files/1.4.1-javadoc.patch
@ -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">
--- 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
--- 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"
--- 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
--- 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="
--- 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
--- 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="
--- 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
--- 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:*"
--- 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
--- 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"
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 )"

--- 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
--- 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.
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- 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
--- 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
--- 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
--- a/dev-libs/libgusb/libgusb-0.3.10.ebuild
+++ 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
+}
--- 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
--- 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
--- 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
--- 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 )"

--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- 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
--- 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}
--- 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
--- 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="
--- a/Show More
+++ b/Show More