gentoo auto-resync : 29:10:2022 - 04:00:35

author: V3n3RiX <venerix@koprulu.sector> 2022-10-29 04:00:35 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-10-29 04:00:35 +0100
commit: 746652e918ce7328c0cc5ffef8a79146b91ba21b (patch)
tree: 755e0aa511453e24ffcf43e05e967e2268f56975
parent: 9c602d90d61cea9fe83c596c68a99e383ee15f73 (diff)
234 files changed, 1401 insertions, 3200 deletions
diff --git a/Manifest b/Manifest
index 8adc00a8b201..c70c59a02ecf 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29576 BLAKE2B 09e3d3cdc8eae652bc42417534828d9b3e2631b308f59965ff3ea867942e0262c1f837094ece861f1b04f23e7d24255f3dc9388edf56c71664da238b543cf1c7 SHA512 3e36d9cdea88300a50a94e05f411265dea500d88a1e57f736e60a75b7d67071585c44221293fa48d3985a4df65169e5437aff30d06e9862cd7ecec7706721ddf
-TIMESTAMP 2022-10-28T20:09:54Z
+MANIFEST Manifest.files.gz 29620 BLAKE2B c34e12884c8b23f2e3446557fb5df2985c43e5299e63871d2beef825887567084c4f8a90b1a2c923daa4aced659cc193ba0f3966dbb0ced4ef9f7ee5c7ed4290 SHA512 0a25b3e278af4e4f516c80d77d27cae6c60d60ae916b903acc3a2e9f555c8f7e9b7c498a8427e0c3abc1f8364d150368483e53b1f0a4b8667c461b1a72d3d719
+TIMESTAMP 2022-10-29T02:10:03Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNci3tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBEKA//VQyUdIxKbuGkCPUCiAK9EjUm4ponipr2Vu29haK4+mREaaC7KnwslVeW
-SGQnVg+91NeL4/36IW5UxzHn3rvnDvWrPd6ohBk8BuQ+GsWPu9DIDucz2913AG1k
-aEDNj579si3l/j9ogmBMUmhkqEzfvG+r7pp8ITC5JcNIak1iw4kvbJvUkUjCrwSz
-zKzoC2knLjjR1PpK7EzpynkI+94A/CEJdgQXWC0SfmgRvU02WuVlrsc0bnFl/5fR
-r6wl+6NogPcaOo8WZRd96h6LJ2XbnII7ijIoaSzAjuKjLXU1PJ9R12gp6qm10JQa
-hFoC0m1Avja2XOwoeHAqORNt46uVknHjHZBYlo2soYzsxqSHZIvXQ/UXB40yGVBf
-YR73f+r25y9AtrbJ301LtuMeUTBtwQ/a5bgfWCAogFRRfZI+cxIMHJC+vAxXMLcu
-QUpKEjbQHNtqvLJq4+N70A9aG4F+VbuOamBuCI7Jddz5HLw+Ta9bocwpcraud2Bg
-VSkrcQTA02nKR3S7uyuKyWTg+nLo9/QztwiYZ8/ljjVuCxeA2YDfVV8AMs7g0EhD
-R16Hw7uB3mN3lEbfwNV2Rcl7JNN2vW5h8LF9nqwX5E1SfnNwOqXKOnNtHLpbqO87
-ykXvq1Vo7KJfNr0d5rsUi5XHfGEyFVQVhgD4An9+CvcVKHQkiYQ=
-=Mupj
+klAIsg/8DFYKuaFp1s/5+Ii9xoRVoSyoc9F0Nm5zpeZZhW6bd5wL7DRIbauQrfsM
+SvVHse7PVJxqjePFybmKgDDoDHD6NZBgIMGQKPbYhiVub3liendyGsmnIiEpgJOJ
+t3Wem8YkcjlaIlzzLRezyie1sJQUnq/rIqSddjm5Z6MGqSmUHWipaajkhr5c9N33
+QrhoinkbQi55oZGqioouGKGceJP7Q1gtSv7oFU+fV5nWu63ARAJm0/PbuH+omQeo
+jKgDB5u1FHjULbByy0Yumcj2xNBEXBL0vVCeodfIAu+HOXqf8ASoYZaNpE2Jnntm
+X5f3CoRDnRFw2s8xf8CLA+XlXSH0c+H0lN0fU81xvSLgwW0zGg+egq9HYoZbZkhg
+Twxn+khCINjjyCMOeKakO9NjhLylK/bsFaw+/AhwkuPbdT6hz5AiRAPy7+9Ua50J
+FmN+CrvD8IfGwK1ZsUEXpHpPE5vU8neOxZ0J35aZ18J9NfYPH++k2Y+bbTHinEea
+1PzGjXH07Nf7N7NNEDLzKZzutB2vUSu57tKvlXLc5YpNOTZV46qNMSzwnjdXZ+D5
+eAghW/9GtDmGLnA2hNZbvq1oxPgOS+5zGw9S0v+abRVh3tGGmxvjVaNStE6dhNZG
+fadRzNkO0f7BvyaqOKu0ltjOiKOiD2BQSEnxnk+rMaCzfXu3Rwc=
+=s45c
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 499653643962..48dc17bb9006 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cde1e228187d..176e6ec70094 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 83ede090e3b6..710081740af2 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,9 @@
+AUX sudo-1.9.12-mips-build.patch 1148 BLAKE2B 6c31a0095b7d615b0f8001f2484e2df5aa975b025bb4747344e1b9d55a0544f3e89f02cd7ebfd5a4cdf1712e1887b97ff3443a98ec6884724f70f3505c7ef05d SHA512 da98b5a163f8e843a8aed7736b84c50985180910a3d78a5014c91e958d0d8571f374d8b98803733864b6cbf3c8a938f8655063f491b55411c03f2c34352f505f
 DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
 DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
 DIST sudo-1.9.12.tar.gz 4906320 BLAKE2B dfe7e45dab9848e7eec30b9c3e96683b2a90c02c8468507a338cda26d8b28206f511c63c2330e1a33e2b0b2d263211d7e2b222d5729dc0670eaafea09603e586 SHA512 34ee165baa2e37ba2530901d49bf0dad30159f27aeccd2519d4719bf93be8281edff71220a49ba2e41dacaa3c58031de1464df48d75a8caea7b9568a76f80b67
 DIST sudo-1.9.12.tar.gz.sig 566 BLAKE2B 98c80addcea18d320a54473e34111411dc3e67bdec45ae1c34e98c5a95a0e0377b08e7d42d9cbf92f68160f6e5dfb2990e6cd3c773ba20484b15aecfe3104433 SHA512 67c2c0234345ff17ed9bef2a974a37dd7e4ba791bda4e6f1cc90620d6541e4549e1e2a8525b4092bc615ae035cd2f97eb4165e2e671a3056ac10585709045ae2
 EBUILD sudo-1.9.11_p3-r1.ebuild 7412 BLAKE2B 1ddfa12c7fed0f71ba2ed700009aee4dfbdf08aaee350e61e67e0ede62904f0eac97233285b94c820dd3da75c4fc4aa09c31673db42b973f3ac18519ec8fd814 SHA512 13254ff59e0360c2979d6e31d3f9491560cd43a03b03628640426a9535ecde6568706db7037cb4b1e4e74fb555381cc2d42d24b2a4b2b97d7d142179e61df46e
-EBUILD sudo-1.9.12.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
+EBUILD sudo-1.9.12.ebuild 7470 BLAKE2B 167e7eb6aa3ab20ab4dbfa1e082afa5dd69c44bf43f42aa519e88952c56114b73347a65840365021612f8b4e87ef23d4c6ec4952fde8db38bc1cd4e5b10c5a48 SHA512 e653968c91d7219b60daf53dce5bd2fb16997635b35f07b22fe0974a18c7304b72ad526c5418a5603d315b2ec2667621dfcdc6dcbbf4245739109038a3da179a
 EBUILD sudo-9999.ebuild 7420 BLAKE2B b0b6e8f5e645b6a9b082693ebbfdb2f5ee6e5fc9564b0e74cd9fa03fe061f10c3816f3073bf2922cbfe6e9f8fae78f292fd0fdc1fec213ec6939e879e59259cb SHA512 f3f70b8015ee9a42261514c9206ddf8f91a1eb58a70fd67154884c972cbfec302135a0ae5a3bbfea99f28e953683bdf05deede217a91bf56dae78f385c1748df
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/files/sudo-1.9.12-mips-build.patch b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
new file mode 100644
index 000000000000..d45393dba443
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.12-mips-build.patch
@@ -0,0 +1,33 @@
+https://github.com/sudo-project/sudo/commit/7944494196d4a9b33e0ae64a7e20f86e19c336d3
+https://bugs.gentoo.org/878401
+
+From 7944494196d4a9b33e0ae64a7e20f86e19c336d3 Mon Sep 17 00:00:00 2001
+From: "Todd C. Miller" <Todd.Miller@sudo.ws>
+Date: Wed, 26 Oct 2022 16:35:30 -0600
+Subject: [PATCH] Fix compilation error on Linux/mips.
+
+--- a/src/exec_ptrace.c
++++ b/src/exec_ptrace.c
+@@ -282,16 +282,17 @@ set_sc_arg4(struct sudo_ptrace_regs *regs, unsigned long addr)
+ static bool
+ ptrace_getregs(int pid, struct sudo_ptrace_regs *regs, int compat)
+ {
++    struct iovec iov;
+     debug_decl(ptrace_getregs, SUDO_DEBUG_EXEC);
+ 
++    iov.iov_base = &regs->u;
++    iov.iov_len = sizeof(regs->u);
++
+ # ifdef __mips__
+     /* PTRACE_GETREGSET has bugs with the MIPS o32 ABI at least. */
+-    if (ptrace(PTRACE_GETREGS, pid, NULL, &regs->u) == -1)
++    if (ptrace(PTRACE_GETREGS, pid, NULL, iov.iov_base) == -1)
+ 	debug_return_bool(false);
+ # else
+-    struct iovec iov;
+-    iov.iov_base = &regs->u;
+-    iov.iov_len = sizeof(regs->u);
+     if (ptrace(PTRACE_GETREGSET, pid, (void *)NT_PRSTATUS, &iov) == -1)
+ 	debug_return_bool(false);
+ # endif /* __mips__ */
+
diff --git a/app-admin/sudo/sudo-1.9.12.ebuild b/app-admin/sudo/sudo-1.9.12.ebuild
index 046d001b4139..d3e78ea71235 100644
--- a/app-admin/sudo/sudo-1.9.12.ebuild
+++ b/app-admin/sudo/sudo-1.9.12.ebuild
@@ -82,6 +82,10 @@ REQUIRED_USE="
 
 MAKEOPTS+=" SAMPLES="
 
+PATCHES=(
+	"${FILESDIR}"/${P}-mips-build.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index adebbe24c2cd..682dcdfd7dc4 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 91f6a6c9123a..bf39443a7f6c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -396,7 +396,7 @@ EBUILD bash-4.3_p48-r2.ebuild 6035 BLAKE2B 408bffd82a0375ccfbe706fd3799a3dc34ce8
 EBUILD bash-4.4_p23-r2.ebuild 6090 BLAKE2B d09c2e76a0766ec38ace27c76b5219a52a6fa5cf2ec87e932950e3d5e3f6dadb84a5e594863b53739314aaad953f5a5fd1427bd9101ab1b4ca69c38e37ba9847 SHA512 9507a94d51dfce866e7ffe36880ad1879cc8a328f941103fb12ff84ab05492edfebee5deab7a19d8f8ff192c2b180656a7e0227f417b771ec32702dc4b549367
 EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f79aaffaf778838f41490dcf7da7eb7dbe4652b47164210c25e764751f8ec60d4dc1c30751373bc0636d9d3ea SHA512 bddcc1a7813ed881f8ba6bf440a890f5ac633335e743ea1393082a6a55d99a3604b36271c6f15c9e2a7b06eefac1820f8f6ee4f92f582afc9ea86181c43ace6b
 EBUILD bash-5.1_p16-r1.ebuild 8047 BLAKE2B 920477ad40a57b693a034c2a526b9769e90d6a8c71a7e956551f198e4cb84605abe32e580df99f78340c183e85590640f213b76a437b825d7710b5c5d755a493 SHA512 d3dba26ef514f9dd93c9743d73dd5ea6041e006bc3f4e5d330898f4579267d08d87cdd0634de57e7f740d065e6f4e518119c141447f691679a0b4a3df7a0a147
-EBUILD bash-5.1_p16-r2.ebuild 8234 BLAKE2B f5b26b6ad263cd92f91f8c6fe0896b90cb43bb5faa4b92c80e123ec3fa74316f43e441fd50a54d47257fc3e4baec625a4274e5ec58b125a9e899d21c1be6263a SHA512 c848cfea6401643d2517cc18a6018f206e384264728dcc040aa8d5d22ec901c37f0e8a49758933b794d6381770f4549ad4d6fd3521f6db14f91c1798895b03d0
+EBUILD bash-5.1_p16-r2.ebuild 8227 BLAKE2B e4009303754b2a37b5b69facafc4e3c7927d57c20d788f39f83f0b04adfa79df40702084f1325f3286b67ce6220519d021f03b8882b023eab208b088dc0de861 SHA512 37a578d23a4484402da6f5421942d6b5460e2d9790e52b7a21d4a93954fddf98ee9d8aed66e4ded20b18a45f3a30f544edf7606172c50c185a14a0b66510b46f
 EBUILD bash-5.2_p2-r2.ebuild 9477 BLAKE2B c16b5f06f20e14a0401f3acde5bab9e5e260117f75b12a8db2d2557f9d98d60231931f141a93a340895896bfade9a8e3de41928e5a26ddcad6ef7068c1562afa SHA512 4377489d3ad2f3d2e50715e10c364fa5e73e0aff7d36399e0176add2f573db9a0b9816c62055d4bf34818fd11e80e7323a9cb8e6bd02d4daaf47e45c10742dbb
 EBUILD bash-9999.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r2.ebuild b/app-shells/bash/bash-5.1_p16-r2.ebuild
index 27cc205c5d91..bff10a6f78c7 100644
--- a/app-shells/bash/bash-5.1_p16-r2.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r2.ebuild
@@ -73,7 +73,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 
 DEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 87b2fabe91e7..a7043a3544ea 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index be3cc7df8bcd..6fca73b0b48d 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2140 BLAKE2B 181f2405c7d762242314a96df3674360f9f98edf168dee983332b58be81db967d6fbee6e1e8c5a622d13dcfdd86f4bba7757c192ef2cd2a0575e16f31eaa12a5 SHA512 384e2d0571621402b9e3cfa0cc666d244e93e42e6520c1d88651c26d3fed1cd3d7b443e7d0e87d7eb4518798a779ee075ff51390d3835b043f4e82ce4e2ad9b8
 DIST gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1939 BLAKE2B c4a6ceecdb733ed619f03e4e2c66ac8641c90dde6e1e35434ee50de1fb8da2aacf7c336870d7835368b6f1423b9b7d0891d7a9bc287f953fdff07706ebbc6042 SHA512 995d3f9bbc1496a4af8d238a139e88d50fd6e339506c198ba65af711f808ebe5fe4bdabba86fe837b55f49a031944625441e5206ab3631cea41b4b134dce3dac
-MISC metadata.xml 260 BLAKE2B 74a7980ab34785ba7920342b0a2708af439bed09b7ffdc1ae3ca6cbbaba8b7dbd7a6894375c6d5adf00819685f44f58b1e069dcd1062a70e99f0dbcfe39dc3d3 SHA512 f4c15c784194c80663c49692140afcfef3450b722254b99b2bd7fd0d7a08c57b463afcfa3b5609e799d0b2d6ff6451172eace91e93b886856d2591d491585c0c
+EBUILD gnome-doc-utils-0.20.10-r3.ebuild 2039 BLAKE2B 1187c4476fceb492869dde37ba7fcd84ca0348f0366b8be20073a66099ab2e6c68e52f00a3c7f925b34c35735e346ccdf0bc7f3a0456461e0a7691de7ba8e19f SHA512 1dedea65fd173f3b7009a299d01c361eeaf57aebc4ebcf5ff4ae5f4730487bbfbd45f801f40003ee5bc085933b069d70f986e6f2e7fa7fdee9e8eec3e6136138
+MISC metadata.xml 358 BLAKE2B 2eea9f0df67157d1f3fb590f9b48dfd4ec8e5c04daadd2cb540787cbd3eaafe8fda16dfe1f5c871bb90d6d9346e6519f0f9c351664a762845f1500fd35ae57a6 SHA512 791f779816b0edcadecef7e96b767ff3867fe3e296b9fb2c84442bb27562906920f593971f2b733aebfc95e522a2ed275ecfcdc31e06737be835a1316e24deb8
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
index 748e7a382e70..3c536ca4e4ca 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r3.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
-inherit gnome2 multibuild python-r1
+inherit gnome2 python-r1
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
-SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/${P}-python3.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -24,6 +23,8 @@ RDEPEND="${PYTHON_DEPS}
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.4
 	app-text/scrollkeeper-dtd
+"
+BDEPEND="
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/awk
@@ -39,6 +40,10 @@ src_prepare() {
 	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
 	eapply "${DISTDIR}"/${P}-python3.patch
 
+	# Empty py-compile, so it doesn't write its own pyo/pyc files
+	echo > "${S}"/py-compile
+	chmod a+x "${S}"/py-compile || die
+
 	gnome2_src_prepare
 
 	# Leave shebang alone
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index c6e394b17a27..b176e403791e 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -5,4 +5,7 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="gnome-gitlab">Archive/gnome-doc-utils</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 65a40d0cc886..d90ff5e2afeb 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
 DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
 EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
-EBUILD xapian-omega-1.4.21.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
+EBUILD xapian-omega-1.4.21.ebuild 1188 BLAKE2B 37df080c39728f3cc87edafc1c08afd6e667bc1a4705ca00573c935865dc8eede821acb401dd60ee0591122bd94942c09f06ff8e1e2429a2721e70dd224b1093 SHA512 6365fe6b20cb93c1785f555fc866d5e24598ac9c70449b1a151a997fffda34bc4eed22d459b37039514c97f64f010ba52dfdc296b3df98568dc9f1dd9e52484f
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
index 91ff25791e25..23a122dd7cc4 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.21.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="~dev-libs/xapian-${PV}:0/30
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 7066302849f9..ba4ec504fd64 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
index dd12ef52e9f9..5eefc280ede2 100644
--- a/dev-embedded/libjaylink/Manifest
+++ b/dev-embedded/libjaylink/Manifest
@@ -1,5 +1,3 @@
-DIST libjaylink-0.2.0.tar.bz2 59078 BLAKE2B 7928875248972bc00ec46511861e160491f7a53f729e0fbfe3a6d08335532fffc9e285e8a354a390037bebe696b6740bdc422164238947baf5e0fcf8f55c0dd5 SHA512 5a8c458982fdea2025aa3ce774d41cc58a283824dcd90a94531ee5e6ca50d9961b0ebb40a6dd3a97fdfcb44625437d685151560185449c3161fe399e0651da44
 DIST libjaylink-0.3.1.tar.bz2 61062 BLAKE2B 7a220b7e1ae1818b9d65d6bb92b282516ce6e4144ce77ee8b77088ebc92f9a091ae04a78c043afaa90ee9f737baa7c2fcd0a9237b60662af0d858fb24cef1c5e SHA512 4964e522cb59f59db444ca350529dd3695e2ccb451f7607e2c14074bafe47688f35b2e8b3304170a611db2d21040f3f98c95def179cf4f95733287986811fd78
-EBUILD libjaylink-0.2.0.ebuild 823 BLAKE2B c388faf02a0292265ff13db4ded9aca6d912de9952cd7b7fe043eea361ce334c07f663a67901525af24afc60b4b7c72057fd092ad2b93aaeb908ca959dd62913 SHA512 c55fcab380cbc8c0e1442c959d60180dbd972857e369ad19d7ce68ef6d03364fb53d6410b525f164b2ca8059b4745b3c361a77792ab5e9a9637863b5f9595068
-EBUILD libjaylink-0.3.1.ebuild 819 BLAKE2B 6a17f87c8067b5e99cef4c66ed60d1c587a82d2a9ff8ca560e098f9c180b4f3f62484a20cb4707b665fb2cb3a141b8bbca14a99aab760bd36d5634d35cbb7f21 SHA512 872cf96a5c017ef2fcdfaf97f81e0f98026e787af1664353b7d9e85fb9f9863193b2391ad43b115ee9d6d661ff93fa7d748b107371f50bb7cfdd6abfd34315fe
+EBUILD libjaylink-0.3.1.ebuild 816 BLAKE2B 20ff8b374f93b5058507dccbbbd4caf2ee4ceb7c329f433c0c2b18ab73687cd479b4841b2d533ec46126541ced09b28dc27236382574680dc8716e252a7f5013 SHA512 f8748b4d3459372f74f3de3e57e8f12b5ab9a96bca6b11b2f35fb9051d892f134e98c2a4b6dfd75676eac169cf83e3114fe92c0c14da3af5e438932527061888
 MISC metadata.xml 248 BLAKE2B 9858a97a2186d5b06e272fe28021e0e668897630d8b99023000e8e58e852e80e16b399d8f864b9dff6c9fda25e1519ac8b4331792a4b441be23922707c4ad6a9 SHA512 a1e8f757e473af3ab0ccf695f849dc91e1be877dd505d339bdd26e35a2cf7fb5ffd8f5bf34e933873a462023aecb0edbddefbbda455289279182059cd6c1b0e5
diff --git a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
deleted file mode 100644
index 81f3e444b538..000000000000
--- a/dev-embedded/libjaylink/libjaylink-0.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="https://gitlab.zapb.de/libjaylink/libjaylink"
-
-SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "/^JAYLINK_CFLAGS=/ s/ -Werror / /" configure.ac || die
-	eapply_user
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use static-libs || find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
index 8601f4cec5f0..acb1508d8178 100644
--- a/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
+++ b/dev-embedded/libjaylink/libjaylink-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${PV}/${P}.tar.b
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 arm ~riscv x86"
 
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index b538ab30bbbc..54c4008f4099 100644
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index a570093b01f0..ea1ef235805a 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,3 +1,5 @@
 DIST esip-1.0.47.tar.gz 91238 BLAKE2B 041a04009d4687187699bfb78381dd6baefb503bdbdd4b31efeb81786e3e0a4e47085336888fd481ecf28c4e32c296adef05eba7ff17eb084da14e645773cb31 SHA512 68be1c8cf507180e73f3a16dfd8ca44ffad825c40df0d1874888afa41f3cb89b445b033036d041af29ec3fdbdab7acc68f770124171ba4af73abd0775a03c0ba
+DIST esip-1.0.48.tar.gz 91251 BLAKE2B ff78a01dd46c73a550b123c87542aebbe988a5e3c19efd83ad82251399287faf8cd97ad39debe52a28a2ddd5bd025cbeec6132658663989470509906111dcb93 SHA512 9acc47fee89ee99f3de892c568052ad614305dbecfb9742269672772393d95c60440f7c676c62b0b8fc69854332924c3d3f661a5972df4f27f58358e591373aa
 EBUILD esip-1.0.47.ebuild 595 BLAKE2B 6c184a4bc942d33b67cd12c2dabe711776ecd7948d611729d56597dc3688bf7b00e26242f138af21410efdcd45803dda24b4a5769cbe0f460de46f8f460de7e3 SHA512 b97a9d19d3696bc8a45c0e74a1f4d0371524d92d9abd40d047316634009902e7fa54410dbdd20eefd4598faaa4477f0c619d0d5ef9ba8e875c512c231f040363
+EBUILD esip-1.0.48.ebuild 596 BLAKE2B 6ee955048f0883daa42542c498e89178b61647e28a39104f1770787f6a5381f1ab6bcd11f3371da66d9b42487af95ffb1a9d6f07ab82c901292947db93f6cc35 SHA512 9eacd15125d0a07d200aa7368aa6e4dc04f0f88a0900c62a45f2e650d1fd4cdf845334dd4d89c09e3eaa852190f62fa6e71fbed598f4a75ede9887efba9171bb
 MISC metadata.xml 301 BLAKE2B 347b9651a389555260467eb39fa0cd3e784fa15718a30a7908861cb0650da45b74cba5ad07537659e09e8437af8f35d0ec246b7d5f853a12bae171a6a8a0355a SHA512 e055c88ec26cfea40085c04618ad7ffb6ce4b71eca39edc4787d9654e58f23a4aa6643eb9295e972408d6cb2cf9ca0187f5a004a61e72f1f5a67d86923673cf9
diff --git a/dev-erlang/esip/esip-1.0.48.ebuild b/dev-erlang/esip/esip-1.0.48.ebuild
new file mode 100644
index 000000000000..77f33750e708
--- /dev/null
+++ b/dev-erlang/esip/esip-1.0.48.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="ProcessOne SIP server component"
+HOMEPAGE="https://github.com/processone/esip"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-erlang/fast_tls-1.1.16
+	>=dev-erlang/stun-1.2.6
+	>=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path stun
+}
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index 0b4f6334ca5b..277cd40ce63e 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,3 +1,5 @@
 DIST fast_tls-1.1.15.tar.gz 83705 BLAKE2B 234c2e10a0661a46482a3db9da21831b0c3c370daff502d3275efcb69337f70977b6509a3b4c1306bf3687eb611b5efe46927c9702fcbe96e6f92f1b378b8293 SHA512 fcbdb9ffbb61c07fb3706bdae9d6d10f425968e722bcd03e2c86a99ca62d3ff0cb1298bf625adb679c627f38953fd3ef0b4263ae34ea100e9134488d9c55e192
+DIST fast_tls-1.1.16.tar.gz 83971 BLAKE2B 979435e067c0365d933c784501e95501cadfbc83a2fd743b694bb365eb2eab3818d743eb0c0586f216858045f2e4fb8bc7dc4e2d7ad4e1bb1e969670bd26d4b8 SHA512 c143eacf3b36b21c51cbf3c6fbb9327bc9a987ac88ef72f85981352efc3361a703caab970ae3f08bbcb1b99ded89160f9ccf798f718935d6c1950a51231abfbf
 EBUILD fast_tls-1.1.15.ebuild 518 BLAKE2B 7fc75b0497c54fa4bcc3ae04ee2c4e48aeb10bc75041f2fd35d8286335861513394e84ae80b902b7ce09fecfbddb2d31534dbf9d1d85f921cabb036c34db7337 SHA512 5eb78c15204e17b65184d76d4b685701aa99cb87931a406f7bc93fca620297acd8c80c3907f75f9d18d15ee9c3b1fc8c08c7aaa9b4bbc0d1c6c96934878a2727
+EBUILD fast_tls-1.1.16.ebuild 519 BLAKE2B aea84cf7cc471f6c206ddbedf77f1400a51b9055d24cb0eb0534584715e8614bbbed8536cbbbad45c6436c37670a190d4a935ec65f2882cc3dab639f10d7a3e3 SHA512 352131ec8ece1df749d9f877731f032394c84cff05727a7e3946c3ed3e6772586d8903ae308fa2d079750d2b27274ac5dd41824431dd0d757a3ac496ce69d89f
 MISC metadata.xml 305 BLAKE2B bf0b25ceb535ebd859716f30269451360238f1afd799ac49c58cfacc5e0bf9352ca245cdce61fd120807942cbc1e41ebcaaaa0c4f3916cabea51b49d3231c8f1 SHA512 d6afb7f8ccc5b82cf9b6deaa1713a7dae1b863b3bfe28b2a57b915eecaa7022d626373880f600a6ec95492859c5e2ab424b3aad9f2c7dfcd20252205dd5a7717
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild
new file mode 100644
index 000000000000..c386b4c39dc5
--- /dev/null
+++ b/dev-erlang/fast_tls/fast_tls-1.1.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_tls"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-erlang/p1_utils-1.0.25
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_yaml/Manifest b/dev-erlang/fast_yaml/Manifest
index 4b2ab251a7f0..190da07f9522 100644
--- a/dev-erlang/fast_yaml/Manifest
+++ b/dev-erlang/fast_yaml/Manifest
@@ -1,5 +1,7 @@
 DIST fast_yaml-1.0.32.tar.gz 59969 BLAKE2B 690b9f463fde3fdde4a0b0b72b4f2d88e24e3bc2f79a650c3f2f2d0d627efec32a0d604e3575860c52c7238642da7e80b71cefbea3379c46b2809073b2dfd639 SHA512 8ae75b68417513e72eff61311c5cc989866ac9b885e4e2d80844d3eb20b7c688f77daf41415d24fb9cac7a7dc08df870efc9c3edcac61a2bd1fc68e7d8937702
 DIST fast_yaml-1.0.33.tar.gz 60314 BLAKE2B 3a4e807ef88d460d7e1f98f8f5567efe18ea153e8fb038bf6baaa4e1951491bd7504fd6d5013f77a3ddafa3c1ab14d54f7b64652fc002897de266de7297c97e6 SHA512 ace64e8818604031180955c2527cbd4eb73246f60d9d23e2fcde54d25451c3e2b0625e97df817a48cb23593f10555063aa894dd84fa64e5a2d68884a8d75a4f5
+DIST fast_yaml-1.0.34.tar.gz 60367 BLAKE2B 076b90e575b36ba3d3f920351ec749d6f7cd25d246cc1d80b826a463e91a62f8dd9a36d54ea2a3fa7a753a5e1bc137b3ab03ec6636b3844f13b987986979fb8d SHA512 d1f0081075fe0009658d83eb23da046f4e12a25eda293cb061ff33825324445059cafeec95c3e53f3eca94085188c63b436d2057b6266b32076c33b9ecd1e347
 EBUILD fast_yaml-1.0.32.ebuild 509 BLAKE2B 548f67a433680904383a76ccb6c1bbccfda12dac4b5e4d4619edfd15ad49d8c41e0e3ec6ae05377c10b29bb3d29259555dfe8e06c2485530a7e5c75dbddb5d18 SHA512 d512e404a104c1c807e4ad386fa7feb85c69bb58a5ba2bdd43557114e4d8a3234874e8cc4ae42dda5bfc3ef6682806980146dee14d874b8e045356645e33bb6e
 EBUILD fast_yaml-1.0.33.ebuild 511 BLAKE2B ad2c11de984d914cc8550296a01a265418c19205fed9c568bdc54cdbc45fc7764969011373969c72134bb5bf3fd89dea2622785653325865a24159fe954c9bf4 SHA512 89718821f209901c23d85fc704d8c9b698c38fe7e7318f2a8eb6d4f0669d545e08ae0aaf379ae3a4d62c7f78d05e317762ae56f2062554a6b1bc6e37412a3815
+EBUILD fast_yaml-1.0.34.ebuild 512 BLAKE2B 555334b3278d6f4582fae3d7bf1c015222ea99e69a6e907c1af5f4f93b0b4058c5265b279907dc821eeb3aaa3cef6789d065538ce2a5dc8177be20b79345b974 SHA512 d810df9923493231e79d4bb150b37ca07e630d65ad05c1e11a973d4b46fcb3e0c25e961bcdf8e9c26ef6d889bf5c093e8fd6938852cf0b9b1f469a08c6ba2a6b
 MISC metadata.xml 306 BLAKE2B 9ce6768498bb68673f916041055acad0df077c31a840fbc63e538417736a5544e6f3e2f530c7f16f799d12603d91389747058a10082f10ca7203e5362547c4ec SHA512 9018400010c756b3e33d308d747742ac25cb5ff2ebff5fa0de6d15b7142b40c74158fc28886c9a81ca28ef9d19685a3464e28681e20dd79bc9d75fc5888c5c5d
diff --git a/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild b/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild
new file mode 100644
index 000000000000..4b1ade0bbc2f
--- /dev/null
+++ b/dev-erlang/fast_yaml/fast_yaml-1.0.34.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Fast Yaml native library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/fast_yaml"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-erlang/p1_utils-1.0.25
+	dev-libs/libyaml
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 4460931386c9..acadfa3ef655 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1,3 +1,5 @@
 DIST p1_acme-1.0.19.tar.gz 223303 BLAKE2B 48027739d46582c7acc72ea22fe08376dd67295b2f9161782abbb786a421fb976a2447e86cdcbfd30663fb02ac5fec58dc1285096e57c474d93dbc4e9624aa87 SHA512 d0896ca53fd48798f0e3f502a09e9df6ea88e4248968b5273b1a6e0f6735c39d680de251e0f2c49d04271018a5664252771be1746cf9d18ddd9d42e2ddf90b24
+DIST p1_acme-1.0.20.tar.gz 223319 BLAKE2B a12213a84b473659c7b639cdf766d189312f7a09377c909e131d4e0e6412444db519eb30160741ff5d722fd2747085024b16eff4d42d6f428501eb126e498a74 SHA512 5bb82183e361d795ae59dc620b0677a9daeb52d9587f19d1c2e2b39ef45f50eb229244dd148cf99a740ac7c2e9d7571ebc9b1a271b4bca7263c3e898e36c2a7c
 EBUILD p1_acme-1.0.19.ebuild 757 BLAKE2B 6987dd6a454f413dcbcbb946ec26b37f07c0316c80dcc9b6bea7460295d646a4d3dcdbc2683656af6387220cd7c0aef817284954520e320f75cd58b260dee782 SHA512 933868cd219d5a660cfd51ad491b4c792db1ca32855b1737cf98afca6482c4a63b49b765cabaeface514177d0ef3a4907a0d4f5a7bb92411ce937574a206380b
+EBUILD p1_acme-1.0.20.ebuild 607 BLAKE2B 853efc685c635bd682c7e4e3e6a9dd043a89cb3ac2b51bca96c4299a91d882815722deb2d5ce48a722e6ea65fa422f46967f69687a6abd86081d16669a652032 SHA512 33c294c772692b9e0a7ee76fbb234df49a8b2a043d42b0db335fdab490c37248badcf2bde1165f8fee28b5a75ffd45d71dea284f7d8d4460fe59afb9667c0872
 MISC metadata.xml 304 BLAKE2B b426590d7bbfeed55f57348118fe55c96fe7bb77ffb55ee569631a8b61c979d7c5e4d07cb83a74cae313d238f9297ec908abc68264edc6170cbd269449fc99e2 SHA512 463012c44e87a736e73fbceebd5df376bb8dcf1b9ecb0e696a30857683c09fd761e9c2a8822da48da4bc36cc55d4e23c119b210d10cc92fb0a8968c6b2a9d9d6
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild
new file mode 100644
index 000000000000..ca684d0853fc
--- /dev/null
+++ b/dev-erlang/p1_acme/p1_acme-1.0.20.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rebar
+
+DESCRIPTION="ACME client library for Erlang"
+HOMEPAGE="https://github.com/processone/p1_acme"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-lang/erlang-17.1
+	>=dev-erlang/jiffy-1.1.1
+	>=dev-erlang/yconf-1.0.14
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/jose-1.11.1
+	>=dev-erlang/base64url-1.0.1
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index d39729eb2df0..4b5c26d1ae03 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,3 +1,5 @@
 DIST p1_mysql-1.0.19.tar.gz 27476 BLAKE2B 14acb400c08c6b49fc2f3569dbb8891b52dd27c42fade7ad79858728a4c12bbc5cbd5aedc86432d61fbbdcc8df1277227b39343288d200cb056ab511ab0d0ae1 SHA512 eee2402661cc7d58228641057c571c383c09261a0022287ca19ab56a51530ea575478971fea944919aeb910e37cd9dedfea629bdd949b8dae7892aa5590ac675
+DIST p1_mysql-1.0.20.tar.gz 26257 BLAKE2B cdd6ac6c497f2fff7b2854a7e6b8533109c5929994d4565d844866495b72857ad94a6c146d3bcc0bd58e0e6de69b8b0a74039b1597b2c9a5eb10261eeb75617a SHA512 b23aa5227a9a8a505448c3eb36caeba769ae8142c2aefb2125263d0dbabeac7507229d654e4bc08133175f2cd13a7742e28dfec064d75b8af112d81485c6b38b
 EBUILD p1_mysql-1.0.19.ebuild 455 BLAKE2B 6b24d34fce9c8d9fa18e0d376ef336cfc3f3bed5fe9714d14abde83305a0ca22b6726e609b1c6556ff6c79f5f0345b0852d9d5ad01a9691f6fdb61dc0d20611d SHA512 d18df288e3871ca91c7047063a1e1defbf264b09202276c75a8f636c28764b83f0f1d0c2aab25bb69f1c5b26777a9e684ef9f466a5a22a7c838164f187b5ba78
+EBUILD p1_mysql-1.0.20.ebuild 456 BLAKE2B bbcf1d744b032c4e589f5725461b8347ec3d6c1f6ec7789f1e77febc653808c0d0715116936674d3372d21c86dc20283748e99e518fab1d75dbda66955320c06 SHA512 132805917c63cf3a08ccd948d2846f4fc94ad8f47c8bc3c5c8a63e495a7d2c1e27bedcf6aa1a42961eac37a7c7f5059dfa1a32537e5a4dc852970f7169e0c8dd
 MISC metadata.xml 305 BLAKE2B ce7dede50a0249ac238414f103c1428ab898801e31d0e056d617af54cfc45d8c14b5442699bddd38c3f1b349966d540fc2efa02821789006ce88fc4f8643be61 SHA512 e59321091144f587b0f0afbae340b91c58dc638881fabfc3141431375e873a79937453496c37b558a3486fee7f81b337d46f9196871c1186e55aef6e2b6d6c06
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild
new file mode 100644
index 000000000000..584abcc6bc91
--- /dev/null
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.20.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index 89996c225b49..5bcb7f678af3 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,3 +1,5 @@
 DIST p1_pgsql-1.1.18.tar.gz 27186 BLAKE2B 114e407630f61d4f9b7aed116f5b7f604c2ea2c18a963c6d74ddb65001f7f98556b5bb7f208afbb604b217c145ce3361e242034e6b382fcea9d86f2c44aa8eb0 SHA512 b075475a8729ca4d24d8cf05dc82b17a5c1e05c38d22586fe490c39194640e36145b0732126bb023881d6b258411a87046ab81a25fd85a1d3505d28da0d50122
+DIST p1_pgsql-1.1.19.tar.gz 27194 BLAKE2B 94335b49d9515bd07fe8598906679d466497852c0a3c9a7d5cb76befe98217743839aa0e2a3cc180f632b2932865b6cbaf4d2059e0884bbc42bc1362427921e9 SHA512 d789cadaf504f13a7533447f1f1ec56a7d95608da0fe90d4ff5c8f93157928439603dba8f19863704736cefe21c5c288a96c81ac17f9a428e0a0be535564b9fc
 EBUILD p1_pgsql-1.1.18.ebuild 494 BLAKE2B eb16037d99c6801b8edb3084d0fb25f8fcb01b018d75ba21bfe84d9f5d2139ad98a7dfda64bcc4772d706227d18464df5addbaded82de2f4516a376f03569aa3 SHA512 6baae052c552f0c2ca2887be7da711c07352edb9a1fae07932637e7b76174333b6975b016f6c2e2f853f7247245a7632ba104561be7d6d5db70a6b145033ad4e
+EBUILD p1_pgsql-1.1.19.ebuild 495 BLAKE2B bccafc08c78e8fc096044c4e0aacd8fe83666fb73e1db15a1f16e4a0fd6a36a953906fb5828ed9b8f5a18de0e1463e2b6fbff19ad0a841cc6e81efa5b1a3f048 SHA512 572a1650908dec367cc1652e6429a778c99caa23a16e89cecddd0d04a8808edb34750992c1a32402587704f98529756637359dc59aad36006c259cfbf60478a9
 MISC metadata.xml 305 BLAKE2B 8efb10b662fb1bcf472b8f132766873ab121002fb64103ab386b95bfcee9d3f9feb92be34b79f11df91e0e3f5e9d53e4978ce99f75b41843f24c4737a2e1701d SHA512 8bf58e143d49aae6a416c756da20665557edf472a48adec5f6fd2e05a7892603b73b56e19e8b82d51fa4d0c3c6624351269f0d7e05e917ce8b367f0930afedbe
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild
new file mode 100644
index 000000000000..330c443d7513
--- /dev/null
+++ b/dev-erlang/p1_pgsql/p1_pgsql-1.1.19.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang PostgreSQL driver"
+HOMEPAGE="https://github.com/processone/p1_pgsql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-erlang/xmpp-1.6.0
+	>=dev-lang/erlang-17.1
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index bb3895b8d963..f0c51a337cf1 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,3 +1,5 @@
 DIST stringprep-1.0.28.tar.gz 100057 BLAKE2B f9bb2b326bfe8f59771929dc087f019445edcfaf455f530b390ab79ab98df76d2d154329e70eee584ce6851c54cafb1a92c15a1ebf7af3210e5285518f239744 SHA512 1bedef40b38494ff42f551fedb83e47a2938eb29871b8649a76521035f16a7a2575d6524e12dfdfc45379c3cbe50af2988daa9ae9ab82632156514c86e06df7e
+DIST stringprep-1.0.29.tar.gz 100076 BLAKE2B 8dee25a1c65de617ae682bca061d747c56e694d1f6eb41d4ffbe18dbd955cddf6b4437b22b6492677235577e624dce381825869a5619714d7c2e67779b805222 SHA512 53b24c166d9328efab8e01b3e7ee7df3d66d240a6ac95f5338d0237ae4e6db20a4f53b487d632cbe6ae46c5f2c62001f7afb77172b27840a824944e51e08ef56
 EBUILD stringprep-1.0.28.ebuild 530 BLAKE2B ab6e23de73625b945375ffa17c962169ddf98a4a83e6ce70ef7ecbd4fc3bb6154ace56c1b69a54fdd83c0fded9632422733a16752e3ccd971489e7bb954cf3d5 SHA512 1fcba2843ab907a92cfba77acffe3410160349c2d903362844e02bf0297cb21c7ebcb39b3d8bf12755fe46fdb71de9bd91333cca39845a9752b1400859910c3b
+EBUILD stringprep-1.0.29.ebuild 531 BLAKE2B 99b58ab1c6af65e3782d85a98ab226163c02bfe10540b1d667bbedb162239df8056cf95800a2bb73249f0315a348ca6f508b7f52947eb36502ce352386853b73 SHA512 7b6409a02ce1b8ed81e574d830c865a162ba5017a33fa67f6c6d14eb10007e5e99fb2a96b462e4589493e8f92308d37574004c9ac006fc8e8e5e27c9c920ed37
 MISC metadata.xml 505 BLAKE2B c9380bcf16d6c65c4c39247a85f6cacbac24786e1ce393363b50db558f8ad6de5b90a4f2a05ff654b27f7c44d5ab822715509bd0539a10cabfbb58cb013919d9 SHA512 a162b2b304f806c7a852f5b4ba15afdafd1ca64918ccb4d81707514e1fa7f309248ed0ba76971d3a94df27b72b30cf114a77490859d7d4845068e252deb7d902
diff --git a/dev-erlang/stringprep/stringprep-1.0.29.ebuild b/dev-erlang/stringprep/stringprep-1.0.29.ebuild
new file mode 100644
index 000000000000..5a4e0c05a3cf
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.29.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stun/Manifest b/dev-erlang/stun/Manifest
index e4f2ae325458..559d6e7dc5c0 100644
--- a/dev-erlang/stun/Manifest
+++ b/dev-erlang/stun/Manifest
@@ -1,5 +1,7 @@
 DIST stun-1.0.47.tar.gz 41277 BLAKE2B c40e326688dbddc37c82a0850cd2f8c4676898f208789960c0af346e0e27cc5aca199605e431ce7eb012dd2469b8938be39e02c59daea8d039d73c043f449ffd SHA512 921064bdaa6838d30c8fdd161f525ab11f91011700cfee222a9bac0c56a01efa63ad104bdf29068a32338387c3be5df1265612ebddd979e408b0c07825607d66
 DIST stun-1.2.2.tar.gz 41090 BLAKE2B fbcebb9a30dc547ab4fcf75cd78f57d141368c726629f4958f019d670de1d2b4c1f98594cd99befaa08ea4fffbabb28822484f8684adf7b9624b1d2eda976e74 SHA512 ddbb13300c1cc2ac09d7049fbd97fcd67e7f2e0dbb56569279ea1b1e4fe5e106712178e683757a4c205ddc54d1b2a0291369affc42a23325d7ad6ad61b648fd9
+DIST stun-1.2.6.tar.gz 42153 BLAKE2B 26d36d5ed878117f45105d3f8f65787026b8544e1e8568c249dc85bc7d7d14349450cb841c64e43ca4dcb27367dad5a0351ee5813edceb20da310371cb43da05 SHA512 6d6d0468c0272662326286a31402f748abce174c04edfcc9f49f08bf78019f6d34c62f706c8b3cf7e1d556ded72c227f55037926e2f4724f05cde9fac67cbe64
 EBUILD stun-1.0.47.ebuild 506 BLAKE2B 8123f73b447b9640cf8e6c2394cdf59d57d33f3d350211da27a14cf4ce6dcea953ab15834350c13f100c1464f2dab2d9951d2d1f976de918c3a416967b06e425 SHA512 6863a5adf9d1d8d42bb740da013fb1e375a9515d2d3a68e498956df300b368f3d39203eb55a59702cbd3eb9a1dce1591ac46e5f0e32a89f010af8e348baa480b
 EBUILD stun-1.2.2.ebuild 508 BLAKE2B 50f38a9893723de5a7596df24e3631ef8d35be315c9da0b5932e9e8e8978620a578b5e6331688bbf093d05142d723d850064187edd86505f76e7682661e7187f SHA512 44d23d37d00bc7623deed74632651ba58c30a164c15a4f51ec6047e374a610f63a65827cbc983ea23ca567dab7c71271ae5f3d8d9f884bfd0f68e35ce31ff0be
+EBUILD stun-1.2.6.ebuild 509 BLAKE2B 1a62f624d1b9f33a200a27b54140cb3acbb8000d21c7e3b31e6731337d09fe156976b6b2eddf4fcfc872e10996d9d54dea12199ceb7d4e806ec47ffcd9dd92b7 SHA512 b51fb96dcf17995ea3926f47f5159c10da88aa5401b518592c59533fb707fae92e6fe577557bbfa1c91856b35ded92626a59f6f6cbea39254987fa43d1a374ff
 MISC metadata.xml 301 BLAKE2B 9e48b7579f660552d7296803c63e853d3d9b50d6f62812ced09141bc944063561f3a91e6fae78e88cf0ce062b5a0ae55d7480975e4e0119eba02ff72216b57ff SHA512 09b39cd79708f6f9c76f6be52a645ba089d9681fec069cd392a4dae1c1880f090919759935867a85a37ce326e9d4e809cb95ce6e4b696257ef9002c3557b132f
diff --git a/dev-erlang/stun/stun-1.2.6.ebuild b/dev-erlang/stun/stun-1.2.6.ebuild
new file mode 100644
index 000000000000..02adc6445dbe
--- /dev/null
+++ b/dev-erlang/stun/stun-1.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="STUN and TURN library for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stun"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-erlang/fast_tls-1.1.15
+	>=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 3008af9a6724..961d5723f374 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1,3 +1,5 @@
 DIST xmpp-1.5.8.tar.gz 557974 BLAKE2B 63a0a0481ab5f527417aed68e798f46f0562b0e882bb3c91d6dde43b4190901dec49fb0838db3466928a2db9088a1f09b87f8a1a56f4de98682fe304f8fa891e SHA512 0ef76dd65741072276ef3590e4c82456c832dda530f857a30072acc6444532865b716c82e60e972320ddab191ac1fb0a72be2bc71b01a72e16892015381086e3
+DIST xmpp-1.6.0.tar.gz 561026 BLAKE2B 52797606d0aa88d5e72f8855da108c6c0f0b8e43c8fd131a65fa5ac863d51b8fe0be5582965bd65f2c5ea001dd0ee343cf70447fd669f951efbf57b87ea37eef SHA512 296a2f6c06e1a82e74e5484ae082124ad9ba05830aee2ecfea49ccf01a4fc4d46d94b8960ac5309911db66f0e8f2d06f48a0571f31cd5873c6e003b394f34300
 EBUILD xmpp-1.5.8.ebuild 718 BLAKE2B f65bdacf3881e3ace19dbc7a4e02b3bd682de136e63b5ab0051dc961e99281cdb3872a9812eaa010c9fcfa307ac4329a9126a0935efc64b7fc5eacd97ed08602 SHA512 f77ff9a6379583f0b2775345242597259ad5a4e733341f8c580c03c821b39eff203d8d089fe6c6baac7c85d4990c1b5ba2bc60d21c311860312ebf60e9f03494
+EBUILD xmpp-1.6.0.ebuild 719 BLAKE2B b0e721e3fa2fecbe2ba8c56fa3821ba766a2f0eb4b4625806847114943e1c46294761a50a28d9c0a05bc90ba46fbcdca2d4e69daeec0278a0f91ac208ab5182e SHA512 0b088851d1cedb03cfc7f161cb8f65aa0c52ea4aa3aa08b8f9fbd3ce256cfc647815f50550e927bea32d0e9aa51b3cc73b86dd2ce019ad370a03e3e8aa601e67
 MISC metadata.xml 301 BLAKE2B af92d4a8015e515dbb3098a7187b06425cb18e6845156ad471a2e1fa24e632f5397292d461cd79e8464578d527367b73719091143780fa959f587d1da9ae01a8 SHA512 b884fa199850f7935b8b81b3b47b7ee5b0686a30729c1152d9f5a9b215d84a8d4264b8bb3de541af4f0623581199ee9204cf2911e24fcfc49084b3746fa74976
diff --git a/dev-erlang/xmpp/xmpp-1.6.0.ebuild b/dev-erlang/xmpp/xmpp-1.6.0.ebuild
new file mode 100644
index 000000000000..f797d4db1469
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	>=dev-erlang/ezlib-1.0.12
+	>=dev-erlang/fast_tls-1.1.16
+	>=dev-erlang/fast_xml-1.1.49
+	>=dev-erlang/p1_utils-1.0.25
+	>=dev-erlang/stringprep-1.0.29
+	>=dev-erlang/idna-6.0.0-r1
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	rebar_src_prepare
+	rebar_fix_include_path fast_xml
+}
diff --git a/dev-erlang/yconf/Manifest b/dev-erlang/yconf/Manifest
index 9dccd052d4ea..25fdd16bab0d 100644
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@@ -1,3 +1,5 @@
 DIST yconf-1.0.13.tar.gz 223970 BLAKE2B 877094613a89afa3c819b8b8254b83091b3ff302534366ef9e0b321e1b65eb8cb52e03a7074f4836359bb8af566caf6f23ba2b04bfd7fc3a22fc27415b752778 SHA512 1e5df69421a82e8c442e17ed74738a4717e84521570f48a885de3e4fda2cbbc6d7567736d87255050d21e85edf976532ba6659b8a51d3150d1ac5e2c19d89a61
+DIST yconf-1.0.14.tar.gz 223966 BLAKE2B 1f910a47f55822d2e5d71ee53f26e40a1967245ca5959011c3062d2c69107aa9f63ef5ae0adb3f2557677cbc8f0e7155345c9510600de1d7a7bdeee19997a87b SHA512 5b495f6975a7d844f28af9295423b90d3e003122ef9b15a5734caf2bc46ad78c982a2fd36b4c1890ec0325ca0c72b029e470fd3e89ce52d9616047353a296e82
 EBUILD yconf-1.0.13.ebuild 496 BLAKE2B aca0b3b0a86b2c5107d378a1735c2e85e820fa7a0e801a710c2d50e8917daac836ea697bcefd688fc943a13f129ac5a24b5b7dd2a1c482aab2bd48a529a12c07 SHA512 1521b550f60d299c32c5c7e84893f139bd71a71aff867c967d5107a34baf73df6383acc4e46d43be85224fc850443c81575635cbec80f2f7cb44091c332d71cc
+EBUILD yconf-1.0.14.ebuild 497 BLAKE2B 0d0aaa10cc831b913fcb6fb6e1a01f330dbcad3419b7075feae7c0bfda011a98c171dcdae5ae12e185966e60328beb3815c31b655dcca0d13eec6af3577120ce SHA512 7c4dc46f1cc3edd48011f3ded231c62b38886860f9db9526b3e5f62625f02c31734bee4e51b0d54efc626b505b885e602baee28032c86538fc6530178d872114
 MISC metadata.xml 302 BLAKE2B 380c4945098b812c322f2a72fafd625b247f113c4166846cba400aa535a749df312848a4d2cfba220e0fee663d9b89222681670e8a975f107921bde7c9a283c0 SHA512 ca22951b464148ff558e6b84217375d5aa753560c4deb68257eda4015ebe249715d812ccbc5e79e342d94896a284c58f2ed0b3d3697e04c60de4c991e6556716
diff --git a/dev-erlang/yconf/yconf-1.0.14.ebuild b/dev-erlang/yconf/yconf-1.0.14.ebuild
new file mode 100644
index 000000000000..82bd486fcf94
--- /dev/null
+++ b/dev-erlang/yconf/yconf-1.0.14.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit rebar
+
+DESCRIPTION="YAML configuration processor"
+HOMEPAGE="https://github.com/processone/yconf"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-lang/erlang-17.1
+	>=dev-erlang/fast_yaml-1.0.34
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 020ac00907c9..81c8b1bfd1a1 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index e2b4ae6dbf4f..7ec9699e4d91 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -11,11 +11,17 @@ AUX clanlib-2.3.7-32bit-opengl.patch 515 BLAKE2B 96823139c5235c5e780727c8be48615
 AUX clanlib-2.3.7-autotools.patch 1458 BLAKE2B ecf797fa09893422b94364ac0df8156b3e2c3b2164530cd845201ad266977426b692860efce1b2cf6f6dee0cb098c6e28e8c3e203567c81713f63fc6099c30a9 SHA512 170580de7780e638e3a1788eb2bfcfe58f64d5f5695cbbd550ddc5bf59933303dea7970191792adefc8b1408647d4e3c816c30aaf253a9ceb139f9300b9e5807
 AUX clanlib-2.3.7-doc.patch 434 BLAKE2B e17cedc12f9b840231dae739edb933a6c8dffaac7feb53e4d4ce2639603e6ce03e716476bfa3b75f964aa1799676f18f19dfc09f3fa918d40b66519878f78904 SHA512 993edfcf9955bf89c6458933b1db9b4cdf6b3935f856c71aa82c3f9ad0f9a2d3704657fa8bd6f6760262a0f8d0669998f7c1ab426ecee7c57954f5674a24f8e4
 AUX clanlib-2.3.7-freetype_pkgconfig.patch 1069 BLAKE2B 48fe4d540a9dd5cce20efcea7802b45b13d8e56831abcf1f1d9aef9aa747dc40e4209a1a37f061b4162459619e8174fbba18963c3c3acb4b0457642c1a9a6142 SHA512 db151e1b5a07f01890ec0a164a3a82217f5a0f47fa6c15f566991965feedae50b69e99d801f04d1ca7583a6192e1d0f4766d66a0cbcca6278c03713ae7837233
+AUX clanlib-2.3.7-gcc47.patch 4702 BLAKE2B 638e7abe09cd0684e3fff6ef0a6fa51eeb92a26b67e37499dd8760fe17373a3da8ad7264d73e36b926ce949ef6eb09495b300715f53569c625f315ea3c9b7561 SHA512 f8eaa5281271893afccf546655cc3cbe85790507570f4a2f54e1acc346aab18c179e06149b40851fcf599a79e042d54c5b762952f6d31aea3b1232b9b49e2273
+AUX clanlib-2.3.7-gcc7.patch 614 BLAKE2B 72988b4a399478504c6d1153a23148eb37bb235a1bfb680a5feba083e69309f03d60e1bbb4e005bfb5aa8062a005c29e55a586038e324b6cf2895eb07263d679 SHA512 495ce3b400de9fa6aa2ebe8aac7b38ab1b6ddfa70ea7b4e3c3da59e584dc5950a032868f8d3111033cfcf6b1b80fb5e1a893d48e7ee5b4ab76a76ff954e03908
 AUX clanlib-2.3.7-glibc2.34.patch 612 BLAKE2B 7a1c5407a228fe7c245f6e4aa530a371d5e9c424935cd3688a4cd34e543ddfbfbfe77a31e3845226679409d2aebb6bfc0b96d5817a3284940f85f6a07f6e4e1d SHA512 dfa58ec02fd0e5f0a767203e9518504f0255078688dd97e47e6c0dc8207122318e80bf9a42ee02bb8f2501b621e3538437b37a5102b50186cd3c83315369789f
+AUX clanlib-2.3.7-no-ldflags-for-conftest.patch 892 BLAKE2B ba3117c2194021fb4f1d6853fab08ba4043bf1b371f3cf1f7c59ef6f37c0f5065f5c1277b75254f60e07ffb5b8066a3d3e3c407f7c48cbc83322985dd8f5543e SHA512 fad2323d879fc342d915295c4b33a0b44b8f3e486c64d31680b8a226fa0c1c11cc5d4606b49338bbd2046caa64c5c959e2893ba5b19cb4e5c0f966c53e10682e
+AUX clanlib-2.3.7-no-wm_type-in-fs.patch 659 BLAKE2B b3a5498bb706225d828622e8dead234c2df4755151e017921df52f6072258e77eb05e71135cf8ecbd02fc591daf277f8f68a8af86079883bf7d2d9c6a0f5cd70 SHA512 efd99cf2e6c0cedf6a4752981c6e9931512de7140b4b83e636e2d3db96d4eed0a92413c833c9ac95d0bf0a1017b7119141c5c815a00420765032b17923643103
+AUX clanlib-2.3.7-non-x86.patch 1263 BLAKE2B af0f26f0148e66ed20cc226539b30fe44a455f221689d8baa62f543e1f512e84bcc54d908893ac3386d5058872243ec422586488d938373589ddeae5c2d82c62 SHA512 e28e4dac473b6a71b0bfc207c42b68cf2bf57e29b88400e32a829af27bffba7f07e58445588e18f40e70593e245ebd33a4b4de0d26bd23b2718e6fcc0d7fe335
 DIST ClanLib-0.8.1.tgz 7629019 BLAKE2B 7f238111931212e3f9c82ed43842706bf16ee145896735ca35595e29dd357e52364cc592be55d88e231f962adc313bc8f57357bc74c9f1b8b134bc411497f5e9 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b
 DIST ClanLib-2.3.7.tgz 26132425 BLAKE2B 109ba92baf21174022c8dbc4044e39ec16ec77c730b57590733418e246ab71d18d81bbf281cd469dd9e2aebd4ac4302fbb581f27dc7fc0054a8c7ce69699e19d SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a
 DIST clanlib-4.1.0.tar.gz 6871886 BLAKE2B 0aeb9e89998a9ef6975bf16a2e77f461e6415aacda9a26a5c0a9c6ec3c19a136a5f092c7866b60898251fbd6cb8aa7e96c86f6b87afb564824298fac77bf20c3 SHA512 34f5d1fdb7b071a218f081a6b06a6018a9c20cedc4c8500a9796be02d335f06fa148304379eeb1a35e08b9a734e504ceb490a6558a43d1611187bd97be01f4b0
 EBUILD clanlib-0.8.1-r2.ebuild 2288 BLAKE2B ccb633ddd4ff1148a4c35f94a835888050552576bfa5e23adf367cb56b24bf9896244b11d59894bdeb7f4b1b0146ea7e114d9a0376215fbeb821a5055b47b3d6 SHA512 2d0279c1526e9e25bb94d5e849552c89879ea0265ce9e5e1540e29411adc040ea1a9049d78b7afcdb8ffd0c49725d1cd339a6999a04eaf74966d3e279bb7aace
 EBUILD clanlib-2.3.7-r2.ebuild 2224 BLAKE2B d9275002067b10c5955502b13f15c7a03849f7039d2b6e0dbe985ea5ab2785416be6241bb9b4e9bddaeeef22fea10fc092cc7229324b9dde96ab2704578e1f5a SHA512 6fe0fcc5f837e4db9126f3b0e090c4a72d0d5add331a96c847ce3905a7696f86c95e3957e1ac6b8c3d3657bbdefe31f029f73a0b430f5249018360549afadf9b
+EBUILD clanlib-2.3.7-r3.ebuild 2491 BLAKE2B 68b05e491439f17ff9f10638435fddcdc9080a4b90424bef9907caad57f70906c6e1f6eb9b087aa8e7ce41c35b6780de915b76ce71e08e834f59e339e27692e5 SHA512 c5dcb125cdb1ebaea960715348b64934b64d6401ad21695ff06398f2bd995d3df5b1bfdaa399e10add3bc090ce00d3820504d6d00a9c2b152c3020d7e943cec4
 EBUILD clanlib-4.1.0.ebuild 1491 BLAKE2B da46029e71367101d4ecbe76015b13660255732d93df2bfcc6f3d2b53feb7b0a70a85a5bd9f691822582a140eb0a5e1a800ece9f56ea2d25d3fefd373c24d1c9 SHA512 2548f5db4749ad2d4b569a1992370c1d56ad0d8120e67b246a9a787ce3c78da0ed350a626a0507a30d55a4ec2dd46b19d895f8287b78a1d41c7b4ddb65b98878
 MISC metadata.xml 3097 BLAKE2B a17189a5334540d64d105470c7785d223628d8cff00f5ac162084acc0b4905c537abfbe9383bfa293c751b2efbe5d30a9a3280c92c7954cb3c4a8e04d2c925c5 SHA512 e86eda205bb05a47d49160a458c27d6eb9d67ff1f23921880f6dd46e4c16a930b405f6f2fc41fcd1623458f50452ea5ccdea36abafee802cc6933a7b3b471992
diff --git a/dev-games/clanlib/clanlib-2.3.7-r3.ebuild b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
new file mode 100644
index 000000000000..d5d41ff83ea1
--- /dev/null
+++ b/dev-games/clanlib/clanlib-2.3.7-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P=ClanLib-${PV}
+DESCRIPTION="Multi-platform game development library"
+HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://clanlib.org/download/releases-2.0/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="ZLIB"
+SLOT="2.3"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X"
+REQUIRED_USE="opengl? ( X )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-lang/perl
+		media-gfx/graphviz
+	)
+"
+RDEPEND="
+	sys-libs/zlib
+	X? (
+		app-arch/bzip2
+		media-libs/libpng:0
+		media-libs/freetype
+		media-libs/fontconfig
+		media-libs/libjpeg-turbo:0=
+		x11-libs/libX11
+		opengl? ( virtual/opengl )
+	)
+	mikmod? (
+		media-libs/alsa-lib
+		media-libs/libmikmod
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	sound? ( media-libs/alsa-lib )
+	vorbis? (
+		media-libs/alsa-lib
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902
+	"${FILESDIR}"/${P}-glibc2.34.patch
+	"${FILESDIR}"/${P}-32bit-opengl.patch
+	# From Fedora
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-non-x86.patch
+	"${FILESDIR}"/${P}-no-ldflags-for-conftest.patch
+	"${FILESDIR}"/${P}-no-wm_type-in-fs.patch
+)
+
+DOCS=( CODING_STYLE CREDITS PATCHES README )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	ln -sf ../../../Sources/API Documentation/Utilities/ReferenceDocs/ClanLib || die
+}
+
+src_configure() {
+	# Add -DPACKAGE_BUGREPORT?
+	local myeconfargs=(
+		$(use_enable doc docs)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable opengl clanGL)
+		$(use_enable opengl clanGL1)
+		$(use_enable opengl clanGUI)
+		$(use_enable X clanDisplay)
+		$(use_enable vorbis clanVorbis)
+		$(use_enable mikmod clanMikMod)
+		$(use_enable sqlite clanSqlite)
+		$(use_enable ipv6 getaddr)
+	)
+
+	use sound \
+		|| use vorbis \
+		|| use mikmod \
+		|| myeconfargs+=( --disable-clanSound )
+
+	tc-export PKG_CONFIG
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+
+	use doc && emake html
+}
+
+# html files are keeped in a directory that is dependent on the SLOT
+# so to keep eventual bookmarks to the doc from version to version
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use doc ; then
+		emake DESTDIR="${D}" install-html
+		dodoc -r Examples Resources
+	fi
+}
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
new file mode 100644
index 000000000000..58b55ccf0291
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-gcc47.patch
@@ -0,0 +1,107 @@
+diff -up ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~ ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp~	2011-07-22 10:03:21.000000000 +0200
++++ ClanLib-2.3.4/Sources/Core/IOData/file_help.cpp	2012-01-12 22:16:39.779011207 +0100
+@@ -34,6 +34,7 @@
+ #include "API/Core/System/exception.h"
+ 
+ #ifndef WIN32
++#include <unistd.h>
+ #include <sys/stat.h>
+ #endif
+ 
+diff -up ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp~ ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp~	2011-08-03 10:13:57.000000000 +0200
++++ ClanLib-2.3.4/Sources/Core/IOData/path_help.cpp	2012-01-12 22:18:30.754009662 +0100
+@@ -43,6 +43,7 @@
+ 
+ #ifndef WIN32
+ #include <cstring>
++#include <unistd.h>
+ #endif
+ 
+ /////////////////////////////////////////////////////////////////////////////
+diff -up ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp~ ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp~	2011-01-27 10:03:39.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/iodevice_provider_pipe_connection.cpp	2012-01-12 22:24:55.536004557 +0100
+@@ -33,6 +33,7 @@
+ #include "API/Core/Text/string_help.h"
+ #include "API/Core/Text/string_format.h"
+ #ifndef WIN32
++#include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #ifndef UNIX_PATH_MAX
+diff -up ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp~ ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp~	2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/pipe_listen_impl.cpp	2012-01-12 22:25:17.359004259 +0100
+@@ -36,6 +36,7 @@
+ #include "API/Core/Text/string_help.h"
+ #ifndef WIN32
+ #include "Network/Socket/event_provider_unixsocket.h"
++#include <unistd.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #ifndef UNIX_PATH_MAX 
+diff -up ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp~ ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp~	2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/security_identifier.cpp	2012-01-12 22:26:06.047003649 +0100
+@@ -31,6 +31,9 @@
+ #include "API/Core/System/exception.h"
+ #ifdef WIN32
+ #include <AclAPI.h>
++#else
++#include <unistd.h>
++#include <sys/types.h>
+ #endif
+ 
+ /////////////////////////////////////////////////////////////////////////////
+diff -up ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp~ ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp
+--- ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp~	2011-11-25 09:16:46.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/IOData/virtual_directory.cpp	2012-01-12 22:26:37.583003215 +0100
+@@ -38,6 +38,10 @@
+ #include "API/Core/System/weakptr.h"
+ #include "API/Core/Text/string_help.h"
+ 
++#ifndef WIN32
++#include <unistd.h>
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_VirtualDirectory_Impl Class:
+ 
+diff -up ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp~ ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp
+--- ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp~	2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/System/Unix/service_unix.cpp	2012-01-12 22:29:12.478001042 +0100
+@@ -35,6 +35,7 @@
+ #include "service_unix.h"
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_Service_Unix Construction:
+diff -up ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp~ ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp
+--- ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp~	2011-01-13 12:17:34.000000000 +0100
++++ ClanLib-2.3.4/Sources/Core/Text/console_logger.cpp	2012-01-12 22:27:54.446002158 +0100
+@@ -33,6 +33,10 @@
+ #include "API/Core/Text/string_format.h"
+ #include "API/Core/System/datetime.h"
+ 
++#ifndef WIN32
++#include <unistd.h>
++#endif
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_ConsoleLogger Construction:
+ 
+diff -up ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp
+--- ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp~	2012-01-12 22:18:49.000000000 +0100
++++ ClanLib-2.3.4/Sources/Display/X11/x11_window.cpp	2012-01-12 22:30:46.492999847 +0100
+@@ -50,6 +50,7 @@
+ #include "display_message_queue_x11.h"
+ #include <X11/Xatom.h>
+ #include <cstdio>
++#include <unistd.h>
+ #include "../Window/input_context_impl.h"
+ #include <X11/XKBlib.h>
+ #include <dlfcn.h>
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch b/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch
new file mode 100644
index 000000000000..22cce76debfb
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-gcc7.patch
@@ -0,0 +1,20 @@
+diff -up ClanLib-2.3.7/configure.ac~ ClanLib-2.3.7/configure.ac
+--- ClanLib-2.3.7/configure.ac~	2012-04-11 08:55:49.000000000 +0200
++++ ClanLib-2.3.7/configure.ac	2017-02-21 11:57:23.482504683 +0100
+@@ -119,7 +119,6 @@ case $target in
+ 	*)
+ 		X11="yes"
+ 		WIN32="no"
+-		CXXFLAGS="$CXXFLAGS -std=c++0x"
+ 		;;
+ esac
+ 
+@@ -259,7 +258,7 @@ if test "$use_sse2" != "no"; then
+ fi
+ 
+ if test "$WIN32" = "no"; then
+-	extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -pthread -std=c++0x"
++	extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -pthread"
+ else
+ 	extra_CFLAGS_clanCore="$extra_CFLAGS_clanCore -mthreads -std=c++0x"
+ fi
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch b/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch
new file mode 100644
index 000000000000..c22e58106485
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-no-ldflags-for-conftest.patch
@@ -0,0 +1,19 @@
+diff -up ClanLib-2.3.7/acinclude.m4~ ClanLib-2.3.7/acinclude.m4
+--- ClanLib-2.3.7/acinclude.m4~	2011-11-24 11:57:30.000000000 +0100
++++ ClanLib-2.3.7/acinclude.m4	2015-04-02 15:22:52.060631122 +0200
+@@ -5,6 +5,7 @@ dnl CLANLIB_CHECK_LIB(lib, testprog, mod
+ define([CLANLIB_CHECK_LIB],[if test "$enable_$3" != "no"; then
+     OLDLIBS="$LIBS"; LIBS="$5"; AC_MSG_CHECKING(for $1)
+     OLD_CXXFLAGS="$CXXFLAGS"; CXXFLAGS="$6";
++    OLD_LDFLAGS="$LDFLAGS"; LDFLAGS=;
+     AC_RUN_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT=yes], [CL_RESULT=no], [AC_LINK_IFELSE([AC_LANG_SOURCE($2)], [CL_RESULT="yes, linked"],[CL_RESULT=no])])
+     AC_MSG_RESULT([$CL_RESULT])
+     if test "$CL_RESULT" = "no"; then
+@@ -14,6 +15,7 @@ define([CLANLIB_CHECK_LIB],[if test "$en
+         extra_LIBS_$3=" $extra_LIBS_$3 $LIBS "
+     fi
+     CXXFLAGS="$OLD_CXXFLAGS"
++    LDFLAGS="$OLD_LDFLAGS"
+     LIBS="$OLDLIBS"
+ fi])
+ 
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch b/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch
new file mode 100644
index 000000000000..48799baa42c2
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-no-wm_type-in-fs.patch
@@ -0,0 +1,12 @@
+diff -up ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp~ ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp
+--- ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp~	2013-08-01 16:32:37.866001296 +0200
++++ ClanLib-2.3.7/Sources/Display/X11/x11_window.cpp	2013-08-01 16:33:26.267001811 +0200
+@@ -289,7 +289,7 @@ void CL_X11Window::create(XVisualInfo *v
+ 	// Retrieve the frame size (emulating microsoft windows)
+ 	bool window_is_frameless = false;
+ 	bool window_has_thin_frame = false;
+-	if ((!desc.has_caption()) || (!desc.get_decorations()))
++	if (!desc.is_fullscreen() && (!desc.has_caption() || !desc.get_decorations()))
+ 	{
+ 		if (desc.is_tool_window())
+ 		{
diff --git a/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch b/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch
new file mode 100644
index 000000000000..acaa8520b645
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-2.3.7-non-x86.patch
@@ -0,0 +1,38 @@
+diff -up ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp.non-x86 ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp
+--- ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp.non-x86	2011-11-15 13:15:42.000000000 +0100
++++ ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp	2013-01-08 13:33:20.000000000 +0100
+@@ -30,7 +30,7 @@
+ #include "Core/precomp.h"
+ #include "API/Core/System/system.h"
+ 
+-#ifdef CL_ARM_PLATFORM
++#if ! (defined(__i386__) || defined(__x86_64__) || defined(__amd64__))
+ bool CL_System::detect_cpu_extension(CL_CPU_ExtensionPPC ext)
+ {
+ 	throw ("Congratulations, you've just been selected to code this feature!");
+@@ -48,11 +48,12 @@ bool CL_System::detect_cpu_extension(CL_
+ #ifdef __GNUC__
+ 
+ 
+-#ifdef __amd64__
++#if defined(__amd64__) || defined(__x86_64__)
+ 
+ #define __cpuid(out, infoType)\
+ 	asm("cpuid": "=a" ((out)[0]), "=b" ((out)[1]), "=c" ((out)[2]), "=d" ((out)[3]): "a" (infoType));
+-#else
++
++#elif defined(__i386__)
+ 
+ #define __cpuid(out, infoType) \
+ 	asm volatile(	"pushl %%ebx \n" \
+@@ -61,6 +62,10 @@ bool CL_System::detect_cpu_extension(CL_
+ 			"popl %%ebx" \
+ 		: "=a" ((out)[0]), "=r" ((out)[1]), "=c" ((out)[2]), "=d" ((out)[3]): "a" (infoType));
+ 
++#else
++
++#define __cpuid(out, infoType) {}
++
+ #endif
+ 
+ #endif
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 43512249d24b..284a04c409e3 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 8340a38aa9da..c0aa157b32ae 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -5,4 +5,4 @@ DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2
 DIST tcl-core8.6.12-src.tar.gz 6064625 BLAKE2B 30dc780562aa6955e2c417798cc96fabd23e947cee81146dc192156598e3c43f588864aab4392d62901b8964cf59bedb6cad1f064e32b03dd9733b3a0a7b5c8a SHA512 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3
 EBUILD tcl-8.6.11.ebuild 4016 BLAKE2B 761335036c4f86499dea605a7659b5b4d7d95d1c8ab78bc0aab0edc2bf23e42eea316251b6a6a92e1ec504955b19fafaeb4722230f7e1dc9ec04ef6b3ccb7684 SHA512 0e8bbf84e92819348121919dc625d410b5be4d921230ec11d4bdf14d1debc6e2f39517a2c53c02fbc95127b1347e0e53ab6fe3f0efdbe9cdad5c7b5bd4eebb48
 EBUILD tcl-8.6.12.ebuild 3538 BLAKE2B a8184cc2c44a8778e7449ac31ef8c1e8306080986ebe1cabaead12d6196e78f2b0b51b38168cb92271d52e6ecaaa6ace7b03ce45cec337dedfa0cf92031aa8d7 SHA512 8088e1da04711a211cd30668985e67ed95d8038ba8bc8f57a62b40be7ada762bca4e984a5da27c99eae25b9ff78d849303f6efe3e59f3c7a750f982ba5bf736b
-MISC metadata.xml 319 BLAKE2B 0deb5e21e559ee13f3778e4f3aa453b868fe4686b77addfc925cc8d1be32648b8ecb47cda1e0bd7ec8601141c83b7edbf9cd64de4f26c9a66a3e44d2e8726191 SHA512 1987cf2e51de189cb14098bde54fd1372dd1b790eee68bdf3f7f2854b41602e649eae98c0b1699eac71a6106abd293802596652b90775294e4f74ddaf1039b84
+MISC metadata.xml 421 BLAKE2B c056a7ae8f2deaddda9bb329d46ec4f322548f4d031479ba522f5d93add46bd47cc783e9876b398579898af2cbdedb053c6328433eacfd02df4bb6dcf0185766 SHA512 0e77b876a127d68c7b193db874b9d3ab38f8475abafec1d866f2a4158ea4334ae04fbd6cb1d9acc23c81e13e584fe667503e4d9352873e1880a2d6acf7dec59c
diff --git a/dev-lang/tcl/metadata.xml b/dev-lang/tcl/metadata.xml
index 04255bbc4e83..609c89ab3a47 100644
--- a/dev-lang/tcl/metadata.xml
+++ b/dev-lang/tcl/metadata.xml
@@ -3,9 +3,11 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
-		<name>TCL/TK Herd.</name>
+		<name>TCL/TK project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:tcl:tcl</remote-id>
 		<remote-id type="sourceforge">tcl</remote-id>
+		<remote-id type="github">tcltk/tcl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d94bb43043bf..933739c3b999 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index dfcd87191a38..ded37a43b20b 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,11 +1,7 @@
-AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8
 AUX libaio-0.3.112-cppflags.patch 350 BLAKE2B 8c2d0706f92a47dffff6465712588b525b89ff223019cf3ec759beca14ff2ef9515d4b3697ca64931c2d86969a40ad74642aa06544cc2671906e5b49d2e10352 SHA512 7386d741658af265cc4f156d4cc8518a7ec9abc15e8738cb13c2e2c3827b284cf8f8ee07c4a16dd0b7ae424cf87e9aad438389f0a832dac2e49ef945e3829374
-AUX libaio-0.3.112-respect-LDFLAGS.patch 521 BLAKE2B f45b0147202e767385f6816192c0fe8418cd7ed61b6807d9a6d16ec7448f10f4f842c32167f6a2ef82df820c291142cedcd66b610693858aa6ca956de272d2a4 SHA512 c1d8385fc66909168e2ff39d334e9ac37a02527a892ed13a594c1b0b55103a5115d79c32aff756a9ec96117a7001703a3d141319369dc7bcb118eb752860f0ba
 AUX libaio-0.3.113-32-bit-tests.patch 794 BLAKE2B af169fe70e736bcc83bac7394a8c8ac737799a31b23abe1d5a6158f4f118dcdd90378f515279b861f2e5086258f233aa7778062e2e8025788ebbec158dd41993 SHA512 358bab7166887f19c3d64fb8911c4fc9fc0811aabda28838e11013f28f1a6911d5d4ee9b5369e998f01848f1f758cba63644b56ad3b1bd69d0d17f487898e9e1
 AUX libaio-0.3.113-respect-LDFLAGS.patch 537 BLAKE2B 6981fe9a607ddd4f9f803797f91271eaa403d05f65b3c2e778548b30cd486e15245a75a7f201c5f2a573828e20708d77f37d3834e131636228c49d4c697e6ba3 SHA512 726aa73e2d9fd15110acd024312f36293b841aa442a14b77b49cff4dc78961981ba09d406bc1105d31afdb4b96d29906ad4359c23c78a09e0e1d1b26e25ae11a
-DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
 DIST libaio-0.3.113.tar.gz 49980 BLAKE2B 2379c88670310b36942563d10f29dfcba0f49391952ffe7fe18b0c917f33ef610405fe13297d1dbb34b7ad1d3066d4a32587a7fb20babba2f264cfc2ab289e57 SHA512 65c30a102433bf8386581b03fc706d84bd341be249fbdee11a032b237a7b239e8c27413504fef15e2797b1acd67f752526637005889590ecb380e2e120ab0b71
-EBUILD libaio-0.3.112.ebuild 2184 BLAKE2B 9af25ed8c5c41bb07f93f6139ba91ae70bac4131fa5171328b527842169bf68bf6c49a2becfc2539e1fc13a16ffc2026b8e208c6f2817d060c534ba5f8b49576 SHA512 695bd6ae41e784f76c16cf1a094f9d9282e8e9918d0612628ae587a669fbbc7bcd1d7276aeb1b421712b278333b33020e3ca1ac22e8be8e06676aff2e8970b28
 EBUILD libaio-0.3.113.ebuild 2288 BLAKE2B 3ff24b4cd6bbd9f515ef5611a789c37e90c059a13fd3c618a3627d070bf01a441b89ec218c1470e86d7b7db31097c706697b76ff75091ef83322e6e78d1ff53c SHA512 96f6aa57a82077de291b7246c1c945b6efe3c0be6bb53bef7a63f0c343cbfe24a5ea842e192d1646b799afd3e85bde4fa5cf9573225eea4f0bcd29a609513c0b
 EBUILD libaio-9999.ebuild 2248 BLAKE2B b9df5b16af67563434bc1297eb3d5b4ca767db287f57f457152e9f41d20f5f56cdb2fd0f2588667d197e0c5ecb4402774c2ecbc226ba0d9cf403933148c603db SHA512 82e56ce625dce6d15a6061897ed7d710c06692c326befc8f6b5310c4826716cfaf9a7b71d411d9dac6e6ee8033dbbc166e85f6ce60cbb3601e841208a33ef572
 MISC metadata.xml 505 BLAKE2B dd6fdcca9f3876cd5e33eefe891b4e0fd87d8bf21417b36c0e3a0e8b248a2191143037970bb1ce9ed4cc59f3da399e8057c73db1a5b194f265c7940bcb4bdb9f SHA512 5edfc92d534ac0b1526d010cc43dc33da62db6575ebba6e0edcb3b063eec7053dc18d496f0bb02b5f6a8568197d198be309a5fce57f538dc9906b788f46d0d6f
diff --git a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
deleted file mode 100644
index 5b6f91e56d98..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 12:44:26 +0200
-Subject: [PATCH] make -Werror into an optional flag
-
-This lets distros disable the flag as random errors might come up with
-different compiler flags and older/newer toolchain versions.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- harness/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/harness/Makefile b/harness/Makefile
-index f477737..a155c4b 100644
---- a/harness/Makefile
-+++ b/harness/Makefile
-@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
-+CFLAGS_WERROR?=-Werror
-+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
- #-lpthread -lrt
- 
- all: $(PROGS)
--- 
-2.21.0
-
diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
deleted file mode 100644
index 20e23874fb6b..000000000000
--- a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
- 	$(RANLIB) libaio.a
- 
- $(libname): $(libaio_sobjs) libaio.map
--	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
-+	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
- 
- install: $(all_targets)
- 	install -D -m 644 libaio.h $(includedir)/libaio.h
-
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
deleted file mode 100644
index dd90b717f5d9..000000000000
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
-
-DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
-HOMEPAGE="https://pagure.io/libaio"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://pagure.io/libaio.git"
-else
-	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
-	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
-	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=(
-		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
-		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
-	)
-	if ! use static-libs; then
-		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
-		# Tests require the static library to be built.
-		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
-	fi
-	sed -i "${sed_args[@]}" src/Makefile Makefile || die
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	if use arm ; then
-		# When building for thumb, we can't allow frame pointers.
-		# http://crbug.com/464517
-		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
-			append-flags -fomit-frame-pointer
-		fi
-	fi
-}
-
-_emake() {
-	CC="$(tc-getCC)" \
-	AR="$(tc-getAR)" \
-	RANLIB="$(tc-getRANLIB)" \
-	ABI_LIBDIR="$(get_libdir)" \
-	CFLAGS_WERROR= \
-	emake "$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	mkdir -p testdir || die
-	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
-}
-
-multilib_src_install() {
-	_emake install DESTDIR="${D}"
-}
-
-multilib_src_install_all() {
-	doman man/*
-	dodoc ChangeLog TODO
-
-	# move crap to / for multipath-tools #325355
-	gen_usr_ldscript -a aio
-
-	# This lib is a bare minimal shim on top of kernel syscalls.
-	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
-}
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index 7469eca9031c..a717f860ba2c 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -1,5 +1,8 @@
 AUX libmcrypt-2.5.8-autoconf-2.70.patch 561 BLAKE2B 7781b257c87eb1f6d793fd5a0a2f017190728731f95dec00b25986fd97c36590db38f3670af6ef29c480ebab90405a1b2638601536102a6b62363226011c1199 SHA512 5aec87f49632a4e9d7cddabd5f661b813caa8558cb304374fda331a490a9f9f7a0bb753b2d4c81a17ca605246c18b9aaf24ee4d437af7f5e7a293e2fc9e37b79
+AUX libmcrypt-2.5.8-prototypes.patch 1435 BLAKE2B 6b4e85df1432e7766d5e678595b08b75a1592993d79f18373d28868566b4cbe271552d7e899719530677e4f2ad2b34d4308f01ff7808a0527507f23dc74dbf70 SHA512 c821c8c6bb42e50bb377c85042ff3127375b195ffa075d17a6ead6cedd01ff66dfe6e1fdf049a48d12b5285ee26e0a2208a86ab333294055c2df7723857c70d7
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
+AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a239e45020de177271da7ac6b15c20f6d791399f5fb9c48970e66e6f43168408ce83c347fc8c1387308fee9d273726f268ed91 SHA512 d5bf3520f101a5edae1e165358c075be763ec1a76d721301b562476fe6495f4cfb0b991c71c24fe182885bf86903ef796b934fd9f5b2f026ad8a433579d70791
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
 EBUILD libmcrypt-2.5.8-r4.ebuild 997 BLAKE2B 09eabad4327b46c88a5930322f77bebf3035c09ff5d53cc9a2cafff485326b7c7f6d02c6e70695e308ec856fa7bd2a9d4014413133214ffa31e049eca3b70e15 SHA512 db16aa64a129a6feadbc8831712b7e0b95163c6c1a6459aa35075e60839e76022c2361a73db80d57b333717ea4dfcb82399c2b7abd3c2e9641e3ef47294bff47
+EBUILD libmcrypt-2.5.8-r5.ebuild 1254 BLAKE2B 46f964ee310decd45d39f409a5d890da2f4ade958f4f079a1776576a7a498f94416b63a2d6719c0d732d63c4e918262fbc9b8b0a94012e23b3f6285949b1ab63 SHA512 196d42be134d5a7ab32cbd7f798c39e65a50d02108d78581b06faffde4b9f99f2c3b58909402a4d33ad9184419e848bb330e86d05a38be77f0f8f12df7a774be
 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
new file mode 100644
index 000000000000..eca6e7793161
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-prototypes.patch
@@ -0,0 +1,35 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/des.c.BAD libmcrypt-2.5.8/modules/algorithms/des.c
+--- libmcrypt-2.5.8/modules/algorithms/des.c.BAD	2008-08-25 17:40:29.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/des.c	2008-08-25 17:40:51.000000000 -0400
+@@ -35,9 +35,12 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
+-perminit_fp();
+-static word32 f();
++static void permute_ip(char *, DES_KEY *, char *);
++static void permute_fp(char *, DES_KEY *, char *);
++static void perminit_ip(DES_KEY *);
++static void spinit(DES_KEY *);
++static void perminit_fp(DES_KEY *);
++static word32 f(DES_KEY *, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
+diff -up libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD libmcrypt-2.5.8/modules/algorithms/tripledes.c
+--- libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD	2008-08-25 17:40:56.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/tripledes.c	2008-08-25 17:41:13.000000000 -0400
+@@ -36,8 +36,10 @@
+ 
+ /* #define	NULL	0 */
+ 
+-static void permute(), perminit(), spinit();
+-static word32 f();
++static void permute(char *, char[16][16][8], char *);
++static void perminit(char[16][16][8], char[64]);
++static void spinit(TRIPLEDES_KEY *, int);
++static word32 f(TRIPLEDES_KEY *, int, register word32, register char *);
+ 
+ 
+ /* Tables defined in the Data Encryption Standard documents */
diff --git a/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
new file mode 100644
index 000000000000..f52dc9334b40
--- /dev/null
+++ b/dev-libs/libmcrypt/files/libmcrypt-2.5.8-uninitialized.patch
@@ -0,0 +1,12 @@
+diff -up libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD libmcrypt-2.5.8/modules/algorithms/twofish.c
+--- libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD	2008-08-25 17:38:21.000000000 -0400
++++ libmcrypt-2.5.8/modules/algorithms/twofish.c	2008-08-25 17:38:30.000000000 -0400
+@@ -499,7 +499,7 @@ static void f_rnd(int i, word32* blk, TW
+ /* encrypt a block of text  */
+ WIN32DLL_DEFINE void _mcrypt_encrypt(TWI * pkey, word32 * in_blk)
+ {
+-	word32 t0, t1, blk[4];
++	word32 t0 = 0, t1 = 0, blk[4];
+ #ifdef WORDS_BIGENDIAN
+ 	blk[0] = byteswap32(in_blk[0]) ^ pkey->l_key[0];
+ 	blk[1] = byteswap32(in_blk[1]) ^ pkey->l_key[1];
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
new file mode 100644
index 000000000000..cf8ea98d268d
--- /dev/null
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="libmcrypt provides uniform interface to access several encryption algorithms"
+HOMEPAGE="http://mcrypt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+DOCS=(
+	AUTHORS NEWS README THANKS TODO ChangeLog
+	doc/README.config doc/README.key doc/README.xtea
+	doc/example.c
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-rotate-mask.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch" #775113
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895
+	"${FILESDIR}/${P}-uninitialized.patch"
+	"${FILESDIR}/${P}-prototypes.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac
+	mv libltdl/configure.in libltdl/configure.ac
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
+	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 7de0241c8aef..dd6970a6a2a7 100644
--- a/dev-libs/libslz/Manifest
+++ b/dev-libs/libslz/Manifest
@@ -1,5 +1,5 @@
 DIST libslz-1.1.0.tar.bz2 229577 BLAKE2B d05b619d0b7b76c2777285ecaf976b75565b50c77e00a1ce042f5a28ab8d527788a75d28d70357a32ea9a98267ae621d5a6e4613e4a7e4f52767e68c77765bb3 SHA512 064e2e8e7091adf863653981e5b677bdb9e64901f61cf3b68f098cf7957a4c32e19cec7d41b8dab61098017119d6ea562350c7fbfa10b5e922f52ac0d6066948
 DIST libslz-1.2.0.tar.bz2 230567 BLAKE2B cf8a21fe0c23ae003830bfae3bd5ae172df4e88f63b0d5c1394c316e9d69c570b544d2c2db76cddd1e320d68119d7ae39352f9932673fb41e06ded030ebc5078 SHA512 811876f3893c0a0c273518fcf6d5a827a86513033e2048dbb541ca32286171c408f124495c4454ce7811e3c52ffb6a7bfcbb08af5b7f56a670c2c1cb2c5cd496
 EBUILD libslz-1.1.0.ebuild 1171 BLAKE2B 198e5fca5067778136ff7a2b50b990879186b073095906e4ac134922386780822f5d6a6d52b8f9122f3a793944c19ce560ac77c24b429f50be1f28607b7d89fb SHA512 4d2e6f3c7b54edd926e9bbe275e999314fb3e7ab577abad77126ae88fbf477b6c2d98a0282d00cdc435228271cd8928eece3cb56a069fccd3d7fd69636a9feb4
-EBUILD libslz-1.2.0-r1.ebuild 826 BLAKE2B 3425b3b0e38e2a70a67489195faa6bfb0172f9939653a79b9f97c73d85eacf3e804e76c7889d42d247fa7216b40ebe2a55f716b3633fa71b4f99bf63e7694ab9 SHA512 1b3f89147d86c97c04abb458677440d16ccba65ef4210486daccdf9031c9c977337e3cbc273b212a1f2c23dfbd4d62c1adf3dc7e30f81196162633bf5b048f4e
+EBUILD libslz-1.2.0-r1.ebuild 824 BLAKE2B fae5deac8b237f795b42d304e34c791a6477b64927c0bd8cb0b446ff55f196051dff2f7cea5170b98a6b1e51554a701d603708381645dffda0f1d3df99fecd96 SHA512 3ff0f544fa0e64d9ba17d58b35a57bd69645414c097a7962eb2f0a8fc763510890e0b0cc3b43f1c22cdded13d16089bb8ce35971f15a27672bec52fcc0d8e93e
 MISC metadata.xml 1191 BLAKE2B 98101432b70c26facdf54b28710ec27afe7ede00aa69840d29d9e0ce0e78b915656d8e9b4dba0fb7eb0332535e2a53fc142d90df1d6a79ca1df7a23a9ca60d44 SHA512 3696dabd8230d673f7077109ff791dab7415c6d7b5466ff0a59633a06ab8415592903232d50832cc9ba64d2bc38bddcbd542a82aaa88384e2277475c406f0adf
diff --git a/dev-libs/libslz/libslz-1.2.0-r1.ebuild b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
index 633d4804c308..e9a2001ccec7 100644
--- a/dev-libs/libslz/libslz-1.2.0-r1.ebuild
+++ b/dev-libs/libslz/libslz-1.2.0-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 IUSE="tools"
 
 src_compile() {
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 5a8b7b8590cc..0b16bfeb6a08 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -4,6 +4,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3
 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288
 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe
 EBUILD libxml2-2.10.2.ebuild 5335 BLAKE2B 46ade566ce046d0cf524741064b8e4f365f3df13c709cf6897feb91c3d71197a98f1a26ee41081dc92a79ec13cdbca57e948ac5a18bf8207d91ee307e3b07dc9 SHA512 7ea53bd001bb838007665254d02cdd1ba7ab5ab7ee6d5c056d7406dd799d215a3bcfcbc6a053a5e0e7a7f5552d74189ff66bacbc0e65d9bdbfabf953b5dbcd51
-EBUILD libxml2-2.10.3.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
+EBUILD libxml2-2.10.3.ebuild 5337 BLAKE2B 5e7b8edd844bfcfc5090ab19bc63af84644eb4419b98201cad35e0cb64cf9159705e407cf99c2423070b442d98f469591790f6b2f4be65e6ec14cc0e83fd1bb8 SHA512 25f5afecf19552c80daeffc1cf891bacf15c9816300d2fb4ede0b7e7397ca7f56808fb26ecb223c2c333c3e7924de564722469cbd80027a94df30057ffa327ab
 EBUILD libxml2-9999.ebuild 5343 BLAKE2B 64d792ad51b340afdba62613c4e565ac6c8b2557dc16a0843df4bef23573d28c4ea41e212c72dbaebac82ed2b3bc494689f98800c6e56e949b5f436c51924193 SHA512 b4ea90b16cdd78a46ba4f1591416c7ddd100cd97d2e4f2a0296812581a38db33de922c7a9793bfb81ad286830b416dcb071dc216826fa1b375e102cbe0fa6760
 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0
diff --git a/dev-libs/libxml2/libxml2-2.10.3.ebuild b/dev-libs/libxml2/libxml2-2.10.3.ebuild
index b8f7fa168857..b30e9b92afbc 100644
--- a/dev-libs/libxml2/libxml2-2.10.3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.10.3.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit autotools git-r3
 else
 	inherit gnome.org libtool
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 SRC_URI+="
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 7d28f7c95b85..cce81b2b3775 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,5 @@
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
 DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
 EBUILD xapian-bindings-1.4.19.ebuild 7119 BLAKE2B 94c1604be122be96515ccceaf6ae9c380771a3ccda47ffbf522fadf094c132e8b1052d171afa2b55a812831ba674667c5f11c618d6c9d270f8df1fd67d28d1aa SHA512 59a412af6c10d7624aadaf9b59dfc499f9e97f1da5d710c0f6c435b9a057e19eacd3362c39e663a35e8086a6a7a7b04f40db4cce6f0de7be7dcc0c321a02b415
-EBUILD xapian-bindings-1.4.21.ebuild 7129 BLAKE2B 8944d678da73648ef5d629c10e01786c273a541e373a30961c2ec3e85804a05798412d0f77af8ceb50f0b4e896412805fb9851c2930c210e11bae870a90afc54 SHA512 65771b8c107e0d6048bfa268c3faacafb9ca729e79cc6f0e5e87c56a5a9fe28f096481006ac6fb47f4052efa4c0101c976f2879f115fff1afbef872f92f967d0
+EBUILD xapian-bindings-1.4.21.ebuild 7128 BLAKE2B e6cb918415ade766d831f0fb2e2242b0f7bd1e1d35ed4a1375d4a179e827ea0be2ac75c30db7496393e1139fda1c7117c011c259a791b81b87d79a32b7607181 SHA512 c7419d868d7b4f6817b504f3a784859c503169fcd3e1e66378bc204710cd88b34101fa0939f72468c6338ea9146306707adee4b7e754e0a8b0d56b151fc7c6d2
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
index cd70cb26aeb5..2c547fb7dbc2 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.21.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java lua mono perl php python ruby tcl"
 REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
 	lua? ( ${LUA_REQUIRED_USE} )
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index f6b4f28ae14b..d58c00dda7f6 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,5 +2,5 @@ DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
 EBUILD xapian-1.4.19.ebuild 1885 BLAKE2B 564a230f9ab784c55be59808404b631b9653ddec0befcc396bd71bbf23fec1c3de92a66d40dbfa6805701c659c48b8ef511958e9d42e12767dde12e586292ffe SHA512 9eafa08e04443a43e3d3346fd2d46fcba30c624cda8b84404cc5bd098dc6186b612545bcfbf34952e419ef1029efecbc1e27a66539de7f628cd5455121b5aa66
 EBUILD xapian-1.4.21-r1.ebuild 1442 BLAKE2B 11616926e8253292615ac885cafb21cf4f7a51e5bcc1300ba9b82be07948f3a3ed91271077a80c27311a907b69d832bfa561d6345a9867b446bf0abca3fbfd24 SHA512 a56e927607f735a0036bc637fb8f11cef8d9e9d29205324f190fd6c2071e8c3deea848eeb69f0936db687665014f411763abe8f814949fdf14b258c4c96453f4
-EBUILD xapian-1.4.21.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee
+EBUILD xapian-1.4.21.ebuild 1890 BLAKE2B bd063977d6ba078d3f74882f6a951f1198bc2e1ac02e075a39d2c4f3d72cedb47596f7adb12716e252555c28534614748e436a4f13e9a97fcbcaf357a35d84f2 SHA512 17be2d5b6982f780b5637f1ae70069782eb1cbd2f1184505cfdc418c85e0dc1c303ea9aec0b9dd13b8fa90ea84f1c2a5959a60dc92bc6aa8e616e038642f56b9
 MISC metadata.xml 813 BLAKE2B b365d558fc9e5c1c86d9dfb90624fb27f4c502303fb602c7f21c9b392f729160cb1e7f56120d276d4fadeb88c616fca81912e5473b5273cc5841693d507f51d7 SHA512 0a40218154223a4ac13301ef324d925fd56d74749fa289c9a6d19cee7348f781430491fa65991bedc89aaaef9b0a0dd725eda49edcc993df506884b9cf3289d2
diff --git a/dev-libs/xapian/xapian-1.4.21.ebuild b/dev-libs/xapian/xapian-1.4.21.ebuild
index d50c34543512..fe771fc628c3 100644
--- a/dev-libs/xapian/xapian-1.4.21.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/30" # ABI version of libxapian.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
 DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4f57ea10a35b..62d43c80abfe 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest
index a05b22aa9d7b..f9f41f5c1d77 100644
--- a/dev-python/PyQt6/Manifest
+++ b/dev-python/PyQt6/Manifest
@@ -1,3 +1,3 @@
 DIST PyQt6-6.4.0.tar.gz 1024037 BLAKE2B a55d2e33160b6bb713b5e32e6b3a3df942f373ce9c9697cad548325c35ee7ee73a57e93ebc8780480086b02d651fa848258f11f85bea0e54c61c8a0f99039c3d SHA512 836696cc708e140ff497fd915fac147265c58e5d44d54d7dcd1908bad54ed793b4c2c4f20b487d13c7a5f7eb6b2c47d7ab822d8ffc875657de7fd0f88ee6c53b
-EBUILD PyQt6-6.4.0.ebuild 4625 BLAKE2B a8b23055e006a5c0c570604193c9e1091ab4b1978f8689207f376a88a8fcc0faa0c847ce951dc3f2d3691fd19c0aefec0904b7f752c4b4000f9e64595ed46a11 SHA512 170db0a14adbf07d3561e2e5a0afdfad44f9a994767738764004d7b847ff2e9c7d0008eb8fbd6e58058352985f733dc016d49fc9963fc37800037110f4c2ea4a
+EBUILD PyQt6-6.4.0.ebuild 4546 BLAKE2B 3b8330259bd419622bb16891b3918db30187d85762413e77f595e1f3dc784f1fe9ac2dd1cd2ba83e85d0316677c87485839234a85338a1cda384ccaa5d4bb859 SHA512 bfffda04193cbeb1491383e5f22064ae945ab5d10dea56ef8b49cdb7474d61d2700003d2d3179153ee0e09690706bf822bd8e4e55ff524a856075c2863a3043c
 MISC metadata.xml 1915 BLAKE2B b4ca171871165e02fbc54d7931a52da3a70415b4acf5f85b23459d6949c7a720b68fbddba1a5c22d4d8b90e16faa7f628cb088cc93eb9f1db05da15d33967b1b SHA512 32671e148db535c25b9bf1dd48f945d3ddd74e9df86014af2beb92dccb8d49289e778a1ba38c57cc61dabab88528057ab1aa57ee48b95b80aa1254b1c765772b
diff --git a/dev-python/PyQt6/PyQt6-6.4.0.ebuild b/dev-python/PyQt6/PyQt6-6.4.0.ebuild
index dc1177248853..8812d89f6f37 100644
--- a/dev-python/PyQt6/PyQt6-6.4.0.ebuild
+++ b/dev-python/PyQt6/PyQt6-6.4.0.ebuild
@@ -16,12 +16,11 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-# currently keeping defaults in sync with qtbase (no extra deps), but trying
-# to stay minimal'ish given each builds relatively slowly (subject to change,
-# perhaps more or less depending on consumers and if qtbase is ever split)
+# defaults match what is provided with qtbase by default (except testlib),
+# reduces the need to set flags but does increase build time a fair amount
 IUSE="
 	+dbus debug qml designer examples gles2-only +gui help multimedia
-	+network opengl positioning printsupport quick quick3d serialport
+	+network opengl positioning +printsupport quick quick3d serialport
 	+sql +ssl svg testlib webchannel websockets +widgets +xml"
 # see `grep -r "%Import " sip` and `grep qmake_QT project.py`
 REQUIRED_USE="
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 11a2df9065ff..4f08c6422627 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -58,4 +58,4 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cryptography-38.0.1.ebuild 3193 BLAKE2B f42a5dd98deb51f1fd1bebcd1c7b9b0248f6d93e549db9318cfbb9017dfeed728c1073f3addf465abd2125dd1f10f6ad2eb3057fd8439c0ff5a8de11f7975887 SHA512 392fefefa77b56103b843239b959478909e92cb9f667c8b6f9e175a3375d917d5ef4c77134c585046f7847d6758cd07e7c1ea9bc1563d5130d92e5d84261b761
 EBUILD cryptography-38.0.2.ebuild 3200 BLAKE2B faa7d9fc8f709098d3dfccf11d234bf8a9d96a20a1814824719f14d7d46d95aef2605ac561d6bc55eb6f0d8cc67159bb84c59468e3a67327ca485d074fc14f33 SHA512 3c666509d1ffb0c675d65e2503818e78f89503ca6d71aa07b3c4832171df5d86717ba0836e70480c175dfd736f413246f8b1d4ff261125dc737e63dac25f6237
-MISC metadata.xml 385 BLAKE2B 28c12f0c0303afca4d0fb015a1ed123efb559686e71477b3120291164a01f219c0dce373d7f4f7380ced372343945a8ee1ce875c27851d3864a468ba48eb2cc1 SHA512 f80a4794ae57fc9e434679ccdd0ff4cc5e2c4fb48274cca32316f827dd6d4cd3b903cb45f52abdd4893866987d4d1026f7ddb1efaa76cb99e0f55d01e8433b83
+MISC metadata.xml 464 BLAKE2B 96c0bd97b83c9718910d129260402fdc37e88a96ac6002c8f6dd19fb21d6daf31211b83ff7423036811e27954811ebdc810c8328f18c620682bd9428f42ba1f9 SHA512 2f36a186bb195a8cbafe1d8dd6630fadf0ea56b22906ebaf3c90954adb8b66e1017f599169e2b1ca386e1113c1a6b834fff90f2bec527bed53f62985120732d6
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index 4ba9bca32fc2..e334e10a9786 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -6,6 +6,7 @@
     <name>Python</name>
   </maintainer>
   <upstream>
+    <remote-id type="cpe">cpe:/a:cryptography_project:cryptography</remote-id>
     <remote-id type="pypi">cryptography</remote-id>
     <remote-id type="github">pyca/cryptography</remote-id>
   </upstream>
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index d45c6d6f6492..6c41192fee51 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,3 @@
 DIST Pygments-2.13.0.tar.gz 4324285 BLAKE2B 6edbce4827684baf61c571fe4d900fd8d1850c49ed9a2ec4bf674757b17efc3d933145f0ccb743d5f713887dff95abce58d38ceafb4d5b033d46afbf5645c6fe SHA512 d492acf112423fa997f35d6d3cae18b89bf11619c696879c6df49697dca933b6d54d7cb22907e06812e0a562f03e8ed5ccefde5247bc1c51cf2d3d69e7d65422
 EBUILD pygments-2.13.0.ebuild 920 BLAKE2B f11ef43e34fda226552141fd4a7956799920b260359c84551ec4bb5fffb3847d781ff959b0e2c366534af6f9815a2863d3c6f0356a57b765f2ef0af48414bc7c SHA512 de88ed7ffc5aa92bebbb5f03a0f844088b9cf2e5799199b41759f1405cd5c60f5e5737583d987b51acbd7233d7e56c8d8feb57a881201ddcc88d7dc86815ec6b
-MISC metadata.xml 557 BLAKE2B 59b5fbb74f5d0b8f65127b36871561853ec6afde94f0a31986067c1f6f24aa18e648c38752ae7bcaebe0ef43fc457ef32d017e463006f1c2c9e92932675e03ca SHA512 0810f5412085ff458230b3137845bebf5841a1bab0f729f2bc5152ee44b570e855323cefbc24eee54c5febb1ea2c90a5a4357106a15c8fa250d77eaa057c01fe
+MISC metadata.xml 618 BLAKE2B fbe7a30ff157e4e13592f96ef8a8b9be60ef2f8e72c08baa56dcca027dde82715b78b3b670ef29190d88dbb582f5cc5fdf9aa2547db5d714c666c28020b54def SHA512 860f398e047e516a8ea4d7fd4e900f1c8efed92422c304e305dc16df9e536ce7be7e06407f93caca0d47f6f929eaa66b2e56acd25105d4f232b841eaca381eb6
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index a8185a9df5bc..9f522cdfbec5 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -8,6 +8,7 @@
 	<longdescription>Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats.</longdescription>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:pygments:pygments</remote-id>
 		<remote-id type="pypi">Pygments</remote-id>
 		<remote-id type="github">pygments/pygments</remote-id>
 	</upstream>
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 1160f80fc39c..a39e1896917d 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index ed6d03ade3c1..e1e96c346be9 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -2,4 +2,4 @@ AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c
 AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
 DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
 EBUILD tclx-8.4.4.ebuild 1006 BLAKE2B acb554f43814b36f8bce5a80781b1ac52fc8e09f6487704c618eaaf005e6d1999b12e97a605af788c0801db66b4ae2b4e76214379171b41f0450671e8b174f9c SHA512 0241e79e00bdfb9966e2831248cd69f297798aa1a2392d122e476cd8f08671c818390a4c2618273f1408f9c16e6daa43c0a4753026869cc39c2023ba0c6a7e70
-MISC metadata.xml 321 BLAKE2B 76e04e9e8eedbfe6f503cbe73ab57aeada13917f14f1b8eef52d1cf75c180d4db5f590f3e7f9473b85b28054a8032006a044a6275a911d968853b41e0e0145c1 SHA512 ab343f2414d40aa54cec3781f344bfc64bf2f6a3708b0c199b164411c8ba98bdc9d8b66ddcec308375c6f3d374150704f2f4fa65c731203011a04643d1814d85
+MISC metadata.xml 322 BLAKE2B c162241d2d6f414dc332f2ec8cbd3f44989a60af71286cc71d45a2e3fcc3cb7b2b93916793beceea19b2b8da44f19d40c9c4d8aa392534901801dc68367faee4 SHA512 e9da2f25cee7f1e03e31a4a3af15c1f9bcf68a7033f896cefe1fcd6aa5d4649d68473fb0def44dde379e9ff9a63790e4131dfb447ea57b88dcf117a36ccd91bc
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 8be602619be5..5d724171f964 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
-		<name>TCL / TK herd</name>
+		<name>TCL/TK project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclx</remote-id>
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
index 4f6ef5120ccc..d38ba32a0c03 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -2,4 +2,4 @@ AUX 3.3.6-ldflags.patch 552 BLAKE2B ebd7496be2a97cf7325d25a46e272fe287e7bd17d7e8
 AUX tkzinc-3.3.4-latex.patch 254 BLAKE2B 23b996d25c762c9598af86182a2aed1b13638183144d893ccbdc02ef1215f32041c161636dcf894e97720c0b41a94c7bf105c8b1dac0406a8fd68506ca03b9f0 SHA512 032ab424273f6b69fbbec3e2d028ca054e11bd49b7cb119756ba495edd81eba9e005d55d60bb5b759766c07c013d21a4d99b99137b3cb16d00be816168699d40
 DIST Tkzinc-3.3.6plus.tar.gz 1924729 BLAKE2B 9e02b113c37cfb870b2e238591e9b35cf5851c6534249312118c54d179d9ba7dbca17217cd924cfcfb1ef2444697840e3136d0fd1385b976a8a2bfda156c488d SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838
 EBUILD tkzinc-3.3.6-r1.ebuild 962 BLAKE2B a94760e526f7ff1579e874924b2a66f3bb4cc0b996f2fc81052b56d26f3f9e94142c44517bcecc5a822c92867e7da51d62cd88a678762f06ab17f99cc506d1d0 SHA512 f867d9e31d72d070bbfe3aced62f100a4b8fb5da77e3f3edcd77d0aae2f3987a55858f0c1bc3e972fe4c152a78db5539e599a89fa6dbdc10789e0484d900a2cb
-MISC metadata.xml 253 BLAKE2B 3a90be836d3afaed7fe209751899dce43a503670cb48f71ece4ab952c1528a42bace06f56bca3766b559bf6a46d20279f25229bf274f16ecf9999a553f7ef47e SHA512 5a3283662c7649427a2c567889d47e32a83e4f619638588976b9864deac9868b5454e280283812f8d7c2a516ef0c99665900849095af028cfa0ea76066a6cda1
+MISC metadata.xml 254 BLAKE2B 9573404fa3a0c7ca69eb6a410ebc3e834700d2e2cad03ab584e919f1c00e6fa68c902d2239fe5ece779dce9da9922b2867d201d11312702561166cbb3bc2f19e SHA512 b2480af89acd36bfbdf6af850f846b3e95ab8a9354882048948812ff79c6066a33fcc4c2d32cfe1c8db005f6d0ef2f51f813ab2ecefe207083412498943d433a
diff --git a/dev-tcltk/tkzinc/metadata.xml b/dev-tcltk/tkzinc/metadata.xml
index 21143551a761..0eb27a71b580 100644
--- a/dev-tcltk/tkzinc/metadata.xml
+++ b/dev-tcltk/tkzinc/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>tcltk@gentoo.org</email>
-    <name>TCL / TK Herd</name>
+    <name>TCL/TK project</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-tcltk/vtcl/Manifest b/dev-tcltk/vtcl/Manifest
index c7125bff9d38..8477956338d7 100644
--- a/dev-tcltk/vtcl/Manifest
+++ b/dev-tcltk/vtcl/Manifest
@@ -3,4 +3,4 @@ DIST vtcl-1.6.0.tar.gz 554727 BLAKE2B abf5e9a9fbc42e8c9ab1c216f0d103fcd88c9894a7
 DIST vtcl-1.6.1a1.tar.gz 599864 BLAKE2B 59c3b503cad053de5110d4a46a92803c2e513ddee300ca525382bf76f523e09f01f2680b9ca7ad8b647350c609cedea691b0e40fe028da3ecb7475d95338d60a SHA512 8c7fa1a036d9e30aff322dff2a740ca473b4fe28689b3832304ab29832162967edaf7b6e67f641f2b298c24a9ed9cd911dc6d13277cc8e20fefcacd4268b71ad
 EBUILD vtcl-1.6.0-r2.ebuild 868 BLAKE2B 58abb2091a03ac1735690cdcd03b3269079e86b0f78c00bb926bbd0af5a634b785b3a813c23ccb1bb9fc8abe693141732b632a128f19fc8fdae9d2aaf37b4b5f SHA512 c2734750d2648c7bc569d925632e5508c9f51bfa5d9e8162f7b6e7425f589155c21edb321de9405c8380aef9b19991034a8ec72455ca3db4fd3798647e65fd89
 EBUILD vtcl-1.6.1_alpha1.ebuild 1033 BLAKE2B 9452dbda999bbf59a1288c014079a2a2f146bfb8b729a1645fa87d1c822ae4a6d69dafd69c029c39c03a9704134ad157d955bee98be8d5ac88fad2b807b4beda SHA512 441bb967caf93ab0434605ddcc652c52b0caa4eac561480620ffdd2e9784b2ba2787b90b1a2bd2f9c1b80db599d7e089db0bb2017c4d9e90ea44f1ebef3048b7
-MISC metadata.xml 321 BLAKE2B 6f46e567461d99c4b7ee5d479453bc83a8533e1539da3e3b788f27a1e0ca7de4cd544606c23b8f8492905d97f3d3598efb9ff90219d0e6789c04f79ada031b1c SHA512 7a98289fd2308a78f916c87b346b4948f6808dff070c0930e270faccdb5ab7e9bc17699c18d1ce9cdfb0002be24dcf48013d353dd5a7b57008e3e8421301e76b
+MISC metadata.xml 322 BLAKE2B f56128a09ec105c603f06afc9f5e30fd760e02f6d86171c84e2c8ba6becadcc981c3c487e52012a837a9eaa5a11493bf68f680a6e79dfdead86cbc64693929c2 SHA512 7ba02cac7f8cb837af107807e72fc60e90e47e31157f0ff281dc25822ad117c2c5ac049aee0a383a0b040a7687f1ec57da8fceab583bde7e6ffcc850cb7bd4e3
diff --git a/dev-tcltk/vtcl/metadata.xml b/dev-tcltk/vtcl/metadata.xml
index 44eaf589390e..3bb4a54f4ece 100644
--- a/dev-tcltk/vtcl/metadata.xml
+++ b/dev-tcltk/vtcl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
-		<name>TCL / TK herd</name>
+		<name>TCL/TK project</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vtcl</remote-id>
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 584f61973a79..d24670919d6b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 1a5f775e3bea..b377ec24acab 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -5,5 +5,6 @@ DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0e
 DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec9462699e417f618cf44c759307eda0ede9f7a9ef897f5b8bc51d1fdf8b7360872a30b4cf07ba8191e405940030c SHA512 a5702cb8202599c75f4f4c1975d02e398f1394826f01b86039bd53a34f3ca250a7250d043a430ce6a383e6ca854fe4c72305891ab98c5f3d0ce54192423b7627
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.7-r1.ebuild 1548 BLAKE2B cbfd522b33a1444ed0107ce67ed93bdb52d3c08e4759f30a0f29cf0ddb64aaf11e439fc216c0127322e5af2c4d1860019fdb6c38f069c9ffc682815be8deb600 SHA512 5ac04d835b9637569755fe65e4a918820c4d55b08c6eb6a6379aa5eaa1c26cedf8e533cc60090e19b8adc2358a54fec3673d77057b5f65b30be7cdbe99a03cb0
+EBUILD colm-0.14.7-r2.ebuild 1626 BLAKE2B bec293a6d21aebedb9e9152d707f5773ccc7cf6aa840b19a0d3da1d3ec9a5fb0c136f92f880742dc0bc99aaf779d197b492aaa9e2792ecbf2d65a158fcd8649a SHA512 9ec8817ece6986c65092e8d5336b73abbfa9267141afd2a0672cc4804e980b14b7e821e665fc9f05c4f77f67180aa47b0fb7e37c27382bcb520df61573d94dbc
 EBUILD colm-0.14.7.ebuild 1382 BLAKE2B a040745057dc087cca435929c57c7cb09ba76156fddce29a3e8e50bda6e100c550bab847a66a24947bb089566992596d83b69c9f0260287894355a11e9f37284 SHA512 026aa8dcbf7c827840179d3d336bf6ed006732a2b69688df307183ccc6d622eacdf4581510b8499c7cce9904b1028dc6e664af6b71f027dca9dba2f592d1e627
 MISC metadata.xml 253 BLAKE2B a2ab0ef0490c566ca6997a4cf9cb3b5e92449a989cfb7c71a653e6f06c8eeb1945cb81155e315051f91369dcb5ed689eb9f31b4cee0afc479ae4c61d95335833 SHA512 ed9c676e9a7622619fc74ff3cdc943e7ea4203f230043200fe3aa1836b776952ffd2c34160c93ed5156b500ffc538ac0582a201322b5577f29df625224a69ed7
diff --git a/dev-util/colm/colm-0.14.7-r2.ebuild b/dev-util/colm/colm-0.14.7-r2.ebuild
new file mode 100644
index 000000000000..23a2f43b338a
--- /dev/null
+++ b/dev-util/colm/colm-0.14.7-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		|| ( app-text/asciidoc dev-ruby/asciidoctor )
+		dev-python/pygments
+	)
+"
+# libfsm moved from ragel -> colm, bug #766108
+RDEPEND="!<dev-util/ragel-7.0.3"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.7-drop-julia-check.patch
+	"${FILESDIR}"/${PN}-0.14.7-disable-static-lib.patch
+	"${FILESDIR}"/${PN}-0.14.7-solaris.patch
+)
+
+src_prepare() {
+	default
+
+	# bug #733426
+	sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+	# bug #766069
+	sed -i -e "s|gcc|$(tc-getCC) ${CFLAGS}|" src/main.cc || die
+	sed -i -e "s|gcc|$(tc-getCC)|" test/colm.d/gentests.sh || die
+	sed -i -e "s|g++|$(tc-getCXX)|" test/colm.d/gentests.sh || die
+
+	# fix linkage on Darwin from colm itself during build
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/libcolm\.so/libcolm.dylib/' src/main.cc || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc manual)
+}
+
+src_test() {
+	# Build tests
+	default
+
+	# Run them
+	cd test || die
+	./runtests || die
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index ffb624f951ec..75c7c90df893 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,8 +1,4 @@
-DIST dialog-1.3-20220414.tgz 566701 BLAKE2B d3fba0e896d51048876cd1c393d1f2183e47c5307d218dea0bf8c9cbaaed198bfc39e40e1f52b12c978dda10fa61be75d2527c293da652d2f83b80a2237d9d2f SHA512 53b7bc64bb6406c5828f2d023e7db457eee970ade2077bc64860ef12f06c254b4a13706eee068ffe44055ec6b0576ecfe33153438660a5a54f78ea1be00091ee
-DIST dialog-1.3-20220526.tgz 567657 BLAKE2B 1b46c0310e54f26cf5efcd8c84d9b8ef3d7ba7b58292c0967559e4bf281a0312185d3f9dea090e01a95a096ee1781bcdcbab11552175c8d6154ac9268654b6d8 SHA512 619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62
 DIST dialog-1.3-20220728.tgz 568086 BLAKE2B 086d946f2a8d298f1d26a193b5e99c00991a7f25fb032efef77109b20deaf08d54562673132bfa458d0c28360b2271e7ec50611ebe00e0c1584f178c0d8d7254 SHA512 dddceaf00bfec4b53f2cf67e51d4c54841d9db337536657c21bc8f324a0eb9c6d621f00e09bfb741bd263f171dde38cfea87568f86daf04a9e88575a0ed61218
 DIST dialog-1.3-20220728.tgz.asc 729 BLAKE2B c317713cae1abe26471c005f033a8ebb406a2a741d67865f90c8a356e204b468fda1349247dbe42e84d434434d202938b55321a22ad0e048eedca93f59a7b547 SHA512 fe0e3559c1c6cbd6ac24cd5da96cde4e4780c6a804f1ed3c96c1ee93dc8f434336cb5cf27c9ac420338c8491dfa9beead48761f07152b2cae9f2d2f7d482eb8b
-EBUILD dialog-1.3.20220414.ebuild 1290 BLAKE2B 690ab3410effd792a305509ea6e87005f2982a04d13bb5354fae2b9952d0f2e49cb37805f1ce318c7430a28a5fc56b3d7a776461ff761fb05b347902426ee141 SHA512 816bd5d804ac91ab2b1297116cf9a5a8d180dd6c6dddbe9542016fb54fcb7a17f63e39b35ac6811a4f5fd88874fc2718380cc6b6076e6212358f0026712a2f4a
-EBUILD dialog-1.3.20220526.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
 EBUILD dialog-1.3.20220728.ebuild 1536 BLAKE2B fbdd5948331c59d85f60772d0e199200846f56d362dc6cfbc9e2dcfffcb4bf6020514b1e05b7ad2445801e95e68784a73cec347f96058f8239af06c5ecd22bf5 SHA512 932c0004bfa89dac2f4de3efa4020a43e7890b9952af31470c1b21887afa83bac775abdf756fda8b711648deb7d993934e222eceb08932bc7fdd63d5722b9e0a
 MISC metadata.xml 530 BLAKE2B 018162b342a7a0462f5087ead1bfaf931a299a2934220afe0d1f2736951b66d05b9985dcae0b3a9039ccbf2df21f3a20271e5718a4f8cc8391daf23f16c0b1cb SHA512 e49c5b6feeabf720469a5d34e7c40b26cec9800eea1cdd54c103407d653b45c22de4fe341d1264d516fa00d8706c6a969ded915f2df24f463b0a8d40072afd40
diff --git a/dev-util/dialog/dialog-1.3.20220414.ebuild b/dev-util/dialog/dialog-1.3.20220414.ebuild
deleted file mode 100644
index 4594e6e0756a..000000000000
--- a/dev-util/dialog/dialog-1.3.20220414.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dialog/dialog-1.3.20220526.ebuild b/dev-util/dialog/dialog-1.3.20220526.ebuild
deleted file mode 100644
index 201a560880f4..000000000000
--- a/dev-util/dialog/dialog-1.3.20220526.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${PN}-$(ver_rs 2 -)
-
-DESCRIPTION="Tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="LGPL-2.1"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="examples minimal nls unicode"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-BDEPEND="!minimal? ( sys-devel/libtool )
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_prog_LIBTOOL=glibtool
-	fi
-
-	econf \
-		--disable-rpath-hack \
-		--with-pkg-config \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts='-shared' \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index a01cb4c8275f..573585ee905c 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index a5257bff1b96..c3e10b17b84d 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -3,5 +3,5 @@ AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea7
 DIST bedrock-server-1.19.31.01.zip 77882899 BLAKE2B eef22247045fb6b15a1a1b6a73d53dcdfda096adddd798875f1b1ff7fd8b5af1179f0f4b5e05dd5f51a098d896633bc7e2e2c3edd713e21fb2da84801ab9c66a SHA512 ec43e491ed946cfc7da12e9f46f00b3e06aa0f72970abfd8d63bbc7c3c875c933651e1d6f332a201d2bbf4c0cded2f8b2e69f971aa55a74d2721ab953ea9dfd1
 DIST bedrock-server-1.19.40.02.zip 76026384 BLAKE2B 5b8d56c66558f1284f2edbb7d47f5c51cc4dcfb3b00baf19d3222deed0062e5e77dc2a328154bfe6041c1a68cd7bd8bb1fcd4f916f0875fc89bed63183d79d0f SHA512 fdc05595ce2414f40393ce0e39ad126adfea21b36c6aa46c22d8bf93532817fef1249e7782234d04b9c76991b5418d761eba797e3ff448f89f81219374a157a0
 EBUILD bedrock-server-1.19.31.01.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
-EBUILD bedrock-server-1.19.40.02.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+EBUILD bedrock-server-1.19.40.02.ebuild 1076 BLAKE2B 9afb068512d5d2aa3240b3ae066d503a8d3cee4ce2823d894be0ce1643ab7b2928ac1e12ac09d048f9afa5f0f52bf7e6e668e20405320b5ed9fadcc6c0a571c1 SHA512 8da9233a4e20a18a74e0d98e9741ab96743c5d96d16babaf44596c8ddc6ec51b8252733fe2409d53d426637639077ceb2411201dffb9f1b82276550251ef74d9
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.40.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.40.02.ebuild
index 16dd14a8e660..d9652070e3a9 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.40.02.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.40.02.ebuild
@@ -41,7 +41,7 @@ src_install() {
 
 	insinto /opt/bedrock-server
 	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
+	doins -r {behavior,resource}_packs definitions
 
 	dodir /opt/bin
 	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 69b26b9dd85a..7b9f26cdd6b9 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index aa72053dc836..e20590652833 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -5,11 +5,9 @@ AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490
 AUX pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch 2771 BLAKE2B a6248de6ca263fa275938f61e504b442e06e41ef5cb650fe03c0c8a91d28567fc3e20b02626f2293a3ca1c0014c8f6692498178be38017445e167efcdf2d6e7e SHA512 46534f3fc267170090c0abdc076a1486fe4c3b964790bba19156349814b26b14b0dd637ff4aeaa0b5a3775ddebcf021e93cc4e1f85f7aa7cfda3bb4a66af6fc7
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
-DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a
 DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
-EBUILD pipewire-0.3.51-r2.ebuild 13198 BLAKE2B 367ab8b3f5682ed707f8ad46a4959216c10ade3697661e748c90a4473f993d40f1137cf1364b35b2aa884acbf24b3989a5fd3046fdc78bc90ca4334644a711b1 SHA512 a9b4ce58ae5a13491f019d51863f2de822e642cbecdc1ca4018385a2e3a07e5bfba865df09fec6d2a5af3269a72fbcd8c8c3b13a3db310e83cf0e3cd100380da
 EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917
-EBUILD pipewire-0.3.59-r2.ebuild 15858 BLAKE2B 26f0a7bf93dab5acc54bfa7ea2ee9d81dd620b1e89e24b982eb94d9d0007eda4246b426d23943681951fc937f71628bf3f653e280a0477b81433a98fff98ae63 SHA512 db2a7685bdda58c88d7049875480685e3d20a9ba331c902bb6a07739c1e88f84c932489b75e66c6f62999a24aebb7765eb4197d103dd6f64e658eb3316df34b4
+EBUILD pipewire-0.3.59-r2.ebuild 15857 BLAKE2B 7d1abb301d122673c87ca39778bfbfe13d7f15a69fd6e6061453815e378db3a568b51cbef57fdc693bd4cd33e1f6918872b90dd06142819ff7aa800699fae94d SHA512 f83d4ff4b027faa27cc0cec3e17963fc0dc1e7f8319c333011fa18ec14f2424abde721ab5d868adae7ab22c3b6cf622c03cc17c6017ca609e2e654993ef1453f
 EBUILD pipewire-9999.ebuild 15796 BLAKE2B 2949a6d3fafe2d924352f1d8c932e024529264376241c093bd4bca67866e1dd9ce2c9c2757cfe5c3a092233fac266b158b3f540b4c6a1523aea8632e4a3cfb94 SHA512 43a3d853cea62ccd6c43f5530cac884e8ecf0d37d5519438ca4cfbfb44f6cd3c233bba2d1dbcfc06a9a275c838e7d9a493d1fb501a163966e0db33a24ab7fc3d
 MISC metadata.xml 1533 BLAKE2B 75e656bea9420a16158649d0909be5833ddd7e8f61664d4e6ef00ecaa179110704777faaa5971c1bb7d818b193474e015649468533a0699c6249c57c27f51293 SHA512 8ba9665ef28168d804c5ef3c3f353b8313dbbb12fc9d3bbdfc09771a13a690ae4af903a73670789a2d17c9d3e0566575140d6f6b104279771fd374fab90338d4
diff --git a/media-video/pipewire/pipewire-0.3.51-r2.ebuild b/media-video/pipewire/pipewire-0.3.51-r2.ebuild
deleted file mode 100644
index 861f7c4939a7..000000000000
--- a/media-video/pipewire/pipewire-0.3.51-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-apps/dbus[${MULTILIB_USEDEP}]
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	!pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-		if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.59-r2.ebuild b/media-video/pipewire/pipewire-0.3.59-r2.ebuild
index b138b5e03595..7f58c6e116d3 100644
--- a/media-video/pipewire/pipewire-0.3.59-r2.ebuild
+++ b/media-video/pipewire/pipewire-0.3.59-r2.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 0aec1fcb2e68..2a9e20157b2a 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -5,6 +5,6 @@ AUX wireplumber-0.4.11-loop.patch 5638 BLAKE2B ebebd5a0c668f9ceb44cedecb9a7c364e
 DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
 DIST wireplumber-0.4.12.tar.bz2 317524 BLAKE2B 5f020759fab459fb3311f8a5cddddef2bf7dc62304b6e95f5d983b86b0e6ddef7bc16c4f2ef6a36264d7ed94e48dbb4c66ff3389bfd7ca58841b4fd6cdfb21bc SHA512 79827ea9f61bacf8df80f9cd0ca4c80192cf85a1b181a51256b3c845d1d04a690ea5c1270d6d5d05d56f799f16980a593e61d003ef78ad7dc8d5e9ea332aa5d4
 EBUILD wireplumber-0.4.11-r3.ebuild 4143 BLAKE2B 2198a5fae459a27ba6c03c873d123c6744929ec370a5ad1498bdd2bb5fcbc3bf68e79788536171cbafb79f08e0f543e38807945bc46c99dc89172801034eb924 SHA512 c3821991d447e63015c80b6ec3f127508b9e5575b030c14bcb2c08490e6f9ebe6e680938062b69285592c869629d51be028a840de3f37789fc7c30c827a32589
-EBUILD wireplumber-0.4.12-r1.ebuild 4031 BLAKE2B 4b4b58f12c67e03bb0d1073872f70087e5f0da2207c6c56c0532c9083457b497887c7d3ea6d65452c1223fe5e77d57989213b0f0329a76fa9fda53ea0aa9b9a4 SHA512 e1b2136d886679d03d997cc3f9dc234b416b17c7954066130daa417836704d7b7aa44701b72269277ffa4c603230067847294704f59fc37df427fb5aeb7be264
+EBUILD wireplumber-0.4.12-r1.ebuild 4030 BLAKE2B 7f41ad52330e8a85f590b45d6c7ff483c06b3881e0f82f6ddf0866f8afd37ceccf3727c26f341ab21cdd34513454a9ae3b96d80db5d28337515c1df334443829 SHA512 249661a305887185695794429b1f7188b0cdcad4ef774db4bfa7f946e648abc83c38feb1f52322343251713691511bac44755b453febc87d027eb69d1eb5b1c8
 EBUILD wireplumber-9999.ebuild 3890 BLAKE2B 9c7338d6ecbd671285cc294d00eff12480729ed921bd621b722a050d175c4b4d45eb57e73866a71a4c7bbe40c38b2a258a5b00ff39e5416026915e00794fa993 SHA512 a5431c85044ddd96f8e1735206d1cb3d7c516fe27c92b0c249936240fef68f3728ea79b6518eedc236429aca320e4698511059c4db1ff3fb0b9ad667653c02c4
 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e
diff --git a/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild
index 59742a6f7bad..91e5a4cc441d 100644
--- a/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Replacement for pipewire-media-session"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f6777b9a24a9..3eb7f7861bb7 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ad4dbb65d7a8..60d7f065c9cb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 20:09:50 +0000
+Sat, 29 Oct 2022 02:09:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index e151d46edde6..454b06764a46 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-28T20:09:53Z
+TIMESTAMP 2022-10-29T02:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNci3pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDZ4BAAioIVE95SPWD+JiSn3+cVoDYSVaeOrF7PzBc/e396zjZGbYordgfsqOoc
-+IER7GiQWSl7qflBg/VWlV8qHwoKkulV/dqGhzqo60wkLq0MdEgdub0zlCFxNyu3
-K2gydeQ2Le8loRPBZlkV5z2sQqzBLx/mx8w2ytji+oY97nAhzVpnt15hF/2vHW68
-eJN7ouOqaUYlLSBiNU9LCoUsNaHQ+jJE0cXN10azDR/pzL8L1QghSFy0o0PVuesL
-eUQpO3v8GSaafRopa9aJ3PorghYqcYQW4f6paeRvphzNm6STrKsZ1s+a1GCxTuqB
-PVLBusTOiePx4CxygL0MJZq1v9q4klJqvPFzhDWXM/3DqXkjtv0aNYhgMuo2gqN2
-GgXnG9dEy21xD4JQp4cczRPpvrSx/wuIXhrmmfbc/GVAcz38pFGXHpkQQuHWY/3d
-8dGB8R6jxdIb5EPIGlRn0nQm4dHzkZVAQl8P+o1l5zBlvx1QnAFxaALQJhDNXDoA
-recZMOWyRfWhduVNRkP5nh/RJ5iGU2ydzM1wF5XXIZ1AHkzcUtWZ/cSxfOaXv9b7
-ShAAz79iO+GXXGrqz7FNQaL+sA+QUHfmfDl0IygL7W34j1siKgR5JyzSzzx5IYa7
-Rw9DZovhCqh3YKNVhqLqaT/XoayExZ/x2M+pU8IBeBythsc2sOc=
-=EIuW
+klCuVw//dJQXiehWASVY80MKp3eMoZQVId+/xADYKo0V5pGQmsXWqC4CiNw2XEGw
+PQCEE4RbeKCfbOrctotWiQqISI4B9Ww9Iz5V4+ejmbZwNx+bMubc6oR4kyw+qqya
+O9HNzndVonkL9yjmjka4N1Kr2yntM7atagC9VEiCRGzI1zk7I7LbsMJdCZitCgNF
+Kx9veFTuaTEdksKD5gKBewAeCBwr+c5GYUcoat4OG8onPaXI66e07lmXpnGE0y8B
+kPifzM7yc6gg7Q/NBf8tK3dn+Sb0Kjy+7S8apOT8UNFA/jyXYssxBsGNKDuXIAxl
+P2BSn3xEqRDvPYfBdkEAxQq+DKBNSLvLxHmx4Zw049vTD2EHOWyXD4ShKBK1vCjG
+5V9XZh5nKuxv+F1L6MxTZiZQDRZclcVaobdSTE/UlIJeO3CyC5nM73ACaDuBJIm8
+2ILOJRG59ec0D2r9dT13ja73zITbsnSM8+E6atfqV/lcjeKWFrdRx8zc4p6WbgMq
+ClJYE8HRB5xqUCD1S09ZzrVT6nZFNZGpvTCIVPebC2ecoN7eBSXyJedxpwammNkz
+gUPQl3FnIvnsUjfmPUrOK++62FJo7x6C7M/XrC9XXr7LP2oMKw2If8iS3C3wgEql
+2NozaVzIEpuMKaBh8Y4jeCj6D9nxcoHMq8kS2UpepRlAK2df2vA=
+=PE0Q
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ad4dbb65d7a8..60d7f065c9cb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 20:09:50 +0000
+Sat, 29 Oct 2022 02:09:59 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ca33f0ac467a..de366445fd93 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 7a16425bf7e2..7394a96b8713 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.12 b/metadata/md5-cache/app-admin/sudo-1.9.12
index c2f3c2562f5c..61e3c94febc3 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.12
+++ b/metadata/md5-cache/app-admin/sudo-1.9.12
@@ -13,4 +13,4 @@ REQUIRED_USE=?? ( pam skey ) ?? ( gcrypt ssl )
 SLOT=0
 SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.12.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.12.tar.gz.sig )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=a36fba36cb9a635a3bee2b76ff149557
+_md5_=74a1471669d5063c2afd4cc1af6c58bc
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 9e35856184c7..803a18599b99 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16-r2 b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
index fb366911d8c4..422fdec37739 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p16-r2
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html
 INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
 IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=69a76736092ac0e8b15bd1b044d21989
+_md5_=6c12c942bf32be94727865aa7ec9bc7d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 0030963be61e..1cd1da1f476e 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
deleted file mode 100644
index 7e81cd154ee3..000000000000
--- a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libxslt-1.1.8 app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd >=dev-util/intltool-0.35 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A collection of documentation utilities for the Gnome project
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDocUtils
-INHERIT=gnome2 multibuild python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-libs/libxslt-1.1.8
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30c1cbfe470bb21829d9499df63fc893
diff --git a/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3 b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
new file mode 100644
index 000000000000..bba8e4c3d0e4
--- /dev/null
+++ b/metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/intltool-0.35 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-libs/libxslt-1.1.8 app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd
+DESCRIPTION=A collection of documentation utilities for the Gnome project
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDocUtils
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2 python-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/libxml2-2.6.12:2[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-libs/libxslt-1.1.8
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a85faa35230759b7ab613a5b5bf07387
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.21 b/metadata/md5-cache/app-text/xapian-omega-1.4.21
index 4f0d2a407901..b010bb7ccd44 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.21
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.21
@@ -3,9 +3,9 @@ DEPEND=~dev-libs/xapian-1.4.21:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
 EAPI=8
 HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=~dev-libs/xapian-1.4.21:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.21/xapian-omega-1.4.21.tar.xz
-_md5_=26949e44d3dcffd2ef9c96eaa59248c7
+_md5_=4ce00adf45f633f86c4b8b4be531e357
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index c873d1863ec3..5468ca4b051e 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0 b/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
deleted file mode 100644
index 857cc019c96a..000000000000
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Library to access J-Link devices
-EAPI=7
-HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
-INHERIT=autotools multilib-minimal
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.2.0/libjaylink-0.2.0.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c560e1907b5192264c047a7bb2cf353c
diff --git a/metadata/md5-cache/dev-embedded/libjaylink-0.3.1 b/metadata/md5-cache/dev-embedded/libjaylink-0.3.1
index 9f2c4ce390b2..c88781a6caec 100644
--- a/metadata/md5-cache/dev-embedded/libjaylink-0.3.1
+++ b/metadata/md5-cache/dev-embedded/libjaylink-0.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=Library to access J-Link devices
 EAPI=8
 HOMEPAGE=https://gitlab.zapb.de/libjaylink/libjaylink
 INHERIT=autotools udev
-KEYWORDS=~amd64 ~arm ~riscv ~x86
+KEYWORDS=amd64 arm ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/0.3.1/libjaylink-0.3.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=4723fe643ea7ef67acab4d819ddd1f49
+_md5_=2b6e6259771c8945b518fe64c3f1ea8f
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index bf7d68ffefc7..09f9994a2f88 100644
--- a/metadata/md5-cache/dev-erlang/Manifest.gz
+++ b/metadata/md5-cache/dev-erlang/Manifest.gz
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.48 b/metadata/md5-cache/dev-erlang/esip-1.0.48
new file mode 100644
index 000000000000..1cb4fedbf033
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.48
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.1.16 >=dev-erlang/stun-1.2.6 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+DESCRIPTION=ProcessOne SIP server component
+EAPI=7
+HOMEPAGE=https://github.com/processone/esip
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/fast_tls-1.1.16 >=dev-erlang/stun-1.2.6 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/esip/archive/1.0.48.tar.gz -> esip-1.0.48.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=947a56c0df6ca052221684a692e98f72
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.1.16 b/metadata/md5-cache/dev-erlang/fast_tls-1.1.16
new file mode 100644
index 000000000000..dc66d0574550
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_tls-1.1.16
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.25 dev-libs/openssl:0= dev-lang/erlang:=
+DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
+EAPI=7
+HOMEPAGE=https://github.com/processone/fast_tls
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.25 dev-libs/openssl:0= dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/fast_tls/archive/1.1.16.tar.gz -> fast_tls-1.1.16.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=160e9bee8646792c13a603dd00b45864
diff --git a/metadata/md5-cache/dev-erlang/fast_yaml-1.0.34 b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.34
new file mode 100644
index 000000000000..2812bc7a0171
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/fast_yaml-1.0.34
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/p1_utils-1.0.25 dev-libs/libyaml dev-lang/erlang:=
+DESCRIPTION=Fast Yaml native library for Erlang and Elixir
+EAPI=7
+HOMEPAGE=https://github.com/processone/fast_yaml
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/p1_utils-1.0.25 dev-libs/libyaml dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/fast_yaml/archive/1.0.34.tar.gz -> fast_yaml-1.0.34.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=209019fe0ea48f7d89b6b44280334fcc
diff --git a/metadata/md5-cache/dev-erlang/p1_acme-1.0.20 b/metadata/md5-cache/dev-erlang/p1_acme-1.0.20
new file mode 100644
index 000000000000..6d3251c8d7c7
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_acme-1.0.20
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.1.1 >=dev-erlang/yconf-1.0.14 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/jose-1.11.1 >=dev-erlang/base64url-1.0.1 dev-lang/erlang:=
+DESCRIPTION=ACME client library for Erlang
+EAPI=8
+HOMEPAGE=https://github.com/processone/p1_acme
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.1.1 >=dev-erlang/yconf-1.0.14 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/jose-1.11.1 >=dev-erlang/base64url-1.0.1 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/p1_acme/archive/1.0.20.tar.gz -> p1_acme-1.0.20.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=7524734ffb6c7158d1044bd9300677aa
diff --git a/metadata/md5-cache/dev-erlang/p1_mysql-1.0.20 b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.20
new file mode 100644
index 000000000000..a4ef3ac64ba1
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_mysql-1.0.20
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
+DESCRIPTION=Pure Erlang MySQL driver
+EAPI=7
+HOMEPAGE=https://github.com/processone/p1_mysql
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/p1_mysql/archive/1.0.20.tar.gz -> p1_mysql-1.0.20.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=7aab4d22968d3a33a3a2366764897fd7
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.19 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.19
new file mode 100644
index 000000000000..4b92348b1144
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.19
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/xmpp-1.6.0 >=dev-lang/erlang-17.1 dev-lang/erlang:=
+DESCRIPTION=Pure Erlang PostgreSQL driver
+EAPI=7
+HOMEPAGE=https://github.com/processone/p1_pgsql
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=ErlPL-1.1
+RDEPEND=>=dev-erlang/xmpp-1.6.0 >=dev-lang/erlang-17.1 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.19.tar.gz -> p1_pgsql-1.1.19.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=d81857bd478a219ce9a3635dc3f49f5b
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.29 b/metadata/md5-cache/dev-erlang/stringprep-1.0.29
new file mode 100644
index 000000000000..595d50eda081
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stringprep-1.0.29
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
+EAPI=8
+HOMEPAGE=https://github.com/processone/stringprep
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 tcltk
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/stringprep/archive/1.0.29.tar.gz -> stringprep-1.0.29.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=6e44314129f750b19eac4c2d97a893b2
diff --git a/metadata/md5-cache/dev-erlang/stun-1.2.6 b/metadata/md5-cache/dev-erlang/stun-1.2.6
new file mode 100644
index 000000000000..aa120f82ca0a
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/stun-1.2.6
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/fast_tls-1.1.15 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+DESCRIPTION=STUN and TURN library for Erlang and Elixir
+EAPI=7
+HOMEPAGE=https://github.com/processone/stun
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-erlang/fast_tls-1.1.15 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/stun/archive/1.2.6.tar.gz -> stun-1.2.6.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=6140c0aab5fec86b95b80d3a65886d4f
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.6.0 b/metadata/md5-cache/dev-erlang/xmpp-1.6.0
new file mode 100644
index 000000000000..da573b69f2fb
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/xmpp-1.6.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-erlang/ezlib-1.0.12 >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 >=dev-erlang/p1_utils-1.0.25 >=dev-erlang/stringprep-1.0.29 >=dev-erlang/idna-6.0.0-r1 dev-lang/erlang:=
+DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
+EAPI=7
+HOMEPAGE=https://github.com/processone/xmpp
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-erlang/ezlib-1.0.12 >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 >=dev-erlang/p1_utils-1.0.25 >=dev-erlang/stringprep-1.0.29 >=dev-erlang/idna-6.0.0-r1 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/xmpp/archive/1.6.0.tar.gz -> xmpp-1.6.0.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=f409b387407ff4e1e993fa5a9e404395
diff --git a/metadata/md5-cache/dev-erlang/yconf-1.0.14 b/metadata/md5-cache/dev-erlang/yconf-1.0.14
new file mode 100644
index 000000000000..5b70b0f801de
--- /dev/null
+++ b/metadata/md5-cache/dev-erlang/yconf-1.0.14
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.34 dev-lang/erlang:=
+DESCRIPTION=YAML configuration processor
+EAPI=7
+HOMEPAGE=https://github.com/processone/yconf
+INHERIT=rebar
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.34 dev-lang/erlang:=
+SLOT=0
+SRC_URI=https://github.com/processone/yconf/archive/1.0.14.tar.gz -> yconf-1.0.14.tar.gz
+_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
+_md5_=1a279aa1b2feafb47aa058a758315666
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index b8859cfe5939..a72077998ea3 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/clanlib-2.3.7-r3 b/metadata/md5-cache/dev-games/clanlib-2.3.7-r3
new file mode 100644
index 000000000000..1956ffda76a1
--- /dev/null
+++ b/metadata/md5-cache/dev-games/clanlib-2.3.7-r3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-lang/perl media-gfx/graphviz ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib X? ( app-arch/bzip2 media-libs/libpng:0 media-libs/freetype media-libs/fontconfig media-libs/libjpeg-turbo:0= x11-libs/libX11 opengl? ( virtual/opengl ) ) mikmod? ( media-libs/alsa-lib media-libs/libmikmod ) sqlite? ( dev-db/sqlite:3 ) sound? ( media-libs/alsa-lib ) vorbis? ( media-libs/alsa-lib media-libs/libogg media-libs/libvorbis )
+DESCRIPTION=Multi-platform game development library
+EAPI=7
+HOMEPAGE=http://www.clanlib.org/
+INHERIT=autotools toolchain-funcs
+IUSE=doc ipv6 mikmod opengl sound sqlite cpu_flags_x86_sse2 static-libs vorbis X
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=sys-libs/zlib X? ( app-arch/bzip2 media-libs/libpng:0 media-libs/freetype media-libs/fontconfig media-libs/libjpeg-turbo:0= x11-libs/libX11 opengl? ( virtual/opengl ) ) mikmod? ( media-libs/alsa-lib media-libs/libmikmod ) sqlite? ( dev-db/sqlite:3 ) sound? ( media-libs/alsa-lib ) vorbis? ( media-libs/alsa-lib media-libs/libogg media-libs/libvorbis )
+REQUIRED_USE=opengl? ( X )
+SLOT=2.3
+SRC_URI=http://clanlib.org/download/releases-2.0/ClanLib-2.3.7.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=cafe5b3b6048361520363e7f8ea65f66
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bb0d7fed01ba..f0c40bba9d91 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.112 b/metadata/md5-cache/dev-libs/libaio-0.3.112
deleted file mode 100644
index 4e49612f2b51..000000000000
--- a/metadata/md5-cache/dev-libs/libaio-0.3.112
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Asynchronous input/output library that uses the kernels native interface
-EAPI=7
-HOMEPAGE=https://pagure.io/libaio
-INHERIT=multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
-IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=36c32fede7a3b2fa1ecf7d85da5e6c0b
diff --git a/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r5 b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r5
new file mode 100644
index 000000000000..5f8b43d0d08a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r5
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DESCRIPTION=libmcrypt provides uniform interface to access several encryption algorithms
+EAPI=8
+HOMEPAGE=http://mcrypt.sourceforge.net/
+INHERIT=autotools
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=560539701a7c4d1ad8e78d577d715e50
diff --git a/metadata/md5-cache/dev-libs/libslz-1.2.0-r1 b/metadata/md5-cache/dev-libs/libslz-1.2.0-r1
index d29cb9689560..279683d84133 100644
--- a/metadata/md5-cache/dev-libs/libslz-1.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libslz-1.2.0-r1
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=http://1wt.eu/projects/libslz
 INHERIT=toolchain-funcs
 IUSE=tools
-KEYWORDS=~amd64 arm ~arm64 ~ppc ~x86
+KEYWORDS=amd64 arm ~arm64 ~ppc x86
 LICENSE=MIT
 SLOT=0/1
 SRC_URI=http://git.1wt.eu/web?p=libslz.git;a=snapshot;h=v1.2.0;sf=tbz2 -> libslz-1.2.0.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=85dee4bc2f60a419793e083c0e0796a9
+_md5_=502f71d4d04acf058dfe08a684bb8ab9
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.10.3 b/metadata/md5-cache/dev-libs/libxml2-2.10.3
index 1e9cfbfa8026..e059b16856cb 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.10.3
+++ b/metadata/md5-cache/dev-libs/libxml2-2.10.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
 INHERIT=flag-o-matic python-r1 multilib-minimal gnome.org libtool
 IUSE=debug examples +ftp icu lzma +python readline static-libs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libxml2/2.10/libxml2-2.10.3.tar.xz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2fa007d959b952e6666a01443967dfef
+_md5_=0a5ea2ea0c84d2b7237986da005fa36a
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.21 b/metadata/md5-cache/dev-libs/xapian-1.4.21
index 706dad10255c..29c360e65c07 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.21
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.21
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.xapian.org/
 INHERIT=multilib-minimal
 IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/30
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c1c6ecc699886be111b4b895e90a71d5
+_md5_=94617d3e148198225dc70ebd825ac1ab
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
index 2cc4ab6a9e43..934085b14410 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.21
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.xapian.org/
 INHERIT=java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
 IUSE=java lua mono perl php python ruby tcl java lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 php_targets_php7-4 php_targets_php8-0 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/xapian-1.4.21 lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:=[-threads] ) python? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) ) ruby? ( ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ) tcl? ( dev-lang/tcl:= ) mono? ( dev-lang/mono ) java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
 REQUIRED_USE=|| ( java lua mono perl php python ruby tcl ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) ruby? ( || ( ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 php_targets_php8-0 ) )
 SLOT=0
 SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-bindings-1.4.21.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	estack	055c42df72f76a4f45ec92b35e83cd56	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cf7ea543b5126fd2fe4c8111a515162d
+_md5_=3b5a5c070ddaa72d17f1486aba899675
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 6a4adce5d13e..78b9ffb1c82c 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/PyQt6-6.4.0 b/metadata/md5-cache/dev-python/PyQt6-6.4.0
index a278f93a5f13..cd40ad7fddca 100644
--- a/metadata/md5-cache/dev-python/PyQt6-6.4.0
+++ b/metadata/md5-cache/dev-python/PyQt6-6.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the Qt framework
 EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/
 INHERIT=distutils-r1 flag-o-matic multiprocessing qmake-utils
-IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning printsupport quick quick3d serialport +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=+dbus debug qml designer examples gles2-only +gui help multimedia +network opengl positioning +printsupport quick quick3d serialport +sql +ssl svg testlib webchannel websockets +widgets +xml python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtbase-6.3:6[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml(+)?] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/dbus ) designer? ( >=dev-qt/qttools-6.3:6[designer] ) help? ( >=dev-qt/qttools-6.3:6[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-6.3:6 ) positioning? ( >=dev-qt/qtpositioning-6.3:6 ) qml? ( >=dev-qt/qtdeclarative-6.3:6 ) quick3d? ( >=dev-qt/qtquick3d-6.3:6 ) serialport? ( >=dev-qt/qtserialport-6.3:6 ) svg? ( >=dev-qt/qtsvg-6.3:6 ) webchannel? ( >=dev-qt/qtwebchannel-6.3:6 ) websockets? ( >=dev-qt/qtwebsockets-6.3:6 ) >=dev-python/PyQt6-sip-13.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
@@ -13,4 +13,4 @@ REQUIRED_USE=designer? ( gui widgets ) help? ( gui widgets ) multimedia? ( gui n
 SLOT=0
 SRC_URI=mirror://pypi/P/PyQt6/PyQt6-6.4.0.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6755feeeeaa1227f52f643b27116ab3e
+_md5_=0efa7ac2a8fae0b8fc3dc71ce6d38fcf
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 70fc3b6e71f9..95747473dfff 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/colm-0.14.7-r2 b/metadata/md5-cache/dev-util/colm-0.14.7-r2
new file mode 100644
index 000000000000..7ecd0dd3ffac
--- /dev/null
+++ b/metadata/md5-cache/dev-util/colm-0.14.7-r2
@@ -0,0 +1,14 @@
+BDEPEND=doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) dev-python/pygments ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DESCRIPTION=COmputer Language Manipulation
+EAPI=8
+HOMEPAGE=https://www.colm.net/open-source/colm/
+INHERIT=autotools toolchain-funcs
+IUSE=doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=!<dev-util/ragel-7.0.3
+SLOT=0
+SRC_URI=https://www.colm.net/files/colm/colm-0.14.7.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=711132b6b2960d229fc13e8c089262ae
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20220414 b/metadata/md5-cache/dev-util/dialog-1.3.20220414
deleted file mode 100644
index 6767dd85b9ed..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20220414
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
-DESCRIPTION=Tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
-SLOT=0/15
-SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220414.tgz
-_md5_=8a74627b483963428f2b03cc69b82542
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20220526 b/metadata/md5-cache/dev-util/dialog-1.3.20220526
deleted file mode 100644
index 42960887d627..000000000000
--- a/metadata/md5-cache/dev-util/dialog-1.3.20220526
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
-DESCRIPTION=Tool to display dialog boxes from a shell
-EAPI=7
-HOMEPAGE=https://invisible-island.net/dialog/
-IUSE=examples minimal nls unicode
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
-SLOT=0/15
-SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220526.tgz
-_md5_=bbbca4f84c26fc65fe5dae2f01b62039
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 92008941a2fa..11f01695a736 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.40.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.40.02
index c8a027a9d494..f4da0915f5fd 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.40.02
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.40.02
@@ -9,4 +9,4 @@ RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.40.02.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
+_md5_=e533767d1619604d5417256ccd4b81c3
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index fce0de354d6e..d2937506fa51 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.51-r2 b/metadata/md5-cache/media-video/pipewire-0.3.51-r2
deleted file mode 100644
index f4a09eba03d1..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.51-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !pipewire-alsa? ( media-plugins/alsa-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,pulseaudio] ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.51/pipewire-0.3.51.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=8f88c3532fb43b593094483fc8d865b1
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.59-r2 b/metadata/md5-cache/media-video/pipewire-0.3.59-r2
index 31ced658fb77..41e212076035 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.59-r2
+++ b/metadata/md5-cache/media-video/pipewire-0.3.59-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.59/pipewire-0.3.59.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=40980f8f7ddc8528aa175775983c781f
+_md5_=bedafd9613dfcba838399038e17036a3
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.12-r1 b/metadata/md5-cache/media-video/wireplumber-0.4.12-r1
index 223e62c38b03..def24d497a9d 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.12-r1
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.12-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
 INHERIT=lua-single meson systemd
 IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.12/wireplumber-0.4.12.tar.bz2
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=008f8c22a8fbc3c953d6c217b9b882fd
+_md5_=f111029024dd5a2c8a9ec952b811774e
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 1a495fa722c4..b8d71dfcb94b 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.15 b/metadata/md5-cache/net-dialup/rp-pppoe-3.15
deleted file mode 100644
index 9890976f3722..000000000000
--- a/metadata/md5-cache/net-dialup/rp-pppoe-3.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=sys-kernel/linux-headers-2.6.25 elibc_musl? ( net-libs/ppp-defs ) net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
-DESCRIPTION=A user-mode PPPoE client and server suite for Linux
-EAPI=7
-HOMEPAGE=https://dianne.skoll.ca/projects/rp-pppoe/
-INHERIT=autotools readme.gentoo-r1 toolchain-funcs
-IUSE=tk
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=net-dialup/ppp:= sys-apps/iproute2 tk? ( dev-lang/tk:= )
-SLOT=0
-SRC_URI=https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-3.15.tar.gz https://github.com/paulusmack/ppp/archive/ppp-2.4.9.tar.gz https://dev.gentoo.org/~polynomial-c/dist/rp-pppoe-3.14-patches-01.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=825b96cadf90adf60425ea350baeaabc
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index cade90051f0f..03eb422dbdf2 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/libnfs-5.0.1 b/metadata/md5-cache/net-fs/libnfs-5.0.1
deleted file mode 100644
index 449a10833d3f..000000000000
--- a/metadata/md5-cache/net-fs/libnfs-5.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Client library for accessing NFS shares over a network
-EAPI=7
-HOMEPAGE=https://github.com/sahlberg/libnfs
-INHERIT=autotools
-IUSE=examples static-libs utils
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 x86
-LICENSE=LGPL-2.1 GPL-3
-SLOT=0/14
-SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-5.0.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4f00af04c947b16a75dc99e685d75012
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 23ce5ce3078d..f56d1bfc348d 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/ejabberd-22.10 b/metadata/md5-cache/net-im/ejabberd-22.10
new file mode 100644
index 000000000000..7d110dc2cdb1
--- /dev/null
+++ b/metadata/md5-cache/net-im/ejabberd-22.10
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-util/rebar:0 >=sys-apps/gawk-4.1 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.30 >=dev-erlang/eimp-1.0.22 >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 >=dev-erlang/fast_yaml-1.0.34 >=dev-erlang/yconf-1.0.14 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.11.2 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.11 >=dev-erlang/p1_utils-1.0.25 >=dev-erlang/stringprep-1.0.29 >=dev-erlang/xmpp-1.6.0 >=dev-erlang/pkix-1.0.9 >=dev-erlang/mqtree-1.0.15 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.20 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.20 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.12 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.19 ) redis? ( >=dev-erlang/eredis-1.2.0 ) sip? ( >=dev-erlang/esip-1.0.48 ) sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) stun? ( >=dev-erlang/stun-1.2.6 ) zlib? ( >=dev-erlang/ezlib-1.0.12 ) dev-lang/erlang:=
+DESCRIPTION=Robust, scalable and extensible XMPP server
+EAPI=8
+HOMEPAGE=https://www.ejabberd.im/ https://github.com/processone/ejabberd/
+INHERIT=autotools pam rebar systemd
+IUSE=captcha debug full-xml ldap mssql mysql odbc pam postgres redis roster-gw selinux sip sqlite +stun zlib
+KEYWORDS=~amd64 ~arm ~ia64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.30 >=dev-erlang/eimp-1.0.22 >=dev-erlang/fast_tls-1.1.16 >=dev-erlang/fast_xml-1.1.49 >=dev-erlang/fast_yaml-1.0.34 >=dev-erlang/yconf-1.0.14 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.11.2 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.11 >=dev-erlang/p1_utils-1.0.25 >=dev-erlang/stringprep-1.0.29 >=dev-erlang/xmpp-1.6.0 >=dev-erlang/pkix-1.0.9 >=dev-erlang/mqtree-1.0.15 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.20 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.20 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.12 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.19 ) redis? ( >=dev-erlang/eredis-1.2.0 ) sip? ( >=dev-erlang/esip-1.0.48 ) sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) stun? ( >=dev-erlang/stun-1.2.6 ) zlib? ( >=dev-erlang/ezlib-1.0.12 ) >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) dev-lang/erlang:=
+REQUIRED_USE=mssql? ( odbc )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/processone/ejabberd/archive/refs/tags/22.10.tar.gz -> ejabberd-22.10.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	rebar	c90ca870377295e338a9682a5b951ef6	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=03befd19a40dc6bfee96d9553af16222
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index c8949bc45a1f..bcadc82f8581 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/openssh-9.0_p1-r1 b/metadata/md5-cache/net-misc/openssh-9.0_p1-r1
deleted file mode 100644
index 0451d0c83aca..000000000000
--- a/metadata/md5-cache/net-misc/openssh-9.0_p1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/autoconf verify-sig? ( sec-keys/openpgp-keys-openssh ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst preinst prepare pretend test unpack
-DEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) virtual/os-headers kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) ) static? ( audit? ( sys-process/audit[static-libs(+)] ) ldns? ( net-libs/ldns[static-libs(+)] net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:=[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] ) virtual/libcrypt:=[static-libs(+)] >=sys-libs/zlib-1.2.3:=[static-libs(+)] )
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=7
-HOMEPAGE=https://www.openssh.com/
-INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=acct-group/sshd acct-user/sshd !static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.3.2/openssh-9.0p1+x509-13.3.2.diff.gz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	user-info	69a1ed744ec33cf2c910ff2bd6084d11	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7c29fc5c210b1b4ac9e08aa9432fc467
diff --git a/metadata/md5-cache/net-misc/openssh-9.0_p1-r6 b/metadata/md5-cache/net-misc/openssh-9.0_p1-r6
index c6a89c012580..95ffc9966b9d 100644
--- a/metadata/md5-cache/net-misc/openssh-9.0_p1-r6
+++ b/metadata/md5-cache/net-misc/openssh-9.0_p1-r6
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.openssh.com/
 INHERIT=user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
 IUSE=abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD GPL-2
 RDEPEND=acct-group/sshd acct-user/sshd !static? ( !<sys-devel/gcc-config-2.6 audit? ( sys-process/audit ) ldns? ( net-libs/ldns net-libs/ldns[ecdsa(+),ssl(+)] ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) security-key? ( >=dev-libs/libfido2-1.5.0:= ) selinux? ( >=sys-libs/libselinux-1.28 ) ssl? ( >=dev-libs/openssl-1.1.1l-r1:0= ) virtual/libcrypt:= >=sys-libs/zlib-1.2.3:= ) pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 ) pam? ( >=sys-auth/pambase-20081028 ) !prefix? ( sys-apps/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !sctp ssl !xmss ) xmss? ( ssl ) test? ( ssl ) test? ( !xmss )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.0p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff ) X509? ( https://roumenpetrov.info/openssh/x509-13.4.1/openssh-9.0p1+x509-13.4.1.diff.gz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.0p1.tar.gz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	user-info	69a1ed744ec33cf2c910ff2bd6084d11	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ea25626b9f23b738b1ac23b55261cc11
+_md5_=bdfbb41a3ea52bde8b78dfe587bb697f
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 440ff983e9ff..5256516c9cb7 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/open-iscsi-2.1.8 b/metadata/md5-cache/sys-block/open-iscsi-2.1.8
index e2c32a6022f4..76c19556ea1b 100644
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.8
+++ b/metadata/md5-cache/sys-block/open-iscsi-2.1.8
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.open-iscsi.com/
 INHERIT=flag-o-matic linux-info meson systemd udev
 IUSE=debug infiniband +tcp rdma systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:= sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-cluster/rdma-core ) systemd? ( sys-apps/systemd:= ) sys-fs/lsscsi sys-apps/util-linux
 REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0/0.2
 SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.8.tar.gz -> open-iscsi-2.1.8.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=29e1883978d2d82a5dfb252dfc3a5c04
+_md5_=74c7a3a95940f66be79307fa627b1a98
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f49f3563dd83..eae421e221b9 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2022.02.11 b/metadata/md5-cache/sys-devel/autoconf-archive-2022.02.11
deleted file mode 100644
index 23877b20a4f8..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2022.02.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=GNU Autoconf Macro Archive
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!=gnome-base/gnome-common-3.14.0-r0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
-SLOT=0
-SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2022.02.11.tar.xz
-_md5_=6811d43ac43d9e1f6e2b560460ce8e74
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2022.09.03 b/metadata/md5-cache/sys-devel/autoconf-archive-2022.09.03
index 23a587bde830..b9742f3031cb 100644
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2022.09.03
+++ b/metadata/md5-cache/sys-devel/autoconf-archive-2022.09.03
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
 DESCRIPTION=GNU Autoconf Macro Archive
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/autoconf-archive/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!=gnome-base/gnome-common-3.14.0-r0 !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]
 SLOT=0
 SRC_URI=mirror://gnu/autoconf-archive/autoconf-archive-2022.09.03.tar.xz
-_md5_=c6a1b0cbd9daa36a740a402a4eaf5c78
+_md5_=fe37158000644d1f2b0a87c8eae8ec33
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21-r4 b/metadata/md5-cache/sys-devel/gettext-0.21-r4
index fdd409532002..bc07dedc464f 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21-r4
+++ b/metadata/md5-cache/sys-devel/gettext-0.21-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gettext/
 INHERIT=mono-env libtool java-pkg-opt-2 multilib-minimal verify-sig
 IUSE=acl cvs +cxx doc emacs git java ncurses nls openmp static-libs java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-3+ cxx? ( LGPL-2.1+ )
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.tar.xz.sig )
 _eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	mono-env	87888393b1c1b882d0543087e28ec0b0	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5dece7d0f1f9de95c37a72754e0a5737
+_md5_=dbfd2603e149df7315367111c6659eef
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 31434b691cd3..6ddc6c5d7e01 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3 b/metadata/md5-cache/sys-fs/cryptsetup-2.4.3
deleted file mode 100644
index 3427c1c07e00..000000000000
--- a/metadata/md5-cache/sys-fs/cryptsetup-2.4.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) dev-libs/json-c:= dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev:= ) static? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) test? ( app-editors/vim-core )
-DESCRIPTION=Tool to setup encrypted devices with dm-crypt
-EAPI=7
-HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
-INHERIT=linux-info tmpfiles
-IUSE=gcrypt kernel nettle +openssl +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2+
-RDEPEND=static-libs? ( dev-libs/json-c:=[static-libs(+)] dev-libs/popt[static-libs(+)] >=sys-apps/util-linux-2.31-r1[static-libs(+)] argon2? ( app-crypt/argon2:=[static-libs(+)] ) gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] dev-libs/libgpg-error[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( dev-libs/openssl:0=[static-libs(+)] ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) ssh? ( net-libs/libssh[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] ) dev-libs/json-c:= dev-libs/popt >=sys-apps/util-linux-2.31-r1 argon2? ( app-crypt/argon2:= ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( dev-libs/openssl:0= ) pwquality? ( dev-libs/libpwquality ) ssh? ( net-libs/libssh ) sys-fs/lvm2 udev? ( virtual/libudev:= ) virtual/tmpfiles
-REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) static? ( !gcrypt !ssh !udev )
-RESTRICT=!test? ( test )
-SLOT=0/12
-SRC_URI=https://www.kernel.org/pub/linux/utils/cryptsetup/v2.4/cryptsetup-2.4.3.tar.xz
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=557a133f59b5cf28e39e0480f2483e43
diff --git a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8-r1 b/metadata/md5-cache/sys-fs/dd-rescue-1.99.8-r1
deleted file mode 100644
index ec3b91cb0c35..000000000000
--- a/metadata/md5-cache/sys-fs/dd-rescue-1.99.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Similar to dd but can copy from source with errors
-EAPI=6
-HOMEPAGE=http://www.garloff.de/kurt/linux/ddrescue/
-INHERIT=toolchain-funcs flag-o-matic multilib autotools
-IUSE=cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr
-KEYWORDS=amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr )
-SLOT=0
-SRC_URI=http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-1.99.8.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=acd61aa08c1c60246d18ad50df734665
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1 b/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
deleted file mode 100644
index 806a3ed60de1..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-2.9.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DESCRIPTION=An interface for filesystems implemented in userspace
-EAPI=7
-HOMEPAGE=https://github.com/libfuse/libfuse
-INHERIT=autotools flag-o-matic linux-info udev
-IUSE=examples static-libs
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
-SLOT=0
-SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz https://dev.gentoo.org/~sam/distfiles/sys-fs/fuse/iconv.m4.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e34492179834e8a219b06d7470cf6053
diff --git a/metadata/md5-cache/sys-fs/fuse-3.10.5 b/metadata/md5-cache/sys-fs/fuse-3.10.5
deleted file mode 100644
index adcf6b843b41..000000000000
--- a/metadata/md5-cache/sys-fs/fuse-3.10.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install setup test
-DESCRIPTION=An interface for filesystems implemented in userspace
-EAPI=7
-HOMEPAGE=https://github.com/libfuse/libfuse
-INHERIT=meson-multilib udev python-any-r1
-IUSE=+suid test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.10.5/fuse-3.10.5.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=34c9cb9f77a7ff36863116cdb8f80757
diff --git a/metadata/md5-cache/sys-fs/fuse-3.12.0 b/metadata/md5-cache/sys-fs/fuse-3.12.0
index f49f6d797da4..a505a7a6951c 100644
--- a/metadata/md5-cache/sys-fs/fuse-3.12.0
+++ b/metadata/md5-cache/sys-fs/fuse-3.12.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libfuse/libfuse
 INHERIT=meson-multilib udev python-any-r1
 IUSE=+suid test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=sys-fs/fuse-common-3.3.0-r1
 RESTRICT=!test? ( test ) test? ( userpriv )
 SLOT=3
 SRC_URI=https://github.com/libfuse/libfuse/releases/download/fuse-3.12.0/fuse-3.12.0.tar.xz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=045a56bd0433de129cc55a4679e15dfe
+_md5_=eb9cd66a817af87eed53d6410b781173
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.41 b/metadata/md5-cache/sys-fs/mtools-4.0.41
deleted file mode 100644
index 1060c966f881..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.41
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-INHERIT=flag-o-matic
-IUSE=gui
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=virtual/libiconv gui? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.41.tar.bz2
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cbadda7a76a6bff9b6b5e02853b169b5
diff --git a/metadata/md5-cache/sys-fs/xfsprogs-5.18.0-r1 b/metadata/md5-cache/sys-fs/xfsprogs-5.18.0-r1
index 0edf0e6ed780..14c72b0fac12 100644
--- a/metadata/md5-cache/sys-fs/xfsprogs-5.18.0-r1
+++ b/metadata/md5-cache/sys-fs/xfsprogs-5.18.0-r1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://xfs.wiki.kernel.org/
 INHERIT=flag-o-matic systemd usr-ldscript
 IUSE=icu libedit nls selinux split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/inih dev-libs/userspace-rcu:= >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit ) selinux? ( sec-policy/selinux-xfs )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.18.0.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6dc395067c096dbd087b0df68c038a10
+_md5_=972ace73d93605bd20e290259dac1849
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 8bc2f0a0d6e9..a6116c3adaf0 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/lsof-4.96.3 b/metadata/md5-cache/sys-process/lsof-4.96.3
index 81cf81d05d43..09baf3f3c713 100644
--- a/metadata/md5-cache/sys-process/lsof-4.96.3
+++ b/metadata/md5-cache/sys-process/lsof-4.96.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/lsof-org/lsof
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=examples ipv6 rpc selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=lsof
 RDEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/lsof-org/lsof/archive/4.96.3.tar.gz -> lsof-4.96.3.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=deaff46bf40a09868ec6b947130a36c5
+_md5_=0fb534855cd3e588ee96b339d894b7c3
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.14-r1 b/metadata/md5-cache/sys-process/numactl-2.0.14-r1
index dcf13ce2a7cf..e8a0146a63b3 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.14-r1
+++ b/metadata/md5-cache/sys-process/numactl-2.0.14-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/numactl/numactl
 INHERIT=autotools multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux
+KEYWORDS=~alpha amd64 arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.14/numactl-2.0.14.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c2772e93288a8a513ef70c2ad4878db0
+_md5_=a5029aa11df06f11ab40e944bab10a9e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 97e800e29c75..1ce1b12fa8e1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-10-28T20:09:53Z
+TIMESTAMP 2022-10-29T02:10:02Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNci3pfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC6oQ//SIT/N6OLl3xJf9riVEKH1RYRs4pDpsoIKtx5TKh/xy+ukrnUjYwEwns8
-xu0rzfyMe3PSnGc04Gkeg1SPo2v+yePoI1DANbwiltcwUPCOlF/mvX+RlV12CIat
-95TgfmyeVpN5iPcQK7fMDSwkWwdLjHTFqpoWac7l4PBfh5fdadyDYu7Moo7VIzAG
-wPzDKnSK/kvJhg3hfKx2vqD8lOBKQP6UEp2mGMXAdD9oW/lR8WDPDXUHxAHrBzIZ
-mw5Sva8405awm16IkBagAvr8mifFWX+If+9zk0nzuBr/t5sG9xBnAsiHaUL69hEs
-ZTuN1cmKibGLRKbcmfBkz9iqEpGdXND4deo7+Whsonh18Z2O69n1xxwcdKD9lo8/
-c51R4UfKW62v1/R17k9hApUJbbhuWSDTQxgSbez1Sta3qKgCayl4lJX3kabtsJJU
-UMghN0SqqnfoOcayGSdXTEw9QwklntfiTxXDYBmylGlMMJIfFCNDymPc837g8UCm
-/M/jwxYrx5NSMCW4bUXb0OyzCYQualuSvGmLTjjScqNdwmmkPeW+ErtzgWSACo3S
-XhJrLRcNU18tHjw9eJjhY0MaL1TnYSyzvB7EVI+hKvmoIlsL6cZHdGcZB4vkdQkD
-qBXF0fRgjCP/9G1m48lkRybzsqoAHbGYKZ/I3U1A7Tk6QFyP+4c=
-=VpT5
+klBIhRAAimE0WHitbjtHO1wBoVrYtbh+wDEKS9BXTwcKqdot8aQnbr1IxGd+td8q
+aKJId486u67a4IpN6kmhevhz03bhy4CrU+t3j24wXAKwz2ekhg6b7JZzP7jhsag8
+3yuYUbq0IMhIK6egVeSv74SkpihkUhVxCN+JNFDOBpDu/TkddLwwkqnKBBpEvSV7
+JxQyrAew2ywiv4yixIe3yamM4fhvI3vpwCbO3V4wMBNgv/4c09qqNIwlBpKPXJs/
+y+nndGP9YjpC+HXiniye/C8dppfLY2WeMvyE5hG2zkrgwIlPp6Iwq44pFeHM9yJ4
+e6ZQUnLeXF3l+dz4FPWU52jxIV91fZ4V+nZIZXjz8AKg1P/DZaxohW+yEP6OP9yt
+5Xphg56MgsgAPW+oiu7373m7gG/+0uXVMFyHUdwUCh6BRA1Y1M7fa1HCiIIuxi2Z
+14/GTQiXdW8ALnP+PHLEeJBwwBqbBKOtWWSEIqPFncnLrLL3dIuG9iq1fG4bVcOb
+OUPHn7IsW+fQF+l24b8oQI6HaJXktTmDSKqGvO2CoAQ3EmDXrZkksDn2A1iSLIZB
+3GyMa0hogpHL2Ds3nU7XUXazTEgE4ouQmq9CWPUr7n5K5v5MytKs95e4NTT+VSNq
+OyeMbMOeFqVxxUMhMqRdpM8NZe8vblcU17IjfhlN0kMqg44d1sc=
+=JdVo
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ad4dbb65d7a8..60d7f065c9cb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 20:09:50 +0000
+Sat, 29 Oct 2022 02:09:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7b3457f2e669..c1f7d082f264 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 28 08:09:50 PM UTC 2022
+Sat Oct 29 02:09:59 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b3cb1b2a8f26..0fc516922d70 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 20:15:01 +0000
+Sat, 29 Oct 2022 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1fe489a30247..9c5fe903ba88 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c2d8ce0e1b6206a225a9f2547bbc65c79218756c 1666987237 2022-10-28T20:00:37+00:00
+1bb9c87c365738a5a9122f196b2a50555aa83297 1666997222 2022-10-28T22:47:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 78d167bcf286..08758fb24162 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666987801 Fri 28 Oct 2022 08:10:01 PM UTC
+1667009401 Sat 29 Oct 2022 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ad4dbb65d7a8..60d7f065c9cb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 20:09:50 +0000
+Sat, 29 Oct 2022 02:09:59 +0000
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index c3594deef3e0..e4734c4bbea0 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 5851b6741c87..4c030e0c582f 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,9 +1,7 @@
 AUX pppoe-server.confd 428 BLAKE2B 83e91157082122ff084ed5b36031fa37950d154f22bed9630ca09f5e9ba00b65cbeb6769693f039b649b30b9c5f49051d6177e108bae2d23c58af7412363d5f6 SHA512 2216e972469d1b544d1dc5729a5c8e2520006f8fd1d07e4d2152a1fd6dd00f52cb97a984398058006f7830fbeae8ee1e8088d5d9ea7648acf50510cc19372b16
 AUX pppoe-server.initd 456 BLAKE2B 1dd9e1dbfe7e18c4f20d9e7a6eb99f942742516273053375e31e802df5297ad61645439ad76ec28a16b6da672862831de627273dd056021b76e1a37beac1fdbf SHA512 44df1122ae36f56c044c47e94c5dd70d00c060c23d0590f233f6cb6024241c1d1c83832d167c12a45ef4464e94f7d5f5e2ddf04c413ea929e1d398feafa0ec0a
 AUX rp-pppoe-3.15-no_max_interfaces.patch 2821 BLAKE2B 3ad091bb9fbab181a223c92c143ff860e0541856cc2e4296700eff08db81f42562f365da9bb836d8180f8ce8c08042e5fa4fc2466a0864678e46f14df619e324 SHA512 16567d42c4691fa0bee04bcca5dc200385c8749c97e147c4134f4290064ab00fad4e1ad8847aaa0be975d7bc2dea024307adcc91f47d54ae20bb42ae0e8dc18c
-DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
 DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 EBUILD rp-pppoe-3.15-r2.ebuild 2230 BLAKE2B be315b4922acb03eec11ec8890fb01af537f23ed72e8cbc88a298a58bce00b2b14aaebf8a9f122a5bb9b93579b1458335259014518a8ab758c00b50a0974bf3f SHA512 0d5e7fc65c624b91601b5e7d011b49cd4245c87fcec2955f52e3969be4e0b628b786622c1618b34d63b689378e648c2066f32818c13e4e2075e202a3144a7b39
-EBUILD rp-pppoe-3.15.ebuild 2430 BLAKE2B 8e24536d9e8912ecfd18783a674af18f7ecf8f7417d7e46a5f4bef5ca3bbe1bd36073525270f550396e8c95c5f9fae507e4d28102e9c9ed57f995cdf1d54b758 SHA512 5ab6da7ef39568ad1e4e336585a475eae358e29394013dc9d8c43f3fccf941b65882e17c84e942f613053411c238f1bfd22e5c8daf8685a445ce9b66bdc9eb33
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
deleted file mode 100644
index 7ea2da5bedd7..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 toolchain-funcs
-
-PPP_P="ppp-2.4.9"
-PATCHES="${PN}-3.14-patches-01"
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/"
-SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
-	https://github.com/paulusmack/ppp/archive/${PPP_P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/dist/${PATCHES}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="tk"
-
-RDEPEND="
-	net-dialup/ppp:=
-	sys-apps/iproute2
-	tk? ( dev-lang/tk:= )
-"
-DEPEND=">=sys-kernel/linux-headers-2.6.25
-	elibc_musl? ( net-libs/ppp-defs )
-	${RDEPEND}"
-
-DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
-
-pkg_setup() {
-	# This is needed in multiple phases
-	PPPD_VER="$(best_version net-dialup/ppp)"
-	PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR}
-	PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV}
-}
-
-src_prepare() {
-	if ! use elibc_musl ; then
-		rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die
-	fi
-
-	rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die
-
-	eapply "${WORKDIR}/patches"
-	eapply_user
-
-	cd "${S}"/src || die
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /dev/ppp
-
-	cd src || die
-	# Not a mistake! This comes from the GitHub tarball doing funky naming
-	econf --enable-plugin=../../ppp-ppp-${PPPD_VER}
-}
-
-src_compile() {
-	cd src || die
-	emake AR="$(tc-getAR)"
-
-	if use tk ; then
-		emake -C "${S}/gui"
-	fi
-}
-
-src_install() {
-	cd src || die
-	emake DESTDIR="${D}" install
-
-	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	local pppoe_plugin="${ED}/etc/ppp/plugins/rp-pppoe.so"
-	if [[ -f "${pppoe_plugin}" ]] ; then
-		rm "${pppoe_plugin}" || die
-	fi
-
-	if use tk ; then
-		emake -C "${S}/gui" \
-			DESTDIR="${D}" \
-			datadir=/usr/share/doc/${PF}/ \
-			install
-		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
-	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Use the rp-pppoe plugin that comes with net-dialup/pppd
-	if [[ -n "${PPPD_VER}" ]] && [[ -f "${EROOT}/usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so" ]] ; then
-		dosym ../../../usr/$(get_libdir)/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
-	fi
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index a67e1503b318..23faa3a16951 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 17ffec0baf18..e56668c259d9 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -6,4 +6,4 @@ DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d28
 EBUILD cifs-utils-6.15-r1.ebuild 3605 BLAKE2B 37799ff5278632f165be826292236534749142c61ebbcabf5b9d3be69673f3ad8ed42e3117b7f85cb93d258476234c095178e707585328914c4970c402c8a58d SHA512 2aa9e36168c209410d91132d6939cabcc619f40eaf21317c58c71aaea8e085b17fe36fddc90eadd10f63d7b738817117ea03ad6758bdfd77a468b32dddbec23b
 EBUILD cifs-utils-6.15.ebuild 3485 BLAKE2B 691f8b6be41701110de819a67f9fa064e693757bcb9ad99d17b0da7dae4ee2e176455da08f16adc324c11d3eb9ea2dba5aab077049d42832db85b9532e2ba59c SHA512 5381c672478fd3bf506272f1cda66b5bf0a8bb1fec2435c1f84bb74fc56a67f909dfcbd9fba8415e166a6f73edadbfc6c6c6afdcf774238e15d26adf4348af6c
 EBUILD cifs-utils-7.0.ebuild 3610 BLAKE2B 02a15ac4708cbae6954f69f5d0740d2f00f153a5c8da3d905babf4b7c90ee8a9e59f0e49550a79698f74fc4a6a1cdfd538f09c2dfac080a2e2c1b15a097df496 SHA512 c4beb9202a5752db3a1c751144f2b731e573ef402299c32151fb0878d5605e84d72d8c88b3e93aae5f4a258325c6b343b13b796d870d0f3e4682d9034c43a764
-MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650
+MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index 1f04d52ef8c9..8ae7effff581 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -13,6 +13,9 @@
 		part of Samba was problematic and it was deemed better to split
 		them off into their own package
 	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:cifs-utils</remote-id>
+	</upstream>
 	<use>
 		<flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag>
 		<flag name="caps">Enable <pkg>sys-libs/libcap-ng</pkg> support</flag>
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index b72c8d7c926d..75a409bef88e 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,7 +1,4 @@
-AUX libnfs-5.0.1-pthread-configure.patch 1220 BLAKE2B c8a21a2bd75aa60d890336bd398171687eab914b588060c2ded2fe2102bad1eb4c29370694889941b2c1d13a46d27e804efb37974e667036f461ee39104d0bc4 SHA512 c07cc4dd5923ecd5ee79e5353c20378d1752d47f34d57939d4db0dcfe0ac57e3e93ceb5834b8581533c7bcf0989cf0cab4ca62da6b2d59e0e9aa7b039e5db713
-DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf
 DIST libnfs-5.0.2.tar.gz 281154 BLAKE2B 9de3d02e5ae4d41eacda152678e6552708b33d4e88cc6fc5f7b16c887f911fc5a5e834952505438220c961f71a8b70540be3254d5889a4336200d5633dce313e SHA512 6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5
-EBUILD libnfs-5.0.1.ebuild 1348 BLAKE2B 56e0e90b0cacca05e4b4f057c65cdc11c0ad97cface8d1abbe433d9127e5c7681a39f83204627b7680921a121c6388cd4ac66ecf6873130d7d6dc4aaab33a7d5 SHA512 9328194e0fea542124a1f300e0482eb7d0b8f8c7c2d13997732839dfb49ba4cbbb9a1d4098276e59113195ceb44cd21d4aee2bdc214f86b97f4b7e9437a5bd77
 EBUILD libnfs-5.0.2.ebuild 1284 BLAKE2B d85ad537a317890c541f0dde8d1e7fa393273767686fcfcafaaf8b154ad48f765c14d1611b2d660f3db3fd2a1807d02241628f1e541590cc36a6f21179354e90 SHA512 13d327810cac55e024c1e2c02c26c567cd3ba5add845f5fa88b9782a39df4f4bfb55b44239213e30390a50e9812a2177f1f4039a3191857ce402709d6dbbd6a1
 EBUILD libnfs-9999.ebuild 1290 BLAKE2B 8285ae200d1b3b5401c0f4e29341b76f8b6f29b37f5c92054659e1fcf1ad736f5e27e71dddd33a2fc7f881892e4b259abcdb38250c9731c88de88209a68100d2 SHA512 b4ad81545e01f3dcc333e54d0dd4d4afc76b410045bd8bc582a642cc0ce583d025d4b8b0182ab3791fe96ae42d292ed8f5caef3250cc7adc5bb8003e9ccf0d53
 MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7
diff --git a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch b/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
deleted file mode 100644
index 91c3781389b4..000000000000
--- a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/sahlberg/libnfs/pull/380
-
-From af37ac6d766755185dc023b940cfe78a176170a0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 3 Apr 2022 04:22:04 +0100
-Subject: [PATCH] autotools: fix syntax error in configure when pthreads
- disabled
-
-Avoids this warning/syntax error in configure when pthreads aren't
-enabled (default):
-```
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... no
-./configure: 14227: test: =: unexpected operator
-checking whether SO_BINDTODEVICE is available... yes
-checking whether getpwnam() is available... yes
-```
-
-The LHS of the test will be blank, so use an 'x' to give a dummy
-value, like we do elsewhere.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,7 @@ if test x"$libnfs_cv_HAVE_PTHREAD" = x"yes"; then
-     AC_DEFINE(HAVE_MULTITHREADING,1,[Whether we have multithreading support])
- fi
- fi
--AM_CONDITIONAL([HAVE_PTHREAD], [test $libnfs_cv_HAVE_PTHREAD = yes])
-+AM_CONDITIONAL([HAVE_PTHREAD], [test x$libnfs_cv_HAVE_PTHREAD = xyes])
- 
- AC_MSG_CHECKING(whether SO_BINDTODEVICE is available)
- AC_TRY_COMPILE([#include <net/if.h>], [
-
diff --git a/net-fs/libnfs/libnfs-5.0.1.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild
deleted file mode 100644
index 04425c5f0208..000000000000
--- a/net-fs/libnfs/libnfs-5.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
-else
-	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 x86"
-	S="${WORKDIR}"/${PN}-${P}
-fi
-
-DESCRIPTION="Client library for accessing NFS shares over a network"
-HOMEPAGE="https://github.com/sahlberg/libnfs"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/14" # sub-slot matches SONAME major
-IUSE="examples static-libs utils"
-
-# net-libs/rpcsvc-proto for rpcgen called in build system
-BDEPEND="net-libs/rpcsvc-proto
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/libnfs-5.0.1-pthread-configure.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable static-libs static)
-		$(use_enable utils)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index ff827cf40c65..8c34d8cc312e 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 15a49573fdd2..47c85400d19a 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,9 +1,12 @@
 AUX adjust-ejabberd.service.template-to-Gentoo.patch 1088 BLAKE2B 38405d4fa1119a8eca09fb22c1055182e7dfc5f4ce89440382694ba4da2bebf85934bde40204884e777343276448a8d7f256ae795db0c61e02ae82a8021116af SHA512 6c1417d40c17951c8187a4df72fbd755a4b408405a23aaed879e6cd7c01d4df0b7c52f3b8f64c2950f3a3d9996dfc4b29e77ebc5f035d5b13ab5c741c24038b6
 AUX ejabberd-22.05.initd 1065 BLAKE2B 7efbc0a228665243e9cb83ed36fb335cae81c2ccda08c3c433b59e1a29ca2567fe5c68c8ae8ed4c3c70196c3851cc5694c6ff919d2cc94b5596805c9edb809cf SHA512 2e7ee126e9335e70c16f8b53cae2601fc16d83c233b154fa565164a46099765a9720f3a9e54417ac642d5edf5f2c0e05ec75ceb4d4ed196afd962373a44a4b70
 AUX ejabberd-22.05.logrotate 209 BLAKE2B f4da9d1ce350f192804e89a6dfea49ac72a432d8657f6f3e49b68e187d3ffe35818ded52859fb333078e5752100b0195bfc52f45e29fdad97c2dff1bc9f7d77d SHA512 7fee49e82d34fc04028fcf0dc39af7e416be05d9fc3e19e520fa139841657f91e6f8ef37676daad1b31334f631f875cb1619046f3d57f509443a92a8f546de86
+AUX ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch 430 BLAKE2B 0301bd38cf5c08a119ac27368ac7477a5388fd9475a6d8b866635a0b89b989fdff7b41607871d1052a31bba7ddd44035528823caf88a691ffe699ca5f20a1ce5 SHA512 98e41ccceb235dd17c1f265790d5145eae6eadb35e359d935774bdea26739381aad15949fbc22ada394181130556ce91a1d82078d92072e04c91ab212a5ef9dc
 AUX ejabberd.confd 161 BLAKE2B f08ab6310c950d3d248fbaf5e6e35bca2e31289ae476b2379a779ebc38926e091cf04883cce94cedff1e4dcf6ec3224079e7828502b97451a8a96fd278a4d102 SHA512 07143642982df18461fdecd16daaad3baf6a06f8222d7a76757797c531be2803975ed60cc43aace24a624aa7c73bd8fdc6e023e739de492271b79e571f27c8fb
 AUX epam-wrapper 336 BLAKE2B 914ba9c7469ba58fd29a4c70485c77ff2a93000e397aa8c58aab434cfceda34120880184488659e30f1961d576566111b4159b34b30fea5307bc255ce382781d SHA512 b66dfed9967e6524af8f46204eadcbed0a427ecc5cca30ec1fd58373714467077858a252c039828a18130244d46a54a019e17828cf3ac055c18044c2a6881449
 DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
+DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B 670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3 SHA512 3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
 EBUILD ejabberd-22.05-r2.ebuild 7136 BLAKE2B 35e34dede32c4067dd35b54d7a98cd864ddbeb4fa50d14b812dbda642d7d44be5f54a79edd446917975f349dc6680f5bafaf03af9aa11eb722fef38cd3ea04a8 SHA512 6da99fe902f7ba9a62ea1f60d018e3ef7a1fb9eac48d7b3dc9c3503fab388b631e8cbb3b328bc5277ae2ece1cbb0fc5310c034d407c413a2bbb57f3e648b90fd
+EBUILD ejabberd-22.10.ebuild 6926 BLAKE2B f1d03d20bc0d672ff076d76b433dfff8a4dac566cc237d91f39af9af0f6cba419e9a0414d2e4fad8047c670f5a640af24e393d3fefde86bbc5adfbeb1d869f47 SHA512 18ae55e2d445db5d23b38425384ac7ebab772aa88229ef5c1e97f5bd7e9c6b520c382f482ae7f6f94818fd7fc7f4e530eddf0d54c3443081a445898e8cf3d5ba
 MISC metadata.xml 1484 BLAKE2B 74f0ec404b37dfe72d8751dd8bc8f0ba0b56f334939a5311af70df4616f19e536209b9be7361b35c8e5d316fbce623afdbf7e3ce53a139eb0d2e0d895275ae3c SHA512 793584e1e44c3a651b15eed84a91a801cd809392ccf7623f1a1b222e65641f8dca18515fb90e42e4a51178f4686d3c61778e14834be23feb23b269b4f07c91fb
diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild b/net-im/ejabberd/ejabberd-22.10.ebuild
new file mode 100644
index 000000000000..d872abcb6285
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.10.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
+SRC_URI="
+	https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+	roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:		>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+	>=dev-lang/erlang-19.3[odbc?,ssl]
+	>=dev-erlang/cache_tab-1.0.30
+	>=dev-erlang/eimp-1.0.22
+	>=dev-erlang/fast_tls-1.1.16
+	>=dev-erlang/fast_xml-1.1.49
+	>=dev-erlang/fast_yaml-1.0.34
+	>=dev-erlang/yconf-1.0.14
+	>=dev-erlang/jiffy-1.0.5
+	>=dev-erlang/jose-1.11.2
+	>=dev-erlang/lager-3.9.1
+	>=dev-erlang/p1_oauth2-0.6.11
+	>=dev-erlang/p1_utils-1.0.25
+	>=dev-erlang/stringprep-1.0.29
+	>=dev-erlang/xmpp-1.6.0
+	>=dev-erlang/pkix-1.0.9
+	>=dev-erlang/mqtree-1.0.15
+	>=dev-erlang/idna-6.0.0-r1
+	>=dev-erlang/p1_acme-1.0.20
+	>=dev-erlang/base64url-1.0.1
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( >=dev-erlang/p1_mysql-1.0.20 )
+	odbc? ( dev-db/unixODBC )
+	pam? ( >=dev-erlang/epam-1.0.12 )
+	postgres? ( >=dev-erlang/p1_pgsql-1.1.19 )
+	redis? ( >=dev-erlang/eredis-1.2.0 )
+	sip? ( >=dev-erlang/esip-1.0.48 )
+	sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+	stun? ( >=dev-erlang/stun-1.2.6 )
+	zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+	${DEPEND}
+	>=acct-user/ejabberd-2[pam?]
+	captcha? ( media-gfx/imagemagick[truetype,png] )
+	selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+	"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+	echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	rebar_remove_deps
+
+	# Set paths to ejabberd lib directory consistently to point always to directory
+	# suffixed with version.
+	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+		-i "${S}/Makefile.in" \
+		|| die 'failed to set ejabberd path in Makefile.in'
+	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ejabberd path in ejabberdctl.template'
+
+	# Get epam-wrapper from 'files' directory and correct path to lib directory in
+	# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+	# file exists there already.
+	local epam_wrapper_src="${FILESDIR}/epam-wrapper"
+	local epam_wrapper_dst="${S}/epam-wrapper"
+	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+		|| die 'failed to install epam-wrapper'
+
+	rebar_fix_include_path fast_xml
+	rebar_fix_include_path p1_utils
+	rebar_fix_include_path xmpp
+
+	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+	# rather than its parent which is default. That way ejabberd directory
+	# takes precedence is module lookup.
+	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+	sed -e "s|\(ERL_LIBS=\)'{{libdir}}'\.*|\1${ejabberd_erl_libs}|" \
+		-i "${S}/ejabberdctl.template" \
+		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+}
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--localstatedir="${EPREFIX}/var" \
+		--enable-user=${PN} \
+		$(use_enable debug) \
+		$(use_enable full-xml) \
+		$(use_enable mssql) \
+		$(use_enable mysql) \
+		$(use_enable odbc) \
+		$(use_enable pam) \
+		$(use_enable postgres pgsql) \
+		$(use_enable redis) \
+		$(use_enable roster-gw roster-gateway-workaround) \
+		$(use_enable sqlite) \
+		$(use_enable sip) \
+		$(use_enable stun) \
+		$(use_enable zlib)
+
+	# more options to support
+	# --enable-elixir requires https://github.com/elixir-lang/elixir
+}
+
+src_compile() {
+	# Note that we also add ejabberdctl.example, which will be used by
+	# ejabberd's build system to create /usr/sbin/ejabberdctl, as
+	# target. Otherwise, ejabberdctl.example is due to be created by the
+	# 'install' target (as per upstream's Makefile.in). However when
+	# invoke the 'install' target (in src_install below), DESTDIR is
+	# set, which causes DESTDIR to scope into the ejabberdctl.example
+	# generation.
+	emake REBAR='rebar -v' src ejabberdctl.example ejabberd.service
+}
+
+src_install() {
+	default
+
+	if use pam; then
+		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+
+		pamd_mimic_system xmpp auth account
+		into "$(get_ejabberd_path)/priv"
+		newbin epam-wrapper epam
+	fi
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
+	systemd_dounit "${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
+
+	keepdir /var/{lib,log}/ejabberd
+}
+
+pkg_postinst() {
+	local migrate_to_ejabberd_user=false
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 21.04-r1; then
+				migrate_to_ejabberd_user=true
+				break
+			fi
+		done
+	fi
+
+	# Sarting with >=21.04-r1, the ejabberd configuration is now in
+	# /etc/ejabberd and no longer in /etc/jabber. See if we need to
+	# migrate the configuration. Furthermore, ejabberd no longer runs
+	# under the, shared via net-im/jabber-base, 'jabber' use, but under
+	# its own user. This increase isolation and hence robustness and
+	# security.
+	if $migrate_to_ejabberd_user; then
+		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
+		ewarn "(just as upstream) and *not* /etc/jabber."
+		ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd."
+		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
+		ewarn "Please check your configuration, and finish the migration by stopping ejabberd"
+		ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd."
+
+		local -A dirs_to_migrate=(
+			[/etc/jabber]=/etc/ejabberd
+			[/var/spool/jabber]=/var/lib/ejabberd
+		)
+
+		for src_dir in "${!dirs_to_migrate[@]}"; do
+			local eroot_src_dir="${EROOT}${src_dir}"
+			local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
+				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+			fi
+			if ! use prefix; then
+				chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
+			fi
+		done
+	fi
+}
diff --git a/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch
new file mode 100644
index 000000000000..f607f48037ae
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch
@@ -0,0 +1,16 @@
+From c0af543fc3b6047f66bfe820e7ce75abd3ed2049 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 10 Dec 2021 12:36:45 +0100
+Subject: [PATCH] Adjust ejabberd.service.template to Gentoo
+
+--- a/ejabberd.service.template
++++ b/ejabberd.service.template
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=XMPP Server
+-After=network.target
++After=epmd.service network.target
++Requires=epmd.service
+ 
+ [Service]
+ Type=notify
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 390730350b83..d745ddf9457a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 60816c16337f..e83468725b88 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -30,7 +30,6 @@ DIST openssh-8.9p1.tar.gz.asc 833 BLAKE2B fd44a5545bd0795ee335e480011dbe3c12011d
 DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a019996d275655b04997301e247f5c4dd7fad35d12b3b7c25afb1b078d915ef2a4ae02f736f0aec9ba2a8c56a405d7ca303bcadf7 SHA512 4c2dbf99a9b5953fdb955f700272bbaeaa025f108a8860d2190197962b849f8385327af82c4d6a3a130a7fba35a74a8ec9437d642867601acb29817c49632a8f
 DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
 DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
-DIST openssh-9.0p1+x509-13.3.2.diff.gz 1128591 BLAKE2B fb560e2f1803ceb946a1ba8bd53a1f9fd262896b820c23d4b0015218433d2200f1fd9df5b1889a670261f13936d8153da1ab4beb2a5d52ede78168189c522bf3 SHA512 e643168d7098c44f85a9bac9894a936a3480ec843162197ce56e016dd4f634ef182dcfae1f7e18408f6a18832e0a95d2d249a23fdbc3dc46df76989ca0a0c7fc
 DIST openssh-9.0p1+x509-13.4.1.diff.gz 1146757 BLAKE2B 070d6bc23179a581e4fe79412274f11399009ba69ad643cc354ec9cd6392ffb0a651fd2d7f310c52c60a9c626140b9c823e2f19c600f15ac9cdf992707274bcb SHA512 4aaa86c1a785741b28c5e2738cf6de6fa7965ac8692165a8b18fe7677aeb0996979f23b45306781e6be75d34fb39294659be5ae016ab4a82ef2a73bedcc6e8e7
 DIST openssh-9.0p1-sctp-1.2.patch.xz 6768 BLAKE2B 8a18aea57b0b3f8f0a641870f0cd1570c6cc48d1e28ef7261344918905e94a548d3a3acb6feb1c6ef13f0c6cacf2b845163cad2b96ab20cb9fc58a49aeb699c1 SHA512 d6aa5f32464d5f3e2e63e9ba82108f33bdaa890e2adf2ccc47ce0d672979fc67510d9dd7561b17eaba0c2f11a8eb565029b0ebff3b2d050e9e04e6143aedb8a3
 DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e150056728cc4dadf8ff8652a832f7fd46eebb47b15085e57fca4b00c77d1ec4dd1b056ea2bbcee89f54a121ed5e2 SHA512 613ae95317e734868c6a60d9cc5af47a889baa3124bbdd2b31bb51dd6b57b136f4cfcb5604cca78a03bd500baab9b9b45eaf77e038b1ed776c86dce0437449a9
@@ -43,8 +42,7 @@ DIST openssh-9.1p1-sctp-1.2.patch.xz 6772 BLAKE2B 8393c1ca5f0df7e4d490cef5c38d50
 DIST openssh-9.1p1.tar.gz 1838747 BLAKE2B 287b6b1cc4858b27af88f4a4674670afff1fb5b99461892083393c53ef3747c5a0fcd90cba95d2c27465a919e00f7f42732c93af4f306665ba0393bbb7a534f5 SHA512 a1f02c407f6b621b1d0817d1a0c9a6839b67e416c84f3b76c63003b119035b24c19a1564b22691d1152e1d2d55f4dc7eb1af2d2318751e431a99c4efa77edc70
 DIST openssh-9.1p1.tar.gz.asc 833 BLAKE2B 83efe3c705f6a02c25a9fc9bac2a4efd77470598d9e0fcb86dff2d265c58cffec1afecad3621769b2bd78ac25884f0ee20ae9b311e895db93e3bb552dffd6e74 SHA512 47dc7295f9694250bcbb86d7ca0830a47da4f3df7795bb05ebaf1590284ccce5317022c536bea1b09bd2fa4d8013295cc0de287ebe3f9dc605582077e9f11ddd
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
-EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
 EBUILD openssh-9.0_p1-r2.ebuild 16929 BLAKE2B a218c0faba8bb8218841f2c621584bd7b381629a12620e27f54cb5c563fcd1d56a21b2f10be20b77c7492eb2d89be31c209fc250252be86cb88d427642123ebe SHA512 d7a865cbf8bd64fd4518966b43a4af8f3156cd125cb6b91a4d9a63ba1c02625155bd641f082056d753c5f84172c2965e3fc5e5376a6d68b72edf651c8f7b5d55
-EBUILD openssh-9.0_p1-r6.ebuild 17510 BLAKE2B 6644aa9dc6140350767c1a78ad94ba27b62cbb3cedbd6521bfb16fb0dd3c1b37e9aeb6d227319482bae070701b93f1723c08c53858ede890fac0fc91d7846c91 SHA512 b34b3cbc2ef226a2dccb6ed7cb21529271aceb61c646f6d7bc290bd05cd5b211b76587ad5e957eb20af3e33b92129eef71495172c9327067ecbf7a4fc16ec71f
+EBUILD openssh-9.0_p1-r6.ebuild 17503 BLAKE2B 821bca36bfd844e1cd8ad85087a4340d6b9d4b46309a87e5cd6d8ef0f437b06bb8391f74c7e9463243093725ad985231636391c75a84993cde43c99b22557ac8 SHA512 baa22673b929a75bcd224fdb9f52c7524b5229726e6dac8b73f981e74b74181a821f7b6353440a10aa7a48ebe1d6f769a505b6f33b5acbf89bed0b2c5b086e32
 EBUILD openssh-9.1_p1.ebuild 17818 BLAKE2B 17281db2b9f94ae734a7a6b98e0ca1c0f8cf4a52e8f8e66cd21ba281ee13ce3a5ddadd973ab87016462500c2c564662b0995550734c5e32410acce61cb43dabd SHA512 76e8d1605552867fcdc8ce6fc78594e02010798ee043927299f8640a34cbab5bb9ccad970fbfc20d01d4526247d75d9a0103256b6e5181263b5632b62dd306b1
 MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406
diff --git a/net-misc/openssh/openssh-9.0_p1-r1.ebuild b/net-misc/openssh/openssh-9.0_p1-r1.ebuild
deleted file mode 100644
index 25e69c941bf4..000000000000
--- a/net-misc/openssh/openssh-9.0_p1-r1.ebuild
+++ /dev/null
@@ -1,485 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-# PV to USE for HPN patches
-#HPN_PV="${PV^^}"
-HPN_PV="8.5_P1"
-
-HPN_VER="15.2"
-HPN_PATCHES=(
-	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
-	${PN}-${HPN_PV/./_}-hpn-PeakTput-${HPN_VER}.diff
-)
-
-SCTP_VER="1.2"
-SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="13.3.2"
-X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
-	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )
-"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
-S="${WORKDIR}/${PARCH}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	hpn? ( ssl )
-	ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !sctp ssl !xmss )
-	xmss? ( ssl  )
-	test? ( ssl )
-"
-
-# tests currently fail with XMSS
-REQUIRED_USE+="test? ( !xmss )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		net-libs/ldns[ecdsa(+),ssl(+)]
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
-	virtual/libcrypt:=[static-libs(+)]
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( sys-libs/pam )
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	!prefix? ( sys-apps/shadow )
-	X? ( x11-apps/xauth )
-"
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/autoconf
-	verify-sig? ( sec-keys/openpgp-keys-openssh )
-"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	local missing=()
-	check_feature() { use "${1}" && [[ -z ${!2} ]] && missing+=( "${1}" ); }
-	check_feature hpn HPN_VER
-	check_feature sctp SCTP_PATCH
-	check_feature X509 X509_PATCH
-	if [[ ${#missing[@]} -ne 0 ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested: ${missing[*]}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "Missing requested third party patch."
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
-	fi
-}
-
-src_unpack() {
-	default
-
-	# We don't have signatures for HPN, X509, so we have to write this ourselves
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${PARCH}.tar.gz{,.asc}
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
-	eapply "${FILESDIR}"/${PN}-8.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
-	eapply "${FILESDIR}"/${PN}-8.9_p1-allow-ppoll_time64.patch #834019
-	eapply "${FILESDIR}"/${PN}-8.9_p1-gss-use-HOST_NAME_MAX.patch #834044
-
-	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		pushd "${WORKDIR}" &>/dev/null || die
-		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
-		popd &>/dev/null || die
-
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}/${PN}-9.0_p1-X509-uninitialized-delay.patch"
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling known failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
-		mkdir "${hpn_patchdir}" || die
-		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
-		pushd "${hpn_patchdir}" &>/dev/null || die
-		eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-glue.patch
-		use X509 && eapply "${FILESDIR}"/${PN}-8.9_p1-hpn-${HPN_VER}-X509-glue.patch
-		use sctp && eapply "${FILESDIR}"/${PN}-8.5_p1-hpn-${HPN_VER}-sctp-glue.patch
-		popd &>/dev/null || die
-
-		eapply "${hpn_patchdir}"
-
-		use X509 || eapply "${FILESDIR}/openssh-8.6_p1-hpn-version.patch"
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use sctp || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply_user #473004
-
-	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
-	sed -e '/\t\tpercent \\/ d' \
-		-i regress/Makefile || die
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-	use xmss && append-cflags -DWITH_XMSS
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
-		# doesn't check for this, so force the replacement to be put in
-		# place
-		append-cppflags -DBROKEN_GLOB
-	fi
-
-	# use replacement, RPF_ECHO_ON doesn't exist here
-	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the sctp patch conditionally, so can't pass --without-sctp
-		# unconditionally else we get unknown flag warnings.
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(usex X509 '' "$(use_with security-key security-key-builtin)")
-		$(use_with ssl openssl)
-		$(use_with ssl ssl-engine)
-		$(use_with !elibc_Cygwin hardening) #659210
-	)
-
-	if use elibc_musl; then
-		# musl defines bogus values for UTMP_FILE and WTMP_FILE
-		# https://bugs.gentoo.org/753230
-		myconf+=( --disable-utmp --disable-wtmp )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local tests=( compat-tests )
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		ewarn "user, so we will run a subset only."
-		tests+=( interop-tests )
-	else
-		tests+=( tests )
-	fi
-
-	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
-	mkdir -p "${HOME}"/.ssh || die
-	emake -j1 "${tests[@]}" </dev/null
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd-r1.initd sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	if use pam; then
-		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	fi
-
-	tweak_ssh_configs
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-	rmdir "${ED}"/var/empty || die
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-pkg_preinst() {
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
-		show_ssl_warning=1
-	fi
-}
-
-pkg_postinst() {
-	local old_ver
-	for old_ver in ${REPLACING_VERSIONS}; do
-		if ver_test "${old_ver}" -lt "5.8_p1"; then
-			elog "Starting with openssh-5.8p1, the server will default to a newer key"
-			elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-			elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-		fi
-		if ver_test "${old_ver}" -lt "7.0_p1"; then
-			elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-			elog "Make sure to update any configs that you might have.  Note that xinetd might"
-			elog "be an alternative for you as it supports USE=tcpd."
-		fi
-		if ver_test "${old_ver}" -lt "7.1_p1"; then #557388 #555518
-			elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-			elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-			elog "adding to your sshd_config or ~/.ssh/config files:"
-			elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-			elog "You should however generate new keys using rsa or ed25519."
-
-			elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-			elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-			elog "out of the box.  If you need this, please update your sshd_config explicitly."
-		fi
-		if ver_test "${old_ver}" -lt "7.6_p1"; then
-			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-		fi
-		if ver_test "${old_ver}" -lt "7.7_p1"; then
-			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
-			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
-			elog "if you need to authenticate against LDAP."
-			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
-		fi
-		if ver_test "${old_ver}" -lt "8.2_p1"; then
-			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
-			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
-			ewarn "connection is generally safe."
-		fi
-	done
-
-	if [[ -n ${show_ssl_warning} ]]; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh/openssh-9.0_p1-r6.ebuild b/net-misc/openssh/openssh-9.0_p1-r6.ebuild
index f1fddab0bc79..7251de181f3e 100644
--- a/net-misc/openssh/openssh-9.0_p1-r6.ebuild
+++ b/net-misc/openssh/openssh-9.0_p1-r6.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6a41d44ff696..41bc05b63b75 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/open-iscsi/Manifest b/sys-block/open-iscsi/Manifest
index 0c7535cd996f..af391282745f 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -7,5 +7,5 @@ AUX open-iscsi-2.1.7-no_werror.patch 1025 BLAKE2B 2d96bc5c35708206c68281d3153bbf
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
 DIST open-iscsi-2.1.8.tar.gz 638346 BLAKE2B 1e85b6bd75ac31e5aaa65ea8869c2e6e13190786e28e473ab8bd1ea3edb0ef835624194e2ba53718fb2a49c25af53bff9035f5109e1a569155244f03a7dccdc0 SHA512 168ce68dc495cc8b2f217ad0373851d681f9274036b8ec562ece513de493adfdbba55f2038518f246f5244f6405102b2e096a9cce15e73fce9654f06790002c1
 EBUILD open-iscsi-2.1.4-r2.ebuild 3995 BLAKE2B cde9eedfd0adce665015ced51a9a6a83c6d4e163ebcd3578c4733b9816829d815db0d0c11a502be52c15a9ec1ea47a4b248a1ed4d44e9939096281b8fc69b0e8 SHA512 7a3fa0b2296478e1fe7b00f73b6aa7dc6117781958835d6e9f038e7b6cd2b22e4ae53c78543addc69bba1079238d7b455260ce825d6ef6792865323202735896
-EBUILD open-iscsi-2.1.8.ebuild 3353 BLAKE2B c17ee0a0935e58d305be615d98e10ef48104f8e3104d198346046bc1eee07d3de4ad607ffd54d7bfd03d386d6b6202a1aaa672d7a41012dbe8a124eff3056281 SHA512 73757323fb36daa0d138811da9cf660d99de44416f7051197649f9b4656bbd512010889edf5c6473a80f83b3e75921bc8be26bf70316cb6f32ddc5cadd1c62f7
+EBUILD open-iscsi-2.1.8.ebuild 3346 BLAKE2B b575b5b9238c7218fcc7d2dc64d7ca76c032100df942b72782d1c7b3a8d3628dde40126933cbf5b5e85a928dba7b96a8a8080e99d50dbedb67a5c17c83d340a5 SHA512 0780ea38e6b96d7a02867dbb3467aa4bfe22899644dfc65c100f8622e15257c9ff5f78a75a00a5b54108c9434ca96dad17ca84f99c8ef54d20d3b4de2173b8a6
 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
index ef1cc614b680..93b8afb21848 100644
--- a/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
+++ b/sys-block/open-iscsi/open-iscsi-2.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/0.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="debug infiniband +tcp rdma systemd"
 REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
 # Tries to write to /run/lock/iscsi etc
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 5b929fee4801..5349d76c1902 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/shim/Manifest b/sys-boot/shim/Manifest
index 5c90b9d7955e..85e06e99fdd6 100644
--- a/sys-boot/shim/Manifest
+++ b/sys-boot/shim/Manifest
@@ -2,4 +2,4 @@ DIST shim-aa64-15.6-2.aarch64.rpm 466804 BLAKE2B 706f31835be24fee7202b8f8eb49204
 DIST shim-ia32-15.6-2.x86_64.rpm 419081 BLAKE2B f7160dd1330bfd7ad2d64cfe370750f576f1e3291aa8bc8313d52869f3dd23228db8514e7578c2609428479e430a1d39c1992450f4f42197216c00c420a0a150 SHA512 045325802474f53c6e86eff1166f1a966268c9ad706fac4c08966f211dbc32fba21ed3a07c46445ec579ac1e2819a1313ff54d6169737806954962945c61bdc2
 DIST shim-x64-15.6-2.x86_64.rpm 479835 BLAKE2B 7d12b97275c25659f94a8dd4c8678eb7df9e11fd3258966cb65c762467f28744b9403e13d5b5c98d6d6a5244ce4d81ef31b9d802040be99da03c1bb56be21275 SHA512 971978bddee95a6a134ef05c4d88cf5df41926e631de863b74ef772307f3e106c82c8f6889c18280d47187986abd774d8671c5be4b85b1b0bb3d1858b65d02cf
 EBUILD shim-15.6.ebuild 904 BLAKE2B a59fa0d03273b6dd4b5d95e06cea3642bde3cb8e7223ba0375593e01b8fb07d6ca9bdf2c22b32ab3f84ce2a9bfd80d8d17a0491c70cab044923d327c171e6449 SHA512 491bf669e378c6de103f745e051639468042cacdf4e8d7bc560fb3d57aec9d76c1c34ba73f0a886e73c99c9f044f165f8c7ba95b237e9727c076073cd608a18f
-MISC metadata.xml 248 BLAKE2B 289644a08c163016713ef605da208e5e305427bc7e76b65abc70af7167fdb4db34e89b0cfef631a702965e89e85058471b9dbab0abadb6d7bec3c8b2a72f3add SHA512 9030c9a82b92ffa1e5501c40175477a47e724fd841a78019a7a0a7e3bba91f19aaee02d286af9a1d71004f0003f6e2f04abd0f6799d830f76bf12bf67163e631
+MISC metadata.xml 379 BLAKE2B b6eb0f18d22675a68c22cb8cffe964bb21d65fa2f2958740aab82cb96ced8922f7c0163aab8d19f9c9815bc237a9f841c2deb5391a7715c55f591742b4f8ca3c SHA512 d1283d44596721c8ac5c4e812124bf167cd3c834ef63d5a48917ab7995b69751a8400b00608eea1888ee9dab4dcb26a055664aa7feca6d2e8647c0bc7c2c0c24
diff --git a/sys-boot/shim/metadata.xml b/sys-boot/shim/metadata.xml
index 97eff4632a18..be6f6f5712cf 100644
--- a/sys-boot/shim/metadata.xml
+++ b/sys-boot/shim/metadata.xml
@@ -5,4 +5,8 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:redhat:shim</remote-id>
+		<remote-id type="github">rhboot/shim</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c38e25750d00..54eb12e56b8b 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index af935fd3acf5..def2d1dd02ea 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,6 +1,3 @@
-AUX autoconf-archive-2021.02.19-python310.patch 1344 BLAKE2B adf7282ce2f57c957d3542f4fb1af2cce0da4d93556249529d2bfe11e5f7c3f42e725770decf5dce37ee310710d954f43ca61fd6f7685c5a5d2362830520355b SHA512 5541fe628832b071bfba890530bc72f0b1747ec3cfc1e43a79b5a0f992c8c59609d836fd00eb8ee0daf0428c6d3f7b8894bddf2d9485625f683175e45d4f5640
-DIST autoconf-archive-2022.02.11.tar.xz 675264 BLAKE2B b9ff928186312969ffd09fd0523367857e7072e867f6b43689a4a5130db9f5fe19a8337875f5186409e7b0bd200491e3d1f612739499c89547a47862c59ba07f SHA512 243e06a356ea2c0fddc527febd4241da49fe4c11fb64b548873744a54e079860739d7a1da842833b99540acde3f6a2ebfddc41897306cc2e61e2c6037a7d22ff
 DIST autoconf-archive-2022.09.03.tar.xz 676144 BLAKE2B 9511b1bd2afee78209261d9757c3fc6bf079eb6ea82bc039530532cfaaea8a7d977f6310265c0af2fde377edc9bddfcabf1e81c426a9716d5bf4b4eb7bb64a4a SHA512 157b5b6a979d5ec5bfab6ddf34422da620fec1e95f4c901821abbb7361544af77747b4a449029b84750d75679d6130a591e98da8772de2c121ecdea163f0340b
-EBUILD autoconf-archive-2022.02.11.ebuild 689 BLAKE2B ab66e415a7b8e85a070a8b4782ce29d17d5da942dc6ca3bc88b327a3746c319c481870e49b7082a55858e4ccd10d3d5d4ee4d9d4c7ab9164113c41622b1fd2ae SHA512 a4eb8667227e103100732f7ac84e9ceca73f923c6067ab981d1f300a63391ab088fab76cee0915561c69ef73533ddc1144fe42b58ed933545f8ba4a06c3f9879
-EBUILD autoconf-archive-2022.09.03.ebuild 641 BLAKE2B a4f7ab80034375c5098756944f0c6a8ba86cf2cbd1615f7a112911eda67d9a199137c4f03c01bfee76ddf8b4705e519c3fd4d0f48c7d36ea885449f3315b7968 SHA512 f8b9a1812e00a5f7100dc90331c42410939928c4c1692c609dca3989baa3d1d3b50d6580f058ceab59a89fc3fc4e23081d568d4f5ba882544b09fe344e8dd6fb
+EBUILD autoconf-archive-2022.09.03.ebuild 633 BLAKE2B 5de00de3f8acf7e28a6976245229de75c73d1dd447deaaa9af84676a6d5cec593e08e581cddf316940274c5ab37f1bc4842ab25b650076ac9026060400a7a62e SHA512 56df319feab89fefb589278afeb56d225b10abd69fc8ba02961218e60d8f2b5d29f7fd74ad46b4134ad3d56aef49c7396899182e68f71956c8d80bf5d2e2ceca
 MISC metadata.xml 380 BLAKE2B 49267dfffb9d805ec3628b175ceab3aa82106669690fe263ae9b9a07f2706f481ef976b56b561f1eeabef18b5be871c3d76161601d5654912a94b92716ec2a66 SHA512 de2dac77eea27093848b2233f6be17e2f1caf4a22b58904c6596990ab1bae444c8f21d17bc0e4d3b5aa3de2d5866701f733ec86ec81689d3d0bc3bda3167e04b
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2022.02.11.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2022.02.11.ebuild
deleted file mode 100644
index bce68764f863..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2022.02.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="GNU Autoconf Macro Archive"
-HOMEPAGE="https://www.gnu.org/software/autoconf-archive/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# File collisions. #540246
-RDEPEND="!=gnome-base/gnome-common-3.14.0-r0
-	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2021.02.19-python310.patch
-)
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild
index d1b8423afe79..03257458af52 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2022.09.03.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # File collisions, bug #540246
 RDEPEND="
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch
deleted file mode 100644
index d76605eb5c1d..000000000000
--- a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-python310.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Ensure configure tests don't fail with Python 3.10, 3.11.
-
-https://github.com/autoconf-archive/autoconf-archive/pull/235
-
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Thu, 5 Aug 2021 11:12:47 -0400
-Subject: [PATCH 1/2] AX_PYTHON_DEVEL: fix for Python 3.10+
-
---- a/m4/ax_python_devel.m4
-+++ b/m4/ax_python_devel.m4
-@@ -208,7 +208,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[[:3]])"`
-+					print ("%d.%d" % sys.version_info[[:2]])"`
- 			fi
- 		fi
- 
-
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Thu, 5 Aug 2021 11:27:24 -0400
-Subject: [PATCH 2/2] AX_PYTHON: Add 3.10 and 3.11
-
---- a/m4/ax_python.m4
-+++ b/m4/ax_python.m4
-@@ -55,7 +55,7 @@
- AC_DEFUN([AX_PYTHON],
- [AC_MSG_CHECKING(for python build information)
- AC_MSG_RESULT([])
--for python in python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-+for python in python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
- AC_CHECK_PROGS(PYTHON_BIN, [$python])
- ax_python_bin=$PYTHON_BIN
- if test x$ax_python_bin != x; then
-
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index b9dbcdb4d2ef..d5e4a95c4f39 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -9,6 +9,6 @@ DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
 EBUILD gettext-0.21-r3.ebuild 4676 BLAKE2B 44a27f8c9ca8b7093cbb6c53dfea6ad562da229c0c00ba2420a06cfa1e52e5fff178c1ac4ae1516f855e1aeef05b5aefc61add22f1ca3a12b6371090b07f41a9 SHA512 c11ef2bd673318196170021a272595a916b136524aa1ccc1450bdd66cec8a757d020a4cd8a4ed4ecbff5343ce482ded80485c80990b10d97749ce732c2f559fd
-EBUILD gettext-0.21-r4.ebuild 4885 BLAKE2B f59da97b1d94144305ed1783933510fd81a87e64ff2bb09ac5f2ece0dbf43123dcf70637c910c854b1946b232946acad6d012f7b2236f9a7e97e681fc96c322e SHA512 0b7d2469ef9733978bc42cd67cdc096e37cad952385309fbca8a9d32d5e5c5e528648aced7af144da5052b2c005be7a379165879bb8a93b9586b5b2d5b6f2862
+EBUILD gettext-0.21-r4.ebuild 4882 BLAKE2B 2fd56818df1934c9f9bde70e7f5580a92ec59c8fd9fc7dc111ce29d9d41430ca979507acefeb358aececf4b87efee5d8f3b514f6fc30f5878263b7f8d1ae3cb1 SHA512 9d69e1b87d0390759ad2f3d348d6437e5681ba0eb6b3ff03a48193118e28c7e6ebb663ca5979fe7e64972b20b3cb189b15ede2eda6d369ab5ebab304df9a1710
 EBUILD gettext-0.21.1.ebuild 5163 BLAKE2B 917a05cc26b43d84720641a7dc51c8facf11cc3bb4e765a995194b60e8dc705f9dd8adb50cdfbab0cd84b58c7d7b4278c1ec318dd086bb4a5cf37dfb4f434f9a SHA512 a568817a25246bc53dbf92149dc069c56448affcc5284ad5ff941f1382467e916f7e5e1f1609353808f45d674ac70642af229d57b1f9a53ede9be0799e728040
 MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac
diff --git a/sys-devel/gettext/gettext-0.21-r4.ebuild b/sys-devel/gettext/gettext-0.21-r4.ebuild
index e53871814631..5d08bb74c889 100644
--- a/sys-devel/gettext/gettext-0.21-r4.ebuild
+++ b/sys-devel/gettext/gettext-0.21-r4.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 # Only libasprintf is under the LGPL (and libintl is in a sep package),
 # so put that license behind USE=cxx.
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index fb0dadf960b4..4d4ada3e9a30 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index d7558850a1cb..095e81687378 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,8 +1,5 @@
-AUX 2.4.0-dmcrypt.confd 4009 BLAKE2B efaf826fc78b60068aeddb6d5fbd9665bcf85e66c5f0b48fa74316d8ad98fb5400ed89f674b6a93e30d76fa1adc3391a209a95936156fcd472b779cf5dbdd8b4 SHA512 131cee054019eed3f1939615386ba849bad2b02e31042075d5839e9a5943c8716431aae01aece25b2193645bcd706e14e6c947ee59f1fab4c2d7e0afc80228be
-AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f66ba4be5df1a0d29da7c1dadd0e2379a5f4ef35a9b17d4cb11fe2419cce6cad2df63546370b6a1975b SHA512 7f32bd09e22405deb4a7cd8233da0262764233562421a8fb49bd625be591f1dc27154c2204462df480668ab2f1a81aab5a992f426603a8a4fd86cd15a27a6a97
 AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a
 AUX 2.4.3-dmcrypt.rc 9697 BLAKE2B 356a54e5de24717731ffdcf6235fe229bc57169c3bd248f5cac77c1cbf0c596c77c0d95a5ef502972db3bab155f4253a53db9be2b7787e10791275d4695821d2 SHA512 61434a6ae3346e5a2f330656055add0c32d1c79a62fec3e8b0f4e38e95f8cf0a3e8ab8d1cc0955316e2ea1b47d9863bffbf46c980fc2f32d6fdd4e817769ca9c
 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e
 EBUILD cryptsetup-2.4.3-r2.ebuild 4259 BLAKE2B 227bedbb96411297404c9c5468354cf263705f3105d7452f770c86718489ab5bb20ba3a991c0aa27703f1d8c8b38549d5756e9298604ed4b6ba12f4dd2a028b4 SHA512 00c15a4ff6dfd2a59370661d1005c411b0da4941b41e33e5b8571d86016323c3921f09679a4a6717c46175360a930f35c355f2eeb460cbd90bd4c4fe702f4cee
-EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe
 MISC metadata.xml 1204 BLAKE2B aff35e9aa5025dce5c55206274e23bc575aa8138b1e8d0269ba322c86ef10f4702e69f7838c3d580a963e39c1270d2e907234f540febb5bd4fc403412623a83b SHA512 86f328fadbadb8e582b4ae9a055f943e0c9cb3711a9c80cf84868d5e329770957886d58fe43aaec7aa0f0985acb0e4ac12947f58d1a423814ea4ea8d290b2b39
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
deleted file mode 100644
index 79282c022d79..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.4.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info tmpfiles
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs test +udev urandom"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt !ssh !udev )" # 496612, 832711
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? (
-		dev-libs/libgcrypt:0=[static-libs(+)]
-		dev-libs/libgpg-error[static-libs(+)]
-	)
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? ( dev-libs/openssl:0=[static-libs(+)] )
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	ssh? ( net-libs/libssh[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}
-	udev? ( virtual/libudev:= )"
-# vim-core needed for xxd in tests
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	test? ( app-editors/vim-core )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable !static external-tokens)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-		$(use_enable ssh ssh-token)
-		$(usex argon2 '' '--with-luks2-pbkdf=pbkdf2')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		mv "${ED}"/sbin/integritysetup{.static,} || die
-		if use ssh ; then
-			mv "${ED}"/sbin/cryptsetup-ssh{.static,} || die
-		fi
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/2.4.0-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/2.4.0-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	tmpfiles_process cryptsetup.conf
-}
diff --git a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd
deleted file mode 100644
index 96c523e0f954..000000000000
--- a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.confd
+++ /dev/null
@@ -1,112 +0,0 @@
-# /etc/conf.d/dmcrypt
-
-# For people who run dmcrypt on top of some other layer (like raid),
-# use rc_need to specify that requirement.  See the runscript(8) man
-# page for more information.
-
-#--------------------
-# Instructions
-#--------------------
-
-# Note regarding the syntax of this file.  This file is *almost* bash,
-# but each line is evaluated separately.  Separate swaps/targets can be
-# specified.  The init-script which reads this file assumes that a
-# swap= or target= line starts a new section, similar to lilo or grub
-# configuration.
-
-# Note when using gpg keys and /usr on a separate partition, you will
-# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
-# and ensure that gpg has been compiled statically.
-# See http://bugs.gentoo.org/90482 for more information.
-
-# Note that the init-script which reads this file detects whether your
-# partition is LUKS or not. No mkfs is run unless you specify a makefs
-# option.
-
-# Global options:
-#----------------
-
-# How long to wait for each timeout (in seconds).
-dmcrypt_key_timeout=1
-
-# Max number of checks to perform (see dmcrypt_key_timeout).
-#dmcrypt_max_timeout=300
-
-# Number of password retries.
-dmcrypt_retries=5
-
-# Arguments:
-#-----------
-# target=<name>                      == Mapping name for partition.
-# swap=<name>                        == Mapping name for swap partition.
-# source='<dev>'                     == Real device for partition.
-#                                    Note: You can (and should) specify a tag like UUID
-#                                    for blkid (see -t option).  This is safer than using
-#                                    the full path to the device.
-# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
-# remdev='<dev>'                     == Device that will be assigned to removable media.
-# gpg_options='<opts>'               == Default are --quiet --decrypt
-# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
-# loop_file='<file>'                 == Loopback file.
-#                                    Note: If you omit $source, then a free loopback will
-#                                    be looked up automatically.
-# pre_mount='cmds'                   == commands to execute before mounting partition.
-# post_mount='cmds'                  == commands to execute after mounting partition.
-# wait=5                             == wait given amount of seconds for source to appear
-#-----------
-# Supported Modes
-# gpg					== decrypt and pipe key into cryptsetup.
-#						Note: new-line character must not be part of key.
-#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
-
-#--------------------
-# dm-crypt examples
-#--------------------
-
-## swap
-# Swap partitions. These should come first so that no keys make their
-# way into unencrypted swap.
-# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
-# If no makefs is given then mkswap will be assumed
-#swap=crypt-swap
-#source='/dev/hda2'
-
-## /home with passphrase
-#target=crypt-home
-#source='/dev/hda5'
-
-## /home with regular keyfile
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-
-## /home with gpg protected key
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-
-## /home with regular keyfile on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-#remdev='/dev/sda1'
-
-## /home with gpg protected key on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-#remdev='/dev/sda1'
-
-## /tmp with regular keyfile
-#target=crypt-tmp
-#source='/dev/hda6'
-#key='/full/path/to/tmpkey'
-#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
-#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
-
-## Loopback file example
-#target='crypt-loop-home'
-#source='/dev/loop0'
-#loop_file='/mnt/crypt/home'
-
-# The file must be terminated by a newline.  Or leave this comment last.
diff --git a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc b/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc
deleted file mode 100644
index 102576509515..000000000000
--- a/sys-fs/cryptsetup/files/2.4.0-dmcrypt.rc
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use modules
-	before checkfs fsck
-
-	if grep -qs ^swap= "${conf_file}" ; then
-		before swap
-	fi
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-	. /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute() {
-	local dev ret mode foo source_dev
-
-	if [ -z "${target}" -a -z "${swap}" ] ; then
-		return
-	fi
-
-	# Set up default values.
-	: ${dmcrypt_key_timeout:=1}
-	: ${dmcrypt_max_timeout:=300}
-	: ${dmcrypt_retries:=5}
-	: ${wait:=5}
-
-	# Handle automatic look up of the source path.
-	if [ -z "${source}" -a -n "${loop_file}" ] ; then
-		source=$(losetup --show -f "${loop_file}")
-	fi
-	case ${source} in
-	*=*)
-		i=0
-		while [ ${i} -lt ${wait} ]; do
-			if source_dev="$(blkid -l -t "${source}" -o device)"; then
-				source="${source_dev}"
-				break
-			fi
-			: $((i += 1))
-			einfo "waiting for source \"${source}\" for ${target}..."
-			sleep 1
-		done
-		;;
-	esac
-	if [ -z "${source}" ] || [ ! -e "${source}" ] ; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [ -n "${target}" ] ; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "${swap}" ] ; then
-		if cryptsetup isLuks ${source} 2>/dev/null ; then
-			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-			return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	fi
-
-	if [ -n "${loop_file}" ] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# open   <device> <name>      # <device> is $source
-	# create <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="${target}" arg3="${source}"
-	if cryptsetup isLuks ${source} 2>/dev/null ; then
-		arg1="open"
-		arg2="${source}"
-		arg3="${target}"
-	fi
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "${key}" ] ; then
-		read_abort() {
-			# some colors
-			local ans savetty resettty
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			shift
-			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-			# we end up having to implement our own crap with stty/etc...
-			savetty=$(stty -g)
-			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-			trap 'eval "${resettty}"' EXIT HUP INT TERM
-			stty -icanon
-			stty min 0 time "$(( $2 * 10 ))"
-			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-			eval "${resettty}"
-			if [ -z "${ans}" ] ; then
-				printf '\r'
-			else
-				echo
-			fi
-			case ${ans} in
-				[yY]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key%:*}
-		case "${mode}" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "${remdev}" ] ; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ] ; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${dmcrypt_key_timeout} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					: $((i += 1))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "${key}" ] ; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "${mode}" = "gpg" ] ; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if command -v gpg >/dev/null ; then
-			i=0
-			while [ ${i} -lt ${dmcrypt_retries} ] ; do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \
-					cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3}
-				ret=$?
-				# The timeout command exits 124 when it times out.
-				[ ${ret} -eq 0 -o ${ret} -eq 124 ] && break
-				: $(( i += 1 ))
-			done
-			eend ${ret} "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "${mode}" = "reg" ] ; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "${mntrem}" ] ; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [ ${ret} -ne 0 ] ; then
-		cryptfs_status=1
-	else
-		if [ -n "${pre_mount}" ] ; then
-			dev="/dev/mapper/${target}"
-			eval ebegin \""    pre_mount: ${pre_mount}"\"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-	# We're given something like:
-	#    foo=bar=cow
-	# Return the "bar=cow" part.
-	case $1 in
-	*=*)
-		echo "${1#*=}"
-		;;
-	esac
-}
-
-start() {
-	local header=true cryptfs_status=0
-	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-	local x
-	for x in $(cat /proc/cmdline) ; do
-		case "${x}" in
-		key_timeout=*)
-			dmcrypt_key_timeout=$(get_bootparam_val "${x}")
-			;;
-		esac
-	done
-
-	while read targetline <&3 ; do
-		case ${targetline} in
-		# skip comments and blank lines
-		""|"#"*) continue ;;
-		# skip service-specific openrc configs #377927
-		rc_*) continue ;;
-		esac
-
-		${header} && ebegin "Setting up dm-crypt mappings"
-		header=false
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-		target=*|swap=*)
-			# If we have a target queued up, then execute it
-			dm_crypt_execute
-
-			# Prepare for the next target/swap by resetting variables
-			unset gpg_options key loop_file target options pre_mount post_mount source swap remdev wait
-			;;
-
-		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|wait=*|source=*)
-			if [ -z "${target}${swap}" ] ; then
-				ewarn "Ignoring setting outside target/swap section: ${targetline}"
-				continue
-			fi
-			;;
-
-		dmcrypt_*=*)
-			# ignore global options
-			continue
-			;;
-
-		*)
-			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-			;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	dm_crypt_execute
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-	local line header
-
-	# Break down all mappings
-	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Removing dm-crypt mappings"
-		header=false
-
-		target= swap=
-		eval ${line}
-
-		[ -n "${swap}" ] && target=${swap}
-		if [ -z "${target}" ] ; then
-			ewarn "invalid line in ${conf_file}: ${line}"
-			continue
-		fi
-
-		ebegin "  ${target}"
-		cryptsetup remove ${target}
-		eend $?
-	done
-
-	# Break down loop devices
-	header=true
-	grep '^source=./dev/loop' ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Detaching dm-crypt loop devices"
-		header=false
-
-		source=
-		eval ${line}
-
-		ebegin "  ${source}"
-		losetup -d "${source}"
-		eend $?
-	done
-
-	return 0
-}
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index eac72364d581..3e078599940f 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,12 +1,6 @@
 AUX dd-rescue-1.99.11-musl-r2.patch 1556 BLAKE2B 6b71ac5e30c988894a5fe260372e004c48280f4eeea0f1d79ac5a103bfc3ce33f2c2d44b424203c0c58518bbecd374719a7de53d0d2c876336f843fb20eb75e7 SHA512 82ade941b969342b2b91c92667301c18d16da06eed88fae2e43d5e2833dfcd597c17b2842930ec6c5ae0712dbd3768e35499d9c6aaf67d8510bb0b9e469821b8
-AUX dd-rescue-1.99.8-sysrandom.patch 1204 BLAKE2B 4ef909c294a9299c93fb0ca793e5815fa6f98a9860de1886d9f8da8584a16c0320d56c6ecb6894cbe7f62be62e290f36b76319ed714ccc085c59f952a03cacc6 SHA512 14020e023ea7cf5b56d78776149933241f7424fb22076686a9541737f2fe887406b94e584c5cf650d754e9ead9bf6f2f96c390a2c1fba49f961955df49445a06
-AUX dd-rescue-1.99.8-testhole.patch 1267 BLAKE2B 137961d607cd93ad758c7cf6b8f8ab4b2e54017f43585e277563a5050e9c32ee52567de08af83a048e7e59b2ed05753fc67286d640d3c7998504bd11e9a1286c SHA512 f6a6649a4bce486a07f2eac382db609a47585361ad24ce03bad49da284c0b5485e35fcaec95445c46b74f6dfa5fe09d28c45a33a1b319a03c8cbb15c03a4ee8d
-AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab568cfa501b14f1b56a48f80f7e9777e8be439fe0f1edbe9eb6232344e850360b504dc81ffd1052067c1f68b2152d78e SHA512 b9a2a0c3c035b89c9ef45f52b48d247bcb56f250e86e39bce905826c83823eb855407aeaeadefbf878c946ac019b4f7ec58a46930f0b3450b191b62bd524690a
-AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
 DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001
-DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.99.11.ebuild 2379 BLAKE2B c139cf37004c7ecff737db83b41d5bcbe8c12e9b5855d442d1f3cb66992461c599ff6ed8f2e8af8692e28c6165574224f8eb1154e9e117449030738ee5f7afca SHA512 c47eaeb5495311afbca3f24d5682200d91ccbd103830a29964fdc7198160ff8cf2afedb2b4e6ce83afee85db3379195093908ad80dbfd7dff33c62d1cf421621
 EBUILD dd-rescue-1.99.12.ebuild 2317 BLAKE2B 3c19c525b2aaa0b3f8a0441e279811950886b543f9debc7c6999145ef773289880e6ba54c7cb79f7350e16e899513b3da9640e6b5781105985325db758ef87c5 SHA512 38f0439c10eb86b10788194ccecf27a264c44552f239a180703eb91e41dfc7d243e2e90903e0e3bbfd96eedd65259e1420f55e6ac165bc80e8ad9bec8f771eb0
-EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
deleted file mode 100644
index d421dc83aa03..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs flag-o-matic multilib autotools
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Similar to dd but can copy from source with errors"
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
-
-RDEPEND="lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch
-	"${FILESDIR}"/${PN}-1.99.8-xattr.patch
-	"${FILESDIR}"/${PN}-1.99.8-sysrandom.patch
-	"${FILESDIR}"/${PN}-1.99.8-testhole.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:-ldl:$(LDFLAGS) -ldl:' \
-		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
-		Makefile || die
-
-	if ! use cpu_flags_x86_sse4_2; then
-		sed -i \
-			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
-			configure.in || die
-	fi
-
-	if ! use cpu_flags_x86_avx2; then
-		sed -i \
-			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
-			configure.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# OpenSSL is only used by a random helper tool we don't install.
-	ac_cv_header_attr_xattr_h=$(usex xattr) \
-	ac_cv_header_openssl_evp_h=no \
-	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
-	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
-	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
-	econf
-}
-
-_emake() {
-	local arch
-	case ${ARCH} in
-	x86)   arch=i386;;
-	amd64) arch=x86_64;;
-	arm)   arch=arm;;
-	arm64) arch=aarch64;;
-	esac
-
-	local os=$(usex kernel_linux Linux IDK)
-
-	# The Makefile is a mess.  Override a few vars rather than patch it.
-	emake \
-		MACH="${arch}" \
-		OS="${os}" \
-		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
-		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
-		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
-		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
-		CC="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	append-cflags -fcommon # bug 707796
-	_emake check
-}
-
-src_install() {
-	# easier to install by hand than trying to make sense of the Makefile.
-	dobin dd_rescue
-	dodir /usr/$(get_libdir)/${PN}
-	cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die
-	dodoc README.dd_rescue
-	doman dd_rescue.1
-	use lzo && doman ddr_lzo.1
-}
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
deleted file mode 100644
index 5ef3da297747..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use sys/random.h for getrandom() decl if present.
-
---- a/configure.in
-+++ b/configure.in
-@@ -6,7 +6,7 @@ AC_C_INLINE
- AC_HEADER_STDC
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h sys/random.h malloc.h sched.h sys/statvfs.h])
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---- a/random.c
-+++ b/random.c
-@@ -23,6 +23,10 @@ typedef unsigned int __u32;
- #include <linux/random.h>
- #endif
- 
-+#ifdef HAVE_SYS_RANDOM_H
-+#include <sys/random.h>
-+#endif
-+
- static void msleep(unsigned int msecs)
- {
- 	struct timespec ts1, ts2;
- 
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
deleted file mode 100644
index 444907088b3b..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 7f2ff6434586083747bc5d046e0207886025e684
-Author: Kurt Garloff <kurt@garloff.de>
-Date:   Sat May 12 09:54:45 2018 +0000
-
-    Fix test case by ensuring there is a hole ...
-
-diff --git a/test_crypt.sh b/test_crypt.sh
-index 47f1fc9..62cf853 100755
---- a/test_crypt.sh
-+++ b/test_crypt.sh
-@@ -52,13 +52,20 @@ rm dd_rescue2
- 
- # Holes (all), skiphole
- echo "*** Holes ***"
-+# Produce file that consists of dd_rescue + hole + dd_rescue
- ./dd_rescue -qpt dd_rescue dd_rescue3
- ./dd_rescue -qS 512k dd_rescue dd_rescue3
-+# Ensure there is a hole even if dd_rescue is long
-+./dd_rescue -qS 384k -m 128k /dev/zero dd_rescue3
-+# Test without and with skiphole
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qpt"
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qpt"
-+# Store 384k-512k in cmp3
- ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
-+# Should be 128k of zeroes
- ./dd_rescue -qm 128k /dev/zero dd_rescue3.cmp2
- cmp dd_rescue3.cmp2 dd_rescue3.cmp3 || exit 4
-+# Repeat test with reverse
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qptr"
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qptr"
- ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
- 
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
deleted file mode 100644
index 39e719c33861..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
+++ /dev/null
@@ -1,300 +0,0 @@
---- dd_rescue-1.99.8/configure.in
-+++ dd_rescue-1.99.8/configure.in
-@@ -6,7 +6,7 @@
- AC_HEADER_STDC
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---- dd_rescue-1.99.8/dd_rescue.c
-+++ dd_rescue-1.99.8/dd_rescue.c
-@@ -161,8 +161,8 @@
- #endif
- 
- /* xattrs */
--#ifdef HAVE_ATTR_XATTR_H
--# include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+# include <sys/xattr.h>
- #else
- /* TODO: Could provide the prototypes for the syscalls ourselves ... */
- # warning No support for copying extended attributes / ACLs
-@@ -1276,7 +1276,7 @@
- 
- /** Copy xattrs */
- int copyxattr(const char* inm, const char* onm)
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- {
- 	char *attrs = NULL;
- 	ssize_t aln = listxattr(inm, NULL, 0);
-@@ -2486,7 +2486,7 @@
- #ifdef FITRIM
- 	fprintf(stderr, "fitrim ");
- #endif
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	fprintf(stderr, "xattr ");
- #endif
- #if (defined(__x86_64__) || defined(__i386__)) && !defined(NO_RDRND)
---- dd_rescue-1.99.8/libddr_crypt.c
-+++ dd_rescue-1.99.8/libddr_crypt.c
-@@ -47,8 +47,8 @@
- #include <endian.h>
- #include <signal.h>
- 
--#ifdef HAVE_ATTR_XATTR_H
--#include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+#include <sys/xattr.h>
- #endif
- 
- #if __WORDSIZE == 64
-@@ -90,7 +90,7 @@
- 	size_t saltlen;
- 	loff_t lastpos;
- 	loff_t processed;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- 	char* salt_xattr_name;
- 	char sxattr, sxfallback;
- 	char* key_xattr_name;
-@@ -113,13 +113,13 @@
- 		" Parameters: [alg[o[rithm]]=]ALG:enc[rypt]:dec[rypt]:engine=STR:pad=STR\n"
- 		"\t:keyhex=HEX:keyfd=[x]INT[@INT@INT]:keyfile=NAME[@INT@INT]:keygen:keysfile\n"
- 		"\t:ivhex=HEX:ivfd=[x]INT[@INT@INT]:ivfile=NAME[@INT@INT]:ivgen:ivsfile\n"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		"\t:keyxattr[=xattr_name]:kxfallback:ivxattr[=xattr_name]:ixfallback\n"
- #endif
- 		"\t:pass=STR:passfd=[x]INT[@INT@INT]:passfile=NAME[@INT@INT]\n"
- 		"\t:salt=STR:salthex=HEX:saltfd=[x]INT[@INT@INT]:saltfile=NAME[@INT@INT]\n"
- 		"\t:saltlen=INT:saltgen:saltsfile"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		":saltxattr[=xattr_name]:sxfallback"
- #endif
- 		"\n\t:pbkdf2[=INT]:opbkdf[11]:debug:bench[mark]:skiphole:weakrnd:outkeyiv:ctrbug198\n"
-@@ -346,7 +346,7 @@
- 			state->saltlen = ATOL(param+8);
- 		else if (!strcmp(param, "saltgen"))
- 			state->sgen = 1;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		else if (!strcmp(param, "saltxattr"))
- 			err += set_flag(&state->sxattr, "saltxattr");
- 		else if (!memcmp(param, "saltxattr=", 10)) {
-@@ -709,7 +709,7 @@
- 	return err;
- }
- 
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- int get_xattr(crypt_state *state, const char* atrnm,
- 		unsigned char* data, int dlen,
- 		char fb, char* fbf, char* flag)
-@@ -883,7 +883,7 @@
- 	sprintf(ivsnm, "IVS.%s", state->alg->name);
- 	sprintf(keynm, "KEYS.%s", state->alg->name);
- 	sprintf(saltnm, "SALT.%s", state->alg->name);
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	if (state->sxattr && !state->salt_xattr_name) {
- 		state->salt_xattr_name = malloc(32);
- 		snprintf(state->salt_xattr_name, 32, "user.salt.%s", state->alg->name);
-@@ -958,7 +958,7 @@
- 		}
- 
- 		/* 5c */
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		/* Try getting salt from xattr */
- 		if (!state->sset && state->sxattr && !get_salt_xattr(state) && !state->enc)
- 			state->sxattr = 0;
-@@ -999,7 +999,7 @@
- 			if (write_file(state->sec->salt, state->sfnm, 8, 0640))
- 				return -1;
- 		}
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		/* Write salt to xattr */
- 		if (state->sxattr && state->enc && set_salt_xattr(state)) {
- 			if (!state->sxfallback)
-@@ -1028,7 +1028,7 @@
- 			if (!state->keyf && !state->kxattr)
- 				FPLOG(WARN, "Generated key not written anywhere?\n", NULL);
- 			else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 				/* Write key to xattr, failure is fatal */
- 				if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
- 					return -1;
-@@ -1066,7 +1066,7 @@
- 				FPLOG(FATAL, "Key generation with pass+salt failed!\n", NULL);
- 				return -1;
- 			}
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 			/* Write key to xattr, failure is fatal */
- 			if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
- 				return -1;
-@@ -1077,7 +1077,7 @@
- 					return -1;
- 
- 		} else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 			if (state->kxattr)
- 				get_key_xattr(state);
- #endif
-@@ -1100,7 +1100,7 @@
- 			}
- 		}
- 	} else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		if (state->kxattr && set_key_xattr(state) && !state->kxfallback) {
- 			FPLOG(FATAL, "Can't save key in xattr");
- 			return -1;
-@@ -1123,7 +1123,7 @@
- 			if (!state->ivf && !state->ixattr)
- 				FPLOG(WARN, "Generated IV not saved?\n", NULL);
- 			else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 				/* Write IV to xattr, failure w/o fb is fatal */
- 				if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
- 					return -1;
-@@ -1149,7 +1149,7 @@
- 					return -1;
- 				}
- 			}
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 			/* Write IV to xattr, failure w/o fb is fatal */
- 			if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
- 				return -1;
-@@ -1159,7 +1159,7 @@
- 				if (write_keyfile(state, ivsnm, encnm, state->sec->nonce1, BLKSZ, 0640, 1, 0))
- 					return -1;
- 		} else { 
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 			if (state->ixattr)
- 				get_iv_xattr(state);
- #endif
-@@ -1180,7 +1180,7 @@
- 			}
- 		 }
- 	} else if (state->alg->stream->needs_iv) {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		if (state->ixattr && set_iv_xattr(state) && !state->ixfallback) {
- 			FPLOG(FATAL, "Can't save IV in xattr");
- 			return -1;
-@@ -1454,7 +1454,7 @@
- 		FPLOG(INFO, "%.2fs CPU time, %.1fMiB/s\n",
- 			(double)state->cpu/CLOCKS_PER_SEC, 
- 			state->processed/1024 / (state->cpu/(CLOCKS_PER_SEC/1024.0)));
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	if (state->salt_xattr_name)
- 		free(state->salt_xattr_name);
- 	if (state->key_xattr_name)
---- dd_rescue-1.99.8/libddr_hash.c
-+++ dd_rescue-1.99.8/libddr_hash.c
-@@ -36,8 +36,8 @@
- #include <netinet/in.h>	/* For ntohl/htonl */
- #include <endian.h>
- 
--#ifdef HAVE_ATTR_XATTR_H
--#include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+#include <sys/xattr.h>
- #endif
- // TODO: pass at runtime rather than compile time
- #define HASH_DEBUG(x) if (state->debug) x
-@@ -75,7 +75,7 @@
- #endif
- 	int hmacpln;
- 	char xfallback;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- 	char chk_xattr, set_xattr, xnmalloc;
- 	char* xattr_name;
- #endif
-@@ -90,7 +90,7 @@
- 		":multipart=size"
- #endif
- 		"\n"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		"\t:chk_xattr[=xattr_name]:set_xattr[=xattr_name]:fallb[ack][=FILE]\n"
- #endif
- 		" Use algorithm=help to get a list of supported hash algorithms\n";
-@@ -167,7 +167,7 @@
- 			state->append = param+7;
- 		else if (!memcmp(param, "prepend=", 8))
- 			state->prepend = param+8;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- 		else if (!memcmp(param, "chk_xattr=", 10)) {
- 			state->chk_xattr = 1; state->xattr_name = param+10; }
- 		else if (!strcmp(param, "chk_xattr"))
-@@ -258,7 +258,7 @@
- 		FPLOG(FATAL, "No hash algorithm specified\n");
- 		return --err;
- 	}
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	if ((state->chk_xattr || state->set_xattr) && !state->xattr_name) {
- 		state->xattr_name = (char*)malloc(32);
- 		state->xnmalloc = 1;
-@@ -269,7 +269,7 @@
- 	}
- #endif
- 	if ((!state->chkfnm || !*state->chkfnm) && (state->chkf || state->outf
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 				|| state->xfallback
- #endif
- 			     				)) {
-@@ -301,7 +301,7 @@
- 	if (!stat || !(*stat))
- 		return -1;
- 	hash_state *state = (hash_state*)*stat;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	if (state->xnmalloc)
- 		free((void*)state->xattr_name);
- #endif
-@@ -351,7 +351,7 @@
- 		strcat(nnm, "->");
- 		strcat(nnm, opt->oname);
- 		state->fname = nnm;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 		if (state->chk_xattr || state->set_xattr) {
- 			--err;
- 			FPLOG(WARN, "Can't access xattr in the middle of a plugin chain!");
-@@ -607,7 +607,7 @@
- 	return err;
- }
- 
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- int check_xattr(hash_state* state, const char* res)
- {
- 	char xatstr[144];
-@@ -734,7 +734,7 @@
- 		err += check_chkf(state, res);
- 	if (state->outf)
- 		err += write_chkf(state, res);
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- 	if (state->chk_xattr)
- 		err += check_xattr(state, res);
- 	if (state->set_xattr)
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
deleted file mode 100644
index c98ddeca13a0..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From e96b79c9e4cd6c40ba6e5fe495904f07a95fb909 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 13 Dec 2017 01:02:12 +0100
-Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL
-
-Rewrite of Justin Keogh's patch [Link 1] to fix build problems
-on ARM.
-
-Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
-Fixes: https://bugs.gentoo.org/616364
----
- configure.in  | 2 +-
- ddr_ctrl.h    | 3 +++
- ffs.h         | 3 +++
- fiemap.h      | 4 ++++
- fmt_no.h      | 2 ++
- fstrim.h      | 3 +++
- libddr_hash.c | 4 ++++
- libddr_lzo.c  | 3 +++
- libddr_null.c | 3 +++
- sha512.h      | 4 ++++
- 10 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index eb2e813..355ea84 100644
---- a/configure.in
-+++ b/configure.in
-@@ -6,7 +6,7 @@ AC_C_INLINE
- AC_HEADER_STDC
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
-diff --git a/ddr_ctrl.h b/ddr_ctrl.h
-index ac71e4f..58cffd5 100644
---- a/ddr_ctrl.h
-+++ b/ddr_ctrl.h
-@@ -7,6 +7,9 @@
-  *  License: GNU GPLv2 or v3
-  */
- 
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _DDR_CTRL_H
- #define _DDR_CTRL_H
- 
-diff --git a/ffs.h b/ffs.h
-index 2215080..c1f3444 100644
---- a/ffs.h
-+++ b/ffs.h
-@@ -28,6 +28,9 @@
- #include <endian.h>
- #endif
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- 
- #ifdef HAVE_FFS
- # define myffs(x) ffs(x)
-diff --git a/fiemap.h b/fiemap.h
-index df1ba95..31cde3b 100644
---- a/fiemap.h
-+++ b/fiemap.h
-@@ -29,5 +29,9 @@
- 
- #endif	/* HAVE_LINUX_FS_H */
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- #endif	/* _FIEMAPH */
- 
-diff --git a/fmt_no.h b/fmt_no.h
-index cb0a81b..52ec236 100644
---- a/fmt_no.h
-+++ b/fmt_no.h
-@@ -1,4 +1,6 @@
- /** Decl for int to str conversion with highlighting */
-+#define _GNU_SOURCE
-+#include <fcntl.h>
- 
- #ifndef _FMT_NO_H
- #define _FMT_NO_H
-diff --git a/fstrim.h b/fstrim.h
-index 7447061..b9cdcbb 100644
---- a/fstrim.h
-+++ b/fstrim.h
-@@ -1,3 +1,6 @@
-+#define _GNU_SOURCE
-+#include <fcntl.h>
-+
- #ifndef _FSTRIM_H
- #define _FSTRIM_H
- 
-diff --git a/libddr_hash.c b/libddr_hash.c
-index 7c8cdf8..cdbbd4d 100644
---- a/libddr_hash.c
-+++ b/libddr_hash.c
-@@ -33,6 +33,10 @@
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- #include <netinet/in.h>	/* For ntohl/htonl */
- #include <endian.h>
- 
-diff --git a/libddr_lzo.c b/libddr_lzo.c
-index 8d3983e..8c83c04 100644
---- a/libddr_lzo.c
-+++ b/libddr_lzo.c
-@@ -26,6 +26,9 @@
- #include <errno.h>
- #include <netinet/in.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- #include <signal.h>
- #include <lzo/lzo1x.h>
- #include <lzo/lzo1y.h>
-diff --git a/libddr_null.c b/libddr_null.c
-index 3f0f194..c379961 100644
---- a/libddr_null.c
-+++ b/libddr_null.c
-@@ -10,6 +10,9 @@
- #include "ddr_ctrl.h"
- #include <string.h>
- #include <stdlib.h>
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
- 
- /* fwd decl */
- extern ddr_plugin_t ddr_plug;
-diff --git a/sha512.h b/sha512.h
-index 4d08043..f54d371 100644
---- a/sha512.h
-+++ b/sha512.h
-@@ -3,6 +3,10 @@
- 
- #include "hash.h"
- 
-+#ifdef HAVE_SYS_REG_H
-+#include <sys/reg.h>
-+#endif
-+
- void sha512_init(hash_t *ctx);
- void sha384_init(hash_t *ctx);
- void sha512_128(const uint8_t* msg, hash_t* ctx);
--- 
-2.15.0
-
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 9fd27ed1cccc..c2dac1eb9696 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -2,13 +2,10 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f
 AUX fuse-2.9.9-avoid-calling-umount.patch 1264 BLAKE2B f02bb80aab844f90638ed291891d819169946e3e4e58318bf370f5f3721aa80ba8ecd7cb127e387780e5ed8336875e3eca2d776ecde29a85e40821ee89c8264d SHA512 24f6c7ccf8b3d291e0e477685532854a21aeb65a90f7c428db039e6c7ba8a4cdb5435f2effba3a397448c0f6a44e056f2580eb55357a0b29c6c78bf5b364830c
 AUX fuse-2.9.9-closefrom-glibc-2-34.patch 1649 BLAKE2B 6697ecfd16ca8a71ec10c0caadee97c84fe412056c04124cf501a30df1dd7cb5bbbfd8a761692f2396755dda156fd94b86278d78f1a2bd2d7a41b9fd87f20fee SHA512 77bca6a67c235d7d22b156a9c3a8b906de59029d28fa0c985cb15e30d306b0dd6b9437d75eabe307aca7e159ecd90e47bd8fb723a582e95d0c491a6cb308e8a5
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f654626ba9d397753a7fbbf21dde877e6c528a44950ae1c828583f36a49c39f44a587544e44f8e749bd4c604b33b4 SHA512 da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe
 DIST fuse-3.11.0.tar.xz 3515332 BLAKE2B 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 SHA512 033324de7ea4c7e91fb21c453211c01e53771ec5805c2126e13ef2d4334119a51f5c783b6249e888e28888c753aa04b48ed33cefb6d486d8d526546565f6ae50
 DIST fuse-3.12.0.tar.xz 3206368 BLAKE2B 9f7df324f5c28480e48264c53c23fd2afc372592aab586bebdee38a809881603c93d05d0ca20c9007ba4b77efdf391705a93a0a6a12b218c9bd5541aa6a5275d SHA512 b66232785fbe83ec32a9779542d085dc2c19f1fe0655e5f1e22e1a7add69795df40eb58da256a963537e64a9bf798ed8dfbc678f977fdd22567c5befa5b6ca04
 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55
-EBUILD fuse-2.9.9-r1.ebuild 2038 BLAKE2B 7f3651e463178f8ae6767cd156d5182e916e8031f40f7c84d31076d8b508569b6dacc33da339493bc55399a6d53645c314e57632b67d32e620360d9f1f50b38b SHA512 00a9431575b9b5d802c05c96b30757f432ca68e9a7701071ff91805537d44d8e86e2709c9da96632f182cc59ad53637bdf873509a521200b897f32fb6e23cea2
 EBUILD fuse-2.9.9-r2.ebuild 2141 BLAKE2B 92bedf477999e4b306f48194f211769747f1c0955efa944421c5afbfd95f0d2f731b1b0ccc33dd403a8083a915c3c73081b332ea9c08629084923fcc470d0ca5 SHA512 808807cdd2daef32aa9923beb6317e4c13b9a70205899537aecf1c31ad88a7b1945f5b5242edb1869db9d0e56ade86a1fc2b65633c64b02236f9358bae9aafe3
-EBUILD fuse-3.10.5.ebuild 1810 BLAKE2B ca8d502a914aa0b85a2835a446af55615b630840c9b03dce94c556ad3db4551b14e27058d97f3189f9c7c045a6d0f1b4e4c863e53ea607778d395a634454b91b SHA512 531ee27a2cc22b3510e44f134df13a3f8818ff265610e4943754d0539494d05d211c88b16a4f84a336b68cb588764ca856dbffb5598f1e71381df45e8aca2d62
 EBUILD fuse-3.11.0.ebuild 1817 BLAKE2B bc42b0bb79488b1106b9b8dc7382a40576f8e21941c45018807d504d1e0dd7fed2b32d36145d406de4b8e4060464f41adc7c8231c3689a7d49b9a76620e41980 SHA512 813c8414dedcdd36b9fa8b8f7c8991af7fbd50b5239ee6adc635e176c8bd67769b1bb0dab5ec2641c41b6a584abba36e0bb8f1432631658cd56d2d886a4a38db
-EBUILD fuse-3.12.0.ebuild 1688 BLAKE2B 8c986f9360cefde1dc644819b8b6a9092b5d901e1c59a2962a6de781fa092cf8b0c85631019c55efefc5fed6c06d1e5a537ac6193135ca6640754e46f0d5c4c1 SHA512 47cd40224c28d361f1df7b4cbad8a77dbc7c7a922a721004624de2b22196a012bc48ecb0da8e1325303e04590f1947355bf042bbe13b0d259330e8ea034a840f
+EBUILD fuse-3.12.0.ebuild 1680 BLAKE2B 113a7dbde8dc78707b9dcc010ecd417dc6c99c2d5fbafb7e34eb9021af177d8dda4deafd1e1781ef85ff25cb01c182ddc6ccd31b433cf97c7b779b2954ee97be SHA512 5d717d3a87afc16d6e784727becae6b7dd4afafcd3225541440cea60c2c352d6b05166ee874f2dd94b4dfb17e42e0e563793329a284ed6a202042cdaf35f7613
 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
deleted file mode 100644
index a5bf77f814c8..000000000000
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info udev
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.gz"
-# For bug #809920 to avoid a gettext dependency
-# extracted from sys-devel/gettext-0.21-r1
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.3-kernel-types.patch
-	"${FILESDIR}"/${PN}-2.9.9-avoid-calling-umount.patch
-	"${FILESDIR}"/${PN}-2.9.9-closefrom-glibc-2-34.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~FUSE_FS"
-		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Can be dropped along with additional SRC_URI if dropping eautoreconf
-	cp "${WORKDIR}"/iconv.m4 m4/ || die
-	eautoreconf
-}
-
-src_configure() {
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	# gcc-9 with -flto leads to link failures: #663518 (see also #863899)
-	# https://gcc.gnu.org/PR91186
-	filter-lto
-
-	econf \
-		INIT_D_PATH="${EPREFIX}/etc/init.d" \
-		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
-		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
-		$(use_enable static-libs static) \
-		--disable-example
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc example/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
-	# handled by the device manager
-	rm -r "${D}"/dev || die
-}
diff --git a/sys-fs/fuse/fuse-3.10.5.ebuild b/sys-fs/fuse/fuse-3.10.5.ebuild
deleted file mode 100644
index 3afb5b7135e0..000000000000
--- a/sys-fs/fuse/fuse-3.10.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit meson-multilib udev python-any-r1
-
-DESCRIPTION="An interface for filesystems implemented in userspace"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+suid test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
-	)"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
-
-python_check_deps() {
-	python_has_version "dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use test examples)
-		$(meson_use test tests)
-		-Duseroot=false
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} != 0 ]]; then
-		ewarn "Running as non-root user, skipping tests"
-	elif has sandbox ${FEATURES}; then
-		ewarn "Sandbox enabled, skipping tests"
-	else
-		multilib-minimal_src_test
-	fi
-}
-
-multilib_src_test() {
-	${EPYTHON} -m pytest test || die
-}
-
-multilib_src_install_all() {
-	# installed via fuse-common
-	rm -r "${ED}"{/etc,$(get_udevdir)} || die
-
-	# init script location is hard-coded in install_helper.sh
-	rm -rf "${D}"/etc || die
-
-	# useroot=false prevents the build system from doing this.
-	use suid && fperms u+s /usr/bin/fusermount3
-
-	# manually install man pages to respect compression
-	rm -r "${ED}"/usr/share/man || die
-	doman doc/{fusermount3.1,mount.fuse3.8}
-}
diff --git a/sys-fs/fuse/fuse-3.12.0.ebuild b/sys-fs/fuse/fuse-3.12.0.ebuild
index aad082f7b864..010d644d8bf5 100644
--- a/sys-fs/fuse/fuse-3.12.0.ebuild
+++ b/sys-fs/fuse/fuse-3.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+suid test"
 RESTRICT="!test? ( test ) test? ( userpriv )"
 
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 6271f5a31a12..fb5618256e1f 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,5 @@
 DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4
-DIST mtools-4.0.41.tar.bz2 447256 BLAKE2B 9c0d24a2340038a2f482569e9ae6e326b0ba5fbc9abac3f70637682231e0541711c970b58c3c419f6114ce046084731b2ee7efd8c1e0cf091debec8816d851b5 SHA512 930321004d55c3fee17b1ed2319080446799d3230eee8df1cf4f0bbbbf9a82685837c3bfcce0d84749516fc8b945b1db01ac0379439ca53d974141c66b58ca8c
 DIST mtools-4.0.42.tar.bz2 441506 BLAKE2B 07afec0aea49427ec71ae8ddde9c1dceb33b2533e9acbde3564b0715efce784b5ea8c2122ff588f84e42435abb73ac9912520fd654a078bf0336e62f35f3ce2a SHA512 fd8d56d2dea9ce5e2b311b29ebdd4d89ec7baaf5f2fbfdc85019d480eff4d198ebf0e591c0f28ee1e39d8b81d49d7d4e9ed94b0e94e5b02ce9bbc03632124811
 EBUILD mtools-4.0.39.ebuild 1067 BLAKE2B 2201d21726df7847dd3f9d8d531109c58a47d0282da4c63bdd11870f333bf220895aa3fb63a5f1c8d66624e22dc96c7e7819b240fc99cd0abf912ca38d47169e SHA512 708e4ed394adcc07965530f736cd5b80033f28563a596a1ccdb798af5fb1eaa41ca4e9f72ffe06a88654400a869358dfdbaf76985403d0edc99b9c5ffa4e64e1
-EBUILD mtools-4.0.41.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730
 EBUILD mtools-4.0.42.ebuild 1073 BLAKE2B 283d037ca23d4f96b682ef56b73157b3e34dc8ffaf062a4459a97f75734fe23e398af57f8c385dcada4766ee57c5de46388f8bb4613e4437614329edc86e1dfa SHA512 b0de29e692932ed81b1ffa4e09b66daf328857b13714d793fa3d0c7ca4ae978d91450bf61aa65418468dd307207df8ba80ecff47dc1abd86253520c3a3e95730
 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316
diff --git a/sys-fs/mtools/mtools-4.0.41.ebuild b/sys-fs/mtools/mtools-4.0.41.ebuild
deleted file mode 100644
index c123dc4b895b..000000000000
--- a/sys-fs/mtools/mtools-4.0.41.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="gui"
-
-RDEPEND="
-	virtual/libiconv
-	gui? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if ! use elibc_glibc && ! use elibc_musl ; then
-		# bug #447688
-		append-libs "-liconv"
-	fi
-
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with gui x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# Default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 02a0fc40b6e6..db66ae5eabbc 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
 EBUILD squashfs-tools-4.5.1-r1.ebuild 1361 BLAKE2B 0845f4a351fee8f6fd2982b345c9b04112720a2e00230ed5962a2e72ccab87a9c05f8505efb44f15ccbc5c2fddab46732ae2840052b6cdca9375b4a7f5bdd674 SHA512 210e4d6bcc71c16e6cd76a877869bd911ef5ecc792c8c9db7a259d8bb681c7f3441ced29725774b1b81efef1d1f358445941c6b0d732c91a72d66090e8567e20
-MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117
+MISC metadata.xml 407 BLAKE2B d9b2395d73165c829f6442d6da860e0a4f08f654e72c9b06d26080ef9626974967f6440121c7ddb9fb1c7da42f4f5e022ab4f9d8b0fb959e9fe885b938d72d44 SHA512 7639a59c8155b1735cfc86ab23c1b2392336cc346a956964b65c67b3a0bcc6ece43ed2552d776150f0f310703571dfdca89cf00e5742d10bbebbde0b5fba66ba
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index b772b072f223..2c922ee2c5c8 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:squashfs-tools_project:squashfs-tools</remote-id>
 		<remote-id type="sourceforge">squashfs</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 75da477808e0..e602924c9ed2 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -6,6 +6,6 @@ DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957
 DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739
 DIST xfsprogs-5.19.0.tar.xz 1325160 BLAKE2B 37258ca34b3fc241a5153518ac5230aec9aeefc04d3fc05b96087d8e2fb374094ba21027fbcfa163cbafab21a69a510a7b278972130083387a97fd0027def6e2 SHA512 0b069cd44eb87052ee55ebffcce736ef103adeda539e854bd86d53942f541c07d74cc174f06a2221230eaa82b21d43327833492cd0ded577d442e1935a0abe7d
 EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e
-EBUILD xfsprogs-5.18.0-r1.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2
+EBUILD xfsprogs-5.18.0-r1.ebuild 2328 BLAKE2B ce2442d5aae69e178059e9192a9b850ab0ae5629543825f952a2b79370766a26dc2fdce82a1dbfa050d2833b8c8c72c7173e57bc39d849d80ad58c532b06a70f SHA512 af99aab32f60713b056ec72f1cf21adc62eacc6fcce43b6dc10633bc3b71050070da17e42f8ac31014200239809f2d5505eac658567fd18d11190c38e814f679
 EBUILD xfsprogs-5.19.0.ebuild 2335 BLAKE2B 889580817ad1ca670695eaf8575cd2ce8758785108ec97588b4b31f00d6023c7f770e54f934cd24c9bf6954fd0e7d1df3ffd4bfd17c9566feb03117ce6297d3a SHA512 c275a27e05ea97a5963889a0a7ff7950f3972b13595aedde9cf67d783ea532bbacd6b59a60ca09eec91cf3e1c631cb37c0a20f9f1b7718571dacf7cd1cc654a2
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
index 2f545bcf92b0..e85dda5a3eb3 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.18.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="icu libedit nls selinux"
 
 RDEPEND="dev-libs/inih
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 88a81bdc69ff..ad5789fab59c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 75d93f234997..341a4a98bf56 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -4,5 +4,5 @@ AUX lsof-4.95.0-test-typo.patch 935 BLAKE2B 508728789172985e16ba60a1a28cda07ae18
 DIST lsof-4.95.0.tar.gz 1343380 BLAKE2B ffb0a656463f8f0e84ddcba36d78a94a8b4b883f0ff043c3821b3236274fb11e04b8c82f84f4e67ab922f021769c2711c1e97716aef3190d640fc321110521a3 SHA512 09c5c4b0ea0530e23b98b96df8485f37c2594028b604097a816aee216a8b1a7bc887071e8727cbaf3c765d0992314a5aa49723572cfe926f88806be18a6b8aef
 DIST lsof-4.96.3.tar.gz 1342843 BLAKE2B 79e276d0db5138c356cc8bfa32e6f991ce8860644eb5d02f49ba04ce08076232f0fb8b10e143ee135205de5c64bd053d7bf021e48d666b65ffc01c0a47b76116 SHA512 ad17a73590ffb154a13b8b5de8ada738ce343fcc833012b2a5e9b3bda587785b09ae8bf090a99fba8e84b788c2a6d61eaa7359f939bfa68d2423e604801e2a98
 EBUILD lsof-4.95.0.ebuild 3474 BLAKE2B b5073fd31fee0137da8a587436eb551ce44d06e9aa81295c13d4b82520fc0b4da698c503ebaaa8eb51191e0bfda7b600ad58200846cf7b2426064ae184b629d3 SHA512 cdcdc6706007771ed126f153fa7bfb22c4c7e1c856988c679123f3e95d685c03f1e445492c04a2a0c40d74f85829c65d4433f7ee29068183087899931c49c7a5
-EBUILD lsof-4.96.3.ebuild 3449 BLAKE2B f73acab9c1cefb70b5bb51c2722fbade61581e56b3311c1c7676b0c28d932790aa36aae5183d881cb96801eb91728bd29a3700989a34abc3ea6eb9d1fb81864e SHA512 5b4b397223b3082a4b1bd397a15bea4f8ba1ab3c68768ad7fdea4b56649c5882d798afdcd87e3a1df1366fd284255a128d25bf6aacf75a4d84017d18c083388a
+EBUILD lsof-4.96.3.ebuild 3442 BLAKE2B 0eeeaf15a4a4026bd9417f67e0a1962daed882e8bc8ec93bbafc7e556a09d2e05c29e1f38583db059277414a9d3dafc5d95eff1dec56436afc1c52ae4d5fbaf5 SHA512 0e4e272bfcf1f630f9270ab8cd8214563f5daa0c20d1734320f85d621def03a9f1b7e56898f0d3b54dd2d14165ca9ba6284624a6dfb7fc38cc839958846f5d44
 MISC metadata.xml 474 BLAKE2B d3c6368abc4d7656f3e2b136ffb651465fe7a65d65cb355b675b055ee6aa118d13d08ef224bd31fd17017d2ac3669b35a12dbd85f5375268bd48c099557c6eb1 SHA512 b7f98a413e6eb9fd787725e27c966586fea085ecbde22c84fd01e4fe5582e2e0d2ca18d1cce786d8e979d08e0fbdfed338c22d122d84544c1fc848b61573adfc
diff --git a/sys-process/lsof/lsof-4.96.3.ebuild b/sys-process/lsof/lsof-4.96.3.ebuild
index 02ae293dff8e..8fbad29f51f9 100644
--- a/sys-process/lsof/lsof-4.96.3.ebuild
+++ b/sys-process/lsof/lsof-4.96.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lsof-org/lsof/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
diff --git a/sys-process/numactl/Manifest b/sys-process/numactl/Manifest
index e14903e26fb2..78c8644f4c0c 100644
--- a/sys-process/numactl/Manifest
+++ b/sys-process/numactl/Manifest
@@ -2,7 +2,7 @@ AUX numactl-2.0.14-latomic.patch 1657 BLAKE2B fbaec11307df3fd619254f5f1f253c8561
 AUX numactl-2.0.14-numademo-cflags.patch 501 BLAKE2B 23eb5a93f07edcd67d3b964bd3b48469ec4316e64a9b1641b3dc92e299f03b4f5ec4a31154236fb811fc613da5e8bdd9b401238f6da883f1818f67ab1800ebec SHA512 0d58314ee1454add2d4d35114c5dca0d4785ecd09700f041ad312e7aa0b2d23aa1c3bc0ae01a33db901252081509de45abce690acb3c6ae3f0d9393903739386
 DIST numactl-2.0.14.tar.gz 439000 BLAKE2B 5f2abe25061ac29ecad8a6b24fe800d72c3538d9a155358f4b329ed1140053c7dbd93f01891904f76db94ed01113a34b4ebcbbf40e4060caf747958785ac9590 SHA512 28b95985d6b2f26c5f6f15fe235224c998c86f534adf5fdaa355a292cf2fd65515c91ba2a76c899d552d439b18ea1209a1712bd6755f8ee3a442f3935993b2e6
 DIST numactl-2.0.16.tar.gz 450003 BLAKE2B 3ac38129b914d62958182020f57969878f2817bd3155c6b5362a66f96deb2058268fa8004729a2d3333642c8c0bee73a451030a287958fa145247b7685e426aa SHA512 6e17724567c363a08994fe7f5569b6ec62bd1ae608244945fddcb2d6a212b08140340f0d862595ba4016fcba95193e851cb286798f685d314b4c72687af6d879
-EBUILD numactl-2.0.14-r1.ebuild 1978 BLAKE2B 45cdb342882498704b3dc22eb8af8029b071ee3148a38ec7d23c6344db60b19f36bb16b4f646b614079bb6adf37e564c95931d8d28c689a54b64dc658f589ece SHA512 7e53edd5664ba53dbe3661ceba95660d3145c88df2ff208a1edf9162d29b2b0c52904070a4784af015cc1267533d7ad862b9877246d6a19e583bddf758a4e3f8
+EBUILD numactl-2.0.14-r1.ebuild 1973 BLAKE2B ea286773c40b4d6aba327ec2c80b76ec9185bce12f63ea4ea15e298ac63c20ee278190db34308358292458e9163dc29e690107a97611afa6238bdc3aeeab8c67 SHA512 e87357b89b8924d95447a689de3f2b6fc28db0359f192b191994393022e54d1d127d81c71c57e94adb66c666c2b92e782d51bac97fa069fac4c15f938ce4ddfb
 EBUILD numactl-2.0.14.ebuild 1850 BLAKE2B 79a112c3115a49bcf57435892b4f2b8907e9a131f5c4c095ba5f564fd31720041cf3e11db1ba63dcce36ad4e41c3aa0af470942583d7f89c20cac0043ebcb05f SHA512 0b795f1fd010e060ab3b3b719aca58c1584d06cd59110551b29330de5ac016624aba367b03a1605f11d398f360ff831c5a40027e220c7e0c0a28004bf0cc82c0
 EBUILD numactl-2.0.16.ebuild 1663 BLAKE2B a2e4d0f75f12f3d700a18b3481b52706dbe6fb0fe02581beb0621e7f05ff9a6620b9ad3c40dce523c732766ab391af215b654efbee109c0fc0872da6220c56f5 SHA512 32b9f789352e35bd79b05ea6b646565b360e80c50afb66524b8f2e7b0c50617b77c286a1c9c7c7ea78a3b2d57d21ca766da38674810634c65a4c512d0ca55c18
 EBUILD numactl-9999.ebuild 1663 BLAKE2B a2e4d0f75f12f3d700a18b3481b52706dbe6fb0fe02581beb0621e7f05ff9a6620b9ad3c40dce523c732766ab391af215b654efbee109c0fc0872da6220c56f5 SHA512 32b9f789352e35bd79b05ea6b646565b360e80c50afb66524b8f2e7b0c50617b77c286a1c9c7c7ea78a3b2d57d21ca766da38674810634c65a4c512d0ca55c18
diff --git a/sys-process/numactl/numactl-2.0.14-r1.ebuild b/sys-process/numactl/numactl-2.0.14-r1.ebuild
index 4d8877a49392..e1b565a83a6f 100644
--- a/sys-process/numactl/numactl-2.0.14-r1.ebuild
+++ b/sys-process/numactl/numactl-2.0.14-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/numactl/numactl.git"
 else
 	SRC_URI="https://github.com/numactl/numactl/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@koprulu.sector>	2022-10-29 04:00:35 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-10-29 04:00:35 +0100
commit	746652e918ce7328c0cc5ffef8a79146b91ba21b (patch)
tree	755e0aa511453e24ffcf43e05e967e2268f56975
parent	9c602d90d61cea9fe83c596c68a99e383ee15f73 (diff)