gentoo auto-resync : 28:10:2022 - 22:00:04

1194 files changed, 5946 insertions, 18634 deletions

diff --git a/Manifest b/Manifest
index f2c15338d492..8adc00a8b201 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29626 BLAKE2B 277b8c8fe7e53ae4decd674ea68601cc4f6d644b69fc7e1e87827be2e1ed2d57f843de1c41da644aebad60e0986331714d788de039ab840f7361f9461157f8f8 SHA512 46314e1609e560fc9c8952b494aa7185c34e561e68d75158a5671ab736ec59bd2601a6bdea6ebf79e34028fa093e0af0fe39b99bec8da276585e757d5c4c1b13
-TIMESTAMP 2022-10-28T14:09:53Z
+MANIFEST Manifest.files.gz 29576 BLAKE2B 09e3d3cdc8eae652bc42417534828d9b3e2631b308f59965ff3ea867942e0262c1f837094ece861f1b04f23e7d24255f3dc9388edf56c71664da238b543cf1c7 SHA512 3e36d9cdea88300a50a94e05f411265dea500d88a1e57f736e60a75b7d67071585c44221293fa48d3985a4df65169e5437aff30d06e9862cd7ecec7706721ddf
+TIMESTAMP 2022-10-28T20:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBlhRAAtuGD6JX5vhHLKHDNzI+/numecDCY9lhYnhKy36U1A3Y09QhKzaX8yDEf
-kOLWX8+JcrWIZd8obu6zYuWbBIxslc1aYgbEOoijQZ/psMeipde4dhSlPHI7HmfD
-zEofeZ5zheObKPN6lIuHIWFZvwOEZmw9L+VvTGGt9Vzt1eqiReFi8XRuDxXfZ0JM
-S+IH/n0nMfvSkNg5Y0fvehabCCuuRH+eh/81nm9kwFMofqMHB/Wos5FzJz8IsgQb
-E8lvD4ITXPEMrBqPYLlgxiph0OG93kdG9GWpITUFoRXCiStYizoAnIanTekHI51e
-iDbcqpegbHUqjXHYTgJl8KgKn10GS9jLfTOf7CxO8+EVfUbZarF3FDezlk58H2SX
-DFMqC719m4I4oW+ZYtuh4y2f7TNoXrauBRYfbJnABPIOwNiv7Iv8xNIvkpGJnIPw
-NoxhoPamtLd5mDKIeG5e6aHlg4A5AJsNk4szFWzVtKkybY4vE9m0MlGdjQw/X5an
-pNmz9C4XyOK9hVg8HZwehyTI+k/9manzB/5zhxpHIAuPgG5EsTUuj4q3rgToQYDU
-Ib65wavTnGIw6aRTj5/f1o8VQ2w3Kq+xxunVOrav4i4IpozY1rFQl011yw+uGz2F
-5H4ANOh4QtAiVSCHzGlqPqTv1nHklGd+n3/TzlrWqhUhkMgMPbo=
-=goD0
+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
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ad4592138e98..499653643962 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 62c1155de8a6..cde1e228187d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index dd5d5ed44a2a..d28a146b8b4a 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,3 +1,3 @@
 DIST ansible-molecule-4.0.1.tar.gz 301517 BLAKE2B 73cf7a2257368c737b9003236bf77011de167dd6f692166702e7948c136202b33bcce1c70893b61a95af9baa90e7b5266a5fa889e3bba0e5a8c9c1e6f48fec9a SHA512 7515e07bf791d5586e1f5fb4ce0d2f731c94c8268c589155340b2bdc1528534084870e66e492b2d883f9e9764293c93799a4c75478523502a2f37ad0642a472d
-EBUILD ansible-molecule-4.0.1.ebuild 2845 BLAKE2B 7900ccb41af0a1a4d2199a41c140530e6abccb76aec3e17325410f62971637b6ba07d08e0b20110054b2931f065f3599194dd506aa7e350e8bcb77587b00b182 SHA512 d3a6f8256654c06b86a8daada3d8a58af11c6b35777c0e4c830e0fa7b3a2d639850e85800f83f216d71cc528d71996a69d7c5bf8cb95ad95ff69d33d745d9da7
+EBUILD ansible-molecule-4.0.1.ebuild 2794 BLAKE2B 276dbb430a10c95a7362711c58ec694d4617d4c17d7bc5f1c7b0b3b2524fb84b786702d87e6bf92d810c4cea90c5f2b62df2b053f81f6ff1da89bcbc2ec1711a SHA512 5cbbd964a57f2fd1b08ca9aa04fda3ffb26a4199bcf80d3c5a1fc25ca8dbca071e6236852b964eb3f809c13bb8a0f7e8b4ca139503fe60b48fa2bb595e422558
 MISC metadata.xml 407 BLAKE2B 869b6c1d6da66568eeac2daaca56567876dbfb057f50add7bbc95fef8a3fc38b99279d359a90573f8d6af47d0e451445827f6efeefa8fb0e7954e8b624783855 SHA512 e6dbbe2c0536ea84bdfea0168a743dbe3de424b442757441bc4f978e07d41ca6022eb2d6f269c921f42b4e7d858788f967c1c35bd4241a35dbe25a161f5744de
diff --git a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
index 3e827f95a347..603414d23bdf 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -48,7 +48,6 @@ BDEPEND="$(python_gen_cond_dep '
 		>=dev-python/ansi2html-1.6.0[${PYTHON_USEDEP}]
 		dev-python/filelock[${PYTHON_USEDEP}]
 		<dev-python/pexpect-5[${PYTHON_USEDEP}]
-		>=dev-python/pytest-html-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pytest-mock-3.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-testinfra-6.1.0[${PYTHON_USEDEP}]
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 4f9430ecb865..4d87dea670fa 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,5 +1,5 @@
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
 DIST OpenDoas-6.8.2.tar.gz 32430 BLAKE2B 14c418537b17cb82ceb1d789acc74d17364390c04d0a8d81b65de2ce3feca800e48158c6a8ea066176edeea44252f4baa99d1abde0dfbdc548c06f96e6409984 SHA512 4a93ff477413c859ba2702e688fa4f83248fff85e61e12336838a1e9aa1a8d9963a9782e4bc5e58e8d04b86c2c8ceb6b235ae9d3b32b3e548a2514a43653137d
 EBUILD doas-6.8.1-r1.ebuild 1362 BLAKE2B 4896ec32b6b00850d7452a765b0ac1644ac42995dd7b60857a57e1d2d73388b49c4b70330bdff918f521dbd4cc3ef64249861765a5f6baf0b4f073466b838b11 SHA512 8bd3e23ebb8f24c1ac71a7d4d624d32be42fd92bd4c0a617e6e0761bb3f9a0a48d5f088eac03d4caa4cecfd42a098412a3bd06fd2800624fe51d95e6bf6b8ea7
-EBUILD doas-6.8.2.ebuild 1302 BLAKE2B 838a808e7ea7aa86e780c1651d0e9cbee8935149fcb233145f90cd95caa68e500f687301291bc0f7a1c2ebe86872d2d0c343d22dd2ff45c5b5e958e52fdbaead SHA512 0fb2269c78fc0e6e512224ff58b33b1755f0450c2678dc61b7991ca5fd9363caa414b120a20425fe178cd73b17b5bd04364d4ceeb0b2fe06138efb10c6076ceb
+EBUILD doas-6.8.2.ebuild 1299 BLAKE2B 9e2afcb4395fb1e013fa70e8d8d9c8822311f31fdc7f00bdaeae02184dfb6d506f8ef0600cacb98926201341352818a83caf2f166f199ac3e46fd2a4bfd774c5 SHA512 547be5fff6c1b49df890dab3bb700f96bbc2e802586f6df145cd11acf14537f9c2f0fabfffc4573a1b587fa4a40e3719324831abc19ab933aaaac25e64908d8f
 MISC metadata.xml 558 BLAKE2B 2f308d787a7b1f5d51fa36c63c4e0fe79171d6967a34f00c5b5e47035d4176a83403ca1ab6e74c44e7e32a8988ae363fac045c4771a9f2f3975e87593f53aa94 SHA512 3a69c68de5619d4377931c9331e00a5fd5c478930b1fff95ee308ad110c6b7607a491ec9f16b2e59491f9c8634eb22d0c703f62246f79e3bb1684a47b17f8ea5
diff --git a/app-admin/doas/doas-6.8.2.ebuild b/app-admin/doas/doas-6.8.2.ebuild
index 25d4f3a7608d..8d775443d9b9 100644
--- a/app-admin/doas/doas-6.8.2.ebuild
+++ b/app-admin/doas/doas-6.8.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam persist"
 
 BDEPEND="virtual/yacc"
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index fa9d58c6a6c6..7ead38adde75 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -4,6 +4,5 @@ AUX xtail-2.1_p8-rename-configure.patch 841 BLAKE2B 78a524fabd83ff46a1e2288bcd64
 DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e1be231b4b08b640a310f9c5e9642b9f6ea25d45c717902cdf1024509fca6d804f8e64d3bb764eac8bc3e9bd0846 SHA512 ae20448944e25aa04879bdab8d61bd910b1aa6f85c3d8287e712c6d37b1154af480edc6569467e31b3b404d7f90f771ec3e4c20c58132d9125303b40a6f102f2
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
 DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc
-EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
 EBUILD xtail-2.1_p8.ebuild 1025 BLAKE2B b3fb0bb8057fa1203c6e40269910e0019782295e850dec3849eeaa979fb05676afe25bb8cb69e7f05c6e2aaecb813090c5d74e02bb2e0301fb779df57222ae70 SHA512 81f4a8c132c50990ca83fe527e22e5ffedf9ece7dc7e79b6946dc7a8b89177f80cd452d625816169f1b1cec1f95d3181c1ae0ad41a6792ca154e5346ae561776
 MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607
diff --git a/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
deleted file mode 100644
index 9f010062d31f..000000000000
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tail multiple logfiles at once, even if rotated"
-HOMEPAGE="http://www.unicom.com/sw/xtail/"
-SRC_URI="
-	http://www.unicom.com/sw/xtail/${P}.tar.gz
-	http://www.unicom.com/files/20120219-patch-aalto.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${WORKDIR}"/0001-Use-ISO8601-Fix-Gcc-header-Use-C-c.patch
-	"${WORKDIR}"/0001-xtail.1-remove-SIGQUIT.patch
-	"${WORKDIR}"/xtail_2.1-5-debian-local-changes.patch
-)
-
-src_configure() {
-	tc-export CC
-	default
-}
-
-src_install() {
-	dobin xtail
-	doman xtail.1
-	dodoc README
-	newdoc ../README README.patches
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b43c6ea5bfd6..0300c89b27f3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 18ae9270a98a..f4c094f1d6f2 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1,10 +1,7 @@
-DIST xz-5.2.6.tar.gz 2069602 BLAKE2B 3cc160dc76944ad2a181fbfb23ce386dbbd04e75bbeb0b159aaaf82e2e8157ea8b2bb80b216d79a7c25339bfbd13bd9d8c261789829cc7c3cb86fc893a7b4b94 SHA512 090958dd6c202c989746686094c86707ad4ae835026640080fc0a9d0fad699821b7d5cb3a67e6700661a0938818ba153662366f89ab8ec47e0bae4a3fe9b1961
-DIST xz-5.2.6.tar.gz.sig 566 BLAKE2B 7c6114d93b4e3c8553108da3985029fc4585bfea5d72fc5028024221e91cc43c3b6cd3b7d169e4c8afed445a6beef7c255ef8420c5266a22ee9449a57cacec5d SHA512 50a1ac0f8f87f8c04c25c69870ba054094abf20b668bdecd42ed247a2eff24b8e52178b6442da84c125a9401a6f98d40ca76b27453833a30807c83128ab70eee
 DIST xz-5.2.7.tar.gz 2105803 BLAKE2B 5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b SHA512 06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9
 DIST xz-5.2.7.tar.gz.sig 566 BLAKE2B 00702dff24d655ebf30f2bf8bee94406e002164408b9eabb4f461a789482584c2b9c90675b8d1d5e030913e674946aa7392b73fcedf6ac62e3b1e3bc05bf92e6 SHA512 556e05107437fae2c75cc1a93465fce04426707e979403f41c6ee5b748fe7c3f985812a4e3b07785a84f68ef9d9f362ded470af1cceb9f4e8c80620a2699163f
 DIST xz-5.3.3alpha.tar.gz 2119150 BLAKE2B 031e1a1556cbbd49565c2b72676e46a22c00e0e25bca2938c21d56f2d7f585c294d2a3a5712a3ae5d62fe8fef6e7b2f411fcc3c0ccac4714786209599b599d25 SHA512 c780c6854cb7599ed97629dbf923f5c6802b48e12aa25638c863e2403e56557abffb2b501823d4d53c852b7d09360b9ede355989756fef1daa1fa8cd9395da8d
 DIST xz-5.3.3alpha.tar.gz.sig 566 BLAKE2B 2a02fd8a84c27967384021aa879efdf598b40ca9ff552080be2d057f402b3aace13bb0d98574e0185edd6ee3084793767f9941d4c1f21f5c5d55f886025cb845 SHA512 e6a849f2dd6f67ad3d51f50fe5f3e7f2a57e97e9d89499e2f88b94ab9716f1db5de34c3bb6f17b6fd55498ee5f4653d3d25e1a495b9c682b3200b2603a85479f
-EBUILD xz-utils-5.2.6.ebuild 2951 BLAKE2B fe70288d4b6b9582600339ef3800546aacb734665593cafa8ece0cc2781262906ad8dffaeabe5610e2769d7a006bc08763634822c6d9f978ac3463ddd460a1d8 SHA512 caddd665690b8acb03c3697566a9e977eed8a003e3f56bf25dc77ab74877994bfec86965334ce6683f582e07e4c6d53b6bab10f3322880b6d6342a92ad726f94
 EBUILD xz-utils-5.2.7.ebuild 2847 BLAKE2B f7e07afe31018ac1aaa06ce82467d8fb119abb0185a6415fb6d63586f9c924d85b21279cb845b8b8da3db8a6927c7cc27b6f056b1b7669a9b6661f8a824fe258 SHA512 79c90863cae998c4393da6bb1d877b15248ad81ecdbdde77ab0bdde1222933abf725c7c5b42142e0698bf293cedf14b66dea251d62fa5cef3815026611e27294
 EBUILD xz-utils-5.3.3_alpha.ebuild 2885 BLAKE2B 00cedd70d450943dd489e6b9e05ce1d7a0f5f4472b501f4587cf482c2294fcd7f86d5811a7325b6812f468738a0144838291033eb83afb79aaaba640b34800d1 SHA512 8172456c5fcfd424a4f2bf7e6993fc67b782dc8a7fc3c4c433610cae31252acb2a022cde8a128d5e20d5842ceee4a3b5eeeff9f8a4e9c0f667505d7397a37398
 EBUILD xz-utils-9999.ebuild 2761 BLAKE2B 909cd4550713dd2eaae9f242ec5c45e5aedcaa78748569bfcaeac3c867638bfe2f0e8ecc0a7dbd0b1220f7a2860cfe1430545e272c0a97cbf9877ebc5190cc27 SHA512 88b9523cb3c31be766d78198716489fc9b26ac39897b20ded7c775c9c74969028a84241af1ee688149442ab9c333f1ec25f7d134a8182bfd4396c8f17995b3ad
diff --git a/app-arch/xz-utils/xz-utils-5.2.6.ebuild b/app-arch/xz-utils/xz-utils-5.2.6.ebuild
deleted file mode 100644
index e2fc3bcfe2f8..000000000000
--- a/app-arch/xz-utils/xz-utils-5.2.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Remember: we cannot leverage autotools in this ebuild in order
-#           to avoid circular deps with autotools
-
-EAPI=7
-
-inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
-	inherit git-r3 autotools
-
-	# bug #272880 and bug #286068
-	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
-	inherit verify-sig
-
-	MY_P="${PN/-utils}-${PV/_}"
-	SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://tukaani.org/xz/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		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
-
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utils for managing LZMA compressed files"
-HOMEPAGE="https://tukaani.org/xz/"
-
-# See top-level COPYING file as it outlines the various pieces and their licenses.
-LICENSE="public-domain LGPL-2.1+ GPL-2+"
-SLOT="0"
-IUSE="+extra-filters nls static-libs"
-
-RDEPEND="!<app-arch/lzma-4.63
-	!<app-arch/p7zip-4.57
-	!<app-i18n/man-pages-de-2.16"
-DEPEND="${RDEPEND}"
-if [[ ${PV} != 9999 ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-lassecollin )"
-fi
-
-# Tests currently do not account for smaller feature set
-RESTRICT="!extra-filters? ( test )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautopoint
-		eautoreconf
-	else
-		# Allow building shared libs on Solaris/x64
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--enable-threads
-		$(use_enable nls)
-		$(use_enable static-libs static)
-	)
-
-	if ! multilib_is_native_abi ; then
-		myconf+=(
-			--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
-		)
-	fi
-
-	if ! use extra-filters ; then
-		myconf+=(
-			# LZMA1 + LZMA2 for standard .lzma & .xz files
-			--enable-encoders=lzma1,lzma2
-			--enable-decoders=lzma1,lzma2
-
-			# those are used by default, depending on preset
-			--enable-match-finders=hc3,hc4,bt4
-
-			# CRC64 is used by default, though some (old?) files use CRC32
-			--enable-checks=crc32,crc64
-		)
-	fi
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		export gl_cv_posix_shell="${EPREFIX}"/bin/sh
-
-		# Undo Solaris-based defaults pointing to /usr/xpg5/bin
-		myconf+=( --disable-path-for-script )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	gen_usr_ldscript -a lzma
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
-}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 755fddfa1814..868982c9d86d 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,5 +3,4 @@ DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
 EBUILD zstd-1.5.2-r2.ebuild 1514 BLAKE2B 084465efa31a284db22176179dd61952b658ff02511c9b09e0dc38b0d1084bf53d6663f7890939b51774cf772a0adfb2855932f49ae67e934c8e1baf2b440fbf SHA512 d9a5cd15accef02b2bc2bf202313bcd816a3bd1cfb85d9fb2d7879e871ffc29dcbdbbc7baaca9e492e793dbed143f9e914803bbf39db31286692956bab49fe56
 EBUILD zstd-1.5.2-r3.ebuild 1492 BLAKE2B 3cc1ebc1effc30df2b21d3992fa958d2a4b15b661b91ad96a7a7de67f8caa523af46d313a8234c24683a1ae3b143134320c510c9079d4aa5ac076365f00d3c59 SHA512 d05896a73f492da897fb681a7ae8d74318b4c48e6eeb91c232cef8c14cdbed92c3a9bd421cb4c5f74a3bc8186cd3aa460360d915d488ec3083cdc1b1c240f936
-EBUILD zstd-1.5.2.ebuild 1456 BLAKE2B b1f0a313494d5025c9568bc09a4cc5c4caefc8aad0009ff272745541a97977fc812a69cd0ac05c8caf3a487d9cb51578e46e9446f9e9402448fd9227db6145d5 SHA512 445ca54ab352ff64fd6acbbc7e0a2e76ace9e4f55719efe80b304efb4e3da0e369e743f7516c22fd1e4d1611bcd38ea97624f7a874156e595f231b4e958147fb
 MISC metadata.xml 302 BLAKE2B 66692581b8918a23bab99bb3b0909702327c1acf2b7f8ec2fbfdf74ff75a8f178ce1140e0a9d46b64983dfe9529134db842a5a60a86b7fcbbd5db88e844d136d SHA512 097c09d06824c85919b21bc841c791851b1a7d1a6c6d16a26bbe9bed9dfb1522cacdd2b430b8ff51762fb73b388d88ec679d46570b2e56b36352ea2cf20e46f6
diff --git a/app-arch/zstd/zstd-1.5.2.ebuild b/app-arch/zstd/zstd-1.5.2.ebuild
deleted file mode 100644
index f255feaadc52..000000000000
--- a/app-arch/zstd/zstd-1.5.2.ebuild
+++ /dev/null
@@ -1,65 +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
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-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="lz4 static-libs +threads"
-
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 \
-		"${@}"
-}
-
-multilib_src_compile() {
-	local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
-
-	mymake -C lib ${libzstd_targets[@]} libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
-
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 2525c6b8f961..bb8e61e44019 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5a673e086a64..497effed58b6 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,16 +1,12 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.2.40-fix-no-ldap-build.patch 1017 BLAKE2B b260be86597a20ac1daa331d87fa741f1e17bdf65ca81f1e24d5465292567f16c6320271adbdf74cc2f93f2b8d8fda799a23bfedc45de9ce63fe34803da4eea2 SHA512 5a08a2e6737203761358adadfbc781f81923cf1add2614666dc47d25cd012e71779d749cc614f86c73f41d38ff05c2223bfe2b1f409879f020f1343edcb4b0a5
-AUX gnupg-2.3.7-yubikey-workaround-fix.patch 2010 BLAKE2B 9baaa3781e7fcdc7379eb838c965078127dba25eb90285504110bc4e81cc3d5018c0a391a065c33f0b3e29d48b5acbee79e47d4b6b281f11f083b7f44d5b7be1 SHA512 3a59955582af9abc576d533f548c9d6670a089415afbb23de9131d4c8cfab0a285ca71efcc7a423bcff0ec2b759d9428146b90a86413d7c6be6b1b0bbca41056
 DIST gnupg-2.2.39.tar.bz2 7290098 BLAKE2B a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9607d3b5f13f5edc0c54505afb6c6c119cd397023b1378d96c7d0f15c0d60da1d15721e9a18eb3ea8c7b69fba83 SHA512 73f881c12c82010aeaada500517ff39ab22b27ff21b1248bc2228b60a2d75385a44a53c5cfadb8f6b84ef22ad9db0105096b6620fb689560809b324019713940
 DIST gnupg-2.2.39.tar.bz2.sig 119 BLAKE2B 584d7d36671670ac507948257e9c6be556ed2a2d3c0100bb2746edfe96df5ee1d4c6172fe0cae39d85fc290097bc5f6e1b351debc8ec2f5cc78047354fbed016 SHA512 6f7d7c2d1fae706b03c735cf453976c3aebef3f23659426f39a88c63d979f4d873ae09280d75dee9000805468d2a7f49d348609061939000f7cedf34ec5c6019
 DIST gnupg-2.2.40.tar.bz2 7301631 BLAKE2B c9a077e28b22888573bdd12029205eb5f79a463a297e400a623bc86a39eeb6454cd884d05bd96734998613c695f2c9dcc68963c7275b89938ac38ddc7ba1e229 SHA512 4c2f5fbf37ba6fbad0045aad23129186963010c673ea0b81801adc4f98efe14d6c7228e22815b6b26307c1fe5bb51cd088aa6a0f06a9325d3c021849ef81c594
 DIST gnupg-2.2.40.tar.bz2.sig 119 BLAKE2B baaffad8203169fca54be031b3c77f818ecf973c73b9389cb3cbcd8217ae8a6018f0d3d4d2d5b6f0611f7643b78467f91902add3107e9538273607c6ba3a49bf SHA512 fccc06c709450d58e64716c505cd79556edac440462613c47c6ec78714355425c045418946b4b4b2a5c79e33e0e75b20f0699ae6de9921add4877fd6c8cc2d64
-DIST gnupg-2.3.7.tar.bz2 7599853 BLAKE2B 3e9e33c8357222f42cc0e2af538e9f1f1f0453f35d790aaadf47ce9df24229efa91457b6014b34f19084448a3a6603c82e7d07714b89a68c6a84a08af6fa0e02 SHA512 c7fe169050ef17051cdaac9ad476e7ea792483baad1208fc359d568fa9e138d920ecaa2cd9cae73b20f5472a7d8ca6540a62062ff7a06055cc656b0eb4b917b9
-DIST gnupg-2.3.7.tar.bz2.sig 119 BLAKE2B c2652adf203bc828ed0aaf778542e990028156c16b435cd35aa6fe57ca0a5b798087c98e16589685c8ab9b8b92e16c3f7d4da56a4b1209b9adf2c24ea548ae6e SHA512 0257034b3e7ac390dadb151c656ff59822dacedaddca4ad6b5980b3e03a468ada47553e6a1fcff6a12c64ae2f9c15b245df855cd424b010041df8daaaab9a1b8
 DIST gnupg-2.3.8.tar.bz2 7644926 BLAKE2B afb960adb877398363d92585d54bccc82c816f87b4489835950c19fc330edbf5302f7f958fdc6333b80d2e34730c9518e6abffea721891fd76c1b2ff2aa704be SHA512 6df8b1c53f0112c358f9f9eac732dd4ca13bcec24fc55a7d4a606587da988c5b7bb4c61be52b8b7769f1536dd2043087e6eb5cf224991cb0b2ed38ad00717ee2
 DIST gnupg-2.3.8.tar.bz2.sig 119 BLAKE2B 29a133605d72dc4c102ec9a82d654cb980a72463fdc6e255d595e0559bb08860dcb1b014681e1d177eb29c0d32f4ce4ef6caefa6558f1cb97c87c42fb426ea63 SHA512 d97a92c245df997dbff800b25872e9f0769b20e9336b12682b4539fd4fe0e9c2dada7af397b8afeeeba316100b8f4dd86ba96e1dc62cee70158927229b0a015d
 EBUILD gnupg-2.2.39.ebuild 5348 BLAKE2B c1aa7063d623fd45825d528ff392e309620b37a484787151ee786401d067c451c9a4d068d505c114630dbe812aeb0ee497d3ac2149d59abc373c48385b76ba29 SHA512 cf8f0474601831b51a333167257b3f4e18d91e34a2c16ccd27f81092ecf0a19a79056469a715e602379435c7e0699051ef130d014b7239d7d926c8661535ff6c
 EBUILD gnupg-2.2.40.ebuild 5400 BLAKE2B 32ab43b2f518b7c546e598e995a813fed600c42df75f819d3675f7d799ec92f15e6550017b5f37481e2baadbbd534302701a0353098f06068b4b9abed53db4a1 SHA512 7f448909d4923573792daa4d0ab84a1aa0fde9ddbd6c0b5019f887f52144d33063c889a511cfbdd206c035d107687fadbca4ffe62d7adf6e8ad4264add5b23c6
-EBUILD gnupg-2.3.7-r1.ebuild 5574 BLAKE2B 7d32a90de93a16381bc7b8622504b61f08dba7e2f719719e0e0233c77f5e33e9a6763e113aec9446ec3760b8c87132a51b39d93b4fb7deba141ea0f804156385 SHA512 3a7bb0a4465cfb9fb6d0d173f0d19ec6e4e0efeeea467fc0310b3046dd5edbe13d1e67b40c9116b05d30f2a7d943a78f7fe71b2f2270ff863cdd1203bb2fea76
 EBUILD gnupg-2.3.8.ebuild 5577 BLAKE2B dcb32e4f411c1aba0954ba2cd2c30528a82ecb9988c334e65d3c92db42fb2442464e719d6f6a738c61ef05dd9548e1dab90a9b033cf75d7f39c528469d9b07c5 SHA512 ce7ec66d3543a61a6ab7c9a36c88ec8bf5308ec72a78f7b0a3406fbdfd1b04b78623963104157e64b215ba056fcdb855d169b4ffc918e52c2f8a258d40f42619
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch b/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
deleted file mode 100644
index 94062c885b5b..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.3.7-yubikey-workaround-fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=f34b9147eb3070bce80d53febaa564164cd6c977
-
-From f34b9147eb3070bce80d53febaa564164cd6c977 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Wed, 13 Jul 2022 10:40:55 +0900
-Subject: [PATCH] scd:openpgp: Fix workaround for Yubikey heuristics.
-
-* scd/app-openpgp.c (parse_algorithm_attribute): Handle the case
-of firmware 5.4, too.
-
---
-
-GnuPG-bug-id: 6070
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---- a/scd/app-openpgp.c
-+++ b/scd/app-openpgp.c
-@@ -6259,15 +6259,28 @@ parse_algorithm_attribute (app_t app, int keyno)
-       app->app_local->keyattr[keyno].ecc.algo = *buffer;
-       app->app_local->keyattr[keyno].ecc.flags = 0;
- 
--      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
--	  || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
--        { /* Found "pubkey required"-byte for private key template.  */
--          oidlen--;
--          if (buffer[buflen-1] == 0xff)
--            app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY)
-+        {
-+          /* Yubikey implementations vary.
-+           * Firmware version 5.2 returns "pubkey required"-byte with
-+           * 0x00, but after removal and second time insertion, it
-+           * returns bogus value there.
-+           * Firmware version 5.4 returns none.
-+           */
-+          curve = ecc_curve (buffer + 1, oidlen);
-+          if (!curve)
-+            curve = ecc_curve (buffer + 1, oidlen - 1);
-+        }
-+      else
-+        {
-+          if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
-+            { /* Found "pubkey required"-byte for private key template.  */
-+              oidlen--;
-+              if (buffer[buflen-1] == 0xff)
-+                app->app_local->keyattr[keyno].ecc.flags |= ECC_FLAG_PUBKEY;
-+            }
-+          curve = ecc_curve (buffer + 1, oidlen);
-         }
--
--      curve = ecc_curve (buffer + 1, oidlen);
- 
-       if (!curve)
-         {
diff --git a/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
deleted file mode 100644
index 15ad16f6e513..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.7-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-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"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.41
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${P}-yubikey-workaround-fix.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b38aafde84c3..b5cc018283fb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index e076d97b7240..ce93086ef31f 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,8 +1,5 @@
-AUX gentoo.nanorc 4212 BLAKE2B e8e50c1b98f0b593d83bc35c84e79d5d0db6b076862635498bbe81c4413d4818cae3027c163556335c6ae7284545c99477c7269a0df78a9ac694912b28de1939 SHA512 b347ab4e92b2418f59e1f2e0f1d6993102fd2c237eb4cb7daac373f48cc0071f0c3b47f4354e2e4fef00285fe5df22958694238fb4b017f7eff745c84166dc10
 AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fbefc70b4a5b1d08fd360bfc136b6e1cdc4ed480f4ffb6b37b81a019869aa7e322b3f96219241a2d1569 SHA512 bc8db27b8509059833ce1939a3c63d8389968366118596f2a832e188ea5f3e8eb2b66e781ceaabd58c941bbb8ca6818b363189ac267a96f0943bbd64983b5c65
-DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
 DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
-EBUILD nano-6.3.ebuild 2636 BLAKE2B 79f9097ec7bb0052b66c476767c7d1e5ccfdd96f4c8b5ff539b7a1d65f7f171b88c124c88e31ed99ce1f39742ec1cec34e1e254d2541faec5fbef6ed8a173c39 SHA512 8ab371ea08c4afce84d74962a61bdb62e30cb5a1a1db049e6a9493b9b8fde6dce6d67424938f335654af7b997f0c239a61b69aa93fa55382599d6c9eac4915f7
 EBUILD nano-6.4.ebuild 2669 BLAKE2B 17f06b3f4370205742d036f7ca81964532bd22ba7274373429ad148a353335d3fce1eb9ce9a17c5782c3d9e292b274ee2c8a7ff934b04d7f526cf91e6ddc2d6e SHA512 e126669ae0ea24fd3f7d5d173832a6e252b92f5b5be2d8220a24d1b617b361ff6b3d16bc621a2f59497ad6950c0065419b7d9c91fd3b4502660d65d59673815e
 EBUILD nano-9999.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1
 MISC metadata.xml 1677 BLAKE2B f6ed764002859bb082787004b858cc2098273fe034df9215ab380c90d2b6dcea168cd92b2fb6ea69ea157e9f9cb239e5499fb1dd8337d167c13031f8b5505343 SHA512 cf2a9a4224b47bc7657c2bfedacba1db7f66e8f1de25fa6203eb9fcd779bc646cc19ddfcc2b7f2555c8f1d8f173c87792db16667535cd053f1a21fc658ad518f
diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc
deleted file mode 100644
index edf4ae109b1e..000000000000
--- a/app-editors/nano/files/gentoo.nanorc
+++ /dev/null
@@ -1,74 +0,0 @@
-## Syntax highlighting for Gentoo ebuilds/eclasses,
-## and (further down) for Portage control files.
-
-syntax ebuild "\.e(build|class)$"
-comment "#"
-
-## All the standard portage functions:
-color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
-color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
-color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
-## Bash-related syntax:
-color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
-color green "\<(declare|eval|exec|export|let|local)\>"
-color green "[][{}():;|`$<>!=&\]"
-color green "-[defhnrsuwxzL]\>"
-color green "-(eq|ne|gt|lt|ge|le)\>"
-## Variables... official portage ones in red, all others in bright red:
-color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
-color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
-color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
-color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>"
-color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
-color red "\<EBUILD_PHASE(_FUNC)?\>"
-color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
-color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
-## Portage commands:
-color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(apply(_user)?|begin|end|conf|install|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
-color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
-color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>"
-color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
-color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
-color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>"
-color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>"
-color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
-color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
-color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp)|is-cross-compiler)\>"
-## Common commands used in ebuilds:
-color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
-## Comments (doesn't work that well):
-color yellow "(^|[[:space:]])#.*"
-## Strings (doesn't work that well):
-color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
-## Mixed whitespace is also bad.
-color ,green " 	"
-
-
-syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
-comment "#"
-
-## Base text:
-color green ".+"
-## Likely version and slot numbers:
-color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)"
-color magenta ":[^[:space:]]+([[:space:]]|$)"
-## Use flags (must come after version/slot):
-color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+"
-color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+"
-## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>"
-color white "[[:space:]][*~-]?\*"
-## Categories:
-color cyan "^[[:space:]]*[^/]*/"
-## Masking regulators:
-color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)"
-## Comments:
-color yellow "#.*"
-## Trailing space is bad!
-color ,green "[[:space:]]+$"
-## Mixed whitespace is also bad.
-color ,green " 	"
diff --git a/app-editors/nano/nano-6.3.ebuild b/app-editors/nano/nano-6.3.ebuild
deleted file mode 100644
index 2c97dc70df95..000000000000
--- a/app-editors/nano/nano-6.3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		doins "${FILESDIR}/gentoo.nanorc"
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
-
-pkg_postrm() {
-	local e
-	[[ -n ${REPLACED_BY_VERSION} ]] && return
-	e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}")
-	if [[ ${e##*/} == nano ]]; then
-		ewarn "The EDITOR variable is still set to ${e}."
-		ewarn "You can update it with \"eselect editor\"."
-	fi
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a4eb41230af8..12c153a04c86 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 74197cda87f3..d7744f6855db 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,10 +1,6 @@
 AUX 60nxml-libvirt-schemas-gentoo.el 206 BLAKE2B ae9d1fe1da9c86d14796c09597ca34b10dd0e28abb02fdeac4607b8d950bfdf636f5f3c1de49cd5b9cf1fa808513522ab43272f3c26361b871ad0d630a942ed6 SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea
 AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf204c43bbea5db01626847af7ab96854efcbcc34e7fe9b1c32873ad22ef13873a1a06790e9580371d SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
-DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
-DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
 DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
-EBUILD nxml-libvirt-schemas-7.10.0.ebuild 873 BLAKE2B 02b97f936c302f2657280e597ed595b6061e6c71d6fe4c1e2f06c667da87dc51f5b6554ee4392b85f5f12e29f33df7a5a2ab6c4fa1fbe3fa09e66ab786d1ef5f SHA512 1f143986674b1878271a4c6e49fc7473ebbb8900ebfcf662467a84437f072de2e665395381e619e0cffafaefc24ecaf99ae26ccc22e3c0ae0783ab4a55a5be35
-EBUILD nxml-libvirt-schemas-8.7.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
 EBUILD nxml-libvirt-schemas-8.8.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
 MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
deleted file mode 100644
index c3597d40e521..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/docs/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
-	emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}"/schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild
deleted file mode 100644
index 1c0188f9655a..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
-	emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}"/schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 94748ea10a88..6e3f83737002 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 7dc9c571979e..b6cbfca38bf0 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,8 +1,5 @@
 AUX README.gentoo-r3 2065 BLAKE2B f3677b916121126c431ba32e324bcc9f04b4dfeef1ee54517cae1118c67274592d890d6d919a48af6709e9220379797549277904a02fea740a69b1bf8f2397aa SHA512 77ede8a3e1a380b334595e65ae148acd2e52d594200253dc67d68dd256db5bf72ce7ce222d067c739ce53f84634421e74726f30c0ab7a1c76b86ccdc191c8a69
 AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2
-AUX libvirt-6.7.0-do-not-use-sysconfig.patch 5001 BLAKE2B 65e6dfacc598ba771fccc1c45c504aadcc83d0d8df211e70721dd0d7e3653c2c4d44a892ece19ee7e22d95552950e21f9d9e0a4ff960d66ebd2f9999c4cd52d1 SHA512 7dd3e4cf03dd8351a644a1669be70fcc6397b27983c0ec7b716dde61c92cf7dc9c46fc841cead5ae616897d9ed60209b03d5d78a4247215f4e79d11282da91ad
-AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76ef0d6638b00cfbc3f8c4d5a722ba83699d29a32ef2f9a7d9eb678c1f61a128b0fee958a3349a4b843be08cec940f7d1e22757bc66bb95 SHA512 f81627e9c3d6c117e76a7a30af162a8ff8fafa191313155ceecf39bae2c457417152a0380d06cd3a4958b52a6ba410730cf66cd912072f7ec951b507c0a83f96
-AUX libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch 2214 BLAKE2B f36e1e3fecb846834d09699a914e1e79afd8f283cdef1ce1085574d1ec5b573075af26854be2e3002db49aad87d005995606bc1cb501476209ed6eba5c514928 SHA512 24f49141cfe21eee27bc9cd4c3766bca4dec10afb8e2249198e083f5f3980d157c84aa59816f448993bf6ed30d4fe2795714adf16066e8fd185df87f363a18d8
 AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6
 AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 3006 BLAKE2B 641c8942d28b8f3050f67809f332b76acb9d46ccfba30387603a7f3a60f80162a290b0b3ba3dac51c488ba14ac457ecc49526e98251380eb1fd3aaf293f444c2 SHA512 1b267df41892dcf5791720a9e7cd819b65024eaa3469d7b9496b86fc67d89d90dcebddcb5baf627fdde3277400fbc6611d056267a0aa4baa4083da3f532679ec
 AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc
@@ -12,17 +9,11 @@ AUX libvirtd.init-r19 1124 BLAKE2B 0effd71cd3dfda0892c37e4d6d69f5d6d02320a3f0793
 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed
 AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482
 AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34
-DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c SHA512 a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
-DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
-DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544
-DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b
 DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
 DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c SHA512 5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8
 DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
 DIST libvirt-8.8.0.tar.xz.asc 833 BLAKE2B 3919af7c208d9a5f863a9351cfcf72916ff67cbef26fe7b86bb3b1042b5556f75a4a0c5210cdb67aee79bd3706047d2d2244c967297dbf2aba2d28c625797361 SHA512 9bc3c0ae6f7fa9d6ee17ca183e218b0f2f6e413b303bd429cda090828ac0521c142178ca4c3c3bc6030c9e58f36ae5d33c7c8a9d6c8147f214e1740a78f66d2a
-EBUILD libvirt-7.7.0-r2.ebuild 8711 BLAKE2B b233dceaa93b4116d831d449dff6775f672a4b2c78b4fa4f176c1840c34bbbf73bbd5763b8e5ca65296caa2514f06a5300afdce4f37c833aeba16c912d3669f2 SHA512 0a0c8d7f1aeeb0986409f0b4031650f7bea7d45bbbae55606c3a72d1e895d9cdd973251085d75f796fc14f6997ce0999cd2affff857f113d683677071d26af96
-EBUILD libvirt-8.2.0.ebuild 8798 BLAKE2B fbaeb243dd5c1490ef864cb8b67e2a6d7e2e15c953b4d25354c4a4a02a3985495f2222de7f413f0c274f817e41e0ff0c324e65b47d13fb11c290e8793ff011ba SHA512 7db8b2a53380f65e072c4b8d943536bab752ce2f237fd8c68f1a671378686a7cb449e659004195237e69d5f21cadeea9e8c8097e1687e08e8880a15b01cb4cc0
-EBUILD libvirt-8.7.0.ebuild 8930 BLAKE2B 62b0b6de101cd6bdea2a4f88124f81d1e34d3dbae832a5d3cca2a2b0eb0be6cdf8d2ccc6ece6c2da596db593ffb055d08c5dbfb6bfb52b1774fd3a278fa64aa0 SHA512 d2faa9f8abcbfa59019686f18f2ad004b88acb4f5b7d3c22fcbb1a2959e0276412c2cced12031a1e2083c85765f7e2b59ab2428b7dc1ce0681f2e554d9964597
-EBUILD libvirt-8.8.0.ebuild 8935 BLAKE2B cae306db4cf53cdbc883a6bc57f18da32deac98354b0ca60f389e355553b3bb8b3dc747111852bdccf237ca416829db29cbd39a14b0871613d465d43fdabe098 SHA512 e15e9726a857de579f395bb0cfd68349f71affbfaa8be6b71a2cd2582f64a7d59601d2785d427f8b06ff395b0725c4866a4f9a1e0137bf95cca7eca286092b8e
-EBUILD libvirt-9999.ebuild 8930 BLAKE2B 64e5e6065478fb32a58f4bd476cf27289eb2e63b05d2d097f2897680435586d5e662290b59b0aa433e073583001a22b06cae35009e3e5c6c53722b6b33edda15 SHA512 9f2ac622ada386a8e280c9a0038aeafee1b6962c9cc89a4e5fe19ec48e6428cdb5a043357737758df397a4887caa34dfb84bd21842a52892fffbc5e9ac3013c5
+EBUILD libvirt-8.7.0-r1.ebuild 8892 BLAKE2B 47bf4c928885c5851d40a24988464dc07bca48ba25d063ccf4543181e3302173102fb39c752b0b12a983475dc671241d85c795f208802d0901dc47b4d85373b5 SHA512 da44b1181cef1ddb22e9a23fec90ce37b5bccff61777e6d9645581a96080cb518b0aceac6d7611f48bb7b52c39859f7dc17b0c9f1d455fc6ff122ebbf60a8ae8
+EBUILD libvirt-8.8.0-r1.ebuild 8897 BLAKE2B 043c99143cb6a4826e54f330de311c0cc1076fc2e1344371e1c5bf7e63f39c42a30cca0c1c6e69dfa803dece2e582dff3f22174cb5b5f0bc851968d1cb33f33b SHA512 b840590e3314a21ad9dd5c169f2c12c02005711b28d6c3f48be535c7a219457ca205b2db2e9eeb6eeba02dcab83853299605259bf1a6af36eb3d689301d50a51
+EBUILD libvirt-9999.ebuild 8892 BLAKE2B e2b769812ecffd2f7ef6d5967d538a1fbd5140ff91f7a8fde62014232a5590ac1a2b12403d143ac2c83d7d243cef5949a5c64b39a91cb392d745c62550d6817d SHA512 63741913f7725b5b7530a3b2d4384eb0a360db12dc0b9be8b3195b1545e999ee3330e4b4c46e1cf945f31704ce2f1abf47db5a69d28277f220eeb500a5d9602f
 MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
deleted file mode 100644
index f3d2e3c39162..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
+++ /dev/null
@@ -1,169 +0,0 @@
---- a/src/interface/virtinterfaced.service.in
-+++ b/src/interface/virtinterfaced.service.in
-@@ -13,7 +13,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
- ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/libxl/virtxend.service.in
-+++ b/src/libxl/virtxend.service.in
-@@ -17,7 +17,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
- ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/locking/virtlockd.service.in
-+++ b/src/locking/virtlockd.service.in
-@@ -7,8 +7,7 @@
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
--ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
-+ExecStart=@sbindir@/virtlockd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the locks is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
---- a/src/logging/virtlogd.service.in
-+++ b/src/logging/virtlogd.service.in
-@@ -7,8 +7,7 @@
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
--ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
-+ExecStart=@sbindir@/virtlogd
- ExecReload=/bin/kill -USR1 $MAINPID
- # Loosing the logs is a really bad thing that will
- # cause the machine to be fenced (rebooted), so make
---- a/src/lxc/virtlxcd.service.in
-+++ b/src/lxc/virtlxcd.service.in
-@@ -18,7 +18,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
- ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
---- a/src/network/virtnetworkd.service.in
-+++ b/src/network/virtnetworkd.service.in
-@@ -16,7 +16,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
- ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/node_device/virtnodedevd.service.in
-+++ b/src/node_device/virtnodedevd.service.in
-@@ -13,7 +13,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
- ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/nwfilter/virtnwfilterd.service.in
-+++ b/src/nwfilter/virtnwfilterd.service.in
-@@ -13,7 +13,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
- ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/qemu/virtqemud.service.in
-+++ b/src/qemu/virtqemud.service.in
-@@ -18,7 +18,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
- ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -28,8 +28,7 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
--ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd
- ExecReload=/bin/kill -HUP $MAINPID
- KillMode=process
- Restart=on-failure
---- a/src/remote/virtproxyd.service.in
-+++ b/src/remote/virtproxyd.service.in
-@@ -13,7 +13,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
- ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/secret/virtsecretd.service.in
-+++ b/src/secret/virtsecretd.service.in
-@@ -13,7 +13,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
- ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/storage/virtstoraged.service.in
-+++ b/src/storage/virtstoraged.service.in
-@@ -15,7 +15,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
- ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/src/vbox/virtvboxd.service.in
-+++ b/src/vbox/virtvboxd.service.in
-@@ -14,7 +14,6 @@
- 
- [Service]
- Type=notify
--EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
- ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
- ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
---- a/tools/libvirt-guests.service.in
-+++ b/tools/libvirt-guests.service.in
-@@ -10,7 +10,7 @@
- Documentation=https://libvirt.org
- 
- [Service]
--EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
-+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
- # Hack just call traditional service until we factor
- # out the code
- ExecStart=@libexecdir@/libvirt-guests.sh start
---- a/tools/libvirt-guests.sysconf
-+++ b/tools/libvirt-guests.sysconf
-@@ -1,3 +1,9 @@
-+#
-+# Warning: This configuration file is only sourced by the systemd
-+# libvirt-guests.service unit. The coresponding openrc facility is in
-+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
-+#
-+
- # Customizations for the libvirt-guests.service systemd unit
- 
- # URIs to check for running guests
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
deleted file mode 100644
index 18e7ef2daa0b..000000000000
--- a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
-index 80986ae..d550d8c 100644
---- a/src/security/apparmor/libvirt-qemu
-+++ b/src/security/apparmor/libvirt-qemu
-@@ -88,6 +88,7 @@
-   /usr/share/sgabios/** r,
-   /usr/share/slof/** r,
-   /usr/share/vgabios/** r,
-+  /usr/share/seavgabios/** r,
- 
-   # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
-   /etc/pki/CA/ r,
-
---- a/src/security/apparmor/meson.build	2020-10-06 17:45:18.590000000 +0100
-+++ b/src/security/apparmor/meson.build	2020-10-06 17:45:07.044000000 +0100
-@@ -1,5 +1,5 @@
- apparmor_gen_profiles = [
--  'usr.lib.libvirt.virt-aa-helper',
-+  'usr.libexec.libvirt.virt-aa-helper',
-   'usr.sbin.libvirtd',
- ]
- 
-@@ -32,7 +32,7 @@ install_data(
- )
- 
- install_data(
--  'usr.lib.libvirt.virt-aa-helper.local',
-+  'usr.libexec.libvirt.virt-aa-helper.local',
-   install_dir: apparmor_dir / 'local',
--  rename: 'usr.lib.libvirt.virt-aa-helper',
-+  rename: 'usr.libexec.libvirt.virt-aa-helper',
- )
-
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-similarity index 97%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-index dd18c8a..d06f9cb 100644
---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
-+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in
-@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
-   /**.[iI][sS][oO] r,
-   /**/disk{,.*} r,
- 
--  #include <local/usr.lib.libvirt.virt-aa-helper>
-+  #include <local/usr.libexec.libvirt.virt-aa-helper>
- }
-diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
-similarity index 100%
-rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local
-rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local
diff --git a/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch b/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
deleted file mode 100644
index 5207c6d81ec7..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54814c87f3706cc8eb894634ebef0f9cf7dabae6 Mon Sep 17 00:00:00 2001
-Message-Id: <54814c87f3706cc8eb894634ebef0f9cf7dabae6.1645458252.git.mprivozn@redhat.com>
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 21 Feb 2022 09:26:13 +0100
-Subject: [PATCH] docs: Fix template matching in page.xsl
-
-Our last default template had a match of "node()" which incidentally matched
-everything, including text nodes.  Since this has the same priority according to
-the XSLT spec, section 5.5:
-
-  https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
-
-this is an error.  Also according to the same spec section, the XSLT processor
-may signal the error or pick the last rule.
-
-This was uncovered with libxslt 1.1.35 which contains the following commit:
-
-  https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712b853900c51635
-
-which makes the build fail with:
-
-  runtime error: file ../docs/page.xsl line 223 element element
-  xsl:element: The effective name '' is not a valid QName.
-
-because our last rule also matches text nodes and we are trying to extract the
-node name out of them.
-
-To fix this we change the match to "*" which only matches elements and not all
-the nodes, and to avoid any possible errors with different XSLT processors we
-also bump the priority of the match="text()" rule a little higher, just in case
-someone needs to use an XSLT processor that chooses signalling the error instead
-of the optional recovery.
-
-https://bugs.gentoo.org/833586
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- docs/page.xsl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/page.xsl b/docs/page.xsl
-index fd67918d3b..72a6fa0842 100644
---- a/docs/page.xsl
-+++ b/docs/page.xsl
-@@ -215,11 +215,11 @@
-     </xsl:element>
-   </xsl:template>
- 
--  <xsl:template match="text()" mode="copy">
-+  <xsl:template match="text()" mode="copy" priority="0">
-     <xsl:value-of select="."/>
-   </xsl:template>
- 
--  <xsl:template match="node()" mode="copy">
-+  <xsl:template match="*" mode="copy">
-     <xsl:element name="{name()}">
-       <xsl:copy-of select="./@*"/>
-       <xsl:apply-templates mode="copy" />
--- 
-2.34.1
-
diff --git a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
deleted file mode 100644
index d796c4c01e60..000000000000
--- a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-	SRC_URI=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	sys-libs/readline:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:0= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( <net-analyzer/wireshark-3.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.2.0.ebuild b/app-emulation/libvirt/libvirt-8.2.0.ebuild
deleted file mode 100644
index 6011891826fc..000000000000
--- a/app-emulation/libvirt/libvirt-8.2.0.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Please bump with dev-python/libvirt-python!
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.56.0
-	dev-libs/libgcrypt
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.9.1
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-3.2.0:=
-	net-libs/libtirpc:=
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	>=sys-libs/readline-7.0:=
-	virtual/acl
-	apparmor? ( sys-libs/libapparmor )
-	audit? ( sys-process/audit )
-	caps? ( sys-libs/libcap-ng )
-	dtrace? ( dev-util/systemtap )
-	firewalld? ( >=net-firewall/firewalld-0.6.3 )
-	fuse? ( sys-fs/fuse:= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( >=sys-block/open-iscsi-1.18.0 )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( >=net-libs/libssh-0.7:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		>=dev-libs/yajl-2.0.3:=
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.26 )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virt-network? (
-		net-dns/dnsmasq[dhcp,ipv6(+),script]
-		net-firewall/ebtables
-		>=net-firewall/iptables-1.4.10[ipv6(+)]
-		net-misc/radvd
-		sys-apps/iproute2[-minimal]
-	)
-	wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev:=
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )
-	kernel_linux? ( sys-apps/util-linux )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.7.0.ebuild b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
index 972e3dbc1d25..947a2eab6796 100644
--- a/app-emulation/libvirt/libvirt-8.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( >=net-libs/libssh-0.7:= )
 	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
 	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
@@ -97,7 +97,7 @@ RDEPEND="
 	)
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
+		sys-fs/lvm2[lvm]
 	)
 	pcap? ( >=net-libs/libpcap-1.8.0 )
 	policykit? (
diff --git a/app-emulation/libvirt/libvirt-8.8.0.ebuild b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
index 92cd83c672f7..bc8725e909ff 100644
--- a/app-emulation/libvirt/libvirt-8.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( >=net-libs/libssh-0.8.1:= )
 	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
 	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
@@ -97,7 +97,7 @@ RDEPEND="
 	)
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
+		sys-fs/lvm2[lvm]
 	)
 	pcap? ( >=net-libs/libpcap-1.8.0 )
 	policykit? (
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index ceff67f6442c..41862ff36a59 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( >=net-libs/libssh-0.8.1:= )
 	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] )
 	lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
@@ -97,7 +97,7 @@ RDEPEND="
 	)
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2[-device-mapper-only(-)]
+		sys-fs/lvm2[lvm]
 	)
 	pcap? ( >=net-libs/libpcap-1.8.0 )
 	policykit? (
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 8e094bc1cd9f..4192717a7db3 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 433bb8819ba2..c79a456e50c3 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -31,13 +31,16 @@ DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 8
 DIST libreoffice-7.3.4.2.tar.xz 256373724 BLAKE2B 98a3a450e8b16caafdbe914b542c32e3e251ac6f2fe528e593640397d50b533f146b1cfd262c633bfee9766a5ef659f7ce606453952978c71c08f249da7d7125 SHA512 10ea93d380b8c59ec15aefc4c4f6f5cbc76b03cf444e2f172fdb8cdde637e8d3de4aa2b7adbd55ec04ba8ad5db73a1bd80e8b692ca328c416d229526f01bd4a0
 DIST libreoffice-7.3.5.2-patchset-01.tar.xz 12700 BLAKE2B 353f6552d31616dfeb32287173bbd70366045ec437c8735e701bff357032f5ef2358920c5d8495142551116999b034db6611a72536edf14fe13ea9cace3a931c SHA512 dbd8b4b494159845efbe9ad76d5822188b9868aff8ef488793f4e2b0f2f0290942322651e8b53dd71db81cba559e3510732801d0c643cb2af9526cb1e1837891
 DIST libreoffice-7.3.6.2.tar.xz 256616324 BLAKE2B 52456e529ae2898101824882f124a5b039a1dfb98fd77dfceef39a41a3af871123c56b83a73d0aaf92e1cea57f35af442ca0a17814a1374538a9495ac601cee0 SHA512 8f61e9c09b344cf120bc6f9463344b28644e52738360ddeb1a29d9d2294d24132b070902a089531869e11487f5a7153fc4752e6636af7ef57269d23c8187ec86
+DIST libreoffice-7.3.7.2.tar.xz 256653492 BLAKE2B aa3e096ba46d6e23b0e6439a435a6d75fdc9da309885a28d96dc5a4fc05d854a8e4f633d9f4d623af18f6a80ca036409fb26b9a9843fb9a18144468b58ef5ad4 SHA512 f7b6279f5ef9f5ad8290d2bdf4fd54f8df7775a21094ba762dbd9299effab31d4f2c6dff9f4b3d9c5673596931df1d16b195474b547007bfc9a396c47e5e181c
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.3.4.2.tar.xz 112208564 BLAKE2B a47b428d69c62ba38d74ee5eca1dfeba66389ea0c7ef103f97292180d43ddc92a5e6ca4f9377f802318b89fca7aab6278c23171d9480e3961e521c161ec42fd3 SHA512 68af32f017b46f7d3e664bc8cfc69de6939c33f26248273372cc7ba5a29299c79795cc13b92a921b8e2508045e0447319ad0c0cd3678929355db6ef8a79a8614
 DIST libreoffice-help-7.3.6.2.tar.xz 112209384 BLAKE2B 629a9dae6464adb33ed4494df8cbf59305a686b0bab21d55e3c139b87c5e3eee3e77ef1f22be84973d6e51a1ffb74aa74fd7f91b82223b2e3cc6d3bc900e7305 SHA512 7a98e8d3b146638bdb608d86b617bb45ff2649957ad9391aadfbb32fb18a4c8d15675bd24076dbb2b635569bfdab988f7cac461cfe04e53b3febfb2aa35d6189
+DIST libreoffice-help-7.3.7.2.tar.xz 112210852 BLAKE2B 3a3148d6ff9c743c97c0371290b3264f8e9eb8eb5aba3176b2e88f296abc2856f364866ba6ebb9f6364b5c98255c8593d23e3d54db6bcc27eecde53ac9a1b393 SHA512 c223ee49626e36b11a86c077001efc27ca2df9aa10ddb068e04c8ab8a0ea1942ca71b97c2f7379bf856ba7d12a5ca94f2fd8d8058703e2276af3595b75049030
 DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B d3eb44a64187ddd3097bc7473eaa6b631b4043b9679861426ae83956de7907a03b51cc472cbb9169c52e92cbc4ebe681181c675ae938324c6d3a10eff9a7084a SHA512 1234ff6e787947fb6442b7279c7ef07d48d7036b15591782ea197c827c60fba77bbe83029bf7d8dfa7dc126535a9a780f6b927fbf7339f0825061616a9c53436
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19800 BLAKE2B 4002944e91e4858ecda8656f706688ea49f409eab5060302fecec5d06732b64268441b43c95d0e99ac578a421118409cb9700a82233eeccf24722326ca2d8842 SHA512 e218c35b5ee4ace9f26908829f0438de60437461cd72862235006924b8293e22cc3c96affae71ed5c2e9c35cf8fbbd80ed40c309c6a4640b51dcac675d378774
 EBUILD libreoffice-7.3.6.2.ebuild 19389 BLAKE2B 7a28ac2463557cba63dbd9580bfafaa9d2571161f8476c71365b351c88993b00d8af2e2398c0270634d3bf0d3451a42aac29a616c5c63d659748ec6b4b2749ff SHA512 261699ef9b9bdf161ed426ee1961cf98747eab3e04fdb1671fe917970d2da28cace1a43cdf480417a878f484658c44f8d9c8f7d0a263d8ba07e319dc04872f7c
-EBUILD libreoffice-7.3.9999.ebuild 19391 BLAKE2B e295cfb0354d1df6f540cd7682e6c763ab530f8b89e88e6f7c71916d42f99c0816e2c81880ce6c00dc1c1455f11f218cd36d8d1942172641d12610af5099b531 SHA512 00c7e74665a90a164569b29feb748d3036dd355dd88fed3ade0875eb365e89ac8a94edae446f5ecd05a616953dc7bcd079f809e5161652a35cae4249868dee9b
+EBUILD libreoffice-7.3.7.2.ebuild 19323 BLAKE2B 76bb0b7a2f9caa0b8a50b61826c4bc57f5ed675a17d38445533021177c058b51f300f60de16aed83f5cd98650dedd5ed91557a42e3af59635be61292a3a0a98a SHA512 79362f9bfbdea9691434f5258e058c2ab45759841f352fbe788168d8a2d431ab8ce123ae36397395f35e81483a3c91ef45ec08269a3cf56b94cfc57eb6d8bd17
+EBUILD libreoffice-7.3.9999.ebuild 19319 BLAKE2B cf387136ab36554b453c4e30644ada5d0006b484fa8f6a0b394b992557430f22cd5d79fe11508c439f9a14fd3a122097bc009c17fbb240b1078c59500ad313f8 SHA512 322c44cba0e4f3b572d4c5695110b7d8a4ae3b0890edc6b762e90fc94e9d1f7f86ea52275efe0251d79edc7a88234dec708bdf342c97aae760dde2c7d24b1ae9
 EBUILD libreoffice-9999.ebuild 19232 BLAKE2B f3a648480c8c44ba7c14691d378578af9b751a226381959aee0eed33cf6f0eb2ae9ec3626e601103288592b2391fb0497dff9263b0571ba915ddc93037acce48 SHA512 59c637260e6ea0632beef8aabb7e02005cce692b572621bb97c7ece3e102d215077645373eca3c202cd339778c1f2194186b672765fe65e3e32ae920ae11a217
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/libreoffice-7.3.7.2.ebuild b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
new file mode 100644
index 000000000000..e2c4656f8321
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-7.3.7.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="threads(+),xml(+)"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+PATCHSET="${PN}-7.3.5.2-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# broken against latest upstream release, too many patches on top:
+	# https://github.com/tdf/libcmis/pull/43
+	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+	"${ADDONS_URI}/dtoa-20180411.tgz"
+	# not packaged in Gentoo, https://skia.org/
+	"${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+# [[ ${MY_PV} == *9999* ]] || \
+# KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~x86 ~amd64-linux"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme:=[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	dev-cpp/abseil-cpp:=
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	dev-lang/perl
+	dev-libs/boost:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	>=dev-libs/liborcus-0.17.2:0/0.17
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	>=games-engines/box2d-2.4.1:0
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libjpeg-turbo:=
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	media-libs/openjpeg:=
+	media-libs/zxing-cpp:=
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus[X] )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	ldap? ( net-nds/openldap:= )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	!mariadb? ( dev-db/mysql-connector-c:= )
+	pdfimport? ( >=app-text/poppler-22.06:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/2.0
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-11
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/libreoffice
+	acct-user/libreoffice
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-11 )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+BDEPEND="
+	dev-util/intltool
+	sys-apps/which
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	clang? (
+		|| (
+			(	sys-devel/clang:15
+				sys-devel/llvm:15
+				=sys-devel/lld-15*	)
+			(	sys-devel/clang:14
+				sys-devel/llvm:14
+				=sys-devel/lld-14*	)
+			(	sys-devel/clang:13
+				sys-devel/llvm:13
+				=sys-devel/lld-13*	)
+		)
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	"${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+
+	# 7.4 branch
+	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	use base ||
+		ewarn "If you plan to use Base application you must enable USE base."
+	use java ||
+		ewarn "Without USE java, several wizards are not going to be available."
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# Show flags set at the beginning
+	einfo "Preset CFLAGS:    ${CFLAGS}"
+	einfo "Preset LDFLAGS:   ${LDFLAGS}"
+
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		LDFLAGS+=" -fuse-ld=lld"
+	else
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+
+		# Apparently the Clang flags get used even for GCC builds sometimes.
+		# bug #838115
+		sed -i -e "s/-flto=thin/-flto/" solenv/gbuild/platform/com_GCC_defs.mk || die
+	fi
+
+	if use custom-cflags ; then
+		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+		elog "the build succeeds. Good luck!"
+	else
+		strip-flags
+	fi
+
+	export LO_CLANG_CC=${CC}
+	export LO_CLANG_CXX=${CXX}
+
+	# Show flags set at the end
+	einfo "  Used CFLAGS:    ${CFLAGS}"
+	einfo "  Used LDFLAGS:   ${LDFLAGS}"
+
+	# Ensure we use correct toolchain
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	if use vulkan && ! use clang ; then
+		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+	fi
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-qt6
+		--with-extra-buildid="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-abseil
+		--with-system-openjpeg
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-webdav="neon"
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-jfreereport
+		--without-system-libcmis
+		--without-system-sane
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable kde kf5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vulkan skia)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+			--with-jdk-home="${JAVA_HOME}"
+		)
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	default
+}
+
+src_test() {
+	emake unitcheck
+	emake slowcheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+
+	# bug 703474
+	insinto /usr/include
+	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
+
+	newinitd "${FILESDIR}/libreoffice.initd" libreoffice
+	newconfd "${FILESDIR}/libreoffice.confd" libreoffice
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice/libreoffice-7.3.9999.ebuild b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
index 956e03914be1..7890edc7daa9 100644
--- a/app-office/libreoffice/libreoffice-7.3.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.9999.ebuild
@@ -294,9 +294,6 @@ PATCHES=(
 
 	# 7.4 branch
 	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
-
-	# pending upstream
-	"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/wps-office/Manifest b/app-office/wps-office/Manifest
index 9a5fa1b441dd..61c9532009ba 100644
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@@ -1,5 +1,5 @@
-DIST wps-office_11.1.0.10976.XA_amd64.deb 276985802 BLAKE2B f886577e0446d012de8f28866410a6aefad6ba0ba4c0388402bda40de81859f86f4d342055363ee96123af0be4a78c1867fce7b4118fc8447807e01ecec3cac5 SHA512 744a054b78c0b5742b5af86a1d058af982b5d673205d690bd393c29a35558f2fb45081c109a406dd87078a50a09b8f6242cb469e8b93824a6b9d93af84c6f128
 DIST wps-office_11.1.0.11664.XA_amd64.deb 319591396 BLAKE2B 35e94cca54b964731edd4d7bc33d9dbd97f6f9f4502896edcb0cbc0ff21e49953c825c46dbc5b6230443c45d4914a5bf75027c1b98f56307c98ec9ad3d65f955 SHA512 0ea03b27246b796b80187bb252dce0446ae497fd1a9a18da3fd3c0e13531d56fca22157cf1d0e7542b77d3bce8cbdaa407ccebfbf1d7d1d9732e51369608ac36
-EBUILD wps-office-11.1.0.10976-r1.ebuild 2115 BLAKE2B d9a2903d2dc9ee5ea71422a82a94bc2bb225e2056af80b76324f11b8a2184ca831290b128fe2905dc504b4597c8fa1debbe9735e274543b5ed4b266db34a5e63 SHA512 a12c836a59c4c73532a03af6600f7d598344d48ebbb92b2fec40e24f942a68195de6cbc64eee2e95260dd59b9ce13e6acc50843224881ad7970d0e4b004f1d77
+DIST wps-office_11.1.0.11664_amd64.deb 413652340 BLAKE2B 5bca47eef4c0c6a418ff5d79cef46ddd8841400333e72d3ac6fb5337d81fc7265503226da7d78b9a1df0cccf8d021852c69d2f65ed88ed74fc531638ef557f08 SHA512 6dbe7df259d989389df9d3c5730966693538ab1ef95c18a66cd50609894c83b028190f7381e1c998b0470d389c8c6969d8528ef88bc6428fdb0123586880de08
 EBUILD wps-office-11.1.0.11664-r1.ebuild 2115 BLAKE2B d9a2903d2dc9ee5ea71422a82a94bc2bb225e2056af80b76324f11b8a2184ca831290b128fe2905dc504b4597c8fa1debbe9735e274543b5ed4b266db34a5e63 SHA512 a12c836a59c4c73532a03af6600f7d598344d48ebbb92b2fec40e24f942a68195de6cbc64eee2e95260dd59b9ce13e6acc50843224881ad7970d0e4b004f1d77
+EBUILD wps-office-11.1.0.11664-r2.ebuild 2476 BLAKE2B 95340f7cb3264633ae22ba636ab5c4eea5f8c874346095e6ea0317535ad00e86cd286c98f3c8ccbd9e41196c75a7007ba798c505b49ab9be170da30162edada2 SHA512 cab10f60e30c78df281c9f86bdd3f4e393f5f4f49d868c88d8406337e369fae59914ce2e65c8dccc65b2b3746dfcb8bfde3b4206823450e7d42d0bece748aa18
 MISC metadata.xml 240 BLAKE2B 1f4d972fe6e8f4096f8905fe5ec3f77b8689f3b0e01ac676ae4e55ce3aa66c18473cc82b5766131f155b9f4cd3fa6c541ab3bd32bfd233ff89722937105f968a SHA512 2e9f28bd0e525aa062cb098048dd176668b1ca2220e0018279ec4779eb80a2e8ad4f1ea73899aded97b7d27379e88d2f60cc80af4a6992880edf6e301b7e1090
diff --git a/app-office/wps-office/wps-office-11.1.0.10976-r1.ebuild b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
index 67b0072d6049..51854735aea4 100644
--- a/app-office/wps-office/wps-office-11.1.0.10976-r1.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.11664-r2.ebuild
@@ -11,13 +11,14 @@ HOMEPAGE="https://www.wps.com/office/linux/"
 
 KEYWORDS="~amd64"
 
-SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+#SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
+SRC_URI="https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${MY_PV}/${PN}_${PV}_amd64.deb"
 
 SLOT="0"
 RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
 QA_PREBUILT="*"
 LICENSE="WPS-EULA"
-IUSE=""
+IUSE="systemd"
 
 # Deps got from this (listed in order):
 # rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
@@ -39,7 +40,7 @@ RDEPEND="
 	dev-libs/nss
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
-	 || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
+	|| ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
 	media-libs/libogg
 	media-libs/libsndfile
 	media-libs/libvorbis
@@ -72,6 +73,7 @@ RDEPEND="
 	dev-libs/libxslt
 	x11-libs/pango
 	virtual/glu
+	systemd? ( sys-apps/systemd )
 "
 DEPEND=""
 BDEPEND=""
@@ -90,5 +92,11 @@ src_install() {
 	insinto /opt/kingsoft/wps-office
 	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
 
+	# https://bugs.gentoo.org/878451
+	rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
+
+	# https://bugs.gentoo.org/813138
+	use systemd || { rm "${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
+
 	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
 }
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index a12a240cb581..adebbe24c2cd 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 37cdcfbd6ee8..91f6a6c9123a 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -398,6 +398,5 @@ EBUILD bash-5.0_p18.ebuild 7423 BLAKE2B ca28a57b4407a5971bdf25f477e4c6b40b6c2b1f
 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.2_p2-r2.ebuild 9477 BLAKE2B c16b5f06f20e14a0401f3acde5bab9e5e260117f75b12a8db2d2557f9d98d60231931f141a93a340895896bfade9a8e3de41928e5a26ddcad6ef7068c1562afa SHA512 4377489d3ad2f3d2e50715e10c364fa5e73e0aff7d36399e0176add2f573db9a0b9816c62055d4bf34818fd11e80e7323a9cb8e6bd02d4daaf47e45c10742dbb
-EBUILD bash-5.2_p2.ebuild 9350 BLAKE2B e1e028bcef06fbbadaa200376a7d33bd2fa2b1c4ce5a5711805ea9b7bf3426a4785b147cc9cb1a8f2314b004ecef0d95c0b212a935946225b11e9334031e55eb SHA512 deced834f4d2cf6ed25405b45018fbd20e9da7cf2e64bba75979a19e8c13fe6404569a58555a233cdcd4dafa039b8f2bde89e014c0b12194e6c1c326ee0dfb8b
 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.2_p2.ebuild b/app-shells/bash/bash-5.2_p2.ebuild
deleted file mode 100644
index f679e4cd77dc..000000000000
--- a/app-shells/bash/bash-5.2_p2.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic toolchain-funcs prefix verify-sig
-
-# Uncomment if we have a patchset
-#GENTOO_PATCH_DEV="sam"
-#GENTOO_PATCH_VER="${PV}"
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-MY_PATCHES=()
-
-is_release() {
-	case ${PV} in
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
-READLINE_VER="8.2"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif is_release ; then
-	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/bash/${MY_P}.tar.gz.sig )"
-
-	if [[ ${PLEVEL} -gt 0 ]] ; then
-		# bash-5.1 -> bash51
-		my_p=${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))
-
-		patch_url=
-		my_patch_index=
-
-		for ((my_patch_index=1; my_patch_index <= ${PLEVEL} ; my_patch_index++)) ; do
-			for url in mirror://gnu/${pn} ftp://ftp.cwru.edu/pub/bash ; do
-				patch_url=$(printf "${url}/${PN}-$(ver_cut 1-2)-patches/${my_p}-%03d" ${my_patch_index})
-				SRC_URI+=" ${patch_url}"
-				SRC_URI+=" verify-sig? ( ${patch_url}.sig )"
-			done
-
-			MY_PATCHES+=( "${DISTDIR}"/$(printf ${my_p}-%03d ${my_patch_index}) )
-		done
-
-		unset my_pn patch_url my_patch_index
-	fi
-else
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-if is_release ; then
-	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
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if is_release ; then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="virtual/yacc"
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
-)
-
-pkg_setup() {
-	# bug #7332
-	if is-flag -malign-double ; then
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		if use verify-sig ; then
-			verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.sig}
-		fi
-
-		unpack ${MY_P}.tar.gz
-
-		if [[ -n ${GENTOO_PATCH_VER} ]] ; then
-			unpack ${PN}-${GENTOO_PATCH_VER}-patches.tar.xz
-		fi
-	fi
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if is_release ; then
-		rm -rf lib/{readline,termcap}/* || die
-		touch lib/{readline,termcap}/Makefile.in || die # for config.status
-		sed -ri -e 's:\$[{(](RL|HIST)_LIBSRC[)}]/[[:alpha:]_-]*\.h::g' Makefile.in || die
-	fi
-
-	# Prefixify hardcoded path names. No-op for non-prefix.
-	hprefixify pathnames.h.in
-
-	# Avoid regenerating docs after patches, bug #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/* || die
-
-	eapply -p0 "${PATCHES[@]}"
-	eapply_user
-}
-
-src_configure() {
-	local myconf=(
-		--disable-profiling
-
-		# Force linking with system curses ... the bundled termcap lib
-		# sucks bad compared to ncurses.  For the most part, ncurses
-		# is here because readline needs it.  But bash itself calls
-		# ncurses in one or two small places :(.
-		--with-curses
-
-		$(use_enable mem-scramble)
-		$(use_enable net net-redirections)
-		$(use_enable readline)
-		$(use_enable readline bang-history)
-		$(use_enable readline history)
-		$(use_with afs)
-		$(use_with mem-scramble bash-malloc)
-	)
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading bug #7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	if is_release ; then
-		# Historically, we always used the builtin readline, but since
-		# our handling of SONAME upgrades has gotten much more stable
-		# in the PM (and the readline ebuild itself preserves the old
-		# libs during upgrades), linking against the system copy should
-		# be safe.
-		# Exact cached version here doesn't really matter as long as it
-		# is at least what's in the DEPEND up above.
-		export ac_cv_rl_version=${READLINE_VER%%_*}
-
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins ; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-
-	# bug #444070
-	tc-export AR
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	if use pgo ; then
-		# Build Bash and run its tests to generate profiles.
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		# Used in test suite.
-		unset A
-
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
-	else
-		emake
-
-		use plugins && emake -C examples/loadables all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset A
-
-	default
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
-
-	keepdir /etc/bash/bashrc.d
-
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-
-	if ! use readline ; then
-		# bug #432338
-		sed_args+=(
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			docinto ${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					dodoc ${f}
-				fi
-			done
-		done
-	fi
-
-	# Install bash_builtins.1 and rbash.1
-	emake -C doc DESTDIR="${D}" install_builtins
-	sed 's:bash\.1:man1/&:' doc/rbash.1 > "${T}"/rbash.1 || die
-	doman "${T}"/rbash.1
-
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3b3bd943214c..87b2fabe91e7 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 36a2b33268fa..2616fa41ed5e 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,5 +1,3 @@
-DIST lesspipe-2.05.tar.gz 167135 BLAKE2B 6f54a68a3857fcafa19148ba798d6ac49b2693e547e88a4a4fb6a178768d75ba8ae08e808a9e08aabfe903538bd401e3bd25e22ec240bf3a52365df729d87b9e SHA512 b4220b28fb609060735663067f5a738cae32d12e90efc397db3749e4dcfa7bfc063a4458c1f39b8a43be3b04effdc00a25c4feebd6e9a3b23f0064b879bbb698
 DIST lesspipe-2.06.tar.gz 168100 BLAKE2B a7447efa85cd422343f9dbb06001e85fa7b33c92db752f8248e4b4a0d9ecce4ef0241240d6993c5a71157c44da2f4ffc3efd41ac5e0a31e89ed5b80ac99f71fe SHA512 b2411c5e6b287fb67e1ea9b6d10377fe19b58e8c0f54587f825d1ee4c1a85f9a8ed3244a7cf339bcba960094e95821d9a56929951d862eb697f1d12fe55ef20d
-EBUILD lesspipe-2.05-r1.ebuild 1240 BLAKE2B 7ec7fc28cf35072aeddaaa1740dcb4a2305468712795507f793709e663d026011c861827c6f527433de95ab7a26ee85629dc25173a69531307d517d6826be74d SHA512 f85f611a71a28eb501151bd16c3603d9591e140a802b1d13235d262e964d40f0616191d47057f38d8ecde42b96531960ff29f2b5b38a109bab6971eef00be4ec
 EBUILD lesspipe-2.06.ebuild 1316 BLAKE2B b99b541d48f1e922523adb46433756503d93d2c6060f47c4a056be59820a520f0a7bfc45fc93ac9dde7a32ac75dd7ebe624bfa87190c6e452ac2957a8b179fd3 SHA512 ebedbad0bed5cf740f3cdcf908de5246a4143d5d030a9915cf08729c25dc2ceb2dfee14c711bdb08920e7c18206ec824b607aafb5f69f5f9a29717e26e73bc9c
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.05-r1.ebuild b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
deleted file mode 100644
index a795a3880db9..000000000000
--- a/app-text/lesspipe/lesspipe-2.05-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="A preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="test"
-
-BDEPEND="dev-lang/perl"
-RDEPEND="${BDEPEND}"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-
-	rm -r "${ED}"/etc/bash_completion.d || die
-	newbashcomp less_completion less
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index d7c7e4b80d87..ee60c2dbc006 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -2,5 +2,7 @@ AUX sdcv-0.5.3-t_list.patch 592 BLAKE2B 7f1618750a8d9c452f8db257a2b4791b803f45f1
 AUX sdcv-synonyms-bin-search.patch 3409 BLAKE2B e40f32a2e0e401ae5b996992fa227ef70a439f928d762285094237871b7dded242928bab8206a146acf1abf716cdbcaa8a8d0ed5a430ec4dff5cae3a3a014b34 SHA512 bf4cf297abed05f4052cbff8decac2069a52657b3cfc21435e72731536ab9605ddde9053fa8b39d9a2f1dc67416126b1b10a1c31cabca37a6fb31d2272ba5e13
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
 DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
+DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81 SHA512 6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21
 EBUILD sdcv-0.5.3.ebuild 1599 BLAKE2B d1b997b6d9b39686690b1cecf6f51a79144e90d3a6f398a84c720071b99e5f707f286b58c029dd6d452632f9408aa156aefb5dbae5a9671532d5beb53222b5d8 SHA512 2ee3c48aff47225c46f9767d22c671db627a939168d20d1ab462266da12712b0c04933fda126479541811c78923d461cc48ec81d8a237ffa37a7da02e392a6a5
+EBUILD sdcv-0.5.4.ebuild 1554 BLAKE2B 0283b15a20ead0855b0b300c8577985423d4aabe6131954ca60de10355588a207a485d234b3d740e3d355e4e60109efb96d3df291de6dd17dba193cbb6292b59 SHA512 9c15ee609b8efdd06ec42b1bf824dc7c1a2c582e633868754c1da872a137f5793fa3848ecdb97d5554aefc7902a7a4173348434826f75f3c4c02d4271c8450e5
 MISC metadata.xml 449 BLAKE2B 3a4834d7d93e7b98e85a6ef09ae438ad9623eadcfbe3a0d50465b7cb1e9417bd0e4c8d4c005f45c9fb759926a35b566d3763b19311d3bb0fbcfdea9b147598c4 SHA512 b00e28f9c0c46e3068f53f98453dd351b3b7a305acd0aa68b286bd4e73ddc94bf4e7f16ec93a5945e05fc6dead340755d5949daa49fb878a80b1f18aa95f9b21
diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
new file mode 100644
index 000000000000..e345ee7b990d
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+inherit cmake plocale
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.36
+	sys-libs/zlib
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( >=sys-devel/gettext-0.14.1 )
+	test? ( app-misc/jq )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.3-t_list.patch"
+	"${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+	if use darkterm; then
+		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+	fi
+
+	rm_loc() {
+		rm "po/${1}.po" || die
+	}
+	plocale_for_each_disabled_locale rm_loc
+
+	# do not install locale-specific man pages unless asked to
+	if ! has uk ${LINGUAS-uk}; then
+		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DWITH_READLINE="$(usex readline)"
+		-DBUILD_TESTS="$(usex test ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use nls && cmake_src_compile lang
+}
+
+src_install() {
+	# with USE=nls, but empty intersection of LINGUAS and list of
+	# supported translations, this directory is required, see bug 583386
+	mkdir -p "${BUILD_DIR}/locale"
+	cmake_src_install
+	dodoc doc/DICTFILE_FORMAT
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index fb5b3a952d07..65a40d0cc886 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,11 +1,5 @@
-DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
-DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f36a5fb1e486d5178c25db0490bc01812f2173feb8abb97a2e399449950524db7b557b303c671d1e9a50f062f332008a SHA512 35da36bdaa6997353554604db5ced3f3a05d0862ce5cf357fae639ca88a65ea83bf0be039629e6aedd67f8cb369a7eaeba7f279980c9e2f585083c737c61ea43
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
-DIST xapian-omega-1.4.20.tar.xz 563324 BLAKE2B 3836cc1f219f228edbd910dd92eb5bf7f91c6e0e5a1be2fad271dc9246ef0e5dd68d99d48f15c8ac9c449112d492e3becd501413a8c190d0b611d2506f8d82cb SHA512 026ca234d072da39a29d47b5b53033ec7677d51f93a6fedffb2a57ff5b788cc08d94d1dc43ff8c0062639470b8fe3150781008e4b50abd3ec5526b2b98a3a676
 DIST xapian-omega-1.4.21.tar.xz 568440 BLAKE2B 445152c23f58471402d8017906083123c0a0e55eb8feed8908dae46680148471a65c51ef146c693cbbb807ce7a70d6589c0a77c2508c39417b95f292d5e8b9f1 SHA512 a313725084c3c336655a3beaa2c1e6c9186027bf6c90f0c5261f748a08e1e8d1ef9d43b0c6bad5bbd5a5af9d1f3db49b915435e5e815f9e97d452590522e85ec
-EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
-EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
-EBUILD xapian-omega-1.4.19.ebuild 1185 BLAKE2B 654cfa4db30dd554cea03b391bfb26ec39b5b50f46d1c6aafb79e4f429165f7fc760226e0353a294ef78e9999b4c96e92a7e7f31275ffa67539d4c4dcdb4b6b9 SHA512 6766388cb1bd412e1befbfff41574a77e1f546b19873de81e0cc1b93e0cdf5b28936a077ca113e7ac119040f256ac53f93d5969b91ef53130f41dd9d1b7b4eeb
-EBUILD xapian-omega-1.4.20.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
+EBUILD xapian-omega-1.4.19.ebuild 1183 BLAKE2B 860088e7f9d5818b0de08d8aa5d5e1b7c83b98ea892dbf579934c069bd275f6580651afe3ed7f280deaa66e76d8a105be8b001b7d5d968ed6e15a366063c209c SHA512 8abda4b0e180124d2f6c514d800dfaf005f1873555609479d72588ce3100bd711be9b8224fb61951ca3224c81d9a26b4476d771a0fd6b443a996570db6d68c12
 EBUILD xapian-omega-1.4.21.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
deleted file mode 100644
index 51e7f7c7a19d..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/xapian:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild b/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
deleted file mode 100644
index 83d47defb376..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="~dev-libs/xapian-1.4.18:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
index a4f6177030f8..4ab0cfef4675 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.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/app-text/xapian-omega/xapian-omega-1.4.20.ebuild b/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
deleted file mode 100644
index 91ff25791e25..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.4.20.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="https://xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="~dev-libs/xapian-${PV}:0/30
-	dev-lang/perl
-	dev-libs/libpcre
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}" install
-
-	# Protect /etc/omega.conf
-	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
-	doenvd "${T}"/20xapian-omega
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	# Directory containing Xapian databases:
-	keepdir /var/lib/omega/data
-
-	# Directory containing OmegaScript templates:
-	keepdir /var/lib/omega/templates
-	mv "${S}"/templates/* "${ED}"/var/lib/omega/templates || die
-
-	# Directory to write Omega logs to:
-	keepdir /var/log/omega
-
-	# Directory containing any cdb files for the $lookup OmegaScript command:
-	keepdir /var/lib/omega/cdb
-}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index ef726ab82c2b..df8d4dcc7bd4 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -3,6 +3,5 @@ AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6
 AUX xmlto-0.0.28-dont-hardcode-paths.patch 845 BLAKE2B 37618989b609bc7dd2d94d22fad0562d6e0580541d8f6ec2a222316da89a6744a16cac9b4cd446ef80f58cf415f4a784aefedf53349ea85e98cf33000b7799b6 SHA512 9947787a1c3ebbd0a73e271ebab3dfcd01b7aad3bcaa627e7a236947bc7edbc23696c38f96aae62785013e2ac8c5171ce6f386f655676a4cde8d820f49d5df7d
 AUX xmlto-0.0.28-fix-warnings.patch 3085 BLAKE2B 2c9e6323dda3fed36bdd999e10d76b8cfcc3c2bef3893ec044588c22519609889101d65f656f8ebb7b70a2819d009fb81d1f34ad2659b1398d7d3c7b9d565ffc SHA512 b16699d6e592c74ca7400f1a4a0ff6b158eb44cb6e77b73bebab03e10535f44890241bfd53d16382266da4102a42c4db7905481115324a76e667d1b91ec61fe1
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r8.ebuild 1495 BLAKE2B fb48fd354d2837e842b3400014f768119d962345f9dd37cba16ef65517d8bf3c9933ed306d558f408809e513d171727383f7a54c207edd773dd46a15d4880fd9 SHA512 09a4b2c9467c8dc35301dd733207f82bc7f6ccdd9f764da50bfdba5de120ce66c388e181e709ae22e08164e5fdde79ea74aca8a95bf8658b6004e3bf1645022f
 EBUILD xmlto-0.0.28-r9.ebuild 1588 BLAKE2B 08eb600ac325d39ca62f975064c01f5b95314203e3360fc7ede32e923f2fc1a6ec578d9616acb2691f454898531c9f397252fb8898f8708a2d54229883f2aa6a SHA512 024f784a10445fa2796449f5c27fdcd27724dca51a08e53255c817a9c40ee52bd35b81b07d0e012285b1c59c944904f62bd15758229361a030d3b49453ead373
 MISC metadata.xml 324 BLAKE2B 3cabb2600d6843ebecec023a16fef87a40432202ff195a6130e57f97802d4c0ed2e82ffee506c65afe554291f05c64c7ae2fe524c708db7a9c6bf4a71c4c8710 SHA512 19ed2fabc04f96b1b61495e2fdba674ca4b4a9a1cee11b3cb13baec6d9e7fe0d82b653a0cbb523de3fcd4ed1ef18d8111686f8b618db9924674ee274ae5a21ed
diff --git a/app-text/xmlto/xmlto-0.0.28-r8.ebuild b/app-text/xmlto/xmlto-0.0.28-r8.ebuild
deleted file mode 100644
index dd8d9b968fc9..000000000000
--- a/app-text/xmlto/xmlto-0.0.28-r8.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
-
-inherit autotools
-
-DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND="
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	|| ( sys-apps/util-linux app-misc/getopt )
-	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
-	latex? ( dev-texlive/texlive-formatsextra )
-"
-# We only depend on flex when we patch the input lexer.
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
-	"${FILESDIR}"/${PN}-0.0.28-dont-hardcode-paths.patch
-)
-
-src_prepare() {
-	default
-
-	# fix symbol clash on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	# We don't want the script to detect /bin/sh if it is bash.
-	export ac_cv_path_BASH="${BASH}"
-	has_version sys-apps/util-linux || export GETOPT=getopt-long
-
-	econf
-}
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 70101b0b6b60..ae125a4942ae 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -2,6 +2,6 @@ AUX zathura-pdf-mupdf-0.3.8-meson-mupdfthird.patch 719 BLAKE2B e8fee9b67dd4e3156
 DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
 DIST zathura-pdf-mupdf-0.3.9.tar.gz 9201 BLAKE2B a74621e6330889363e25875e25984d8f9d9250a654ddb628849a8750fc4bbbb730cb6707d1959d0d28189d99af6bc041e1806036737b3daaa739373e632e304d SHA512 12537ca4c579be6dfa4c94195eafea09e45a08207eb131ed806ab868a71d781dbe6fef5e4442f77bcc0a70921d44654d97d48a6f4bfdbe28e0bdb9fec67f69b1
 EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
-EBUILD zathura-pdf-mupdf-0.3.9.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
+EBUILD zathura-pdf-mupdf-0.3.9.ebuild 784 BLAKE2B cc9ff02db43aa1f51fff3ce73d51cb84e5070fae3fe130cf124da98191ca840c985b0b5ffd6fb48bfa7512b5fa9032043cef28fa0cc1470cb3c55e5945645cd4 SHA512 1877ff3986f1c4a507d6c8a68b6f31b159b42789bcb3bbdd65be56b287c8ad7cdfa344ef2a68652d72153255b5f4987b87e58aac1e5068e5d39b2675bcde1ff8
 EBUILD zathura-pdf-mupdf-9999.ebuild 787 BLAKE2B 942b51d2a72ed0a3b26eb4f88deb4f1fc510c0a8551e563c6799cbcd653bca158fc1467f1bda0a768d78aa5464714ee15bfc308bbf70f95fa2cd0424118a1195 SHA512 253121b5df0ec0322f7393c748470d062f834df39560a14755a14ba79fe28ad60523717a117b6f4d774e62fde71b1712b813cdc059b61d2fa774544de60009c8
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
index 5ca8fe3fc822..22828fa1fcc3 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://git.pwmt.org/pwmt/${PN}/-/archive/${PV}/${P}.tar.gz"
 fi
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index cb60a33bb2fb..c4ffc17a6967 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 2a248a5b5815..2746ee0c3f28 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,11 +1,5 @@
-DIST sqlite-doc-3390200.zip 10683207 BLAKE2B 745aedf0c71da6c0d802aed2b64b6e10ef57f4a72210b12276a3019ccc5408bef537ad93c64eb972a7f24117df5780e35f75246d2ba9cd74c4537588eb6cba3c SHA512 54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
-DIST sqlite-doc-3390300.zip 10312031 BLAKE2B 53e4490a0b2fdc8a8ee76615cef3c9e3006e79d91c7b21d92fcaecb7bb07190b761c506cb6af6cafb9e876974ece6647f33a663959d4ff83bb65310402e74709 SHA512 edab798f777bec097a20798a71c8ea01e4c59034da1f696ce1574a57719edd252a0004a268866e338803dd4c46980754ed1b5ddd05a5fc01b59397b6fda172ae
 DIST sqlite-doc-3390400.zip 10853153 BLAKE2B 617927351809e5ec7489011f963337e92b539a83b135daa7ccd48f840d35716d08e8adc08a67e17d674a6bc64ca24fa92b56573c0065105386fc9c75f1f7f9ef SHA512 75d97b0f2f0d530b2e0ad505574af3bf657d82f0859bb5de7ee45c40a80351e933944845cedca56b579925a3d07505c6f4721f756f27862ffafdfc2caff539fb
-DIST sqlite-src-3390200.zip 13403722 BLAKE2B 24ab8cfe5fda267c7a90939875e87bc9f9914f2690f195c21ff2b774ba83a7d6914f57648cf618fd79b37e54ad85121f86310a733a87e6c76bf729716a937d02 SHA512 a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1
-DIST sqlite-src-3390300.zip 13404886 BLAKE2B 46c0a39aa1da33b3ab2f3353d641f2e93073531d9db8c7088ce2578eca5c742a4b9d2ac10f1c6488248e103f421cef214596eb692fdf54ef54c113b55961ab89 SHA512 19827a3dc0b57046b3d50e9538dfcf2e0453a04b2d8ccfee94effa3eee1b1a56837740ecef0e6ee4ec0a94d7185fae9f4a5e158291468acbbcead5335196e776
 DIST sqlite-src-3390400.zip 13405169 BLAKE2B aa0e0abbdcafced086a604ec910dbfd1e4df28e83e0edb6056019391e96367050e59478ee8847d930191a65b21cf0bf9957c35ef056abd9be4947a3838d78eb2 SHA512 0acb8afc87f911c91ec555cc97af5b77b6b0e80cc8672711ddd87c651d9e11b697c9669ff9ba2b58da12b972bb46acdf8b8fe35993950f10735b4036501b73bb
-EBUILD sqlite-3.39.2.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
-EBUILD sqlite-3.39.3.ebuild 13260 BLAKE2B 92c5bc279bd338b62cb19a9e1dacfe483c81a48c104e50f5fc1d8c413136031c9f20794f4eb5fcfecc2c3b1b926596788806934ab9eb57b03f635bdd3d81f835 SHA512 95af9af81ff7063c1d1b3497fb02525b36ff8495c08f933f5e226185d040efb3a6c87ba129fb3989ae96640bffc726fd40e8416379c8af3d8883ddfb3ea4005f
 EBUILD sqlite-3.39.4.ebuild 13252 BLAKE2B a11cf6540941038ac710c9bf6bce657da353b520f44119c6a68ace2d73ef9f8ea26062d8fa8bc6008bec0917a45597ae1dd1a35c9c4b7a162993e59b51df89b3 SHA512 df3d005656e2e4447cbf0beb950859870e33867d86716af2b92174ad0e40afa43c7efdba40bde85f3aa72cac8405dcf64688a3eb6e16a93a0441c661b1561e18
 EBUILD sqlite-9999.ebuild 13254 BLAKE2B 70c6c1f542340b97a48d1742acb9d1b1f804ce711fe7bfaa8feb5c3fe164d1cb5535e7451f598d810463e4dd7c2640d42179a03c5670475f20195f076617d7d0 SHA512 188c4356483f4031a1e6dfdb9e4b36c999916bbda4608e58cd70abf845f8a1bc366a24535d8d47c5d96041656df1b66a2b817df9d8d1e99e298598e532229f77
 MISC metadata.xml 824 BLAKE2B 8ab2e8f230bf3a2b26077d90944bca7bf35ae905310205b90bf243365148488303256606c0ee7c3fb736300686466a1c2583bf103693c20063ca668fe9e52647 SHA512 ed4a89e3c2d633cb6ebf8bcbf3ca055d0d1b2ffd801ba559395f812faeaafdfedd97dae11a5a53a4c068e43026fbd4eed4cb12c8b89a7fda6dabe6f78a2e0b38
diff --git a/dev-db/sqlite/sqlite-3.39.2.ebuild b/dev-db/sqlite/sqlite-3.39.2.ebuild
deleted file mode 100644
index a2eb7c1e987f..000000000000
--- a/dev-db/sqlite/sqlite-3.39.2.ebuild
+++ /dev/null
@@ -1,436 +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 multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
-else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	# debug USE flag.
-	options+=($(use_enable debug))
-
-	# icu USE flag.
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	# readline USE flag.
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
-	fi
-
-	# secure-delete USE flag.
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=(--disable-tcl)
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-db/sqlite/sqlite-3.39.3.ebuild b/dev-db/sqlite/sqlite-3.39.3.ebuild
deleted file mode 100644
index c69a893b551d..000000000000
--- a/dev-db/sqlite/sqlite-3.39.3.ebuild
+++ /dev/null
@@ -1,436 +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 multilib-minimal toolchain-funcs
-
-if [[ "${PV}" != "9999" ]]; then
-	SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
-	DOC_PV="${SRC_PV}"
-	# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
-fi
-
-DESCRIPTION="SQL database engine"
-HOMEPAGE="https://sqlite.org/"
-
-# On version updates, make sure to read the forum (https://sqlite.org/forum/forum)
-# for hints regarding test failures, backports, etc.
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://sqlite.org/2022/${PN}-src-${SRC_PV}.zip
-		doc? ( https://sqlite.org/2022/${PN}-doc-${DOC_PV}.zip )"
-fi
-
-LICENSE="public-domain"
-SLOT="3"
-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="debug doc icu +readline secure-delete static-libs tcl test tools"
-if [[ "${PV}" == "9999" ]]; then
-	PROPERTIES="live"
-fi
-RESTRICT="!test? ( test )"
-
-if [[ "${PV}" == "9999" ]]; then
-	BDEPEND=">=dev-lang/tcl-8.6:0
-		dev-vcs/fossil"
-else
-	BDEPEND="app-arch/unzip
-		>=dev-lang/tcl-8.6:0"
-fi
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
-	tools? ( dev-lang/tcl:0= )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
-
-if [[ "${PV}" == "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-else
-	S="${WORKDIR}/${PN}-src-${SRC_PV}"
-fi
-
-_fossil_fetch() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local repo_uri="${2}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	mkdir -p "${T}/fossil/${repo_id}" || die
-	pushd "${T}/fossil/${repo_id}" > /dev/null || die
-
-	if [[ -n "${EVCS_OFFLINE}" ]]; then
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-		fi
-	else
-		if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-			einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil"
-			fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die
-			echo
-		else
-			cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die
-			einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}"
-			fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die
-			echo
-		fi
-
-		(
-			addwrite "${distdir}"
-			mkdir -p "${distdir}/fossil-src/${repo_id}" || die
-			cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die
-		)
-	fi
-
-	popd > /dev/null || die
-}
-
-_fossil_checkout() {
-	local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
-	local repo_id="${1}"
-	local branch_or_commit="${2}"
-	local target_directory="${3}"
-
-	local -x FOSSIL_HOME="${HOME}"
-
-	if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then
-		die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\""
-	fi
-
-	if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then
-		mkdir -p "${T}/fossil/${repo_id}" || die
-		cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die
-	fi
-
-	mkdir "${target_directory}" || die
-	pushd "${target_directory}" > /dev/null || die
-
-	einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}"
-	fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die
-	echo
-
-	popd > /dev/null || die
-}
-
-fossil_fetch() {
-	local repo_id="${1}"
-	local repo_uri="${2}"
-	local target_directory="${3}"
-
-	local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}"
-
-	_fossil_fetch "${repo_id}" "${repo_uri}"
-	_fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}"
-}
-
-src_unpack() {
-	if [[ "${PV}" == "9999" ]]; then
-		fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}"
-		if use doc; then
-			fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc"
-		fi
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
-	local options=()
-
-	options+=(
-		--enable-load-extension
-		--enable-threadsafe
-	)
-
-	# Support detection of misuse of SQLite API.
-	# https://sqlite.org/compile.html#enable_api_armor
-	append-cppflags -DSQLITE_ENABLE_API_ARMOR
-
-	# Support bytecode and tables_used virtual tables.
-	# https://sqlite.org/compile.html#enable_bytecode_vtab
-	# https://sqlite.org/bytecodevtab.html
-	append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
-
-	# Support column metadata functions.
-	# https://sqlite.org/compile.html#enable_column_metadata
-	# https://sqlite.org/c3ref/column_database_name.html
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# Support sqlite_dbpage virtual table.
-	# https://sqlite.org/compile.html#enable_dbpage_vtab
-	# https://sqlite.org/dbpage.html
-	append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
-
-	# Support dbstat virtual table.
-	# https://sqlite.org/compile.html#enable_dbstat_vtab
-	# https://sqlite.org/dbstat.html
-	append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
-
-	# Support sqlite3_serialize() and sqlite3_deserialize() functions.
-	# https://sqlite.org/compile.html#enable_deserialize
-	# https://sqlite.org/c3ref/serialize.html
-	# https://sqlite.org/c3ref/deserialize.html
-	append-cppflags -DSQLITE_ENABLE_DESERIALIZE
-
-	# Support comments in output of EXPLAIN.
-	# https://sqlite.org/compile.html#enable_explain_comments
-	append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
-
-	# Support Full-Text Search versions 3, 4 and 5.
-	# https://sqlite.org/compile.html#enable_fts3
-	# https://sqlite.org/compile.html#enable_fts3_parenthesis
-	# https://sqlite.org/compile.html#enable_fts4
-	# https://sqlite.org/compile.html#enable_fts5
-	# https://sqlite.org/fts3.html
-	# https://sqlite.org/fts5.html
-	append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
-	options+=(--enable-fts5)
-
-	# Support hidden columns.
-	append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
-
-	# Support memsys5 memory allocator.
-	# https://sqlite.org/compile.html#enable_memsys5
-	# https://sqlite.org/malloc.html#memsys5
-	append-cppflags -DSQLITE_ENABLE_MEMSYS5
-
-	# Support sqlite3_normalized_sql() function.
-	# https://sqlite.org/c3ref/expanded_sql.html
-	append-cppflags -DSQLITE_ENABLE_NORMALIZE
-
-	# Support sqlite_offset() function.
-	# https://sqlite.org/compile.html#enable_offset_sql_func
-	# https://sqlite.org/lang_corefunc.html#sqlite_offset
-	append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-
-	# Support pre-update hook functions.
-	# https://sqlite.org/compile.html#enable_preupdate_hook
-	# https://sqlite.org/c3ref/preupdate_count.html
-	append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
-
-	# Support Resumable Bulk Update extension.
-	# https://sqlite.org/compile.html#enable_rbu
-	# https://sqlite.org/rbu.html
-	append-cppflags -DSQLITE_ENABLE_RBU
-
-	# Support R*Trees.
-	# https://sqlite.org/compile.html#enable_rtree
-	# https://sqlite.org/compile.html#enable_geopoly
-	# https://sqlite.org/rtree.html
-	# https://sqlite.org/geopoly.html
-	append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
-
-	# Support Session extension.
-	# https://sqlite.org/compile.html#enable_session
-	# https://sqlite.org/sessionintro.html
-	append-cppflags -DSQLITE_ENABLE_SESSION
-
-	# Support scan status functions.
-	# https://sqlite.org/compile.html#enable_stmt_scanstatus
-	# https://sqlite.org/c3ref/stmt_scanstatus.html
-	# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
-	append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
-
-	# Support sqlite_stmt virtual table.
-	# https://sqlite.org/compile.html#enable_stmtvtab
-	# https://sqlite.org/stmt.html
-	append-cppflags -DSQLITE_ENABLE_STMTVTAB
-
-	# Support unknown() function.
-	# https://sqlite.org/compile.html#enable_unknown_sql_function
-	append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-
-	# Support unlock notification.
-	# https://sqlite.org/compile.html#enable_unlock_notify
-	# https://sqlite.org/c3ref/unlock_notify.html
-	# https://sqlite.org/unlock_notify.html
-	append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
-
-	# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
-	# https://sqlite.org/compile.html#enable_update_delete_limit
-	# https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
-	# https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
-	append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
-
-	# Support soundex() function.
-	# https://sqlite.org/compile.html#soundex
-	# https://sqlite.org/lang_corefunc.html#soundex
-	append-cppflags -DSQLITE_SOUNDEX
-
-	# Support URI filenames.
-	# https://sqlite.org/compile.html#use_uri
-	# https://sqlite.org/uri.html
-	append-cppflags -DSQLITE_USE_URI
-
-	# debug USE flag.
-	options+=($(use_enable debug))
-
-	# icu USE flag.
-	if use icu; then
-		# Support ICU extension.
-		# https://sqlite.org/compile.html#enable_icu
-		append-cppflags -DSQLITE_ENABLE_ICU
-		sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
-	fi
-
-	# readline USE flag.
-	options+=(
-		--disable-editline
-		$(use_enable readline)
-	)
-	if use readline; then
-		options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline")
-	fi
-
-	# secure-delete USE flag.
-	if use secure-delete; then
-		# Enable secure_delete pragma by default.
-		# https://sqlite.org/compile.html#secure_delete
-		# https://sqlite.org/pragma.html#pragma_secure_delete
-		append-cppflags -DSQLITE_SECURE_DELETE
-	fi
-
-	# static-libs USE flag.
-	options+=($(use_enable static-libs static))
-
-	# tcl, test, tools USE flags.
-	if use tcl || use test || { use tools && multilib_is_native_abi; }; then
-		options+=(
-			--enable-tcl
-			--with-tcl="${ESYSROOT}/usr/$(get_libdir)"
-		)
-	else
-		options+=(--disable-tcl)
-	fi
-
-	if [[ "${ABI}" == "x86" ]]; then
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
-			append-cflags -mfpmath=sse
-		else
-			append-cflags -ffloat-store
-		fi
-
-		# Skip known-broken test for now
-		# https://sqlite.org/forum/forumpost/d97caf168f
-		# https://sqlite.org/forum/forumpost/50f136d91d
-		if use test ; then
-			rm test/atof1.test || die
-		fi
-	fi
-
-	econf "${options[@]}"
-}
-
-multilib_src_compile() {
-	emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
-
-	if use tools && multilib_is_native_abi; then
-		emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
-	fi
-
-	if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then
-		emake tclsqlite3.c
-
-		local build_directory="$(pwd)"
-		build_directory="${build_directory##*/}"
-
-		mkdir "${WORKDIR}/${PN}-doc-build" || die
-		pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die
-
-		emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc
-		rmdir doc/matrix{/*,} || die
-
-		popd > /dev/null || die
-	fi
-}
-
-multilib_src_test() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		ewarn "Skipping tests due to root permissions"
-		return
-	fi
-
-	local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
-
-	# e_uri.test tries to open files in /.
-	# https://bugs.gentoo.org/839798
-	local SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict "/test.db:/ÿ.db"
-
-	emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
-
-	if use tools && multilib_is_native_abi; then
-		install_tool() {
-			if [[ -f ".libs/${1}" ]]; then
-				newbin ".libs/${1}" "${2}"
-			else
-				newbin "${1}" "${2}"
-			fi
-		}
-
-		install_tool changeset sqlite3-changeset
-		install_tool dbdump sqlite3-db-dump
-		install_tool dbhash sqlite3-db-hash
-		install_tool dbtotxt sqlite3-db-to-txt
-		install_tool index_usage sqlite3-index-usage
-		install_tool rbu sqlite3-rbu
-		install_tool scrub sqlite3-scrub
-		install_tool showdb sqlite3-show-db
-		install_tool showjournal sqlite3-show-journal
-		install_tool showshm sqlite3-show-shm
-		install_tool showstat4 sqlite3-show-stat4
-		install_tool showwal sqlite3-show-wal
-		install_tool sqldiff sqlite3-diff
-		install_tool sqlite3_analyzer sqlite3-analyzer
-		install_tool sqlite3_checker sqlite3-checker
-		install_tool sqlite3_expert sqlite3-expert
-		install_tool sqltclsh sqlite3-tclsh
-
-		unset -f install_tool
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name "*.la" -delete || die
-
-	doman sqlite3.1
-
-	if use doc; then
-		if [[ "${PV}" == "9999" ]]; then
-			pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die
-		else
-			pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die
-		fi
-
-		find "(" -name "*.db" -o -name "*.txt" ")" -delete || die
-		if [[ "${PV}" != "9999" ]]; then
-			rm search search.d/admin || die
-			rmdir search.d || die
-			find -name "*~" -delete || die
-		fi
-
-		(
-			docinto html
-			dodoc -r *
-		)
-
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 28fd2d2f503e..a5be3e59cdaf 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 953e5851a316..1eaa327530d0 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,8 @@
 DIST bcel-6.5.0-sources.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
 DIST bcel-6.5.0-src.tar.gz 1009051 BLAKE2B fd07d8a5144112efe38e30a8d10c3b6a189a4ec70defa96c402fa88027acf84b07c15138d235354baac18bdb798d407c11ccfada7bbe7339532f829e814e2d2c SHA512 c6da4b4d4cbad3ad2b3a4c0208063e3858170356fc4f6670c95ce819f0aea69f103914875a12bf2715a869c2b19a3e79fcb55a695eb269d9937520db25da1e3d
+DIST bcel-6.6.0-src.tar.gz 1009654 BLAKE2B 9043cc077773383aebf9b56e8c67de9ffb9e278db1737eefb5966b32cbe36131bd6ec14454361daaf424a8114de21e804dadaebfbee6d11493026b8a98135668 SHA512 13f361be498625c3276860ae14c225c49135687f4ba69de4afaac2d135df4e5c6b51277e3cd4c05bac27156e4fab5316c102a25a67d8abb6c640499917d01917
+DIST bcel-6.6.0-src.tar.gz.asc 488 BLAKE2B b3d07f9d6f8f2b92215173d390281cab03b98dea2e926f5fe7f3ced74610c56dfa2915c5bfeeca360cd3904773cb66f8d9042062e6b3821f707853ef5c82fc73 SHA512 65830fcd5f5adb1deb92edd0b9181b9aeaf3d5357858a348606416dcfb416f58420ceb6c8ea58a550d5d7b4d1909dcff125b31496c00a9107ae211936c1d6e1d
 EBUILD bcel-6.5.0-r3.ebuild 2846 BLAKE2B 9fc25e787de06a3b795707fd1bb0a5c34f8c2a2b447fcd0ffee564bfb606e8479784c133f8e7c54ef90d0c318bb60ef1e0545aeffb0a289741f2f10541602f50 SHA512 5e519ae1f796b45092a2f3183c060ce0f81bdf13e91e25f3f2da5698001e664dd522dd0777ba7faf0314e0719f08a5e8d4d11b7154fdfe8a05a3700cbae9dae1
 EBUILD bcel-6.5.0.ebuild 1076 BLAKE2B 53a7a80536e25669860ec17e197bb5219c965690de1c89832187ebea88738908daf8887772090b20fabcf8f5eca07f033a68f628ea3c8675ce743b0a68a79561 SHA512 c1acb164288524653f5f0aa80b7a7bf9cb0e4003015b100a727940d00cab00d4186c33faed1bf02805b9d2944ef0d7c120a7fb571686feda7e7f351d5e4989a8
-MISC metadata.xml 824 BLAKE2B bc553409e03ae7f58cc3122683ff49d86133fcae7b528d8a224ec126e1a43ff6dc1d329f84e54ee296c9c00e077ff732309c5a7bfdf516caad770a9f9a98ad2c SHA512 86cc34324c04905815cb84b4e7aaf5395d2d61eae42d521dda76ad74bd9a03614c0ac5ab67ce0c67312f1e150cc48d397efbd2615ee8520835621ad01b667b21
+EBUILD bcel-6.6.0.ebuild 1994 BLAKE2B 13f05979be506b837ee5553a850a26676e55afdcad6c33ee13be2a587c32a4790a756e6c4e4ac2babf9fac3af3a0df3cc22bdc45a6b474ad3432b8b072022d80 SHA512 b8956d570f43318bf46c22e50cfde5e248e95be5ded129dc7af5baadeee76a0fc5ff65cc2424c5afa17e855ee68002c1c30d2f144215ae1a81c8b45cfd394891
+MISC metadata.xml 897 BLAKE2B fdd417f23c2717d0ff95cbf4decc58768b60710baa803f71c956a3fb4c5049fd83b14679f0ebdb95185f3212541706e2b598617e2a61d6399cd254bd66d031a2 SHA512 99ea77ae905471f571c87a43fd9e8621ea169cf2b41bf3025fc2ecf2e4eed0088c6cc6cbc5c5d756f9083b9c6b11c2f8d0cb05090dcef9f69a797f6c887cab57
diff --git a/dev-java/bcel/bcel-6.6.0.ebuild b/dev-java/bcel/bcel-6.6.0.ebuild
new file mode 100644
index 000000000000..894881257b80
--- /dev/null
+++ b/dev-java/bcel/bcel-6.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" --ebuild bcel-6.6.0.ebuild
+
+EAPI=8
+
+# No tests, junit-jupiter is not packaged
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.bcel:bcel:6.6.0"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Apache Commons Bytecode Engineering Library"
+HOMEPAGE="https://commons.apache.org/proper/commons-bcel/"
+SRC_URI="mirror://apache/commons/${PN}/source/${P}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Common dependencies
+# POM: pom.xml
+# org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6
+
+CP_DEPEND="
+	dev-java/commons-lang:3.6
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? javax:javaee-api:6.0 -> !!!groupId-not-found!!!
+# test? net.java.dev.jna:jna:5.12.1 -> !!!suitable-mavenVersion-not-found!!!
+# test? net.java.dev.jna:jna-platform:5.12.1 -> !!!artifactId-not-found!!!
+# test? org.apache.commons:commons-exec:1.3 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.9.1 -> !!!groupId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="
+	verify-sig? ( sec-keys/openpgp-keys-apache-commons )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc"
+
+DOCS=( NOTICE.txt RELEASE-NOTES.txt )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.apache.bcel"
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/bcel/metadata.xml b/dev-java/bcel/metadata.xml
index fedca9bbcd0c..5b5f89c96e8e 100644
--- a/dev-java/bcel/metadata.xml
+++ b/dev-java/bcel/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>java@gentoo.org</email>
-    <name>Java</name>
-  </maintainer>
-  <longdescription lang="en">
-  This is the main Reference implementation of the BCEL JavaClass API.
-  The Byte Code Engineering Library (formerly known as JavaClass) is intended
-  to give users a convenient possibility to analyze, create, and manipulate
-  (binary) Java class files (those ending with .class). Classes are represented
-  by objects which contain all the symbolic information of the given class:
-  methods, fields and byte code instructions, in particular.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">apache/commons-bcel</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		This is the main Reference implementation of the BCEL JavaClass API.
+		The Byte Code Engineering Library (formerly known as JavaClass) is intended
+		to give users a convenient possibility to analyze, create, and manipulate
+		(binary) Java class files (those ending with .class). Classes are represented
+		by objects which contain all the symbolic information of the given class:
+		methods, fields and byte code instructions, in particular.
+	</longdescription>
+	<upstream>
+		<changelog>https://downloads.apache.org/commons/bcel/RELEASE-NOTES.txt</changelog>
+		<remote-id type="github">apache/commons-bcel</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 89c75e198a39..43512249d24b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest
index 0da736e38385..aa0466692515 100644
--- a/dev-lang/jsonnet/Manifest
+++ b/dev-lang/jsonnet/Manifest
@@ -2,9 +2,12 @@ AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61
 AUX jsonnet-0.14.0-makefile.patch 752 BLAKE2B 5acf8e07cd0f1b9af658015e6ee560f31a25b4b17402e0516bc8a861db4f31d9cb23e86943389d36f0885f4afc179b433764a331aea7a0164368e3561490da61 SHA512 18230b761ec3d3d106e06d02680b54229eb20c681b7591209dbb7d5ee138edc3a5015d1e53d3238dd9c86753bcc3f5ef3352a733e9a950fca4b37af8d83c9888
 AUX jsonnet-0.16.0-cp-var.patch 824 BLAKE2B 111fff8e8b897864e14defa677c1a9b8589ef6a859b2344b24e16a940d90cdeff1affde6cd53c0a1a443a82553ee90d554990160f07c49e98c15a5fc7ea3e03a SHA512 96ecfb8a6b49d31e6a827ed401566b5eef39deb8a3542a6f1b3a5df148bfd93479038468585dc47a76fbb9e7953bf9a6c7161abc7acaff7b81cb8dffe3de2f6d
 AUX jsonnet-0.16.0-libdir.patch 963 BLAKE2B c4b71c01230710bf81fca03b1411bbd21ee02d9957b12997f629c9b4c8e543889658308868d48fe20e0bb9647848bd1b1fa2100c58426785bab1c9bfbbaa8bcb SHA512 9a85c5b8d80f6975ddd3e3c369adb44f6f49382a1e50e9848129c53f81846e69f60a44f401a8a1042657a03f94daaaeb5747632414fa7cb0dc9e2f014ec17a1d
+AUX jsonnet-0.18.0-gcc-13.patch 533 BLAKE2B 02d0b945f4a2fd9db923debff2c50f9f9ce3387f911022bba887fef42300b253cf006414351e77b931902cbe6a62a72ec0576621920e7fb0f611eda544386e8a SHA512 5926f6d15e5b2fd3a4db5787974ca26e7e7f59a3e3b30d49510d7ee47cb043bce220633c89c65b6be958c07874331e2d7484effd948ecffdd5e742b1936f61f0
 AUX jsonnet-0.18.0-unbundle.patch 2564 BLAKE2B 8945b6b17af162a99b7d561a68a48c218d0d939ba74784f35eaa8f8dbafe568e9b4db258d45cf9ce5d87504e3d265697f074d4202c8210e878daf07b56514ef5 SHA512 5bae8d02062ecd29d9650c2b623631e7f7a172148be052620a47ef42788ee272f795011ecc98df9d2000947f0ced4c76776e09f5143058b030cc61a54355bbbf
 DIST jsonnet-0.18.0.tar.gz 22472162 BLAKE2B 4f931a44b0cbeea0dc7705c28ca49817e2b3abe19ba4fdcd550d5df1ce9ad6b06b1b740a9306d36caa3970c88df9d31700373e4997dd52c6c2219cdd9bf125c1 SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1
 DIST jsonnet-0.19.0.tar.gz 22478380 BLAKE2B 0a1612ca0525342763099e70921181578fcf7ab25c2a3811ffede944953e4ce114f1949642038d6147c96d52193cf701473fab8581d50c3e74036139fbd5c19a SHA512 f4e30d977df7840a4f13c7ba75614badd964a5c4484fb264d7b05d6de04aa2a2d3c4c5161523d6fa6559460ea94b94562b07ea6590a34876545c529474c4b9fa
-EBUILD jsonnet-0.18.0-r1.ebuild 2076 BLAKE2B 84ce1cd4819f2fddfa26271f9311a1eb57e66936822c9e9dd94201935e985101a7e11e4a660db95178891053e99ba5079548a7584ef5f8896d15717bb03fff90 SHA512 41e4ddfc52a89de20852f91f0d615a1a01e47ea34f99a7ead2ad43a7e3e0210f67f8eb017a8922274db60334cfcd6681d8a023075dfc09a7508bf329da417350
+DIST jsonnet-0.19.1.tar.gz 22480685 BLAKE2B 7d86bc963f5ced622e91adf015c250b8cae2e817b6af5d60820d8731e04caecc1b2b8142d320414d253ef1fa3558d61aeb1b59480eab0823915d2b15c5d87aab SHA512 21312de71f63f4a74005f563290d67fcc2d220f043291a123af2fc834f4118f8bbc311ea8acc5dd52b13eff8c32f026a5ce6bfe3d88b4c6c770e585dd1f0b688
+EBUILD jsonnet-0.18.0-r1.ebuild 2119 BLAKE2B 38f132f1ec652aaca2280fe5f9e12094ef47b8b670373a5783a46932b5d1629b5d9cc1c5ab4f03baeb2ccbf64bcf5213ffa512d5571ad06da455ab5d4ff67dd1 SHA512 1125926a054884fcd213d5917288f65f19de60966bd2a9f6468de47046ead25fcb50ec4e0f097d771f90cd43d7b739577fd798c5cc2b32644c6e19fe9ce6b266
 EBUILD jsonnet-0.19.0-r1.ebuild 2128 BLAKE2B a4ff0c29853483e5093b469bb811305f7955561bff84349682cce40fcf9e31c4d03d7b974bf3d0227f3e6fcd308ade37911271df1464190c01c973eba0df64f8 SHA512 574237bf6c1992845d83749d00fb7c74bb01c42ae02e7e2b3fd1872a8a9c453117ecab0e81a2a6ff5210a4156ad456797f524cd0da71f5cf7f1a9b3e7365e79b
+EBUILD jsonnet-0.19.1.ebuild 2132 BLAKE2B a22914221574b5844057fb3718998187b15076def31ee6932efb3df954af3597c2c7a3c5fe366f14f4e75e302e9bfd64b4a79d2d1810eb5f732bf3dbfabdd607 SHA512 5a9c1b69fbd19f8c54247f42a801f1e2ba3adef7c6a419627abf3395fc1cf5e1f3be9094b41b26bb6cbfe1664e363b18b3967b2341fe1943a42e8f4713efb32b
 MISC metadata.xml 636 BLAKE2B b4f30bead9e90492366ba9d8fd393cfa6610efcb1dbe7cf11307445f2b7aa596585b576e550aa0df3bcfd14c7a8b068d09040ea94dc815db76d6d15e0f09fccb SHA512 a106617bce041fc24e1fab61d08add74f450742e7c1be14633cd49b5137c86cf52bd5baf9ea8f5f2f51a90619c7dfad7e6bf749894d8e4df8063857f29a0492a
diff --git a/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
new file mode 100644
index 000000000000..b2adca81a351
--- /dev/null
+++ b/dev-lang/jsonnet/files/jsonnet-0.18.0-gcc-13.patch
@@ -0,0 +1,18 @@
+https://github.com/google/jsonnet/pull/1020
+From: WANG Xuerui <git@xen0n.name>
+Date: Thu, 6 Oct 2022 15:04:47 +0800
+Subject: [PATCH] Add #include <cstdint> for gcc-13 builds
+
+See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
+
+This fixes Gentoo bug https://bugs.gentoo.org/875569.
+--- a/include/libjsonnet++.h
++++ b/include/libjsonnet++.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #ifndef CPP_JSONNET_H_
+ #define CPP_JSONNET_H_
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <functional>
+ #include <map>
diff --git a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
index 9411530afa9b..5d8c0d156382 100644
--- a/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.18.0-r1.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
 	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
 	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
+	"${FILESDIR}/jsonnet-0.18.0-gcc-13.patch"
 )
 
 distutils_enable_tests unittest
diff --git a/dev-lang/jsonnet/jsonnet-0.19.1.ebuild b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
new file mode 100644
index 000000000000..586f1b3b4915
--- /dev/null
+++ b/dev-lang/jsonnet/jsonnet-0.19.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit cmake toolchain-funcs flag-o-matic distutils-r1
+
+DESCRIPTION="A data templating language for app and tool developers"
+HOMEPAGE="https://jsonnet.org/"
+SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE="custom-optimization doc examples python test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+RDEPEND="
+	dev-cpp/rapidyaml:=
+	dev-cpp/nlohmann_json:=
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+	"${FILESDIR}/jsonnet-0.16.0-libdir.patch"
+	"${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
+	"${FILESDIR}/jsonnet-0.18.0-unbundle.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	use custom-optimization || replace-flags '-O*' -O3
+	tc-export CC CXX
+
+	local mycmakeargs=(
+		-DUSE_SYSTEM_JSON=ON
+		-DBUILD_STATIC_LIBS=OFF
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTS=ON
+			-DUSE_SYSTEM_GTEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_TESTS=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_compile
+}
+
+src_test() {
+	cmake_src_test
+	use python && CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_test
+}
+
+python_test() {
+	LD_LIBRARY_PATH="${CMAKE_BUILD_DIR}" "${EPYTHON}" -m unittest python._jsonnet_test -v \
+		|| die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	cmake_src_install
+	use python && distutils-r1_src_install
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		docinto html
+		dodoc -r doc/.
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 00703e73ffc2..e7f14c5432c4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,10 +6,14 @@ AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372b
 AUX php80-firebird-warnings.patch 1949 BLAKE2B ab1b693afe26b6529aab8628f9a614478c388ed23603ad1dd4d17b63154d535a3e4c2db04fe27fb22a3d7e1335e368ffd383ed24647ac53ac05170ec3e1beb75 SHA512 d37815ea529167d4959aef056a3a0be6902ee4cda809a48c24299b05ff6477ee82e8ed8dcf49051b8e74ba5c31e3985454591ea751d4550df3d2e3639ec0d616
 DIST php-7.4.32.tar.xz 10419092 BLAKE2B 7657360e661274a34ab17e0e5a103e037d83876187b5413f020c246a91f02b00ac4f0cf34848729d0ccb86d8b9830e5a0ba8a85cc030ec9bd61ec7d4d1a07f5e SHA512 052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
 DIST php-8.0.24.tar.xz 10895332 BLAKE2B efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d SHA512 f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
+DIST php-8.0.25.tar.xz 10802888 BLAKE2B c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb SHA512 43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d SHA512 2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
-DIST php-8.2.0RC3.tar.xz 12013188 BLAKE2B 4d3caf32858d8a42ee229d793ea2b9238ec56ccd8dea2cead3eb5fd1660391968a399e6178d8d2da9a2c5a749055fdc97848bb629fc3ffbda4d640d91bf84e11 SHA512 f0efde3cc30563d1e30a72f368b1dca483d8fe7ebd65c54ee86212d9476f260aed993bd62a2685f50c53a599174b91cb2f0d10f1e83fc68b4403f715a7045f35
+DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
+DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a SHA512 7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94bcccc5e3c068877644e58fc
 EBUILD php-7.4.32.ebuild 21336 BLAKE2B d47b39aba8e40665101d8f1cbff76c2dcf46cf7a3049e1cb2619b7fa927ac59a010c16f5ebf49c8880d78ab24476bc950289bea9d6bd1e5072af41dca5e5d02e SHA512 ca94a122871dd267e899b3a4f2fccc0b7e18c4b9043ba9d7b5eb1a275cbca454b2458a2c4b1b7906ed84739efff1e6d432ede0597ef7254396fb3b83f270487e
 EBUILD php-8.0.24.ebuild 21845 BLAKE2B 9bbc8fcd79a39502a50257ba00eb68abaa8313306d2554e3ade270203bd872fa66083a57fc10f6d4e7e46c8930efbfcf6de7c6562d2499dc262fb690db1aeb7d SHA512 af251c56145df7af13bbbcb73dce4f311af742245e5558cf062a6505526c77e45637adc99454471f5d30791ced2a9fd96438191bce71a1275df2137b85043c5c
+EBUILD php-8.0.25.ebuild 21865 BLAKE2B 4eb9d041487fad140d00633426684433ce357d385d6f9567dcfdd4cac536564d33c82001a680a6ee8a9022fcdbc3278c22ca7895f9ff87dab2481b334816d659 SHA512 49a63a3332b979828c125fee868c96cf4accd173e0d7da390fd0f4d8217ff2af71f99d15c83c3f168c2043eeb2fa6f492dee7af87ff91a25273c8a4fc1cd6ddd
 EBUILD php-8.1.11.ebuild 21802 BLAKE2B 3c440783310cc43ecea65725d6df5877ba9e66d295faaba0fb4d22bb5f2c538e0ec7fbc4a88e760f8c613de3c0cc7cb4e8c469a2ccb4eee0daf5a53c069ce3ae SHA512 c91499df986e64060dbbf0eeaf68fcf94d7838cbca67904abc7f83b4accdb8c25d6d6391406d57de19bc586424a11be19f202afb658cb1790ee36c4205b2a8f9
-EBUILD php-8.2.0_rc3.ebuild 21919 BLAKE2B e35848335391acb488644442eb544472122afdcedb3eb05f372505b7f8d5d61b66ac8ee678b61618d41cce07ec0ec63cca4bb83ed0b46548309721b75ea276d6 SHA512 830af8ec6aae20d330932005aa5a7cb49ce1dd509cd0c7742eb34c7e062d1c9b0af1603101144d448fcf0ae03f46d7e097d20a645eff7d546fc00994e64e9b9e
+EBUILD php-8.1.12.ebuild 21822 BLAKE2B ed8192edd4b20602a243ac762cee927ca03057c31ab4ae508b128dc4dccadb6acccf7984aeffe5b63937b96ca2934a8baa973937f8f4aca15f4be463f9f8a320 SHA512 954da51ade6601e0016f9a02bd1a130de13bbe8481b4d75f12e49c42af510f72762996fefbee2ed5535e264b567c5df9dd3ff2485fc899d7e4b5bcb5c59c4216
+EBUILD php-8.2.0_rc5.ebuild 21929 BLAKE2B 4179ca69a70e7d04e313e3c9f33bf9b12798b1a831ab95729fce97cd792f3af95fa67ba5ec9085b2470dd14da6884fab4d6131d25293b07895909a2b9105b76a SHA512 13a68d3eb5ce5a27cb794fc893d40b0e6a4aead00ab633ed3cb09fec3cb0489bd370d0c8eaa1472c71ea5009a456c18b1861479ff1e8a7c58fcec2c693096f87
 MISC metadata.xml 3230 BLAKE2B 215062835c9f7ae9d570a40b3a6e59c7a2b7fb51e0fb9b89cd51888f54e2cbee1cbcf571b8ccfef3ed1970949dcac81bb411ca6536e972875b184caee688cb12 SHA512 03d948a300d3a29a113248b371be92fa9c1c4feb371886a9cab335e956a2ff9958cb9b5449aab88a5306bcafed42161ac88655115a1e286fa9e876920ad1d59a
diff --git a/dev-lang/php/php-8.0.25.ebuild b/dev-lang/php/php-8.0.25.ebuild
new file mode 100644
index 000000000000..6ab4042b4d70
--- /dev/null
+++ b/dev-lang/php/php-8.0.25.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.1:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+	"${FILESDIR}/php80-firebird-warnings.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.1.12.ebuild b/dev-lang/php/php-8.1.12.ebuild
new file mode 100644
index 000000000000..bdf85e055446
--- /dev/null
+++ b/dev-lang/php/php-8.1.12.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	oci8-instant-client? ( !ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[jit?,unicode]
+	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11:= )
+	firebird? ( dev-db/firebird )
+	gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11:= )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:=[-minimal] )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? ( >=dev-libs/openssl-1.0.2:0= )
+	tidy? ( app-text/htmltidy )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=(
+	"${FILESDIR}/php-iodbc-header-location.patch"
+)
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+
+	# Remove false positive test failures
+	# stream_isatty fails due to portage redirects
+	# curl tests here fail for network sandbox issues
+	# session tests here fail because we set the session directory to $T
+	rm tests/output/stream_isatty_err.phpt \
+	   tests/output/stream_isatty_out-err.phpt \
+	   tests/output/stream_isatty_out.phpt \
+	   ext/curl/tests/bug76675.phpt \
+	   ext/curl/tests/bug77535.phpt \
+	   ext/curl/tests/curl_error_basic.phpt \
+	   ext/session/tests/bug74514.phpt \
+	   ext/session/tests/bug74936.phpt || die
+
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		--without-valgrind
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with apparmor fpm-apparmor)
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "mysqlnd")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	our_conf+=(
+		--with-external-pcre
+		$(use_with jit pcre-jit)
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-lang/php/php-8.2.0_rc3.ebuild b/dev-lang/php/php-8.2.0_rc5.ebuild
index 84430f30f486..07c1880a3098 100644
--- a/dev-lang/php/php-8.2.0_rc3.ebuild
+++ b/dev-lang/php/php-8.2.0_rc5.ebuild
@@ -22,7 +22,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -38,7 +38,7 @@ IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
 	coverage +ctype curl debug
 	enchant exif ffi +fileinfo +filter firebird
 	+flatfile ftp gd gdbm gmp +iconv imap inifile
-	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
+	intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
 	mhash mssql mysql mysqli nls
 	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
 	readline selinux +session session-mm sharedmem
@@ -95,7 +95,7 @@ COMMON_DEPEND="
 	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
 	gmp? ( dev-libs/gmp:0= )
 	iconv? ( virtual/libiconv )
-	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	imap? ( net-libs/c-client[kerberos=,ssl=] )
 	intl? ( dev-libs/icu:= )
 	kerberos? ( virtual/krb5 )
 	ldap? ( >=net-nds/openldap-1.2.11:= )
@@ -255,6 +255,8 @@ src_configure() {
 		--with-libdir="$(get_libdir)"
 		--localstatedir="${EPREFIX}/var"
 		--without-pear
+		--without-valgrind
+		--enable-ipv6
 		$(use_enable threads zts)
 	)
 
@@ -280,7 +282,6 @@ src_configure() {
 		$(use_with iconv iconv \
 			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
 		$(use_enable intl)
-		$(use_enable ipv6)
 		$(use_with kerberos)
 		$(use_with xml libxml)
 		$(use_enable unicode mbstring)
diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index 7f88ba2e3e5a..7664f60b9a30 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1,3 +1,8 @@
+AUX squirrel-3.2-CVE-2022-30292.patch 520 BLAKE2B 9c069837aa7c3981f5b14ddb717db217e9aa45e0411c00258df59361b87f44166d3363576d0615dff0789e4772cb44749fef7bb38f36dc3b105fb602b61d738a SHA512 8a9a5990cb9826771d3ce285194c957ed06df0846b7194d0f136e252427d6f9eeb7fb1550ac9932d864d72bf36da88b4862a21f650e5232f72030734115dfab4
+AUX squirrel.pc.in 223 BLAKE2B f6b6f909e53a59573b1d6e6ac1f902da20c139d69ae62d585c7631450dccac8316b55779f9a570cd59228750d024cda1481476e8447b09d040b7827fe5d198f5 SHA512 a9124dca1e013f55c0498b743230df626cebbd7fd793603303d88e2973ad50ff64a2b7f7f37a773b3aceaea65420e7570efb68554228328542ca0b230bbb515e
 DIST squirrel-3.1_p20200612.tar.gz 181047 BLAKE2B f6965b5e721919c6c33426843a9b73fb27f39b7341763c2ff01421e6b6dce6cb86c6a02df65af9cb2266e8a63d6612c0e857456c4bb6e2546760f937d1979990 SHA512 e9853c92c151ca35e137a91ba4e3c9ad9c4c6d95a22c3686ebbae74cea7c1bf704ec5274d610f9d8158d8662a2b1b1445664f3f33c11689553cfc090a957b204
+DIST squirrel-3.2.tar.gz 620486 BLAKE2B c03cee0dffc12ff48caa4a7c9c0fffec32cdfb23306f265b8475454b0b9f14a3d2ec620b0f2183de8e8bc83e4921d6853105ac1a8d37bf3f2d97e914a001c4fd SHA512 e488ccc07b851e1707f3fde923f691747b18dc2fcc4748d2a68f2590ab84a3c0db647c8ac9ee775796984d2302a3d3686459556ea0c49a0b96b1354fcb8a6c74
+DIST squirrel-config.cmake.in_3.2 143 BLAKE2B e9e795a4f855f41206c5aca89b949c279f35dce06dad73c9153a9c03701f1721d831bdc29e3a399a2a6b2cf6e97d3a966008d81dfe955b2f5412c818d5a054bc SHA512 4820835a233b2beb5768b39e6b3ce5f06f1f9bc57c4c19df2c4f7ce2b03e67c18554c3084259317092d1eb0fee7d909bdbc56a9fc556f57ed61ef8b0f181996d
 EBUILD squirrel-3.1_p20200612.ebuild 969 BLAKE2B 4e3862e00b94df35203c37e6ce4435b91a25af06bae774a777796ec05c5f3531eaa4ada5e02dee16bb53166829a33a9bce2fa0961d86f1ba506c79f777bfc2f9 SHA512 51194be28d9ef6bd7c8d2c3cd374369ddf4fc61112867abeb31655f9d889febd36d938684ea83b80ebbf3faddbbb24240a4d35f56597a4a25baae507f45027ca
+EBUILD squirrel-3.2.ebuild 1545 BLAKE2B 4a57cebc54d95d7a26d913506b98fb0777dcb227a4788d765502aa49539621accc6a999a81c295534eb47ed115da93a1c63a3e7bd4870d32070e19c430b27922 SHA512 569bc9108b3b6edd9c91820176b8d5f40ce7e8f7a0bd0712911563288b088bf9ae5e2b2b8f4b9c9103729abbca4c6ff1c28850b75d443737380b3d24e911b1bb
 MISC metadata.xml 312 BLAKE2B c2cfcb7ffff475030a29560dcac42917662a733e7a6ab37b9224fa0967bec0bf7d517d6c47a9686b30940a80a6e05465b87be918c28622681ef6f596c889b23a SHA512 4f3f5a13638a29c21555a43e22bbb41b2c58708043d7b6eb9cb0eb549f1dfb383adc8c0a0ade1491f1a037fc93a4f057dd5572d258c060fee8023c97e67e0c1b
diff --git a/dev-lang/squirrel/files/squirrel-3.2-CVE-2022-30292.patch b/dev-lang/squirrel/files/squirrel-3.2-CVE-2022-30292.patch
new file mode 100644
index 000000000000..3ba274b3270c
--- /dev/null
+++ b/dev-lang/squirrel/files/squirrel-3.2-CVE-2022-30292.patch
@@ -0,0 +1,12 @@
+diff --git a/squirrel/sqbaselib.cpp b/squirrel/sqbaselib.cpp
+index e2f248e..308d2cc 100644
+--- a/squirrel/sqbaselib.cpp
++++ b/squirrel/sqbaselib.cpp
+@@ -1149,6 +1149,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
+     SQObjectPtr o = stack_get(v,1);

+     if(sq_type(o) == OT_THREAD) {

+         SQInteger nparams = sq_gettop(v);

++	sq_reservestack(_thread(o), nparams + 3);

+         _thread(o)->Push(_thread(o)->_roottable);

+         for(SQInteger i = 2; i<(nparams+1); i++)

+             sq_move(_thread(o),v,i);

diff --git a/dev-lang/squirrel/files/squirrel.pc.in b/dev-lang/squirrel/files/squirrel.pc.in
new file mode 100644
index 000000000000..4dc26b906ad2
--- /dev/null
+++ b/dev-lang/squirrel/files/squirrel.pc.in
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/@libdir@
+includedir=/usr/include/squirrel
+
+Name: squirrel
+Description: squirrel library
+Version: @version@
+
+Requires:
+Libs: -L${libdir} -lsquirrel -lsqstdlib
+Cflags: -I${includedir}
diff --git a/dev-lang/squirrel/squirrel-3.2.ebuild b/dev-lang/squirrel/squirrel-3.2.ebuild
new file mode 100644
index 000000000000..02c8bcc6a1d4
--- /dev/null
+++ b/dev-lang/squirrel/squirrel-3.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A interpreted language mainly used for games"
+HOMEPAGE="http://squirrel-lang.org/"
+# Missing file in the tarball, do the same as Mageia
+SRC_URI="https://download.sourceforge.net/squirrel/${PN}_${PV/./_}_stable.tar.gz -> ${P}.tar.gz
+	https://raw.githubusercontent.com/albertodemichelis/squirrel/v${PV}/squirrel-config.cmake.in -> squirrel-config.cmake.in_${PV}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}3"
+
+PATCHES=(
+	# Fixed in master
+	"${FILESDIR}/${P}-CVE-2022-30292.patch"
+)
+
+src_prepare() {
+	cp "${DISTDIR}/squirrel-config.cmake.in_${PV}" "${S}/squirrel-config.cmake.in" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex static-libs '' -DDISABLE_STATIC=YES)
+		# /usr/bin/sq is used by app-text/ispell
+		# /usr/lib/libsquirrel.so is used by app-shells/squirrelsh
+		-DLONG_OUTPUT_NAMES=YES
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc HISTORY
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/samples
+		dodoc -r samples
+	fi
+
+	# Add pkgconfig file, needed for some reverse deps (follows Mageia
+	# one)
+	# https://github.com/albertodemichelis/squirrel/issues/259
+	dodir /usr/$(get_libdir)/pkgconfig
+	sed \
+		-e "s/@libdir@/$(get_libdir)/" \
+		-e "s/@version@/${PV}/" \
+		"${FILESDIR}/${PN}.pc.in" > "${ED}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 97d158dc36ad..d94bb43043bf 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ding-libs/Manifest b/dev-libs/ding-libs/Manifest
index 1c70f7bf789b..b942f76d2d12 100644
--- a/dev-libs/ding-libs/Manifest
+++ b/dev-libs/ding-libs/Manifest
@@ -1,8 +1,6 @@
 AUX 0000-INI-Fix-detection-of-error-messages.patch 1761 BLAKE2B bc1002e9ff7963af408b8e9cc31415efc1c1679b2bb0f21a998a1d0e951708203778e7d03e58e19cadf760a8f4ff1050d53e1eadbd8b83d5fcf84c4e5d8dc9ba SHA512 f0ef79aa548aef09a1611bacd6dd69d765ab09fd19a498fb24b14c7a2882f2b6ca2f2246f99faa3c1796ef7d9bf43bf4e1412442ec6220c4e71607ab7f41ec9d
 AUX 0001-path_utils_ut-allow-single-as-well.patch 1247 BLAKE2B fb3be441ff1066010043a473c184bc0a4e3a85ead8eb89d38d9731c40f33045a47ac59a6b281223f69f4e173baa9193edd65db7980db9ea031db87ced6a191cf SHA512 1d8e5cd540cbb9be1422274ef9318edc256be3c439b5a320f53913b2322319f67acf58a3e2d308dea12b925ea4a3956d8454a0ec7680412dc68e2aea77b0f65b
 AUX 0002-validators_ut_check-Fix-fail-with-new-glibc.patch 1944 BLAKE2B cf1971b715eb37bdb7b5ff3fdc54b1df4d1c9afc5994f6c48b48955cb534573f38444af81971334c1d39883d2a44d635e014e8a5fe1e54f6a03d2e0d597362f8 SHA512 4bdd24c21d99497cdc751a2002bd6ff29d20d3e51b877d0519a7d3134a2cb4edd81fc33ca577d06b52039c87d520e3f81a56303e6a0cad214915503270599593
-DIST ding-libs-0.6.1.tar.gz 904092 BLAKE2B 72eda10dfe002f27bb2d096bd96f6a6ee60dc246492fb1cc3581661184d050827aad6a5897aadf9b06db9b6dbd18da756637bd27bcc02742c6318c8cc7e68298 SHA512 335a0925bfa7cc113e86c91ad3f2c8aac12711879d5c9b62660140a4b749335a74024c987fcd2304dd78176362997b3e0ebd745193aaffab7a368e2873118628
 DIST ding-libs-0.6.2.tar.gz 957577 BLAKE2B 7236706b0892e5b56506e89f67305cac54da648b2bd6f21dcf3c330d848e1bc556134c8e7d2efd0a9c8234ea41212d6bd2250ff7feaf84df12ff8ee6b56e0602 SHA512 566172e0addb0ee6e0ebd12874d3b72f2fa6bcb1ecc628c0c529984193290fae554efc40f52d2cec675bffab32a36183e47ec629db25e83ed2995f1049c64703
-EBUILD ding-libs-0.6.1-r1.ebuild 932 BLAKE2B bebbf6d14a083ce22b3121f796353427889dd2149b3760487467316171b73eb37964d9f9fe5605d801d660f4ff5ff0f58167d59826b6eb76e46ba90c8766bb9d SHA512 decbaef04bd6023a0f5a2aed6f811781b1db6e8d455ae9db21b65b07c4c4587a788c36af2f20770b352608d11cbd10603b07e71ea7270aef7d188a30f0c74733
 EBUILD ding-libs-0.6.2-r1.ebuild 628 BLAKE2B cb6bca809b82229e0a8611f420a458e9374376f8f3ea672f8fe484dcfaa784e94f06cfc7435061e6beb5999770f93a8cc4088674548e46d3091cc1f7d0cef5b0 SHA512 da3182534777539b47bfd7d37c19ab08706e1762c797c4ee8864d9a63094c02a3d77fc1fd2faaf8873744e2d4762686ee34dd941df0f96b68fb4fc4ea9394d43
 MISC metadata.xml 247 BLAKE2B cb144c57b3bcd3ce9042d41d2c5fe955abd61d93f348e9bc249d6f8a41172bbdf4b28e83682b8817f202886e6daf757fa0bb825b39eb6409633a323a162ee9f0 SHA512 cb8ffcc6e9e67e555d82ca99bccc6479b0db6e211127a53452d07dc4b106e7e0633ff9c8e0af1b1eccd7b6154ae3d7f61a50e8dbec835fcdca7c070e8cde2f1d
diff --git a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild b/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
deleted file mode 100644
index 1445f869fec7..000000000000
--- a/dev-libs/ding-libs/ding-libs-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="set of utility libraries (mostly used by sssd)"
-HOMEPAGE="https://pagure.io/SSSD/ding-libs"
-SRC_URI="https://releases.pagure.org/SSSD/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/0000-INI-Fix-detection-of-error-messages.patch
-	"${FILESDIR}"/0001-path_utils_ut-allow-single-as-well.patch
-	"${FILESDIR}"/0002-validators_ut_check-Fix-fail-with-new-glibc.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-static
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 27234f22affc..61f44f368682 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,9 +1,4 @@
-AUX ell-0.51-musl-build-time.patch 1449 BLAKE2B 7012ac17e87b9e2cb1a4a16b723bc7b77022921ac1b2a6610ad68380ba73bc07bfbd4508ad18e53d70a4247a6720e6e8ab4082209c7046a00257715731ec0ba9 SHA512 cbeda9501f8ce2ceed0043416dc06e705aa8e07e0897ee866b8892290ba255ffb1dcba3e4e09a22c9e98386214f83bc33df770bfc502286f828e19a0da6c7d40
-DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
-DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
 DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
-EBUILD ell-0.51.ebuild 1331 BLAKE2B 7d6a254dbf13ae781be3f9f4e4240590cac8f9bc36267bb84f5fda9d7035b01007bc4106d04537daa5fd2828cda7f1343a5f3ccc8258349c01cbdc41344981cf SHA512 287bfa2f891a9097fb7fbf11c96037fa7f875afe1a268863a8a21d77d0c0bcdfb8a7a83044c010a5fa767cd1bf21b7187e8ead14719428db074c8588b1c24cf8
-EBUILD ell-0.52-r1.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
 EBUILD ell-0.53.ebuild 1175 BLAKE2B 6f34b0b7cd415715039cda1a0fe1387c329cd4f704e96b99adce6b6ea7ae2059a08a24b0041a45cd455b1ec491c7ebc585b414b4afea0182feec5c5fc7c3bb7e SHA512 5a6e778aae87e96794ce29a103e4e4f0591ee8519960a1eefcc3e92d0eb931a2d77fbcbfdf142d0d60da63a4f4e65f31601841282d4fbfabe22af9f4c51ae40e
 EBUILD ell-9999.ebuild 1181 BLAKE2B 882b8780ae8199afea4dda01eedb6e01120646b25fc46b7b7924b6472029abd6716fcd686571234105444a62994f2241ae6577937c6e2bbe3b36222161d7466b SHA512 f8797a2b189c08c3cf29ebf1519970ed4bde3009c0ea3ed21829eface5f7e1fd8a8d541440b858447cb9431e4bc95a31f5178b39230a18c43e3b48b8e4b55155
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.51.ebuild b/dev-libs/ell/ell-0.51.ebuild
deleted file mode 100644
index 094d7615adac..000000000000
--- a/dev-libs/ell/ell-0.51.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 flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-build-time.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	local DOCS=( ChangeLog README )
-	einstalldocs
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.52-r1.ebuild b/dev-libs/ell/ell-0.52-r1.ebuild
deleted file mode 100644
index 0220fd7c1acc..000000000000
--- a/dev-libs/ell/ell-0.52-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
-	~TIMERFD
-	~EVENTFD
-	~CRYPTO_USER_API
-	~CRYPTO_USER_API_HASH
-	~CRYPTO_MD5
-	~CRYPTO_SHA1
-	~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
-	default
-	sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
-		unit/test-dbus*.c unit/dbus.conf || die
-	[[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char" #662694
-	local myeconfargs=(
-		$(use_enable pie)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/files/ell-0.51-musl-build-time.patch b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
deleted file mode 100644
index 201bc7994406..000000000000
--- a/dev-libs/ell/files/ell-0.51-musl-build-time.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=ce7fcfe194f0abcb8f419f83276b16a4ab274032
-
-From: "Milan P. Stanić" <mps@arvanta.net>
-Date: Mon, 6 Jun 2022 22:05:39 +0200
-Subject: build: fix time.h related breakage on musl
-
-missing time.h for struct timeval usage
-forward declaration of struct timeval in time-private.h
---- a/ell/dhcp-transport.c
-+++ b/ell/dhcp-transport.c
-@@ -40,6 +40,7 @@
- #include <linux/filter.h>
- #include <net/if_arp.h>
- #include <errno.h>
-+#include <sys/time.h>
- 
- #include "io.h"
- #include "util.h"
---- a/ell/dhcp6-transport.c
-+++ b/ell/dhcp6-transport.c
-@@ -35,6 +35,7 @@
- #include <net/if.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/time.h>
- 
- #include "private.h"
- #include "missing.h"
---- a/ell/icmp6.c
-+++ b/ell/icmp6.c
-@@ -36,6 +36,7 @@
- #include <net/if.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/time.h>
- 
- #include "private.h"
- #include "useful.h"
---- a/ell/time-private.h
-+++ b/ell/time-private.h
-@@ -19,7 +19,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  *
-  */
--
-+struct timeval;
- uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs);
- uint64_t _time_fuzz_msecs(uint64_t ms);
- uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset);
---- a/ell/time.c
-+++ b/ell/time.c
-@@ -26,6 +26,7 @@
- 
- #define _GNU_SOURCE
- #include <time.h>
-+#include <sys/time.h>
- 
- #include "time.h"
- #include "time-private.h"
-cgit 
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 93a6202bff44..e473c0a8ffe0 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -1,7 +1,4 @@
-AUX jansson-2.13.1-sphinx3.patch 10268 BLAKE2B 97fd3c0faec1201f703d93bdc049eac24be5639493f434fc3931d7fe81e1f3ba28113d98be5f91e602c344e741a2be9b618717dd638dd5c887a5272baf9cdd4f SHA512 bf31c72f4f612b53621cfcda21c358c75f18ba0d9a8b1dc1059232f655788cd05b4deb5c5fc77c36fc2620d49ff97c92a19596829b76aed56fffa53040e01ac7
 AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c
-DIST jansson-2.13.1.tar.gz 531924 BLAKE2B e627bd2ba69bf01b053ff13dee903056db86999f774d6863517e67cef7dc9ddcaa747f2edca9de86bd83f37940a394ac9907f7d58069607ee529af08d8514d57 SHA512 e32be6665e41cf1763608c2f1ac4ce0824d4d7ffa5f4a5824cefde279250fdd399d49ba93d8894e16a473731f629b846554654347f027ca9a0a96ed047f10192
 DIST jansson-2.14.tar.gz 535618 BLAKE2B eb514ff222444d4c0d1ef6b99150e3e43bd4d7a1bec3d66e5ece8bc59ac19a0898d9eb061cacad52afda7fe172ec6df46b5a90952707422f56daae53f82c9427 SHA512 5a592776c7ba8c0b1f5efaf813f77948bbc4bda168a72d221d176af0cf61038e26c1f30795433be10e2fc5069d5763d11852a8574774906a9f8ad261ac30109c
-EBUILD jansson-2.13.1-r1.ebuild 942 BLAKE2B a410c9992a4b386d189e4dfa5cb56c6d815a8e0751251e923fe85c227e1458e296330b3be284d8ed7ab409085cc4ff76472c8ee1c4fa63d140b09350af3b116c SHA512 c6f8114764f437f6f96437ee1108784982dd223adf9cb29d81ba5a57354bbc7dc07377b7d60ff5cf234729ed1a509ce7ce543067434a9fb88a1297d99ea3cd69
-EBUILD jansson-2.14.ebuild 935 BLAKE2B 2136d7b3018876eea3060dfd607d6e485bd4e486fd7df9a24f65ba3439dbf2a5b11404949662c75ae81717142d384e7aab410194b6b54d3269a4dec12ca2d5ec SHA512 a020d8b54885b223efb5a13e8de1d7e29de779aed6a184136b27a02be528957a2d24352180ea7cf37b1357912b50430dd8814557b2bb2da8c34d356eba52d2b8
+EBUILD jansson-2.14-r1.ebuild 846 BLAKE2B 960a04dc7037f0e39fdbd9fe5fd31f037956321dbb0808f693dd0a79a35f0880d8fe3a194780cbb2639003aa18dbc22030af3bd58e4e5aaf201cacd05e4c5d45 SHA512 dd0cdd26830026a4a896400fda6e357a48bb2d45a477c9089ed40ad45a0085b47a835f58750266e511037118c40f836915d8818282da2f440119607f5da5fcf7
 MISC metadata.xml 475 BLAKE2B 9cc60096cb39c1f472a534fd3a1e32da41f251b7f9601e10bd64164f3aa46fef7b492f8c2902b09ea56ac185de146e9c32014d5c741542cce2b5b289864d983a SHA512 7412836cd76c643dd976b26732d827d7efd607d87cecf79ef7d27815e7a14bba4210ee33c01c4f6da5193068c8662fd857935bb1e304edd81a86ae2bf3094ca1
diff --git a/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch b/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch
deleted file mode 100644
index e611896e9c4e..000000000000
--- a/dev-libs/jansson/files/jansson-2.13.1-sphinx3.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-Rebase pull request #543 onto v2.13.1
-
-Allows jansson documentation to compile with Sphinx-3.0
-
-Squashed commit messages below:
-
-
-pick 798d40c doc: convert refcounting directive to a class
-
-Directive functions are no longer supported in Sphinx-3.0
-but directive classes have been supported since early 1.x
-
-
-pick 9431889 doc: do not use references for standard C types or file names
-
-Use double-backtick quoting instead. It has the same effect
-(because these links had nowhere to link to) but it does not
-result in loud warnings about broken references by default with Sphinx-3.x.
-
-
-pick c329fd7 doc: add return types for function-like macros
-
-The Sphinx-3.0 c:function:: directive requires the return type.
-
-Sphinx-3.0 also adds function-like macro support to the c:macro::
-directive, which Sphinx-1.x and Sphinx-2.x do not support, but it
-is probably a good idea to keep compatibility with slightly older
-Sphinx for now.
-
-diff --git a/CHANGES b/CHANGES
-index a374a86..256fde1 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -8,7 +8,7 @@ Released 2020-05-07
-   - Include `jansson_version_str()` and `jansson_version_cmp()` in
-     shared library. (#534)
- 
--  - Include `scripts/` in tarball. (#535)
-+  - Include ``scripts/`` in tarball. (#535)
- 
- 
- Version 2.13
-@@ -127,7 +127,7 @@ Released 2018-02-09
- 
-   - Work around gcc's -Wimplicit-fallthrough.
- 
--  - Fix CMake detection of `sys/types.h` header (#375).
-+  - Fix CMake detection of ``sys/types.h`` header (#375).
- 
-   - Fix `jansson.pc` generated by CMake to be more consistent with the one
-     generated using GNU Autotools (#368).
-diff --git a/doc/apiref.rst b/doc/apiref.rst
-index c3a814f..94c5726 100644
---- a/doc/apiref.rst
-+++ b/doc/apiref.rst
-@@ -145,33 +145,33 @@ Type
- .. function:: int json_typeof(const json_t *json)
- 
-    Return the type of the JSON value (a :type:`json_type` cast to
--   :type:`int`). *json* MUST NOT be *NULL*. This function is actually
-+   ``int``). *json* MUST NOT be *NULL*. This function is actually
-    implemented as a macro for speed.
- 
--.. function:: json_is_object(const json_t *json)
--               json_is_array(const json_t *json)
--               json_is_string(const json_t *json)
--               json_is_integer(const json_t *json)
--               json_is_real(const json_t *json)
--               json_is_true(const json_t *json)
--               json_is_false(const json_t *json)
--               json_is_null(const json_t *json)
-+.. function:: int json_is_object(const json_t *json)
-+              int json_is_array(const json_t *json)
-+              int json_is_string(const json_t *json)
-+              int json_is_integer(const json_t *json)
-+              int json_is_real(const json_t *json)
-+              int json_is_true(const json_t *json)
-+              int json_is_false(const json_t *json)
-+              int json_is_null(const json_t *json)
- 
-    These functions (actually macros) return true (non-zero) for values
-    of the given type, and false (zero) for values of other types and
-    for *NULL*.
- 
--.. function:: json_is_number(const json_t *json)
-+.. function:: int json_is_number(const json_t *json)
- 
-    Returns true for values of types ``JSON_INTEGER`` and
-    ``JSON_REAL``, and false for other types and for *NULL*.
- 
--.. function:: json_is_boolean(const json_t *json)
-+.. function:: int json_is_boolean(const json_t *json)
- 
-    Returns true for types ``JSON_TRUE`` and ``JSON_FALSE``, and false
-    for values of other types and for *NULL*.
- 
--.. function:: json_boolean_value(const json_t *json)
-+.. function:: int json_boolean_value(const json_t *json)
- 
-    Alias of :func:`json_is_true()`, i.e. returns 1 for ``JSON_TRUE``
-    and 0 otherwise.
-@@ -594,7 +594,7 @@ A JSON array is an ordered collection of other JSON values.
-    Appends all elements in *other_array* to the end of *array*.
-    Returns 0 on success and -1 on error.
- 
--.. function:: json_array_foreach(array, index, value)
-+.. function:: void json_array_foreach(array, index, value)
- 
-    Iterate over every element of ``array``, running the block
-    of code that follows each time with the proper values set to
-@@ -732,11 +732,11 @@ allowed in object keys.
-    recursively merged with the corresponding values in *object* if they are also
-    objects, instead of overwriting them. Returns 0 on success or -1 on error.
- 
--.. function:: json_object_foreach(object, key, value)
-+.. function:: void json_object_foreach(object, key, value)
- 
-    Iterate over every key-value pair of ``object``, running the block
-    of code that follows each time with the proper values set to
--   variables ``key`` and ``value``, of types :type:`const char *` and
-+   variables ``key`` and ``value``, of types ``const char *`` and
-    :type:`json_t *` respectively. Example::
- 
-        /* obj is a JSON object */
-@@ -764,7 +764,7 @@ allowed in object keys.
-    .. versionadded:: 2.3
- 
- 
--.. function:: json_object_foreach_safe(object, tmp, key, value)
-+.. function:: void json_object_foreach_safe(object, tmp, key, value)
- 
-    Like :func:`json_object_foreach()`, but it's safe to call
-    ``json_object_del(object, key)`` during iteration. You need to pass
-@@ -1488,17 +1488,17 @@ arguments.
-     Output a JSON null value. No argument is consumed.
- 
- ``b`` (boolean) [int]
--    Convert a C :type:`int` to JSON boolean value. Zero is converted
-+    Convert a C ``int`` to JSON boolean value. Zero is converted
-     to ``false`` and non-zero to ``true``.
- 
- ``i`` (integer) [int]
--    Convert a C :type:`int` to JSON integer.
-+    Convert a C ``int`` to JSON integer.
- 
- ``I`` (integer) [json_int_t]
-     Convert a C :type:`json_int_t` to JSON integer.
- 
- ``f`` (real) [double]
--    Convert a C :type:`double` to JSON real.
-+    Convert a C ``double`` to JSON real.
- 
- ``o`` (any value) [json_t \*]
-     Output any given JSON value as-is. If the value is added to an
-@@ -1625,20 +1625,20 @@ type whose address should be passed.
-     Expect a JSON null value. Nothing is extracted.
- 
- ``b`` (boolean) [int]
--    Convert a JSON boolean value to a C :type:`int`, so that ``true``
-+    Convert a JSON boolean value to a C ``int``, so that ``true``
-     is converted to 1 and ``false`` to 0.
- 
- ``i`` (integer) [int]
--    Convert a JSON integer to C :type:`int`.
-+    Convert a JSON integer to C ``int``.
- 
- ``I`` (integer) [json_int_t]
-     Convert a JSON integer to C :type:`json_int_t`.
- 
- ``f`` (real) [double]
--    Convert a JSON real to C :type:`double`.
-+    Convert a JSON real to C ``double``.
- 
- ``F`` (integer or real) [double]
--    Convert a JSON number (integer or real) to C :type:`double`.
-+    Convert a JSON number (integer or real) to C ``double``.
- 
- ``o`` (any value) [json_t \*]
-     Store a JSON value with no conversion to a :type:`json_t` pointer.
-diff --git a/doc/ext/refcounting.py b/doc/ext/refcounting.py
-index bba2684..e72c481 100644
---- a/doc/ext/refcounting.py
-+++ b/doc/ext/refcounting.py
-@@ -24,8 +24,8 @@
- """
- 
- from docutils import nodes
-+from docutils.parsers.rst import Directive
- 
--class refcounting(nodes.emphasis): pass
- 
- def visit(self, node):
-     self.visit_emphasis(node)
-@@ -40,16 +40,25 @@ def html_depart(self, node):
-     self.body.append('</em>')
- 
- 
--def refcounting_directive(name, arguments, options, content, lineno,
--                   content_offset, block_text, state, state_machine):
--    if arguments[0] == 'borrow':
--        text = 'Return value: Borrowed reference.'
--    elif arguments[0] == 'new':
--        text = 'Return value: New reference.'
--    else:
--        raise Error('Valid arguments: new, borrow')
-+class refcounting(nodes.emphasis):
-+    pass
-+
-+class refcounting_directive(Directive):
-+    has_content = False
-+    required_arguments = 1
-+    optional_arguments = 0
-+    final_argument_whitespace = False
-+
-+    def run(self):
-+        if self.arguments[0] == 'borrow':
-+            text = 'Return value: Borrowed reference.'
-+        elif self.arguments[0] == 'new':
-+            text = 'Return value: New reference.'
-+        else:
-+            raise Error('Valid arguments: new, borrow')
-+
-+        return [refcounting(text, text)]
- 
--    return [refcounting(text, text)]
- 
- def setup(app):
-     app.add_node(refcounting,
-@@ -57,4 +66,4 @@ def setup(app):
-                  latex=(visit, depart),
-                  text=(visit, depart),
-                  man=(visit, depart))
--    app.add_directive('refcounting', refcounting_directive, 0, (1, 0, 0))
-+    app.add_directive('refcounting', refcounting_directive)
-diff --git a/doc/upgrading.rst b/doc/upgrading.rst
-index 9b49046..94ff7de 100644
---- a/doc/upgrading.rst
-+++ b/doc/upgrading.rst
-@@ -47,13 +47,13 @@ List of Incompatible Changes
- 
- **Underlying type of JSON integers**
-     The underlying C type of JSON integers has been changed from
--    :type:`int` to the widest available signed integer type, i.e.
--    :type:`long long` or :type:`long`, depending on whether
--    :type:`long long` is supported on your system or not. This makes
-+    ``int`` to the widest available signed integer type, i.e.
-+    ``long long`` or ``long``, depending on whether
-+    ``long long`` is supported on your system or not. This makes
-     the whole 64-bit integer range available on most modern systems.
- 
-     ``jansson.h`` has a typedef :type:`json_int_t` to the underlying
--    integer type. :type:`int` should still be used in most cases when
-+    integer type. ``int`` should still be used in most cases when
-     dealing with smallish JSON integers, as the compiler handles
-     implicit type coercion. Only when the full 64-bit range is needed,
-     :type:`json_int_t` should be explicitly used.
-@@ -69,8 +69,8 @@ List of Incompatible Changes
- 
- **Unsigned integers in API functions**
-     Version 2.0 unifies unsigned integer usage in the API. All uses of
--    :type:`unsigned int` and :type:`unsigned long` have been replaced
--    with :type:`size_t`. This includes flags, container sizes, etc.
-+    ``unsigned int`` and ``unsigned long`` have been replaced
-+    with ``size_t``. This includes flags, container sizes, etc.
-     This should not require source code changes, as both
--    :type:`unsigned int` and :type:`unsigned long` are usually
--    compatible with :type:`size_t`.
-+    ``unsigned int`` and ``unsigned long`` are usually
-+    compatible with ``size_t``.
diff --git a/dev-libs/jansson/jansson-2.13.1-r1.ebuild b/dev-libs/jansson/jansson-2.13.1-r1.ebuild
deleted file mode 100644
index 0ea1a8080ff6..000000000000
--- a/dev-libs/jansson/jansson-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
-HOMEPAGE="https://www.digip.org/jansson/"
-SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc static-libs"
-
-BDEPEND="doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
-	"${FILESDIR}/${P}-sphinx3.patch"
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use doc ; then
-		emake html
-		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/jansson/jansson-2.14.ebuild b/dev-libs/jansson/jansson-2.14-r1.ebuild
index 8c97fdd39128..fb6ee3866f10 100644
--- a/dev-libs/jansson/jansson-2.14.ebuild
+++ b/dev-libs/jansson/jansson-2.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="C library for encoding, decoding and manipulating JSON data"
 HOMEPAGE="https://www.digip.org/jansson/"
@@ -18,23 +18,23 @@ BDEPEND="doc? ( dev-python/sphinx )"
 
 PATCHES=( "${FILESDIR}/${P}-test-symbols.patch" )
 
-multilib_src_configure() {
+src_configure() {
 	tc-ld-force-bfd
 
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
-multilib_src_compile() {
+src_compile() {
 	default
 
-	if multilib_is_native_abi && use doc ; then
+	if use doc ; then
 		emake html
 		HTML_DOCS=( "${BUILD_DIR}"/doc/_build/html/. )
 	fi
 }
 
-multilib_src_install() {
+src_install() {
 	default
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libIDL/Manifest b/dev-libs/libIDL/Manifest
index 034c455cb482..6c4e742b72a6 100644
--- a/dev-libs/libIDL/Manifest
+++ b/dev-libs/libIDL/Manifest
@@ -1,3 +1,3 @@
 DIST libIDL-0.8.14.tar.bz2 427149 BLAKE2B c4fc6e4da9d581ddcaeab492586406902b07f964e70b84352b1436e8bc214986141f0a3d40506a7f408a1919c31275e89039978b09c496d5164e673ec236fe9a SHA512 906dde087908acd64b209fe466a89ae52a6ea23601cb30092063a6e062b1b6640fc2d5f422efcdd52b2b36ce20e6c244da6205fde0bdcec787fe64058be7adac
-EBUILD libIDL-0.8.14-r3.ebuild 762 BLAKE2B 2b7496df7fa2f2e3011f2a2f8cdf0b9c8e7f365eba1d6fa28ae95693534498d4cde2748c1d55840489ef2dc6684458749b68e74800781693d34d5a574a0be93d SHA512 b5dacd70ba1dee9550ba0e24963dba18845c373c0cad0860b224bde4334d2f9917a0d226589c8c3886ffcc8cc243528e3fc0a437948f7467a85c537f2d988ff2
+EBUILD libIDL-0.8.14-r4.ebuild 557 BLAKE2B 45dedad9f5b5ce5f208d0ff1e53bd1012b5fb5861a2415335f14e1241193b93ec09d8f86fe3000c4f3b80880ce831850249942543263081c74ad3bf9f497655b SHA512 47bae89190fa46923b458ac2a6095228621c2ec85d2fac5814219e09c16b7077e859f2e7f3793c3662b2142495e4890525505ab9fa62c2d329bc767bd269815a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libIDL/libIDL-0.8.14-r3.ebuild b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
index 6f9443f5ab35..905d25ac123d 100644
--- a/dev-libs/libIDL/libIDL-0.8.14-r3.ebuild
+++ b/dev-libs/libIDL/libIDL-0.8.14-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 GNOME_TARBALL_SUFFIX="bz2"
-inherit gnome2 multilib-minimal
+inherit gnome2
 
 DESCRIPTION="CORBA tree builder"
 HOMEPAGE="https://www.gnome.org/"
@@ -13,21 +13,9 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
-RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]"
+RDEPEND=">=dev-libs/glib-2.44.1-r1:2"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-devel/flex
 	virtual/yacc
 	virtual/pkgconfig"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index c90f4f71f0e4..7277df997b99 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,3 +1,3 @@
 DIST libbase58-0.1.4.tar.gz 6718 BLAKE2B d192499920a11f95037a46eb02b19ea5cbedefb14541c22a7c72568a69f4ccc0ed9223883fffd3337f12b718f3e39f11888c95a87b1fec481829989bd73dc741 SHA512 9b36fd7308a1a5486d77cb9baeeac49669a2c823998ff0885fee0757d6fca374f796b743e69af087e20a58b95556faf6c48106e034c09879937d96dae5fc7ac9
-EBUILD libbase58-0.1.4-r1.ebuild 1344 BLAKE2B bc4e5d9bd8d2b30d3d2639f09841251d9509993a2b7ffe295719dc05c61977c145d330c141b5d942854091947057874f6dd0e7a74234aec70ecc5e6a20550bc3 SHA512 d0b9fcc76dc65bd9ee602004f28ae6c810cad8a19d06692c2a38b4a2cfeac5aefeb2b074cfc15ecb84588196f54e154263993560efb67e710cbe465978f43426
+EBUILD libbase58-0.1.4-r2.ebuild 1117 BLAKE2B 4e5c6258df496237f351cf2220f9b61c3506e5c243981c18a584610d032583253e71e0e67068181a867858289c355fe7e7e6022055f84c0c94847a20ff60cfc9 SHA512 cf1e04787046f6b5188111d0e005b01fceb330dde238dc3ec21c26ae121be57206b3bc70e466ecf41a87fc3a2c3277c3a020a7afa694056dd2c9a3b74eacf7af
 MISC metadata.xml 561 BLAKE2B 4747d01d7747818fcb2d36263fd890e08358af515bb399fb13cdfa6c8b2e1551634a9d61e294b0f7d8eca25755c729449b83abafb0d9e76c8da379e005afe664 SHA512 7922704b6f261747a611400dd5b208cd2052e93ed36a4f6a46daeaad1c23ee8693d56406000ffd1021755b6a411351be657690e3db598d18e820826793205fc9
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild
index 80dc047c83be..11e8cf11ea37 100644
--- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.4-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="C implementation of Bitcoin's base58 encoding"
 HOMEPAGE="https://github.com/luke-jr/libbase58"
-LICENSE="MIT"
-
 SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
 SLOT="0/0"
 KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="test tools"
@@ -20,35 +20,35 @@ RDEPEND="tools? ( dev-libs/libgcrypt )"
 DEPEND="${RDEPEND}
 	test? (
 		app-editors/vim-core
-		dev-libs/libgcrypt[${MULTILIB_USEDEP}]
+		dev-libs/libgcrypt
 	)
 "
 
 src_prepare() {
-	eapply_user
-	eautoreconf
+	default
 
-	# NOTE: Needed because test suite uses srcdir instead of builddir to set PATH and for
-	# multilib support.
-	multilib_copy_sources
+	eautoreconf
 }
 
-multilib_src_configure() {
+src_configure() {
 	local myeconf=(
-		--disable-static
 		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
 	)
-	if multilib_is_native_abi && use tools; then
+
+	if use tools; then
 		myeconf+=( --enable-tool )
 	elif use test; then
 		myeconf+=( --enable-tool --bindir='/TRASH' )
 	else
 		myeconf+=( --disable-tool )
 	fi
+
 	econf "${myeconf[@]}"
 }
 
-multilib_src_install_all() {
+src_install() {
+	default
+
 	if use test; then
 		# It's hard to control this directory with multilib_is_native_abi && use tools, hence -f.
 		rm -rf "${ED}/TRASH" || die
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 5ca0788c1090..d4bb6692ba1b 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,19 +1,7 @@
-AUX libfmt-8.0.0-no-udl-define.patch 1802 BLAKE2B 538a9dfe1dec002894db22536de91b8c3180eebd7029f5c97ca31da04b93c83dea38e70c44c880ef45e45fdded7010f571999eb3b65958d5af2cd23b5442bbe9 SHA512 967d2969a2afcfb2ad9be07382e2dba332162c7a43905f855a98dd2ae5cc6b9c387dbfeebd3f8cc538d51b4ac885b78584486831f9e80c1728be75a24f0fd628
 AUX libfmt-8.1.1-fix-static-assert.patch 2670 BLAKE2B 781ccf10647dede937f38f2743dd3ab381c307774d136aeb974997ba6f004bb0e30ba02fa5e69952f76fb142133c9e5c9867194352d54ec6d9f4bacf9a13fa09 SHA512 c03186a3d4d1857f5063e94a5bdbc764535c042d98dc20d577c88ad3d93a60d75e7bf6a95c547df8fc7b037c021b464b9e47b6fcb6aba4ee9716e1727f181cd9
-DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
-DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
-DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c
-DIST libfmt-8.0.1.tar.gz 805616 BLAKE2B b64a4686050a9edb4e5d3ec28a3727a847105ae0b12a89461841e14d6c9c442e391cdcfbca39b2d141d04cdb10d00516ecc8bf605867c792b7d2d6bc99c7b2bc SHA512 643e68d5b2e0e9c83231ab2b0036596a6297b1d9ed6bd7b1172bee4ff134c8af8f09174c06c94225132c1b635b0977ea4ce783748d7bd76a9a0b5ad597456c84
 DIST libfmt-8.1.1.tar.gz 826254 BLAKE2B 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189
-DIST libfmt-9.0.0.tar.gz 833639 BLAKE2B 1455aec5bec73c56d4d4074ae034176143a3f6171aa60505ee48cbc4b6c66e0de4b5600c4a91e2d16073a285f98b3e5b5ee89b4061e49578c005bccc04855045 SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8
 DIST libfmt-9.1.0.tar.gz 837901 BLAKE2B ff1daa43140615b63aeb1ecd0aa1c32d24decfd5006805080293ef3db04d544c0445a30e8da0d985a6f5a25ad48ce4f6ae61e52da5ea4a4d3b031c212da38b18 SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be
-EBUILD libfmt-7.1.2.ebuild 759 BLAKE2B 878df7af9878dd81fad43339b8a7ee30c294edbcdeabc6642c7f65d8ffcc391728c69025f95fee0ed8ebe6db43ca853ecd4839865b338a40f17237013c77126c SHA512 6c86389b1122ea8def13df3eb776a953da71d94544849702892d18301263f5d2f68df1fdeb9e6d95271baa6678494c3b089877da44213d0d89aac447325c1daa
-EBUILD libfmt-7.1.3.ebuild 759 BLAKE2B 878df7af9878dd81fad43339b8a7ee30c294edbcdeabc6642c7f65d8ffcc391728c69025f95fee0ed8ebe6db43ca853ecd4839865b338a40f17237013c77126c SHA512 6c86389b1122ea8def13df3eb776a953da71d94544849702892d18301263f5d2f68df1fdeb9e6d95271baa6678494c3b089877da44213d0d89aac447325c1daa
-EBUILD libfmt-8.0.0-r1.ebuild 818 BLAKE2B 9150bc0e7ccf4561e980c4241658747ff597651c737bc3e310271de310083e644d24b279c61a6a4946364dc392bbe7bb48b0ba1a21fdf1b61798da7e3fbd3c3b SHA512 c27e0a9b392610c580bcdb133f1fbc61efa7e38d22416779527f403b64ddf23ec7dd2551d99dfda76f308669d699b6f74f595678e8d2ab59a7b52f7a6c20c375
-EBUILD libfmt-8.0.1-r1.ebuild 759 BLAKE2B 284fb666372d3c19ffcf0d92881814575ad7f9884186b5c88edc0df4701ecad97a1346494047749434b944b04f207d7b324b2712136761ce0a0435bb489ed532 SHA512 5e8292e4c2205d912f371af533f7d471d4b0b897104d9c37abca59c79d853f435939c52510002b6ea5d5e6380eaeedaaf260b43a2f4f256d21ec9b596b175ce5
-EBUILD libfmt-8.1.1-r1.ebuild 817 BLAKE2B 1b37a334e01cb02318c7f77e5037147a2be99cb1aa10c453ef0db5c29dbca723febbcfb59340ea24e1235a2195936a75ae67170c84add4c6bf65b3ca0568b71e SHA512 c439cdb3988e2cef8cbe2efcd97ba06f61b3c051092ee5ed143a772b9a25751a75bcefb86bd7f055fa05454f48eccf7d18dae4f8e26155a91592610dfe1f3cde
-EBUILD libfmt-8.1.1.ebuild 765 BLAKE2B b734f176937de7e9258cda873b5690d702ebf3b9e3c45f3b197ae8608fd44410e190413bcfff66261b79a3774ee1fd615288ee40d957c61c18cdee56549a6358 SHA512 120127e41cf4b858353ae64b601c9cbfdb60aacc06a53bd7bed3260fcdaf0377be4a32b181bf8736bc3afd30e2386241a359b96e28b593a400786518209eec67
-EBUILD libfmt-9.0.0.ebuild 765 BLAKE2B 34f2ad6148823c50af98d0704b7bbc960899835038d34c739edcfc4935814e3eb864483067b0c8fbb709c6efd10a8566a75225fd28228ccb10de70bd61e7e6fb SHA512 3334906caad2379a7dd4e265ad274a788277c2aa591b19d9cc2401acda3c9cd048a152b8a1101007a69ea838d11b012cfb858656071e4ad274ef3b5224d180d2
+EBUILD libfmt-8.1.1-r1.ebuild 816 BLAKE2B f2012a5435e3d0f901b4a50ec64b20658120dec8193d9f9d1543df6574a0d1f066f0982d4cde2d47b1c3617563922336116bec97d25e91eaa5334b92b2ae0416 SHA512 0fd7f2f39dc951b623836eb8eb82609840d13112a210aad66f689ec9b1e8a79a281cbdb440662a53c4d30807a3faa0248b9f5f7a5d70579ce7a0486d4eac14fe
 EBUILD libfmt-9.1.0-r1.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161
 EBUILD libfmt-9999.ebuild 725 BLAKE2B 66494f629e981ece3c6a28bbbcd75f21203d7013d687d0def461b62c72a52cef7ba5feea15e0219f8d8c06a18ec82169a43b8891ca751de05e7d21ca69935081 SHA512 0994afdab526c5494fa69ecc07f3a285a9a340a99815f61151732c948cfc6bcb7e1e35db8413d1a816a95dd8d69954263a52d1758fce76e2d180d568affde161
 MISC metadata.xml 382 BLAKE2B e67d9bbfe9721b994b68130e570826f819088bf0c891073ecf1451a4fb54611e2ed1465588314cf6d1b69be91d7ac2c082da8aa4e2ed5b4d531a40fce7143bac SHA512 21bd1200ee00e4f664b5d992281492c1c4a61229aa408c387280db08a9438f75b2215ef0c0ee1aa9db0d7537bfff074fba54176d44f1f105db611ebe1e45e742
diff --git a/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch b/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch
deleted file mode 100644
index 83078fa7285c..000000000000
--- a/dev-libs/libfmt/files/libfmt-8.0.0-no-udl-define.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From ab89d342b5454528bd2b46e7f22c0311906f8ca2 Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Tue, 22 Jun 2021 14:34:33 +0200
-Subject: [PATCH] format: do not use udl_{arg,formatter} return types when UDL
- is not in use
-
-The udl_{arg,formatter} structs are only defined when
-FMT_USE_USER_DEFINED_LITERALS is set, so don't try to define things that
-return that struct when it's not defined.
----
- include/fmt/format.h | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 03ae1c961..92b0f0fc5 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2730,6 +2730,8 @@ extern template auto snprintf_float<long double>(long double value,
- #endif  // FMT_HEADER_ONLY
- 
- FMT_END_DETAIL_NAMESPACE
-+
-+#if FMT_USE_USER_DEFINED_LITERALS
- inline namespace literals {
- /**
-   \rst
-@@ -2741,18 +2743,18 @@ inline namespace literals {
-     fmt::print("Elapsed time: {s:.2f} seconds", "s"_a=1.23);
-   \endrst
-  */
--#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
-+#  if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
- template <detail_exported::fixed_string Str>
- constexpr auto operator""_a()
-     -> detail::udl_arg<remove_cvref_t<decltype(Str.data[0])>,
-                        sizeof(Str.data) / sizeof(decltype(Str.data[0])), Str> {
-   return {};
- }
--#else
-+#  else
- constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
-   return {s};
- }
--#endif
-+#  endif
- 
- /**
-   \rst
-@@ -2769,6 +2771,7 @@ constexpr auto operator"" _format(const char* s, size_t n)
-   return {{s, n}};
- }
- }  // namespace literals
-+#endif  // FMT_USE_USER_DEFINED_LITERALS
- 
- template <typename Locale, FMT_ENABLE_IF(detail::is_locale<Locale>::value)>
- inline auto vformat(const Locale& loc, string_view fmt, format_args args)
diff --git a/dev-libs/libfmt/libfmt-7.1.2.ebuild b/dev-libs/libfmt/libfmt-7.1.2.ebuild
deleted file mode 100644
index da3c9a55fcdc..000000000000
--- a/dev-libs/libfmt/libfmt-7.1.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-7.1.3.ebuild b/dev-libs/libfmt/libfmt-7.1.3.ebuild
deleted file mode 100644
index da3c9a55fcdc..000000000000
--- a/dev-libs/libfmt/libfmt-7.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild b/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild
deleted file mode 100644
index 2cbd39e73a14..000000000000
--- a/dev-libs/libfmt/libfmt-8.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-udl-define.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
deleted file mode 100644
index a42f00e8d426..000000000000
--- a/dev-libs/libfmt/libfmt-8.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/${PV}"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild
index e27cb08ab953..b621d9247a58 100644
--- a/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild
+++ b/dev-libs/libfmt/libfmt-8.1.1-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libfmt/libfmt-8.1.1.ebuild b/dev-libs/libfmt/libfmt-8.1.1.ebuild
deleted file mode 100644
index afa368653c52..000000000000
--- a/dev-libs/libfmt/libfmt-8.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/${PV}"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-9.0.0.ebuild b/dev-libs/libfmt/libfmt-9.0.0.ebuild
deleted file mode 100644
index d61928901158..000000000000
--- a/dev-libs/libfmt/libfmt-9.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt"
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/${PV}"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
-		-DFMT_LIB_DIR="$(get_libdir)"
-		-DFMT_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 25c93edb4e6c..c697db0ea40a 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,9 +1,7 @@
 AUX libgpg-error-1.44-remove_broken_check.patch 811 BLAKE2B ff90643ba8afe80393ae0328590ba161c5a68c6b1d6e3ab771a9b295e2827d4cb02d620315e0437647d36698d539c911aa572a9d57393feed9818986440dd437 SHA512 29dbad17b3626eab56ecc352479f55aeb54958245558716134e1da5c8581c0713d53463caa778ebd6c33ea3281072d7aa2d6fd62630bfa973a41bd3e76ca1a57
-AUX libgpg-error-1.45-gpgrt_config_libdir.patch 1663 BLAKE2B c127cd45accd61e1a4b47980a6b269059911831cddfc33de79b3f8989b67f3ea7bdd8fd73fc4f83e1509c32b1addf9979d9eef305fe05cb30bfa336a34953f69 SHA512 493471dfae869710ed1c8fe0765f7e83dd675e3d4a32dd8c1e12389e3ffce24310742c78e7552057da7d4361c01242d01a48800499baca686cc4addddf931937
 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
 DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d
 DIST libgpg-error-1.46.tar.bz2.sig 119 BLAKE2B 5c4ce6111d2872a19d7fa818c67cabc584eef93e47c0e0e42b7e5a54cced137910861bba730f2c8f41fcaf8d9311e21f725d284b4c1948e653741e84fc06ef3d SHA512 2c2957fbf6220d60846cade760985486c9a287b04f4361b22352352ef68963f0ae6add00a8925b76bdb924223383a1029565063e4a925865be1802fa821a7bca
-EBUILD libgpg-error-1.45-r1.ebuild 1984 BLAKE2B fb622e43f183e520c376009b177e1d55c7c6c50d6eb147ab8d58dfaa11f0b208c76216b61574e1413b648d05860d389af940349b98d76885f3f42344170ae0da SHA512 3911ee0d4b74853adc1dbf19c7e7d717639bbf6b5033cf9f54314923167ecd30f258f57082b430e05fab6cc4785b8b359fc46211fa7b3a71240b740379727cc3
 EBUILD libgpg-error-1.45.ebuild 1924 BLAKE2B a082e0038c6372f379492fbbd381fff2c1ede5eb56077b14eeba019fdde88cd3978c35d4f08bcf31e3f814c25cd95b1db91511f57d1c3be691d7b61a23803354 SHA512 a0f50c1e76f2ecf9c1550e2b95dd27d888ffa96bf3cf13abe5a0f4514ef973534ff75fe6e3449c7624ac23dff32dfd1d925ffe0e40c69dae02fef57d39df43ce
 EBUILD libgpg-error-1.46-r1.ebuild 2622 BLAKE2B 74dc5b9629cf9fb784734ba1c0c4e4a1cdc84073782db5d56bc36e02a9232d7895f1da1df7f0f9ded37849c83fa70209697270ed3a801c939527087d81dfca88 SHA512 196512a776c1263803bae61c8cdfc20049eb337175499250c35e011ee1f0a5a1b59b36d3f511933027c041cc50554a3be7ab6ad5acb82aa28ca8fd30a08bc4c5
 MISC metadata.xml 420 BLAKE2B 0b469c533336497584faf0c8a5531c54dd242817d46fb78f1369997b77ec3ea49da3a0ae869488c17639fdee26bc4dee94fb20605db6fa8f6f3dbaeab77d3072 SHA512 22259311b2c83f7b63e859a7196a3fd586c85afbd777327d9a6172a359500160807866b74051836717c42145ed0e289152fb0a374a05bcc7e982d4df3e94b305
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch b/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch
deleted file mode 100644
index a7db0e4d4b64..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.45-gpgrt_config_libdir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream:
-https://dev.gnupg.org/rE4615816f71e91f4c3bb8b0e4122dd153ec7c1927
-https://dev.gnupg.org/T6136
-
-From 4615816f71e91f4c3bb8b0e4122dd153ec7c1927 Mon Sep 17 00:00:00 2001
-From: NIIBE Yutaka <gniibe@fsij.org>
-Date: Thu, 25 Aug 2022 15:30:07 +0900
-Subject: [PATCH] gpgrt-config: Strip system paths for --cflags and --libs.
-
-* src/gpgrt-config.in: Strip -I and -L with system paths.
-
---
-
-This behavior is more compatible to pkg-config.
-
-GnuPG-bug-id: 6136
-Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-
-diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in
-index 3aaa243..85d21b4 100644
---- a/src/gpgrt-config.in
-+++ b/src/gpgrt-config.in
-@@ -1,6 +1,6 @@
- #!@INSTALLSHELLPATH@
- #                          -*- mode: shell-script; sh-shell: "/bin/sh" -*-
--# Copyright (C) 2018, 2021 g10 Code GmbH
-+# Copyright (C) 2018, 2021, 2022 g10 Code GmbH
- #
- # This file is free software; as a special exception the author gives
- # unlimited permission to copy and/or distribute it, with or without
-@@ -193,9 +193,14 @@ list_only_once () {
-     __arg=""
- 
-     for __arg; do
--	if not_listed_yet $__arg $__result; then
--	    __result="$__result${__result:+ }$__arg"
--	fi
-+	case "$__arg" in
-+	    -I/usr/include|-I/include) ;;
-+	    *)
-+                if not_listed_yet $__arg $__result; then
-+	            __result="$__result${__result:+ }$__arg"
-+	        fi
-+                ;;
-+	esac
-     done
- 
-     echo $__result
-@@ -210,6 +215,7 @@ list_only_once_for_libs () {
-     # the resulted list is in reverse order
-     for __arg; do
- 	case "$__arg" in
-+	    -L/usr/lib|-L/usr/lib64|-L/lib|-L/lib64) ;;
- 	    -l*)
- 		# As-is
- 		__rev_list="$__arg${__rev_list:+ }$__rev_list"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild b/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild
deleted file mode 100644
index 9d47ab1f8c4a..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.45-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-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"
-IUSE="common-lisp nls static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
-	"${FILESDIR}/${PN}-1.45-gpgrt_config_libdir.patch"
-)
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's/solaris\*/disabled/' configure.ac || die
-	fi
-
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index 5e56585c4354..951f1a68342e 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,10 +1,5 @@
 AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
-DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
-DIST libksba-1.6.1.tar.bz2 667546 BLAKE2B 6fad243c8eace31188264515cfe146afdfe9155ded571614dc1a9a8e2e357cb301d471cdbd084e1db59e888ed4eea7270755723c98c5bd7bb6ef857aedf4cd75 SHA512 cb1113204ce5a3344103e03c541238bfddf40b79579cf97b5707c03b064afcda362db16467739afe8342e5bd42dd367b6f9e51f46ef8de1126293773d23b7cf4
-DIST libksba-1.6.1.tar.bz2.sig 119 BLAKE2B e80f6706a81b927cb2dcce5def046d5395668b078f6da605476943446607aae580dc775aa21fa11f29b4ce7c7abaa09462e702610b0976eb5fc633c741d8dbed SHA512 574e2cb49c47fa6ac62f30a5b6c06b636d12ec0c1fba02ef0cbb8e50225143925ee9ebb9b4c3112a5f470a62cc2b01687d93ee0037235297c94fdf7ef63fa704
 DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68fbfea075fe828dd0885d6f245c59639b18af6c6593054cd0008b06b1f6e4418c8874b0b59feb77b24fc7940db07 SHA512 50533887942921f8009cedd636915c2b27f231151a3b8316af6801a5f8637d66896ba5a24207bf82d8b03e26624133e80c6dd69f1196f06ada929090ef0f178c
 DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4
-EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
-EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028
 EBUILD libksba-1.6.2.ebuild 1621 BLAKE2B 69ba0fda40914ad0be306dafe90e0ebfe8f26a429fd82ec3535a0e821ef4d9fce8b01bce69a2d872ff252f7c28073cc88f324069465e2a5f1b9e12a869c53f4c SHA512 15973b5e35b323b189a390e5d9cd4fea9f8dc3a756a0fb356dfe89d4c48d1f21a8f4776e35fc0fb5282977d768fe22d9934e58d16300856e4de2eb9c010e15a9
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.0-r1.ebuild b/dev-libs/libksba/libksba-1.6.0-r1.ebuild
deleted file mode 100644
index 4519c155623c..000000000000
--- a/dev-libs/libksba/libksba-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2"
-
-LICENSE="LGPL-3+ GPL-2+ 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"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# People need to use ksba-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libksba/libksba-1.6.1.ebuild b/dev-libs/libksba/libksba-1.6.1.ebuild
deleted file mode 100644
index 6a9a5c5f0e56..000000000000
--- a/dev-libs/libksba/libksba-1.6.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="X.509 and CMS (PKCS#7) library"
-HOMEPAGE="https://www.gnupg.org/related_software/libksba"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="LGPL-3+ GPL-2+ 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"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
-)
-
-src_configure() {
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# People need to use ksba-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libslz/Manifest b/dev-libs/libslz/Manifest
index 66850132e4d7..7de0241c8aef 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 827 BLAKE2B 1fa2258635ce0869ebd64972c5037036791fc72b1b0752f2679d9636e54252af1eaef89f30ae66c05eff13db525ea4c3424d43293127d804ccea444b09efc4ea SHA512 fabb2305828b0a68ec564d8090a7f6b3828b004b66a41d3a4b59b861777d7a895bac0ee578e2e52699d816db4b6dcf94e1d1e2872987e7807715e3a1c71b31b3
+EBUILD libslz-1.2.0-r1.ebuild 826 BLAKE2B 3425b3b0e38e2a70a67489195faa6bfb0172f9939653a79b9f97c73d85eacf3e804e76c7889d42d247fa7216b40ebe2a55f716b3633fa71b4f99bf63e7694ab9 SHA512 1b3f89147d86c97c04abb458677440d16ccba65ef4210486daccdf9031c9c977337e3cbc273b212a1f2c23dfbd4d62c1adf3dc7e30f81196162633bf5b048f4e
 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 8fff4fd6f227..633d4804c308 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/libsodium/Manifest b/dev-libs/libsodium/Manifest
index e17f4edd0c6e..db4c285c070d 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,11 +1,5 @@
 AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd
-DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006e89f734c4d335e75e01d37b1034cc024df2e89d4350ecbe713d3e4b32c08bec537922c81cc63b0e87ee7fd89b2940 SHA512 17e8638e46d8f6f7d024fe5559eccf2b8baf23e143fadd472a7d29d228b186d86686a5e6920385fe2020729119a5f12f989c3a782afbd05a8db4819bb18666ef
-DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c
-DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
-DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
 DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
 DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
-EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb
-EBUILD libsodium-1.0.18_p20210617.ebuild 2525 BLAKE2B 5a7ec4a44f5bb82dbbac1ad5b0c1ac2525922a41997a510d72f56434854dfe7b0246f64a5504181d78c1079d58d619f691644f249fb8ac4b9566b56f53051c3e SHA512 59e898b12d7b0eff6499fa21e830112a80713db65abeec3f985af6d9bce969ec4c12e8d7a214d7f95201fc88f4f180c6a556582a69896c056179d57e9c9f45de
 EBUILD libsodium-1.0.18_p20220618.ebuild 2515 BLAKE2B b99ffc90567e8b15edc548d19ac45603b336a8012575a34856194e05a0249a0bca60ae0d945c39322c0e2552a92ffcff7a96c37f3a1c04f48ae932ebef49200f SHA512 d2483b4e7ceb2c5ad46bce108309e96cbe7d1801a63fc9378be2f859fce959111ce33cacf1247643e96263dd2efa512af9d6b08f13e41b1fd3de24aafa2c934c
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18.ebuild b/dev-libs/libsodium/libsodium-1.0.18.ebuild
deleted file mode 100644
index 3fa3a86d9302..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.18.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc
-inherit autotools multilib-minimal verify-sig
-
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jedisct1 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable minimal)
-		$(use_enable !urandom blocking-random)
-		$(use_enable static-libs static)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable cpu_flags_x86_aes aesni)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then
-		myeconfargs+=( --disable-pie )
-
-		# --disable-ssp is needed on musl x86
-		# TODO: Check if still needed? bug #747346
-		if use elibc_musl ; then
-			myeconfargs+=( --disable-ssp )
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
deleted file mode 100644
index c7b80db078da..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
+++ /dev/null
@@ -1,93 +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="A portable fork of NaCl, a higher-level cryptographic library"
-HOMEPAGE="https://libsodium.org"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
-	MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
-
-	# We use _pN to represent 'stable releases'
-	# These are backports from upstream to the last release branch
-	# See https://download.libsodium.org/libsodium/releases/README.html
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-	# TODO: Could verify-sig.eclass support minisig? bug #783066
-	SRC_URI+=" verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )"
-
-	S="${WORKDIR}/${PN}-stable"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/jedisct1.asc
-	inherit verify-sig
-
-	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
-fi
-
-LICENSE="ISC"
-SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+asm minimal static-libs +urandom"
-
-CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
-IUSE+=" ${CPU_USE[@]}"
-
-if [[ ${PV} == *_p* ]] ; then
-	IUSE+=" verify-sig"
-
-	BDEPEND+=" verify-sig? ( app-crypt/minisign )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == *_p* ]] ; then
-		if use verify-sig ; then
-			elog "Verifying signature using app-crypt/minisign"
-			minisign -V \
-				-P ${MINISIGN_KEY} \
-				-x "${DISTDIR}"/${P}.tar.gz.minisig \
-				-m "${DISTDIR}"/${P}.tar.gz || die "Failed to verify distfile using minisign!"
-		fi
-
-		default
-	else
-		verify-sig_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable asm)
-		$(use_enable cpu_flags_x86_aes aesni)
-		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
-		$(use_enable minimal)
-		$(use_enable static-libs static)
-		$(use_enable !urandom blocking-random)
-	)
-
-	# --disable-pie is needed on x86, see bug #512734
-	# TODO: Check if still needed?
-	if [[ "${MULTILIB_ABI_FLAG}" == "abi_x86_32" ]] ; then
-		myeconfargs+=( --disable-pie )
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 31e46f5155ac..5a8b7b8590cc 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,12 +1,9 @@
 DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5
 DIST libxml2-2.10.3.tar.xz 2639908 BLAKE2B aef2cc87e4632ddc478ff719155fdcb17601a8af37ecc1145ca05e01340935b57f07722e016ca2b27e4b269d47bd2fe97db09119a47849e8745e077e42b8bb66 SHA512 33bb87ae9a45c475c3de09477e5d94840d8f687f893ef7839408bc7267e57611c4f2b863ed8ec819a4b5f1ebd6a122db9f6054c73bceed427d37f3e67f62620c
-DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
-DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733
 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.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827
 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.9.14-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild
deleted file mode 100644
index 28e55087cabf..000000000000
--- a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Note: Please bump in sync with dev-libs/libxslt
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit autotools flag-o-matic python-r1 multilib-minimal
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-XMLCONF_TARBALL="xmlts20130923.tar.gz"
-
-PATCHSET_VERSION="2.9.14-patches-r0"
-
-DESCRIPTION="XML C parser and toolkit"
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
-	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"
-fi
-
-SRC_URI+="
-	https://dev.gentoo.org/~soap/distfiles/${PN}-${PATCHSET_VERSION}.tar.bz2
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
-		https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
-	)"
-S="${WORKDIR}/${PN}-${PV%_rc*}"
-
-LICENSE="MIT"
-SLOT="2"
-IUSE="debug examples icu lzma +python readline static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
-	icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]] ; then
-	BDEPEND+=" dev-util/gtk-doc-am"
-fi
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xml2-config
-)
-
-DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
-
-PATCHES=( "${WORKDIR}"/patches )
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		local tarname=${P/_rc/-rc}.tar.xz
-
-		# ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
-		# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-		unpack ${tarname}
-
-		if [[ -n ${PATCHSET_VERSION} ]] ; then
-			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
-		fi
-	fi
-
-	cd "${S}" || die
-
-	if use test ; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-		unpack ${XMLCONF_TARBALL}
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# Filter seemingly problematic CFLAGS (bug #26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	# Notes:
-	# The meaning of the 'debug' USE flag does not apply to the --with-debug
-	# switch (enabling the libxml2 debug module). See bug #100898.
-	libxml2_configure() {
-		ECONF_SOURCE="${S}" econf \
-			--enable-ipv6 \
-			$(use_with debug run-debug) \
-			$(use_with icu) \
-			$(use_with lzma) \
-			$(use_enable static-libs static) \
-			$(multilib_native_use_with readline) \
-			$(multilib_native_use_with readline history) \
-			"$@"
-	}
-
-	# Build python bindings separately
-	libxml2_configure --without-python
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_configure --with-python
-}
-
-libxml2_py_emake() {
-	pushd "${BUILD_DIR}"/python >/dev/null || die
-
-	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
-
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python ; then
-		NATIVE_BUILD_DIR="${BUILD_DIR}"
-		python_foreach_impl run_in_build_dir libxml2_py_emake all
-	fi
-}
-
-multilib_src_test() {
-	ln -s "${S}"/xmlconf || die
-
-	emake check
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake test
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi && use python &&
-		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use examples ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
-	fi
-
-	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ -n "${ROOT}" ]]; then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# Need an XML catalog, so no-one writes to a non-existent one
-		CATALOG="${EROOT}/etc/xml/catalog"
-
-		# We don't want to clobber an existing catalog though,
-		# only ensure that one is there
-		# <obz@gentoo.org>
-		if [[ ! -e "${CATALOG}" ]]; then
-			[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
-			"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 4902a01c598a..d9a07797a27d 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,6 +1,4 @@
-DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
 DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca
-EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01
 EBUILD libxslt-1.1.37.ebuild 2969 BLAKE2B 815364a6d3e282a5c9dcc2d7d37c6515e77f67e91857e911dfd78958e4444f5c64b95365048e04b4fc93f7b1a84c0b78b9126c06f51d4c235d9ef8a374768a30 SHA512 28b9023d3f913f37ca24553bfc0b1166b99fbb17466566f8e20fa0c12d29256c291767f481b21ddfa61568c4be13f1d9b4724ef1c3261141f751c10233eec6d5
 EBUILD libxslt-9999.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.35.ebuild b/dev-libs/libxslt/libxslt-1.1.35.ebuild
deleted file mode 100644
index 3848a6609fa0..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.35.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 libtool multilib-minimal
-
-# Note: Please bump this in sync with dev-libs/libxml2.
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
-	inherit autotools git-r3
-else
-	inherit gnome.org
-	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
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="crypt debug examples static-libs"
-
-BDEPEND=">=virtual/pkgconfig-1"
-RDEPEND="
-	>=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}]
-	crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libxslt/xsltconfig.h
-)
-
-DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		# Prefix always needs elibtoolize if not eautoreconf'd.
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	# Python bindings were dropped as they were Python 2 only at the time
-	# Work in 1.1.35+ is occurring to add prelim. Python 3 support, so could
-	# restore if something needs them.
-	ECONF_SOURCE="${S}" econf \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-html-subdir=html \
-		--without-python \
-		$(use_with crypt crypto) \
-		$(use_with debug) \
-		$(use_with debug mem-debug) \
-		$(use_enable static-libs static) \
-		"$@"
-}
-
-multilib_src_install() {
-	# "default" does not work here - docs are installed by multilib_src_install_all
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index d10455d04392..54bdcafa9798 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,10 +1,6 @@
 AUX spdlog-1.9.2-fix-clone-test.patch 422 BLAKE2B adf5104879b3ffae5658b8cc38d78b56e9c330c59add082a4604372ba45822512774a331995634915bdf3514ed4cf74d5e8171835cea3e8dbd9bae33177ebfdf SHA512 e66801855e2856f5195644eb31b3f53fee62164df9883d66289c6bfefff1c1c7e7d4aea320b0cd510ab5a656b415886ab2fe2686047d77f33cde4f997569b2c9
 AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d8ad7828e5d21ccfc1e4183a74e3f7f2df1f61a2188a5cf0dc4c08ef9692c5de4a4589fae75c1daa4a9987d4be3f168f6 SHA512 257c7f7f56e66b88a16238a2c81887f2d5ba9692c18bf5fc371b95f44936018ec7c4a0abd0e54f38cb6a7957f82a1b95af9d238fa7fa16631f0be1980d76f692
 DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
-DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
-DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c
-EBUILD spdlog-1.10.0.ebuild 1052 BLAKE2B 0c97ecf8b5a62362dc79d5dc9dbf682881f2694671a5712614057e848f45f001d3dee1f437ddf08100d2703f5e69ada5c130ba3c1898e7b00d5bb9ad53610a53 SHA512 f33ed451d1272ef566ec3b91ab9feeff32481e0e9e7627e0a04e5c00f2dafa330c44ac38aa8146e6a3d701a78b4b1fc8a9a087453bc04bd0eb406acffd929030
-EBUILD spdlog-1.9.2-r1.ebuild 1259 BLAKE2B 6e7ba878d9ee9423170a9c2d3b97a279bb9717937fc1df6d0c7f1ed7a4591cb8c05b829a8da6e97b00b68d82252a9ab459e87fa0205ff99c8d08cfc7895d77a8 SHA512 c4c4bc1f648cb6ca7a716f9d88324cd38e753a1d006cc59483f541531be0ce2b5b83cea0b0f447d4c43ffae01472c673ced43f71043cf21c9633ae1965fbfdb3
-EBUILD spdlog-1.9.2.ebuild 1154 BLAKE2B c9d1a6441a46b9d945e5036734e2efab4551ab7712b6df7faf82c470b18db538eeb16067e186a351c9ba48480cfa9a8455cc5b333922f875567db633be04ef35 SHA512 4234dd4b5319e7932c4a17484411dd5104da67190d6a67cfadfa1b6d30d669d74f7f61b3358f19c1e1312634948715b548869e55f85667368263846c9563167d
+EBUILD spdlog-1.10.0.ebuild 1051 BLAKE2B ebf55210df05bb7a8774a50991e07d9131166b56a8783ae021ae7e351bc7e4193a494738952f1a4783c28db99d289d53abf1202426e77f7d4759960626aa9999 SHA512 5bc8a4613c59d0bda07009191069ac0901121fcaeb220568cb4e68a9f9834c8be61d235f69852ce3af0e1f63e076f3043f17856fd21781f99197127e16f874a6
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
 MISC metadata.xml 475 BLAKE2B cd5f474d10b31fb435f603c876f20d7a13c892eb6b10b4f135855fcd3c2da9ee5d9679ccf384de61472f36df06af8f49ac19c302a27fd0112b07a7da2dba1504 SHA512 89ddbd67b6fd5a54f035d068d71eac904b677d2370f9e15842eb442bc7e4ec9f579df8db2090480c3673d558371c6d7ca3a8f7b36c316ac54d47e4baa018381c
diff --git a/dev-libs/spdlog/spdlog-1.10.0.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild
index f496aa6b47f3..5b255d81d0bd 100644
--- a/dev-libs/spdlog/spdlog-1.10.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild b/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
deleted file mode 100644
index d1522c98ebf1..000000000000
--- a/dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# Temporary for bug #811750
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-force_external_fmt.patch"
-	"${FILESDIR}/${P}-fix-clone-test.patch"
-)
-
-src_prepare() {
-	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
-
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/spdlog/spdlog-1.9.2.ebuild b/dev-libs/spdlog/spdlog-1.9.2.ebuild
deleted file mode 100644
index beb63a1a7f60..000000000000
--- a/dev-libs/spdlog/spdlog-1.9.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Very fast, header only, C++ logging library"
-HOMEPAGE="https://github.com/gabime/spdlog"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gabime/${PN}"
-else
-	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# Temporary for bug #811750
-	SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-update-catch-glibc-2.34.patch.bz2 )"
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/1"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	>=dev-libs/libfmt-8.0.0:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use test && eapply "${WORKDIR}"/${P}-update-catch-glibc-2.34.patch
-
-	cmake_src_prepare
-	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSPDLOG_BUILD_BENCH=no
-		-DSPDLOG_BUILD_EXAMPLE=no
-		-DSPDLOG_FMT_EXTERNAL=yes
-		-DSPDLOG_BUILD_SHARED=yes
-		-DSPDLOG_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index 7dd431679f78..2616a2885890 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -1,7 +1,5 @@
 AUX userspace-rcu-0.13.1-loong.patch 5308 BLAKE2B 94ca49f47c68efb8e368033ee77eeeba0484735d7bef2ea15bc1956a9c05c8f5d275f521412aa3bcaeb4221e86240b6d42b04112d8a3565fc4074b84059d460f SHA512 32fc545a8201cc8a8db4d38c4fc3ec93c0717e23a87cd0533be0e60ef47027d8442547cd0cd46e4e99d235efcf8045eb8c106fde1e3389256fd80114b20df5a6
 AUX userspace-rcu-0.13.1-tests-no-benchmark.patch 441 BLAKE2B 8e5737b349d21ae4cdc87b821027bd500f35921afbc1d506977038a79b14e468ea3dfbf7f2d301e905217b3454641ab81c3eceae7a597dc777967133f66b7c20 SHA512 a1749498e1b038b003502d1c40aa664fea36558f403229bb7c28a0540ef341fc578dcc46985a45a8dcd59c3a7e035efd205c40288d58c0e5866af019b65e0d82
-DIST userspace-rcu-0.13.1.tar.bz2 609961 BLAKE2B 96581fb3e90764870d2eb3eff6999e3c20bf206e3a0d5c910acfe693d55e0cb389fa5126a74d175f3c46655e740ecf1c1426c367eb3c28f3ef3a634848e51e83 SHA512 c86f2eb260cccb3cb6bd54ddbc0b46e60083fc99423e9403242ebed7f39a2a49c68af933ea6f373e2a9d4f9dc56f5befe030740891e28cf2fabe927a48ff8182
 DIST userspace-rcu-0.13.2.tar.bz2 611448 BLAKE2B 6d502e0035b03df262c917ba70f7442e2bd81369091b2c521fe5c32f31ed2ef7404070759f3a8910b767153e05d28e354d5e5ece2a3ba17e4a31dd7db3e1924f SHA512 e5097a7f653f51b3a47a09f79e7a153aab8fd22c0504a1127a9b33d093a9ae6a941b97c0fe175ee168e2976097aefdcdf8d5ce030afbe565c1b72f64d6f5b60a
-EBUILD userspace-rcu-0.13.1.ebuild 1106 BLAKE2B 178a7101a35c4ac47d1ec5522b59d23cf0f1a0a15f569a1b3fb6846a720f92bafc7fc6b90398b3e11f8b5f98e1a16690b707b94ec869ce32b910e4ac132a0b66 SHA512 79ff76ca5bc0dc71a9548d927e61d64afde3232fa1bc5a64391252386d183a51c3a55546b138626eb526c630f68efe0cc28ff0e266c825247ce38c7573e1a221
 EBUILD userspace-rcu-0.13.2.ebuild 1106 BLAKE2B e715d27230f38a2981f7aef2edfcef9291292e6c6eb211dfcc8eee02935f49b001f5560e6a879ff0de203cc5cc30778290a83f228dfbce3d2c5d95af0146ab6a SHA512 eb3fa88ff25378dc8d45001b923aaddb88e7c72ef5ed68edea6059bc7da11baa2f586b8f9fc74df4f44bd15e4573dc62c3605b712d7db7f3142fd0256e9f10d6
 MISC metadata.xml 341 BLAKE2B bc37ed52ea2032c387966023434b69d8b184e7800e8588398350eaa6f55c8895822370ebcf971b8ebc87d112ec3de973929455a78519b4f0f5081a4693be0d8f SHA512 a88f7a9bebe6947cc296e3f0d7b316648cba7117551ee6a9b06c51d5ecd010ebf34918939fffef4dc6156dc818cbd38b72dd394a6acff9b873e8a3fc247e3f02
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.13.1.ebuild
deleted file mode 100644
index a534a4ce7d3f..000000000000
--- a/dev-libs/userspace-rcu/userspace-rcu-0.13.1.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
-
-inherit autotools
-
-DESCRIPTION="Userspace RCU (read-copy-update) library"
-HOMEPAGE="https://liburcu.org/"
-SRC_URI="https://lttng.org/files/urcu/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/8" # subslot = soname version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( sys-process/time )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.13.1-tests-no-benchmark.patch
-	"${FILESDIR}"/${PN}-0.13.1-loong.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for tests patch
-	# ... and refresh libtool (see https://github.com/gentoo/gentoo/pull/23973)
-	# ... and for build on loong (see https://github.com/gentoo/gentoo/pull/25189)
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	default
-
-	emake -C tests/regression regtest
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 922d94d78788..7d28f7c95b85 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,11 +1,5 @@
-AUX xapian-bindings-1.4.20-slibtool.patch 4917 BLAKE2B 7c2b580e39071e7812067165220fcaef016f8e99f451dd5a1c460198987e5754a075214b67b90712686cd6d345c54f31d3a5b0a6d5b7c0fc94dae9c0422ba0f1 SHA512 ce7ee401e91713c9f914e6c87c2adc968dd8c863f19d597048d2052348abc65760213eded0deec3dc46dd0df637d61a0cfd0986670a1aa9c47c892a6b6c1597d
-DIST xapian-bindings-1.4.18.tar.xz 1135644 BLAKE2B 7120c42d73794f8212bf15afb4566119e44cd39c711d50aab4fcc4320419babc440d4dd732af9e739c68397e740da192fa80cd08c5d2b59e1ae13af4444ff3d6 SHA512 e965384febaa83c28fd63b82192bfa4d5d34b4eb7cfacf1ddfc1201deada4f0498df8e50a191713dc95feb8edb0b1a4e9d6983a639c564f086ee305b8a05397e
 DIST xapian-bindings-1.4.19.tar.xz 1137596 BLAKE2B 46004a3449a3137db42164a8b4c5b8684d2eaf0edfa60fe7ca41d5565d1cc16b110ca8204100c9e654baa323a4c73536f80550b17989ce3ee4a132315c31a50e SHA512 c3e353a192822be5d86d448b9d5e4c5eb15d5eb2d079560f7c457f8f7ca85d42e2b933891e784d384c188577f427ca1929c2b47732b9d637e36543e8b5b704d6
-DIST xapian-bindings-1.4.20.tar.xz 1143304 BLAKE2B 3ab6a9be536d10b0dd369c1c638acbdd7fdf855f6dc8726db9c3791a8369cd83196214771b923aa538e5dda320d2b417f5f0944181b5691cfe5d8e7ddc97dd96 SHA512 bdc876b8e1b946d27673122de6d298112c82fa41e19090a2bcbe0954905ddf66171d36e6753a1e8d46578b128edd729e2fd252311d60ff40a2aec9a4d57796ed
 DIST xapian-bindings-1.4.21.tar.xz 1151620 BLAKE2B 5596d0784110b6b73efce4b330ad7c0750a7173c94c37d80b4c75865b949b16f32957ff7ca0d67c08592b85874a5b19e57a11d32ef26976fb3cae38f542f5ba0 SHA512 86cbdc8ba73be8aa947e209106dd49d111d264f0b00b5831356e19ba3299eb8f87f2c57ab051ea54c54fb5f1b8cc6a1175ee18f89094f5c7345b820ea805ad33
-EBUILD xapian-bindings-1.4.18-r1.ebuild 7047 BLAKE2B 1d2fd7b5d833876d00d49f7f5159255e83233ca662dedb720813d10ce15e39a2bfb46cdb0836b88773d3887469c3a62648356aa8676fe3a2cf1ab8e8e45659d5 SHA512 f1c2675ad652b555cb2be48a1a327192424c5866c04b10c84c9f8ea794fff8d487fc9edfe7417c8bf141fee253f2669c635c51def709818db2f8a3b6fa5a3b45
-EBUILD xapian-bindings-1.4.19.ebuild 7121 BLAKE2B a2c0d20a764a5a192e354986961803e49c535ee2338305366d0dbf93c6f1747654c30b48d01cc1fc3a9876c572e3faa588ef941b1ecad9a938060251d89d7bca SHA512 7b8b48bac9926d5a596b775bd687cafd6fc53a153ba18bc5aac8de1730c258494f7e340c623a56e218b626889f14971f44b9e6606d9cc05dd889d14346e94e84
-EBUILD xapian-bindings-1.4.20-r1.ebuild 7206 BLAKE2B badceb446b50d5b5ecb5e934efdd35daa33bed66cbdd3f0cfd48cd3878f266051c77fe08c57ff13d7dd5d1b020d905cf39269a9201a76cd22c16b348f981901c SHA512 5a58191d7c1b8c07ae331b8b24d656709985ce6bb1187c58435b388e5e52fa91ed78427c4c046f61f76e6d157d6b9db8db209b64d57f5f0564f2208fdba85c71
-EBUILD xapian-bindings-1.4.20.ebuild 7125 BLAKE2B d11fbd87002b5e57c1d3c7ce035e0d517b4cf3750bf4a5cd23c6b97203be3754744c8780d1c90848892ce55da1f1904bb70a1bd22dfaba69531fa320bcac1365 SHA512 bcda12bd88f3a6f16e9e6032a9cd143d79e4402a66f3daea677521d5b3b0502ad59a49ae9778085055498e84c1e9c3bef51e1065ed9a8ae8d2c4c86a3798ff05
+EBUILD xapian-bindings-1.4.19.ebuild 7119 BLAKE2B 94c1604be122be96515ccceaf6ae9c380771a3ccda47ffbf522fadf094c132e8b1052d171afa2b55a812831ba674667c5f11c618d6c9d270f8df1fd67d28d1aa SHA512 59a412af6c10d7624aadaf9b59dfc499f9e97f1da5d710c0f6c435b9a057e19eacd3362c39e663a35e8086a6a7a7b04f40db4cce6f0de7be7dcc0c321a02b415
 EBUILD xapian-bindings-1.4.21.ebuild 7129 BLAKE2B 8944d678da73648ef5d629c10e01786c273a541e373a30961c2ec3e85804a05798412d0f77af8ceb50f0b4e896412805fb9851c2930c210e11bae870a90afc54 SHA512 65771b8c107e0d6048bfa268c3faacafb9ca729e79cc6f0e5e87c56a5a9fe28f096481006ac6fb47f4052efa4c0101c976f2879f115fff1afbef872f92f967d0
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch b/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
deleted file mode 100644
index d73f8bcb19b9..000000000000
--- a/dev-libs/xapian-bindings/files/xapian-bindings-1.4.20-slibtool.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-Upstream-PR: https://github.com/xapian/xapian/pull/322
-
-From c513b0d31d2df31eb57ccbe08bbe46821863557d Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Wed, 20 Jul 2022 13:37:20 -0700
-Subject: [PATCH] xapian-bindings: Fix the build with slibtool
-
-With slibtool the --config argument works differently than in GNU
-libtool which results in 'auto/Xapian/Xapian$(PERL_SO)' failing to be
-created. This can be worked around by using libtool --mode=install where
-slibtool can copy the module to the intended location.
-
-However GNU libtool still requires using --config otherwise it fails
-during --mode=install with the following error.
-
-  /bin/bash ../libtool --mode=install cp Xapian.la /home/runner/work/xapian/xapian/perl/auto/Xapian/Xapian.la
-  libtool:   error: error: cannot install 'Xapian.la' to a directory not ending in /usr/local/lib/x86_64-linux-gnu/perl/5.26.1/auto/Xapian
-
-gentoo issue: https://bugs.gentoo.org/793428
----
- java/run-java-test  | 21 +++++++++++++++++----
- perl/Makefile.am    |  9 +++++++--
- python3/Makefile.am |  9 +++++++--
- tcl8/run-tcl-test   | 20 +++++++++++++-------
- 4 files changed, 44 insertions(+), 15 deletions(-)
-
-diff --git a/java/run-java-test b/java/run-java-test
-index d0e97af300e..a838de98492 100755
---- a/java/run-java-test
-+++ b/java/run-java-test
-@@ -1,11 +1,24 @@
- #!/bin/sh
- # To run `jdb` instead of `java` set JAVA=jdb
- # To run under gdb, set JAVA='gdb --args java'
-+LIBTOOL="${LIBTOOL-../libtool}"
- arg=`echo "$1"|sed 's!.*/!!;s!\.class$!!'`
-+
-+# GNU libtool and slibtool have different and incompatible usage for --config.
-+if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
-+	. ./libtoolconfig.$$
-+else
-+	objdir="built/libs"
-+	rm -rf "$objdir"
-+	mkdir -p "$objdir"
-+	${LIBTOOL} --mode=install cp libxapian_jni.la "$objdir"
-+fi
-+rm -f libtoolconfig.$$
-+
- # Use libtool's -dlopen option to ensure that libxapian_jni.so (or whatever)
- # is in the shared library path.
--${LIBTOOL-../libtool} --config > libtoolconfig.$$
--. ./libtoolconfig.$$
--rm -f libtoolconfig.$$
--${LIBTOOL-../libtool} -dlopen libxapian_jni.la --mode=execute \
-+${LIBTOOL} -dlopen libxapian_jni.la --mode=execute \
-   $OSX_SIP_HACK_ENV ${JAVA-java} -Djava.library.path="$objdir" -classpath built/xapian.jar${PATHSEP-:}. "$arg"
-+rc=$?
-+rm -rf built/libs
-+exit $rc
-diff --git a/perl/Makefile.am b/perl/Makefile.am
-index 4f2e5e4283d..f71579736e5 100644
---- a/perl/Makefile.am
-+++ b/perl/Makefile.am
-@@ -55,9 +55,14 @@ BUILT_SOURCES = Xapian.pm xapian_wrap.cc \
- 
- auto/Xapian/Xapian$(PERL_SO): Xapian.la
- 	@$(MKDIR_P) auto/Xapian
--	$(LIBTOOL) --config > libtoolconfig.tmp
-+## GNU libtool and slibtool have different and incompatible usage for --config.
-+	if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
- ## ksh requires a path on the sourced file.
--	. ./libtoolconfig.tmp; cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian
-+		. ./libtoolconfig.tmp; \
-+		cp "$$objdir/Xapian$(PERL_SO)" auto/Xapian; \
-+	else \
-+		$(LIBTOOL) --mode=install cp $< $@; \
-+	fi;
- 	rm -f libtoolconfig.tmp
- 
- EXTRA_DIST = perl.i except.i extra.i $(TESTS) \
-diff --git a/python3/Makefile.am b/python3/Makefile.am
-index 3c692a9e2d4..9bf01833636 100644
---- a/python3/Makefile.am
-+++ b/python3/Makefile.am
-@@ -88,9 +88,14 @@ xapian/__pycache__/__init__.@PYTHON3_CACHE_OPT1_EXT@: xapian/__init__.py xapian/
- 
- xapian/_xapian$(PYTHON3_EXT_SUFFIX): _xapian.la
- 	$(MKDIR_P) xapian
--	$(LIBTOOL) --config > libtoolconfig.tmp
-+## GNU libtool and slibtool have different and incompatible usage for --config.
-+	if $(LIBTOOL) --config > libtoolconfig.tmp 2>/dev/null; then \
- ## ksh requires a path on the sourced file.
--	. ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian
-+		. ./libtoolconfig.tmp; \
-+		cp $$objdir/_xapian$(PYTHON3_EXT_SUFFIX) xapian; \
-+	else \
-+		$(LIBTOOL) --mode=install cp $< $@; \
-+	fi;
- 	rm -f libtoolconfig.tmp
- 
- CLEANFILES = \
-diff --git a/tcl8/run-tcl-test b/tcl8/run-tcl-test
-index 206b5e0e056..71511032024 100755
---- a/tcl8/run-tcl-test
-+++ b/tcl8/run-tcl-test
-@@ -1,14 +1,20 @@
- #!/bin/sh
--${LIBTOOL-../libtool} --config > libtoolconfig.$$
--. ./libtoolconfig.$$
--rm -f libtoolconfig.$$
-+tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}`
-+rm -f xapian$tclshlibext
-+
-+LIBTOOL="${LIBTOOL-../libtool}"
- module=yes
--eval shlibext=$shrext_cmds
- 
--tclshlibext=`echo 'puts [info sharedlibextension]'|${TCLSH-tclsh}`
-+# GNU libtool and slibtool have different and incompatible usage for --config.
-+if ${LIBTOOL} --config > libtoolconfig.$$ 2>/dev/null; then
-+	. ./libtoolconfig.$$
-+	eval shlibext=$shrext_cmds
-+	ln -s $objdir/xapian$shlibext xapian$tclshlibext
-+else
-+	${LIBTOOL} --mode=install cp xapian.la ./xapian$tclshlibext
-+fi
-+rm -f libtoolconfig.$$
- 
--rm -f xapian$tclshlibext
--ln -s $objdir/xapian$shlibext xapian$tclshlibext
- $OSX_SIP_HACK_ENV ${TCLSH-tclsh} ${srcdir-.}/runtest.tcl ${srcdir-.}/smoketest.tcl
- rc=$?
- rm -f xapian$tclshlibext
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
deleted file mode 100644
index 5c0655965cf7..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-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"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.15
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${ED}/var" || die "could not remove java cruft!"
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
index 551cc14289db..080f7453900b 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.19.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-bindings/xapian-bindings-1.4.20-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild
deleted file mode 100644
index adaa8d9ff860..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.20-r1.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-4 php8-0"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_OPTIONAL="yes"
-
-inherit autotools java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-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"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.20
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.8:* )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch # 793428
-)
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-}
-
-src_configure() {
-	# Needed to get e.g. test failure details
-	MAKEOPTS+=" VERBOSE=1"
-
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${ED}/var" || die "could not remove java cruft!"
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
deleted file mode 100644
index b7ecddfc2361..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.20.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-PYTHON_REQ_USE="threads(+)"
-
-USE_PHP="php7-4 php8-0"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-USE_RUBY="ruby26 ruby27 ruby30"
-RUBY_OPTIONAL="yes"
-
-inherit java-pkg-opt-2 lua mono-env multibuild php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="https://www.xapian.org/"
-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"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
-	lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( || ( $(ruby_get_use_targets) ) )"
-
-COMMONDEPEND=">=dev-libs/xapian-1.4.20
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[-threads] )
-	python? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	ruby? ( $(ruby_implementations_depend) )
-	tcl? ( dev-lang/tcl:= )
-	mono? ( dev-lang/mono )"
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${COMMONDEPEND}
-	java? ( >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${P}"
-
-has_basic_bindings() {
-	# Update this list if new bindings are added that are not built
-	# multiple times for multiple versions like lua, php, python and ruby are
-	return $(use mono || use java || use perl || use tcl)
-}
-
-php_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_copy_sources
-}
-
-php_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(php_get_slots))
-	multibuild_foreach_variant "$@"
-}
-
-ruby_copy_sources() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_copy_sources
-}
-
-ruby_foreach_impl() {
-	local MULTIBUILD_VARIANTS=($(ruby_get_use_implementations))
-	multibuild_foreach_variant "$@"
-}
-
-pkg_setup() {
-	use mono && mono-env_pkg_setup
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use php; then
-		local php_slot
-		for php_slot in $(php_get_slots); do
-			# Unfortunately required for php-ext-source-r3_createinifiles().
-			mkdir "${WORKDIR}/${php_slot}"
-		done
-	fi
-}
-
-src_prepare() {
-	use java && java-pkg-opt-2_src_prepare
-
-	# https://trac.xapian.org/ticket/702
-	export XAPIAN_CONFIG="/usr/bin/xapian-config"
-
-	if use lua; then
-		lua_copy_sources
-	fi
-
-	if use php; then
-		php_copy_sources
-	fi
-
-	if use python; then
-		python_copy_sources
-	fi
-
-	if use ruby; then
-		ruby_copy_sources
-	fi
-
-	eapply_user
-}
-
-src_configure() {
-	# Needed to get e.g. test failure details
-	MAKEOPTS+=" VERBOSE=1"
-
-	if has_basic_bindings ; then
-		local conf=(
-			--disable-documentation
-			$(use_with mono csharp)
-			$(use_with java)
-			$(use_with perl)
-			$(use_with tcl)
-			--without-lua
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-		)
-
-		if use java; then
-			local -x CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
-		fi
-
-		if use perl; then
-			local -x PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
-			local -x PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
-		fi
-
-		econf "${conf[@]}"
-	fi
-
-	lua_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-csharp
-			--without-java
-			--without-perl
-			--without-tcl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--without-ruby
-			--with-lua
-		)
-
-		local -x LUA_INC="$(lua_get_include_dir)"
-		local -x LUA_LIB="$(lua_get_cmod_dir)"
-
-		econf "${myconf[@]}"
-
-	}
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir lua_configure
-	fi
-
-	php_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-python
-			--without-python3
-			--without-ruby
-			--without-tcl
-		)
-		if [[ ${MULTIBUILD_VARIANT} == php5.* ]]; then
-			myconf+=(
-				--with-php
-				--without-php7
-			)
-			local -x PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		elif [[ ${MULTIBUILD_VARIANT} == php7.* ]]; then
-			myconf+=(
-				--without-php
-				--with-php7
-			)
-			local -x PHP_CONFIG7="${EPREFIX}/usr/$(get_libdir)/${MULTIBUILD_VARIANT/-/.}/bin/php-config"
-		fi
-
-		econf "${myconf[@]}"
-	}
-
-	if use php; then
-		addpredict /usr/share/snmp/mibs/.index
-		addpredict /var/lib/net-snmp/mib_indexes
-
-		php_foreach_impl run_in_build_dir php_configure
-	fi
-
-	python_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-ruby
-			--without-tcl
-			--with-python3
-		)
-
-		# Avoid sandbox failures when compiling modules
-		addpredict "$(python_get_sitedir)"
-
-		econf "${myconf[@]}"
-	}
-
-	if use python; then
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-
-	ruby_configure() {
-		local myconf=(
-			--disable-documentation
-			--without-java
-			--without-lua
-			--without-csharp
-			--without-perl
-			--without-php
-			--without-php7
-			--without-python
-			--without-python3
-			--with-ruby
-			--without-tcl
-		)
-		local -x RUBY="${EPREFIX}/usr/bin/${MULTIBUILD_VARIANT}"
-
-		econf "${myconf[@]}"
-	}
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir ruby_configure
-	fi
-}
-
-src_compile() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake
-	fi
-
-	if use python; then
-		unset PYTHONDONTWRITEBYTECODE
-		python_foreach_impl run_in_build_dir emake
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake
-	fi
-}
-
-src_test() {
-	if has_basic_bindings ; then
-		default
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake check
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake check
-	fi
-}
-
-src_install() {
-	if has_basic_bindings ; then
-		emake DESTDIR="${D}" install
-	fi
-
-	if use java; then
-		java-pkg_dojar java/built/xapian.jar
-		# TODO: make the build system not install this...
-		java-pkg_doso java/.libs/libxapian_jni.so
-		rm -rf "${ED}/var" || die "could not remove java cruft!"
-	fi
-
-	if use lua; then
-		lua_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	if use php; then
-		php_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		php-ext-source-r3_createinifiles
-		# php-ext-source-r3_createinifiles() changes current directory.
-		cd "${S}"
-	fi
-
-	if use python; then
-		python_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-		python_foreach_impl python_optimize
-	fi
-
-	if use ruby; then
-		ruby_foreach_impl run_in_build_dir emake DESTDIR="${D}" install
-	fi
-
-	# For some USE combinations this directory is not created
-	if [[ -d "${ED}/usr/share/doc/xapian-bindings" ]]; then
-		mv "${ED}/usr/share/doc/xapian-bindings" "${ED}/usr/share/doc/${PF}" || die
-	fi
-
-	dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index a9875c3c0bfa..f6b4f28ae14b 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,14 +1,6 @@
-AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8d91f8d6921f9a897188991e518f78e402b48c013e9659438be65f558157fec0bc214238f64010b428f3e3642586931d561a2ebc7ef SHA512 a2c9c30bbfe1217dd185bf547cf637784b73180f1346b97564c760c2a6cb67eef28766b0829f6dba04483c9bff8d6faeb58d2daddc9c541d6a2df62e9d4a9684
-DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
-DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
-DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
 DIST xapian-core-1.4.19.tar.xz 2994860 BLAKE2B 9566df1646192370e346c1b0d1e1cda68034fe5d3ab94835709f969df643fd36da49a58a2d3b4177a42faf5af2e71df771277848169ae62f94fe0bb0378ba6aa SHA512 d596058d7f9bfa0b73c5b6354331a799936b45f27012894f6792872ade8656bb0387b504aea8c1c3edfbd48787190452e7a49d2b62d181cb050c46edd3e67346
-DIST xapian-core-1.4.20.tar.xz 3003788 BLAKE2B c4bfa4af9112a206b14c8c2f4a76eb4c1267a752130287b6623233d3a09783b903a3275b2ec275f38f1d195119c730565a31ed303b8e2dedefc42cae10387600 SHA512 e2f62eebc946cc5d0641db85d2966e6ad9e84c6a23606e705f0461ab80b012933b46ed5b7e0691fe2070ca1c0755e99895c18bc055eaad0a9376def410aa7f35
 DIST xapian-core-1.4.21.tar.xz 3018384 BLAKE2B 61a25ee381c84e0a9f20650d94aa097225f2e947dafad7f6b5497db74f383f5b0fcf277a35ea27ff461b34cd2a9a0b6333f88264c5817cff09a2caf42fa3b398 SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a
-EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
-EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
-EBUILD xapian-1.4.18-r1.ebuild 1878 BLAKE2B 9f2ace2f966a2f129094b0f9efedf5e998eeb14bf0afad044988d951ef79eeebf56888a2ea108021449705c33eb1b466307fe0c73302b3397b2e5024386913be SHA512 74d0b7b8ed3dbf8c82de3f39e13d1e4720fe346efe5c0e6218805a9fcca59708b19f083056e089b1b33124bfc9f0fc9b0399a2b7aa2e10951f1f3fdefe1806bd
-EBUILD xapian-1.4.19.ebuild 1887 BLAKE2B b5bf0ec1150ede1881b7fa0bba8d7651d6454a6cc9ba663c024c81f6470e0e9004ed31fc8d54c89fbf625d5e2cd5e9388bfc1e4b6f33fcf93d339947b5941117 SHA512 57ecd05889faf1388b51f6d70aa108cd10374c009574f996956adfe05d64bee08d13c1b65bd8b8274228ce4a959a534ca596538a0aa98297d767e5f30003a6b5
-EBUILD xapian-1.4.20.ebuild 1892 BLAKE2B d0c9720409ff3d3d7d03e6c284834ce94497dec98669b7fe4b93e184199c1c738b5042339de63221661e73f85eb40560a2278883a8f05627e464ec2c9f557698 SHA512 559b923784ff7d5e5c5ee1b66c4b2d5d362d89e54a4aeba42036b26445ea73d4b5daefdf63913665e84fffc2ca82ed955bda593ada74805a886a75a883d741ee
+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
-MISC metadata.xml 935 BLAKE2B beadb37293a033eafd108c3c81738866565c127813d860c6014fb75a97edb89117c29bc513a623c47be7270936e0e9e5f28f8a8f7ad3fad6630c896337cd627e SHA512 bd4020e6f4505cb25848c5cddefd2ce9d7a2e6f625ef622b220b510d65e083eda255f00154da26174b998a91082118cba8c25f1ee92df46d2442d1ace3b0b1d5
+MISC metadata.xml 813 BLAKE2B b365d558fc9e5c1c86d9dfb90624fb27f4c502303fb602c7f21c9b392f729160cb1e7f56120d276d4fadeb88c616fca81912e5473b5273cc5841693d507f51d7 SHA512 0a40218154223a4ac13301ef324d925fd56d74749fa289c9a6d19cee7348f781430491fa65991bedc89aaaef9b0a0dd725eda49edcc993df506884b9cf3289d2
diff --git a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch b/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
deleted file mode 100644
index 67693e968dff..000000000000
--- a/dev-libs/xapian/files/xapian-1.4.17-gcc11-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/788046
---- a/api/omdocument.cc
-+++ b/api/omdocument.cc
-@@ -39,6 +39,7 @@
- 
- #include <algorithm>
- #include <string>
-+#include <limits>
- 
- using namespace std;
- 
diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index ca0ccfc79066..0ca12a77b8ac 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -15,8 +15,6 @@
 		applications.
 	</longdescription>
 	<use>
-		<flag name="brass">Enabled brass backend db support</flag>
-		<flag name="chert">Enabled chert backend db support</flag>
 		<flag name="inmemory">Enabled inmemory backend db support</flag>
 		<flag name="remote">Enabled remote backend db support</flag>
 	</use>
diff --git a/dev-libs/xapian/xapian-1.2.25-r1.ebuild b/dev-libs/xapian/xapian-1.2.25-r1.ebuild
deleted file mode 100644
index 8dc1dcb06fb8..000000000000
--- a/dev-libs/xapian/xapian-1.2.25-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-SRC_URI="https://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
-IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	# "brass_check.cc:40:48: error: reference to ‘byte’ is ambiguous"
-	# bug #789390
-	append-cxxflags -std=c++14
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use brass || myconf="${myconf} --disable-backend-brass"
-	use chert || myconf="${myconf} --disable-backend-chert"
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
-	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
-
-	ECONF_SOURCE=${S} econf ${myconf}
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	use doc || rm -rf "${ED%/}/usr/share/doc/xapian-core-${PV}"
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.4.17-r1.ebuild b/dev-libs/xapian/xapian-1.4.17-r1.ebuild
deleted file mode 100644
index 25d39cf439b4..000000000000
--- a/dev-libs/xapian/xapian-1.4.17-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-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 ~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}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.17-gcc11-missing-include.patch
-)
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf ${myconf}
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.18-r1.ebuild b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
deleted file mode 100644
index 2cb7f29c2d2a..000000000000
--- a/dev-libs/xapian/xapian-1.4.18-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 multilib-minimal
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="https://www.xapian.org/"
-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 ~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}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-multilib_src_configure() {
-	local myconf=""
-
-	if use cpu_flags_x86_sse2; then
-		myconf="${myconf} --enable-sse=sse2"
-	else
-		if use cpu_flags_x86_sse; then
-			myconf="${myconf} --enable-sse=sse"
-		else
-			myconf="${myconf} --disable-sse"
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable static-libs static)"
-
-	use inmemory || myconf="${myconf} --disable-backend-inmemory"
-	use remote || myconf="${myconf} --disable-backend-remote"
-
-	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
-
-	ECONF_SOURCE=${S} econf ${myconf}
-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
-	emake check VALGRIND=
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
-	fi
-
-	dodoc AUTHORS HACKING PLATFORMS README NEWS
-
-	find "${ED}" -name "*.la" -type f -delete || die
-}
diff --git a/dev-libs/xapian/xapian-1.4.19.ebuild b/dev-libs/xapian/xapian-1.4.19.ebuild
index 6624e0dffa78..00fe7b8f5d51 100644
--- a/dev-libs/xapian/xapian-1.4.19.ebuild
+++ b/dev-libs/xapian/xapian-1.4.19.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-libs/xapian/xapian-1.4.20.ebuild b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
index d50c34543512..fea1a23cc14a 100644
--- a/dev-libs/xapian/xapian-1.4.20.ebuild
+++ b/dev-libs/xapian/xapian-1.4.21-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI="8"
 
-inherit multilib-minimal
-
 MY_P="${PN}-core-${PV}"
 
 DESCRIPTION="Xapian Probabilistic Information Retrieval library"
@@ -16,13 +14,13 @@ 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"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
-DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]"
+DEPEND="sys-apps/util-linux
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-multilib_src_configure() {
+src_configure() {
 	local myconf=""
 
 	if use cpu_flags_x86_sse2; then
@@ -42,29 +40,16 @@ multilib_src_configure() {
 
 	myconf="${myconf} --enable-backend-glass --enable-backend-chert --program-suffix="
 
-	ECONF_SOURCE=${S} econf ${myconf}
+	econf ${myconf}
 }
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/xapian/postingsource.h
-	/usr/include/xapian/attributes.h
-	/usr/include/xapian/valuesetmatchdecider.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/version.h
-	/usr/include/xapian/types.h
-	/usr/include/xapian/positioniterator.h
-	/usr/include/xapian/registry.h
-)
-
-multilib_src_test() {
+src_test() {
 	emake check VALGRIND=
 }
 
-multilib_src_install() {
+src_install() {
 	emake DESTDIR="${D}" install
-}
 
-multilib_src_install_all() {
 	if use doc; then
 		rm -rf "${ED}/usr/share/doc/xapian-core-${PV}" || die
 	fi
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index f35155826c44..7d68fc0ed74a 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -3,7 +3,5 @@ AUX xmlrpc-c-1.51.06-pkg-config-openssl.patch 1244 BLAKE2B be5e48daa409cb67ae5f7
 DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
 DIST xmlrpc-c-1.54.05.tgz 933228 BLAKE2B 50d73fe22454f04ffebf11d4b88986eaac571d107abce4e04244ad0b74469fc5233178967e3dd832a8525514912e4f835fa1ce13c439caf918a2b2d0c05021a0 SHA512 81bf8f398e9cb73b421907d8e304b9a6dc8da931f573f7296457486ade432f4a00a94b6850391690f7b229928f785522e5852db8aca68cb462c71d139e4f27b1
 EBUILD xmlrpc-c-1.51.06-r2.ebuild 2220 BLAKE2B 0da9ca0b686fb0e01bb9eb9310ee15de032cd2d21114525132125af4dadd4e1256e5bae0701dd422100303f96ddf5e2806b9acdd4021c180097260450e6af11c SHA512 36b12377551f37c6bf8411f4ef5899bb52550135e6c8b963016efc9ab0f07bd3fbd414bb3a16045ee63d872d53efc353d92ff304e9d678d1c9b3a93f8c341baa
-EBUILD xmlrpc-c-1.51.06-r3.ebuild 2416 BLAKE2B 05ad0438a4a14830aa461fe146ad32d951f0df3681ef9517fd584a4ae3f5af360cc22e7c5748d46aaa96595ec62594640a1b1ef1a7fcdfafe1941eb189a7b9d9 SHA512 a8f9edfd8d5533f9f5c954b0fa03dcc09b30ce9cebe64d37fe71db13c5c13a640aeea165349a876e18c4bdbef8b40604d126b75456f4ebba73a3461270ab7e7e
-EBUILD xmlrpc-c-1.54.05-r1.ebuild 2423 BLAKE2B 828387b760176093e38f1b1827c43ada80e2f5b5fa2b3d69d44e0238a4b828e43a70e98b28f63e8fcccfcdcd8e5af5cf59c20af69f062b103ac462123a037a25 SHA512 6ccbb74044cb3a1cc8da1f9e14c6050ef431b957ab5d9dc910c7acbf47e3b6c9c42d29b2d39175cdf35d50d7cf8a66f584906fdfbe29c570dfde1238ce87dd72
-EBUILD xmlrpc-c-1.54.05.ebuild 2233 BLAKE2B e7fae962a0dbabc1f40f1286a0873695c3dfe500326404d3058979cdefdde7943629c3b4e5bb2fd38741d5ab5d77b850756dc669ed0241e52869a7416ded05e9 SHA512 8c7e928a659357fb2c5fcfeef55fe7e30fbe857c625d84e07222713c9ef497c16af16c9ce08425115b1d2c109ae0cb2c28bb25003a3a633aebdc63a18a711022
+EBUILD xmlrpc-c-1.54.05-r2.ebuild 2019 BLAKE2B d11dc16b23051a481b9f330eeb0914b2c8d35dce98391b982f70946d113ee5a08f57be88691212cdc177d7a874e2a04764c2fed5d503045ad656e7117e397606 SHA512 82e5dcea08828ca2158cc59707bff1730eb14cd637bccc585d34290d90d2ad35b4458ce74df67c9c783a58c0828439d932d0c4325c21e08dcf0a6a8ac5e52819
 MISC metadata.xml 628 BLAKE2B 3d59eebbcf6eddfba969215a990fd59daa58b78dc305f05d10ba9f77f3ce5d5edbed0599644b40574beacb3c1e084af745bc2d75f0cb660968f4e3bf963c4f00 SHA512 fd572b06cc3359372e5b048d721b33d6bb614ab631fec95628af36217f94434fc9f279d83ec0de8828cd72265158b1a88f58418f94fb2e3d3e82de117c7bea71
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
deleted file mode 100644
index 2f376e845193..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
+++ /dev/null
@@ -1,88 +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
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweight RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/4.51"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
-	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
-)
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	default
-
-	# Out-of-source install phase is broken
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	tc-export PKG_CONFIG
-
-	ECONF_SOURCE="${S}" \
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-multilib_src_compile() {
-	default_src_compile
-	# Tools building is broken in this release
-	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
-}
-
-multilib_src_test() {
-	# Needed for tests, bug #836469
-	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
-	default_src_test
-}
-
-#multilib_src_install_all() {
-#	# Tools building is broken in this release
-#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-#}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild
index c473a0e5f5f2..185a023016a1 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit multilib-minimal toolchain-funcs
+inherit toolchain-funcs
 
 # Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
 # 1. Only the "Super Stable" series is released as a tarball
@@ -17,18 +17,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="BSD"
 SLOT="0/4.54"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
 IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
-
 RESTRICT="!test? ( test )"
-
 REQUIRED_USE="test? ( abyss curl cxx )"
 
 RDEPEND="
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	curl? ( net-misc/curl )
+	libxml2? ( dev-libs/libxml2 )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -43,21 +40,17 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e "/CFLAGS_COMMON/s|-g -O3$||" \
 		-e "/CXXFLAGS_COMMON/s|-g$||" \
 		common.mk || die
-
-	default
-
-	# Out-of-source install phase is broken
-	multilib_copy_sources
 }
 
-multilib_src_configure() {
+src_configure() {
 	tc-export PKG_CONFIG
 
-	ECONF_SOURCE="${S}" \
 	econf \
 		--disable-libwww-client \
 		--disable-wininet-client \
@@ -70,19 +63,16 @@ multilib_src_configure() {
 		$(use_enable threads abyss-threads)
 }
 
-multilib_src_compile() {
-	default_src_compile
+src_compile() {
+	default
+
 	# Tools building is broken in this release
-	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
+	#use tools && emake -rC "${S}"/tools
 }
 
-multilib_src_test() {
-	# Needed for tests, bug #836469
-	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
-	default_src_test
-}
+src_install() {
+	default
 
-#multilib_src_install_all() {
-#	# Tools building is broken in this release
-#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-#}
+	# Tools building is broken in this release
+	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
deleted file mode 100644
index b09f6997a32b..000000000000
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
-# 1. Only the "Super Stable" series is released as a tarball
-# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
-# Because of this, we are following the "Super Stable" release channel
-
-DESCRIPTION="A lightweight RPC library based on XML and HTTP"
-HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/4.54"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( abyss curl cxx )"
-
-RDEPEND="
-	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
-	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	use curl || ewarn "Curl support disabled: No client library will be built"
-}
-
-src_prepare() {
-	sed -i \
-		-e "/CFLAGS_COMMON/s|-g -O3$||" \
-		-e "/CXXFLAGS_COMMON/s|-g$||" \
-		common.mk || die
-
-	default
-
-	# Out-of-source install phase is broken
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-libwww-client \
-		--disable-wininet-client \
-		--without-libwww-ssl \
-		$(use_enable abyss abyss-server) \
-		$(use_enable cgi cgi-server) \
-		$(use_enable curl curl-client) \
-		$(use_enable cxx cplusplus) \
-		$(use_enable libxml2 libxml2-backend) \
-		$(use_enable threads abyss-threads)
-}
-
-multilib_src_compile() {
-	default_src_compile
-	# Tools building is broken in this release
-	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
-}
-
-multilib_src_test() {
-	# Needed for tests, bug #836469
-	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
-	default_src_test
-}
-
-#multilib_src_install_all() {
-#	# Tools building is broken in this release
-#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
-#}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index d48695a2e8bf..c7b9d1b9124d 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index d1f185a63281..105a60160d0e 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -1,6 +1,3 @@
-DIST Search-Xapian-1.2.25.4.tar.gz 75336 BLAKE2B 06e3fe3871f00c173f4c24303b33eb046867dda1274535c1d22b98027804df19b3dc6b80d6213c2090e05362c508d0e41b55cdc165ccedd8a45bfff19d4fe07b SHA512 14d34641583fb3cce3e7cd4b16e5001be9c7808d07e4942b4842196f36906649053d1ff522a5a1b82200ecd714c55afaf7bd653bf7df9a462db91d05cd12cb01
 DIST Search-Xapian-1.2.25.5.tar.gz 74960 BLAKE2B e0691383c4fd8ddd286b8db653ddd9175cde9f37ccf470764272456dbea8ceb8893eb011ae57a18816b3974a56db2dc773d90b7a4778e24ac0a6c78eb175a19e SHA512 3099ba3f8726029d7a5c916f6b05d2d7cea41534b0f364687c7d9e0212340dca2a313a1ac8e0f6531a7c1084c8833a0e6d45bcff8fec32e0a6e5922bc0bcb81f
-EBUILD Search-Xapian-1.2.25.4-r1.ebuild 855 BLAKE2B a4ebeb94725ef24f8e13ee6e0f93a3850158073109d3e86e78f4fae0596ea3c36c92e62808bd35af5e3f91cd414f78f67e8f6bb596b5e5a17b6279814199bd8e SHA512 991569dcdf5614243070cf7911b01d80cd44988ecc22cc9ec3288584fca503b4763af3c9a7ff7eefbb4ea35eb9dffb6f7e62335a79f458e7530a7c344a32b3ff
-EBUILD Search-Xapian-1.2.25.5-r1.ebuild 761 BLAKE2B ac26c94dde36664398298e2803f6605b70430b4ad9014c8b3d1430e027f51d16a5105c14276335b09e9175db94546120161f9be156ce79fee514662571388a4d SHA512 e56c1803a81db66784347d106c2ba3c2f9e0c63915c8b7b6c9bd5398c39103d9e2eb247b652705cf3f7bf84550b11aca3e245a69467c480ecf50c354dd5aee7a
-EBUILD Search-Xapian-1.2.25.5.ebuild 856 BLAKE2B ef52dec35331d78a47752dfc76d0a19a5bb1997e4d9f26ab2be71dc16173c685a3b43918256652cf44f55fc01e59beeca4de025bfd0f2cb89e51e202401f207f SHA512 623242c308530b4e212a672ce538ffae4da7e6c05699d59f5a2ccfacbcb2dd4b97ed8d03845c4f8e99632c7dba6fa9f91b777904cc81134e858808573385a467
+EBUILD Search-Xapian-1.2.25.5-r1.ebuild 756 BLAKE2B 118a68e37040db9c6dee940c09fec4f5884540f00c566c482a903596b0228b9e43a2b41611a751af9020c28b0b1d0ab5342d11155eed7c127ab24c99ce1642c3 SHA512 5264d100437c1c77e51a2e48474aac226a69f80c2df6011517ba76bc4deb8b0ca10799d33b3450b0ad0c1d439c227e68e036fe0dd89c1e6726dcf8d740588326
 MISC metadata.xml 3930 BLAKE2B 6951bf4c2cfcb9c18197e5bc2871c2463b38932476f422727f5a13df95abf0090b722894dddc56a350ba1fb69987d1858e5414f6067325df208535634f59d18a SHA512 39ba77700e2b3f45bc33a948d6160befbea857740f14b1fea22dd2ee1deb6ca3aedaf28cba7923f8b21888ec51fab886c1dcc434d2f70b380cdafa3c33543ef9
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4-r1.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4-r1.ebuild
deleted file mode 100644
index f7d7e72802ad..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs
-
-MY_VERSION=$(ver_cut 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${MY_VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/xapian:0/1.2.22
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-src_configure() {
-	myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild
index 9e0f99acb617..cc0fe93535db 100644
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild
+++ b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module toolchain-funcs
 DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5.ebuild
deleted file mode 100644
index 0c320bfdd619..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.25.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DIST_AUTHOR=OLLY
-inherit perl-module toolchain-funcs
-
-MY_VERSION=$(ver_cut 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${MY_VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/xapian:0/1.2.22
-	!dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-	test? ( dev-perl/Devel-Leak )
-"
-
-DIST_TEST=do
-# parallel fails sometimes...
-
-src_configure() {
-	myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-	perl-module_src_configure
-}
-
-src_install() {
-	perl-module_src_install
-
-	use examples && {
-		docinto examples
-		dodoc "${S}"/examples/*
-	}
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 2b5984a241a7..608e84c93e66 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index 0a14aa9eb3d3..9d7f12fe635e 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,9 +1,5 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
-DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
-DIST libvirt-php-0.5.5_p20211020.tar.bz2 359477 BLAKE2B f4be3cf138364997911b58b07e128e4b5c9e6f1520d876b51466a30cd2ade4035a06488e07b8be4cce65b1bc6585b768997214c9d0ba72cc51855b4fc0827ff4 SHA512 b935c910e8754000de45e88f5d5e61e2e95fbb1b007f0d747bf4cd3531ee9cb0ff5bc2ec6f561c79711df9b70e1c4cdaf2e046774341d29d3f2382d27ab8c494
 DIST libvirt-php-0.5.6.tar.xz 386372 BLAKE2B 30d6a1c8dd18a4bd9d46e9c20551978fa0c20f2d671a359fdbf86def5166df7f882e65c509087efe0acef7d0dc468b3eb520689f9e7ba552e966809c8f647390 SHA512 5d1b3a2afc697051a5a0d4750ce4d02b31f482b1c17ef2cf4a593b705de438d8ccb4b1543ce6b2520b450734b3634e64ccf9200227f5681cbd2daad5a9f5ee9c
-EBUILD libvirt-php-0.5.5-r1.ebuild 1475 BLAKE2B 32551b061e397285edf1ba9a2165cd459c673aa415c1b743ab7745982f5eda7c13f55b0bcf7f685408a6d813803acd321abbbc56431cb935b0788a796acb7a3e SHA512 90cf2a297540f06e2535b689fdb94ac116574049277bcb453d8ed0883cc59b428f5ce7fb6ed4d860efff129d41955a14763e9cd47be4e7c1a400944b63102e30
-EBUILD libvirt-php-0.5.5_p20211020.ebuild 1610 BLAKE2B c1e92e856a58e9893b8a8c3d984b6442d2069e6520a98809ebe8957c62d0ae3c4305325bfd6bab210c7eb7f66cd2d4325408431e089a0fa1418f3ec830e0cd48 SHA512 b5ed81c28c5ef319bf7de60b0a954fa204fe8917277604faac208ff2c758694baf0f2db77c7b10bba40cbaa2b3bde3bf8e45f23bb359a2cb6fa01738b049e8c8
 EBUILD libvirt-php-0.5.6.ebuild 1453 BLAKE2B 2d30fa5fe60d8015ad498cbd6368c059e0fc4f8345a0d56a17ce31de99d4f3ef5f4e659b085f51d5ebdb72854c5f7b72d7cc55c87a0f45c796857f882a1d7d96 SHA512 54aef6536f38ffdded99ee8fa4f5982adab87e88f68e8bbd57aa8ea3e7af68732d3431331433f3ac6bf3ab1d97b1e08aa6a794d1550413b49feb305aafa125f0
 EBUILD libvirt-php-9999.ebuild 1463 BLAKE2B d482021104136ac237690ed9ffec6ffde66d54fd8adec41d3c2e6caf68ff0bcde507f6792d27ea6727eb6279d0dc7fc972a3021157872d5cff02ddb391649395 SHA512 8d982f4c805b5a485c6a12cbb1604d5c6a9041c1b594dc74c3577ea217b567325ec034673362bb46381793e8fb918d116ecb2095aa78d293f62120d7328ec57f
 MISC metadata.xml 456 BLAKE2B 845b0f2472da5b862a46a3ac26fdabe28229a0b6b190fdc293741732e36eaaa00efed4678b0ae06b3c0692ad4315240efb2050914a23c831a368e9c6e4589271 SHA512 b16080b8879f9db4e459214842b483c06aff8feedf9aa72785b1924225088e3ea58afb15afdd46334beb299c29db59a68308f5fec1ab26b5e62b8faff6b4f78a
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
deleted file mode 100644
index 57415a26ee3c..000000000000
--- a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="libvirt-php"
-PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-4"
-PHP_EXT_ECONF_ARGS=()
-
-inherit php-ext-source-r3 autotools flag-o-matic
-
-DESCRIPTION="PHP bindings for libvirt"
-HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="app-emulation/libvirt
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xhtml1 )"
-
-RESTRICT="test"
-# ChangeLog and NEWS are empty files
-DOCS=( AUTHORS README )
-# Remove the insane check for pecl-imagick which is only used in examples
-# and is not called upon in any build
-PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
-
-src_unpack() {
-	default
-
-	# create the default modules directory to be able
-	# to use the php-ext-source-r3 eclass to configure/build
-	ln -s src "${S}/modules"
-}
-
-src_prepare() {
-	php-ext-source-r3_src_prepare
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		eautoreconf
-	done
-}
-
-src_configure() {
-	append-cflags -fcommon
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		doins "src/.libs/${PHP_EXT_NAME}.so"
-	done
-
-	php-ext-source-r3_createinifiles
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-}
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
deleted file mode 100644
index f5cd312a7461..000000000000
--- a/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PHP_EXT_NAME="libvirt-php"
-PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-4 php8-0 php8-1"
-PHP_EXT_ECONF_ARGS=()
-SNAPSHOT="23dde4ddc42fabee0b8c6625b80183b3cbe96a67"
-
-inherit php-ext-source-r3 autotools
-
-DESCRIPTION="PHP bindings for libvirt"
-HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="https://gitlab.com/libvirt/${PN}/-/archive/${SNAPSHOT}/${PN}-${SNAPSHOT}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="app-emulation/libvirt
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xhtml1 )"
-
-S="${WORKDIR}/${PN}-${SNAPSHOT}"
-PHP_EXT_S="${S}"
-
-DOCS=( ChangeLog NEWS README )
-# Remove the insane check for pecl-imagick which is only used in examples
-# and is not called upon in any build
-PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
-
-src_unpack() {
-	default
-
-	# create the default modules directory to be able
-	# to use the php-ext-source-r3 eclass to configure/build
-	ln -s src "${S}/modules" || die
-}
-
-src_prepare() {
-	php-ext-source-r3_src_prepare
-
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		eautoreconf
-	done
-}
-
-src_install() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		doins "src/.libs/${PHP_EXT_NAME}.so"
-	done
-
-	php-ext-source-r3_createinifiles
-	einstalldocs
-
-	if use doc ; then
-		docinto html
-		dodoc -r docs/*
-	fi
-}
-
-src_test() {
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		default
-	done
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1f7faa6c25d5..4f57ea10a35b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 1a0b81010416..526a4297217c 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,13 +1,7 @@
-DIST libvirt-python-7.7.0.tar.gz 217406 BLAKE2B 4e3e887f9778ca817028d9147913618dcbdc83d05ce01b05b80661bb4cc823de6dc0e9d9b0837bf344774e5a8cdbaec7d4a7e55ce902b2867159795b85800cdc SHA512 07aa75a19dc94f3bde49b1af50fa73a6c920059b3b9ca943354c59f174d756aa5d1dca1394844dc3197b6a22c440028d347480a17858bc18fe1b5b19cf7d797f
-DIST libvirt-python-7.7.0.tar.gz.asc 833 BLAKE2B 159f5b5ec60d3b7966f3f99c185eddb8d2d03480b203473ae47e6139b21f8a4ee8bb8ba28ccacb88ad42c7b47d45862ccb48c90151203fb4e2295f355984e538 SHA512 b58579e648b82ec51de5f15e30dee39f7c42edf47ade4ad6f580bef21191f649b03eb05906bf31baa19afb6fadb57662c5326edb53b056a7235308d9c3bd551d
-DIST libvirt-python-8.2.0.tar.gz 223589 BLAKE2B 6c8d39e6af1167aa24a1c0710177188aa0a73e54d9dbd6015d6a3b60726b78c45442fc756e68c61d54352a5fa9466f538ff986712e775bc54d46c885bcbcc8da SHA512 8d3eceb36651dbb903f51ec198dcf6bcd4dc3d3b31ce6a41df10928bbbf43b32a2f80c006c1fb9fc3e1cf2d7ffed95efc1209e0d20018135fb32c50876987d58
-DIST libvirt-python-8.2.0.tar.gz.asc 833 BLAKE2B 262a8072b58b19f871a72ed81d8dcab907130ce6f25f6478c72e6f3e7d8d51226fda1844a37baf82667d2f35ef3e64e84e47de1d33217a356ea1d78fec6aa548 SHA512 11ea846816a3300940b9792a5a778c633bb2d9e0523f442588ae82f8fb46ecc0256267b2efece655331112e3912c9bfcf46247555e48d1861999d1363f6034b1
 DIST libvirt-python-8.7.0.tar.gz 236343 BLAKE2B 563cd1a18f06c0210465905267c46b3e5c598a9dcb208f468660d40988a4f6d80e61feed3702d830d465769eebb2c4d6604ef9449700923795c0485c36e38680 SHA512 f7883964875657a11c6756e31fda59eadba8394b71dda04df366aac85b163f3ffb379054bace38922d10d0b8972d1e1210d1513498cfd5cd8f0b76d6985ee945
 DIST libvirt-python-8.7.0.tar.gz.asc 833 BLAKE2B 5386780d75114c21105d012fd0ec2fd22fdd979dd6cdaea59f578eff4c0616e377da52d8aec05f337b837fda663ce8afb6d670e960ee65146679cd8c9a60b12b SHA512 499324c7cb520edbd1778a16434de43be062545255abb271832a636ff1ce9f4ba87e90226a181e081d084fccd6c190acc15763fecfc89e80093845589c12f535
 DIST libvirt-python-8.8.0.tar.gz 236523 BLAKE2B 56504045d4c44c2419fb8f97b1c147f12539122acc35644aef748631db5bce0d1ded8ebb5c1bd1160d2472757c0887105f3dd5e41c271a56f963ef21616565c8 SHA512 bcfe69b1279d8e2fc1343959f2c17ff29ef957c1d7f98b233c8bb32cffe50285138d1be11b0c327f6b18e2395b6353c3552cecfd9bbfcb5cc6bc97981f9d6f26
 DIST libvirt-python-8.8.0.tar.gz.asc 833 BLAKE2B 2769a404916227ce9d77ec0e76d2985b67f7e59e3f280486b59f9a9edb4fe5405ae22dd03c2d4c9f1c620a977eef90ec8fdc93d3891d8824021a226a0581cb9a SHA512 edeace09e2de739d318f63ac7b33f814ac3d2e4ad7a32164fb0691723b4872d64bc60d0f96baf1809158e76fd7dbbff75c6ee4e9112b1ba6c264287c36d691b4
-EBUILD libvirt-python-7.7.0.ebuild 1204 BLAKE2B eb29010dcf2599840ad832c909cdceb84a28394454cef6ed237e8d15053f09c75cb823a8b9bb4e1a9c68ad95780402e8cfb0e3cadc2a1b7cca5b27d34e3c1a8b SHA512 011fe53e40d9e563269b8a141cf0f50f14030938b4b8a39aff69824275895f11182b1f10c6d49d18b1bcc62aa8249a3fabe0a6b75903fe8ea204187dc523de8a
-EBUILD libvirt-python-8.2.0.ebuild 1249 BLAKE2B 2b4e677abb22a6ca57c891521f656b35e665bd59544d8a9037e8022292cb363b3a18acc45fd6e7741cab637bc7e5972822587589a54b155deec24987d2378f44 SHA512 70e95c825302e5f1200f2f46fb93567e9a8d5978b9705595f0e94f851424245988afda510d86eda9e2d879fc3a843cdf26a9cd72ecba25f8777bdd24d0833161
 EBUILD libvirt-python-8.7.0.ebuild 1345 BLAKE2B 0a86ea375248535734389a9ca5bc6fb9c7e9784d17c7d18317ded9e5b657e717628375e235cd13c11a5a4f238eb51017210a5e8d6cc0f56cc7a9a7a626ee1b0e SHA512 b66b59e71ac0eed4f8a1ea330897ac8a865e5021838e9ef6c514c79e800773f834962321cd1b3b217e1a50679a99b61f25e7c25776dd718829f2c0be5293875b
 EBUILD libvirt-python-8.8.0.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
 EBUILD libvirt-python-9999.ebuild 1347 BLAKE2B b0e62429ecc6c357f082c3a86d2e60449862de600fb4cd5ea9fd26ee823b81432d39a6b6aa32671a57d5ed8ee94de5f041fbf108ed735bae60bb66ea1e77b5c6 SHA512 3d479e70d507625f86db1a2f03144d42b40f128047e8d58f0a14d3f7c54591ecdfa4ce81475ba659cd56881a07d2501dd799d65ddb429ab27b682a9dbe392ccc
diff --git a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
deleted file mode 100644
index 2173880e6e4b..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
deleted file mode 100644
index c444cb5e424b..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.2.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-emulation/libvirt!
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-MY_P="${P/_rc/-rc}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
-		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index bfea278e70ee..76d0961c8aa1 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
 EBUILD qscintilla-python-2.13.1.ebuild 1831 BLAKE2B 86b481b7b4afb4cfcfb9829e24b644a1a7f3ce4836a8b8eb0abc18c3c3e2ca5566bd86ebb3849632d96034f34f3ad8ae8b7737d7f2f6e411571357c100f1dbbb SHA512 e39e345d290732dabd683f00c7b4f9008d29fe5cae0c7a12a8eacfeaaccb1253f4dfb9e390b1c32628e137448503647f9b2d928076657aff574778800e599bec
-EBUILD qscintilla-python-2.13.3.ebuild 1830 BLAKE2B 61d7f1fa4bc44d0fcf0ad33ea2768dda076ac24662ab43270c46078d3167e73b905bd1e7231812b78f883e1944b177763d218093a4fd30d7b9560d38527f284c SHA512 97663e051a6dd8814e913e8460dd0f1e61c57a9f78fead7b080c5a8b1dc21157854a68f9694a5837c07dc2b35f572e220229f2ec40047ded3bc094a926c67aa7
+EBUILD qscintilla-python-2.13.3.ebuild 1828 BLAKE2B 02e4815b12f1d1a7678862eeca4287a46e287aac47aae5074eb4d3b613b12056744024e2f39316d6d504f986596fd95b88bfc79cf30a1ee9c6322e69ce27b6b7 SHA512 edcb4cbe91f3d00d2bd43cdf2cb21710c0e7361316df9a7fc2a41d1e24d5bf34916dc61f3c65199452f1fdbab5ff24e71994457bfc8ffa73b9801a071a854010
 MISC metadata.xml 679 BLAKE2B 7d346ab99b6c19180388b012b949a7ff4bd474dbe222bdbecac25c6c29a1f5b14fa9e0a979a2b217d2604c1e9471776012303c45341277582bcb0f77681d94d8 SHA512 5a09f0497846433a08b407bc3b2a5c611087744a5354f744d97663687d179a9c8a0159e73fb88a7ee70cb371ddd11293f44698d3fac4899771b9bd3a4ed11a5f
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.13.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.13.3.ebuild
index d570238bf5a6..58a4422d5585 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.13.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.13.3.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}/Python
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 66cf13ab88d1..c417d330d786 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 233d847bb3c7..abaf9016cea9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -5,5 +5,5 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtcore-5.15.5-r2.ebuild 2317 BLAKE2B e5e64c0f64e4e0b2463f67c4bcb19e00f126f88d4527e1bd9703ffe26ace46a8181f3b8b3d052c1d5ad930077160a61a3046a0829279c6c6644fc5ff59ac5fb9 SHA512 8c852de875ced33d03aaf0d896818dd11525fd1853313267c539f561623e42676bc904e38f4a421c862f44a4d7f33a92d8348c78bad833a3cbb69bc4a6fd7a6e
-EBUILD qtcore-5.15.5-r3.ebuild 2358 BLAKE2B 8cd1b2792009e1a80ad569dd291a4cec0ceca1909b87d293aaf72c09a765c1a3a4d8b06c19dbf0f90147b3506576bd2e635ce4b5d53212e442031571bb57683e SHA512 d50d277740d9f18b0ec865840b10ffec6bfea9a5f14deaba88893dbc290716c8372926d048a6a212f4e38066045c69e8a09717a0fd7391a744a742805bbd88b1
+EBUILD qtcore-5.15.5-r3.ebuild 2357 BLAKE2B 4253ae3ae9eeb972833c8aaadb5051297674d42cedd87443c723e7df7ae7262c6b777553a3fad49af6d845e73198a0a510901f2889371b6020c0fb65b143fe84 SHA512 40e1e3b9534c8f3ab953e8bfe503b85307876983bcdb4379ea0b3fa90188c6aacc9813c66aa7806e65ed67ace2be501b35666d071b154c7658268d9900b2d7bd
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
index d3e77b111790..a1f9e116021f 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index b291965c6225..ba5b19d51bf6 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -3,5 +3,5 @@ DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351
 DIST qtbase-5.15.5-gentoo-kde-2.tar.xz 526240 BLAKE2B 68ecca0805c2ea0b29b65706b0c03a3ead1d106e089f2a48a988035842d0cc8ac67d950cbc67ae8f8be860fd11443579d3e06bfe96a2e3161f94e07206d2815e SHA512 d877a2eb4cd05b712a7db6a943f955d3ced88f51efe3e29b2d6716fba4da08398dbd2ed580ca5b9bfbd92a5a20e34451e06a324274447d4b3692b25af4ff8ddf
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
 EBUILD qtgui-5.15.5-r1.ebuild 3895 BLAKE2B da9ffc7eab01eec75f006e0a6c9a052da4ff5c1abf722fe0b5d733159d3d33ea8dd47d3a49b9098f257197a4237981ddbd44ceb4ea0c0d362452a0baaa216037 SHA512 ba03b4e57c23a00903f8c3cd5dc51aaa77cb255c78db057dd1fe4a6db78149f474184e0497e2bdae7cfe8a01f09e140ec8de7b256a334da92fe7ee1402766867
-EBUILD qtgui-5.15.5-r2.ebuild 4090 BLAKE2B fa9f0c2cb23477ae5bbb028c75667cfa043beac401604188f12e1ea565e0d463ce625670a8579dcb88ae39078d87c943df9a593b3a044a466e126f0ee3975bff SHA512 06a25b1a729185469adec4f987651791f4e55f9791cccbe5c16a453587fb19a7eb288a2f320a873b54f6ab8fa9069eb76f2d01d90fa18ce534339c243364310b
+EBUILD qtgui-5.15.5-r2.ebuild 4089 BLAKE2B 76e22bcb215892d7ec1a5d7eedbc47b580acf3d566e1c0b31cf36d8be9099f10d0336473abd64967eb05e0b5cf70d573c0ad6c4ad3c9641801714ab953f1c309 SHA512 75acfbf6febd33b303665ce01e93efe9589fae58ed1a3d77b7e1fefb41e5dbae22abcea725cb5ceae1fd54e7eaefc16982442d8d8d85b53045546ce130cbecd6
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild
index 50dbfdea1dbe..87fe89efcfd4 100644
--- a/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9222e3cc082e..584f61973a79 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index fec0b8ff6c1c..f26d565906ce 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,8 +1,5 @@
-AUX 3.0.17-gcc11.patch 1934 BLAKE2B a51dcf079322144ee84ae41dddfccc08dd878a0b04f0a97dab9ea9d5c3a54ecd035c28cb9fb19402cd2d8c2b2af678b65246fd53515c6d20427f4ead12b7bc86 SHA512 645e87cf4afd0f0c91b62c1bd8257e3eba08d4a5d177d7748ce1be936185618a90c5be4775256cf0dbc8bb2c207caa7871d35e170cdd1d6805ad84a0c3f4287a
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
-DIST bear-3.0.17.tar.gz 123861 BLAKE2B 9dea85c7c0ec5ec4954d08147cdac31e0b28c9780281a544687340e6e226e5403ad82f74db0fb9edd3f65c9a982531afb612e1c744430735e6de97d8d29a2189 SHA512 08e50b04c87745ae60623c32de07e710ffb4e78d9978f13cca9d51929b45477c780f1fe47178569310dca20dab5fef49dbffdf17a087c388f111eb11ffadf5b1
 DIST bear-3.0.19.tar.gz 125086 BLAKE2B 0c6a27359e8c88ab0dbaa3f5442a87efeaba4f6a9b8d0912ad026231421e2555a524b194a19972f549600951bc1f6620398c48338f7eac8850ba6c3969f2e6ac SHA512 688766a76cc3bee1dc82478d29d6e8754618f92633c842586fce95f2f1096764902ffd64a6f2f59101e58eba5472bf39ddb178c3dfcd48491fa4eb63d111585c
 EBUILD bear-2.4.4-r1.ebuild 1829 BLAKE2B 0f87691b8ee68c1176236f4cf1608892941195893b4a1ebdf5872333b05196f81f1b98469bd90534f7de062bb613dbc649ccc2e99ccc739501d4d57b57d48a61 SHA512 be4c5dee00262ac6681cc2486965732ba5f196e70e7cbf21424e96d3154f3171d1db68b7493f802ba359699999664f92bc64488f3922cbf9ac34d785dc61dd8e
-EBUILD bear-3.0.17.ebuild 2161 BLAKE2B bfa03fe21a8766e0d3442c9917d6c06b83fe4151cb7f4202dcdbdff2b73d0d05b50fbaac03566e83a78b6429253118e32f683a396e74943be8d100cbda8e623c SHA512 8591d782a5c82d10fc728809d5f6b78edc4f49ccad68b8f12430329c602c0ff0c14ee35987d9d51c8dd3777c79a8f6ba4a64d4cb8587bd593fd17acb4dc0939e
 EBUILD bear-3.0.19.ebuild 2151 BLAKE2B f71d8ca7f99cf5e07b27a1a390075dd8a13acd4d99b05b8d66743de94630f99eeec424e75836377b103945a4425ef6fd7a5acedfd47bc9f58d3142c5ce513637 SHA512 4702e73afe41c9756a1fba67f2680aeea1cf8ce920b4679288af9924c5dd7a7218cbd6ece08303f521d8156487624a1f157f66670602fe652415761ad4f1408c
 MISC metadata.xml 915 BLAKE2B 74d981eed24b95353d225061c11b11e3f7aedddd6fb3b79a96bc98f2d348d64ea4598337f5b946d94ac64278eaa9bce5a3ade0f9564d9e3f3b4031574569f20c SHA512 010b17d6da15e7b5a4079864c7c2f3f11c8531faddee1ab226c1d6c3f646079c52ef4495e4685bae6eeec8702801ddbd41c4bd2e1aaa82400c1265e2ecad1957
diff --git a/dev-util/bear/bear-3.0.17.ebuild b/dev-util/bear/bear-3.0.17.ebuild
deleted file mode 100644
index b31cd181b486..000000000000
--- a/dev-util/bear/bear-3.0.17.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1
-
-DESCRIPTION="Build EAR generates a compilation database for clang tooling"
-HOMEPAGE="https://github.com/rizsotto/Bear"
-SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-cpp/nlohmann_json-3.7:=
-	>=dev-db/sqlite-3.14:=
-	<dev-libs/libfmt-9.0.0:=
-	dev-libs/protobuf:=
-	>=dev-libs/spdlog-1.5
-	>=net-libs/grpc-1.26:=
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-cpp/gtest-1.10
-	)
-"
-
-BDEPEND="test? (
-	sys-devel/libtool
-	$(python_gen_any_dep '
-		dev-python/lit[${PYTHON_USEDEP}]
-	')
-)"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${P^}"
-
-PATCHES=( "${FILESDIR}/3.0.17-gcc11.patch" )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-	# Turn off testing before installation
-	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_UNIT_TESTS="$(usex test ON OFF)"
-		-DENABLE_FUNC_TESTS="$(usex test ON OFF)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if has sandbox ${FEATURES}; then
-		ewarn "\'FEATURES=sandbox\' detected"
-		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
-		ewarn "Skipping tests"
-	elif
-		has usersandbox ${FEATURES}; then
-		ewarn "\'FEATURES=usersandbox\' detected"
-		ewarn "Skipping tests"
-	elif
-		has network-sandbox ${FEATURES}; then
-		ewarn "\'FEATURES=network-sandbox\' detected"
-		ewarn "Skipping tests"
-	elif
-		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
-		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
-		ewarn "and will fail without generic cc symlink"
-		ewarn "Skipping tests"
-	else
-		einfo "test may use optional tools if found: qmake gfortran valgrind"
-		# unit tests
-		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
-		# functional tests
-		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
-	fi
-}
diff --git a/dev-util/bear/files/3.0.17-gcc11.patch b/dev-util/bear/files/3.0.17-gcc11.patch
deleted file mode 100644
index cb52a7f36215..000000000000
--- a/dev-util/bear/files/3.0.17-gcc11.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ada467c3f4038abc3c3ac964a46ec0da0e8ed1c5 Mon Sep 17 00:00:00 2001
-From: shrkamat <shrinivas.kamath@gmail.com>
-Date: Sat, 11 Dec 2021 17:43:10 +0530
-Subject: [PATCH] Fix compile errors with g++ 11.02 (#434)
-
-Co-authored-by: Shrinivas Kamath <skamath@synamedia.com>
----
- source/citnames/source/semantic/Parsers.h | 1 +
- source/libflags/include/libflags/Flags.h  | 1 +
- third_party/grpc/CMakeLists.txt           | 5 +++++
- 3 files changed, 7 insertions(+)
-
-diff --git a/source/citnames/source/semantic/Parsers.h b/source/citnames/source/semantic/Parsers.h
-index 7a4dc8f4..0ec003ee 100644
---- a/source/citnames/source/semantic/Parsers.h
-+++ b/source/citnames/source/semantic/Parsers.h
-@@ -27,6 +27,7 @@
- #include <map>
- #include <optional>
- #include <string>
-+#include <optional>
- 
- #include <fmt/format.h>
- 
-diff --git a/source/libflags/include/libflags/Flags.h b/source/libflags/include/libflags/Flags.h
-index 76f772df..d92fbae2 100644
---- a/source/libflags/include/libflags/Flags.h
-+++ b/source/libflags/include/libflags/Flags.h
-@@ -28,6 +28,7 @@
- #include <string_view>
- #include <vector>
- #include <iosfwd>
-+#include <optional>
- 
- namespace flags {
- 
-diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt
-index c8a7114b..792a0c6a 100644
---- a/third_party/grpc/CMakeLists.txt
-+++ b/third_party/grpc/CMakeLists.txt
-@@ -46,6 +46,11 @@ else ()
-                 -DgRPC_BUILD_TESTS:BOOL=OFF
-                 -DgRPC_BUILD_CSHARP_EXT:BOOL=OFF
-                 -DCMAKE_INSTALL_PREFIX:PATH=${DEPENDENCIES_INSTALL_PREFIX}/grpc_dependency
-+                -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
-+                -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
-+                -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS}
-+                -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
-+                -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-             )
- 
-     include(GNUInstallDirs)
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 56351f82e4bc..8711f5ece38a 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,5 +1,3 @@
-DIST devscripts_2.22.1.tar.xz 989556 BLAKE2B 2a2e3ca9757c710e181e807f0369c137f21070d86b4c51d8b5132ca4add33677edbd26e04a2faae93e9e4586080286888880ce450119579aa40ad205c8e5d857 SHA512 260603e1a655035c5aca3c9734db1bc6aa7e9aa017ece7e9158c57e06a1ee548922ec2defdd9dcb4560743d78aef08d30695b1bc833bd4d77fe1c7497d157c45
 DIST devscripts_2.22.2.tar.xz 995524 BLAKE2B a7649ea5b790a64b5470a66425e487959b058e9af34be173210277765c8610f7d6da1b9105f97e1da2f84a578ca7514b1dabaa7c38a88c9b1eef29c2f34f97a1 SHA512 d6c47f604a252f58e1cf8ea9fe7387a390683757144bb76cce6915fca1ff7ccb71ce6c87d829f874097d869172774a806b506dc7fb4187876d14e50eaaf92593
-EBUILD checkbashisms-2.22.1.ebuild 800 BLAKE2B 327f2e2099acea61336d5a98166bf3383d1d00f6a9952845115c5b5f24cec50888d051a2daf193178bbe07343ff265a8351783052d15e787f24b9c3c69e13c96 SHA512 7c882651f86473cdeb4d922ab17ed9647295b528f16b8dfad90501fe3679717f877168c439f86a3ecf409bd7da62ef03790dbbf236daa7d0d33c316d8c0c726c
 EBUILD checkbashisms-2.22.2.ebuild 800 BLAKE2B d32ca9230c1950880d8dd3378768fad9594da7d2e96fd6080464704c2852ce02c26baf5f6c7341c2233c928ffd5e7f4ec0782629b3dc2694ad82ceea3cfb9991 SHA512 c5404bcbb54fd866a8608fc504f00908438c4018c8463b4caec23501910b6bc16c63399aeb85d4b9387ab07162e246d6c7e4ceea2f1b9d139799394128f4d685
 MISC metadata.xml 434 BLAKE2B 031cac658d94414702e897991f7e60858edca6ed7c49c6413b20523e4e1f39adaa109c9bd5b87054a2767ba1fb1deadeb4e5021dad58a5bee366e962d7d95ccd SHA512 c30bd0b32e0c851ef023de34a60207c353d8076fc84ec4be67cb23358cdd31ba9be8baa8f3dfacb526a7ac40ebde2b278d413f16595b412d0a9e9590f14bdd0d
diff --git a/dev-util/checkbashisms/checkbashisms-2.22.1.ebuild b/dev-util/checkbashisms/checkbashisms-2.22.1.ebuild
deleted file mode 100644
index d9192e5dd29d..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.22.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-S="${WORKDIR}/${MY_P}/scripts"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long"
-
-src_prepare() {
-	default
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index a6899b47a7c8..b7a64bde40bb 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -13,7 +13,6 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST box_drawing-0.1.2.crate 2819 BLAKE2B 968243dc8cc4c999d87b1ecf45314e9ed5fd81c8403b181f6452889df92edcc407e98774592a4072c1b3a0f551ae99913cbc01bf97bec69dccc7e2b7fba14200 SHA512 fba2720279dbfd56a14371951b854aa0a30fb4caeb5b95703ec6721d681dfe97a37b21b069e6264565510fa3f3d0716dba99d8b3021bec76410c823ef262e746
 DIST bstr-0.2.15.crate 344206 BLAKE2B 3a4f24d2a039f7aeee3b6fcbfcc2fa72f1ef8a06ff8bc039af055739436655851565a57e5a4f86a7984b00ee7598c1fbdf26f3302929f91d7efb1327fd36eb57 SHA512 6e464ca1aec722a283759ff6978bab1769dfc8d61aa683f8e4c59bd69c7be2fe86c5470f4c54457871c6640e2d50b6b882747ec567098eb78e62f7cb07cb93a2
 DIST bugreport-0.5.0.crate 16149 BLAKE2B 2728559a8aa0c0c6346335eadfab93ac4b26407604e003432f4d0db1a22ae0c6c22374638482d2e879d09c9139b7da1ac67547764795d303ded1816d3513a1ae SHA512 d1418b6c8df333b4b245f428f3442968f7b75961a00523fb432ff2f904eca07cd208d417e63b2fb0a86b85a6853e4c474d30c19b80a85d8724db66ecd762da7c
-DIST bytelines-2.2.2.crate 4218 BLAKE2B 48523123ac1b5b643666ccd466a9fb48c4aff77bd13b198b24d0e1092dd971bf5ba804d97a83a38a8b99ecab94b51e837cb4850d5b0789f4d2f0115159c4176d SHA512 0d768b579993c0d72914affe36d61632e0c39310094b4d3dde29e69039249c9bb88af18e8f8033c377b05938c50e43ebd29114d2c664b2c904be27c61b1b8dad
 DIST bytelines-2.4.0.crate 5334 BLAKE2B dfbd3a90633f37ce691edcffd924ac15f55c2ce0bbbb88cdc872ec1e491638462eaeb94ab16d64ce42933f3c137098dda49bf6b4d41767d3ddc1b0dc66628789 SHA512 d7f90e6903b7ad6d00c0e46cad619a7325a24f24e07f6e7a596fbb3023348c79c47681624db7552efd3e8819bd45108548c3e5a9852de770d8253a5ef9c3c2cd
 DIST bytemuck-1.7.3.crate 27879 BLAKE2B b231e200fa8925f71e457a6ae3a6677366cf6a5b1a6c19845b6973f385fdaaa86b6a3d4e8b38356dbc824cde70e8f1120008d21a3d77d06575fd036b0bf20678 SHA512 03569cb6b6532ff62f406f8f6c80ea5cc3a4fc36ebe28f5a4bab32000862192eed2d26163062c62c0749d2f96ebed6968ce76d2e95a6430d9147c3648aff1f64
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
@@ -25,9 +24,7 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST chrono-humanize-0.2.1.crate 14509 BLAKE2B bce741f86f1d826b9efaa25907a40a88d8e18c50b5971a0ac6794d64360605ec9515eccbfa04c12c753cb640406ed45f4da530e1864af5498c0b14fb2b66cb30 SHA512 199a3da317791cd4fd607894afedc8b6607a8562f9f69ff805304a65e935b51cd7681521bb23c1c00baaa6d7e836174d51986f77e683c1312d3017f41f95d083
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST clap-3.0.7.crate 190557 BLAKE2B 79252877f4f35fb6a900914bfd0600e850b2dccfedbe951b923cbba2ec4c878b0286c40a6287945a465db81f2208b2d9ef18829d72780b251f475d88bf5bd73d SHA512 d09c111444576767fea85130db9f9363dca09fd1bb3df7ecf311ef70260e7f48b79ece907351a4cc3d04ddacfea404205c5841dc30d40826e41c3c12a7d52005
 DIST clap-3.2.8.crate 208903 BLAKE2B 93598ddd7fe489b2072160b5880822dd4cf5ee7762946ac927b53fdee0f715267d9f7f6ad60e9e45f0dc93b16ddffa71414f7c46c755906f7a70fd1869a12990 SHA512 1cf2c86038c46af697ff23b7ffb9025f96d4fa025106e08bf9f85679e4a10c80ee4ccac0b8a6899e9923916e32c0572310385f21dac62afe4920dfa4fab813ba
-DIST clap_derive-3.0.5.crate 24680 BLAKE2B 35a536ed73a4f3069ba788792e3e1e335ccd8e14b0813762d472d9c590498c0bc469a40f5a289d740aa9bad9515c045b7d84d93df0ad352426ac5fbd217dc51f SHA512 9e1ba624a119a97804b972698a7ac963d4e1d5204489bccb9236a01396dde7d383d4d78a107b52c6ee02799dd75e8c0858c4ca19feae4548059502f296af370c
 DIST clap_derive-3.2.7.crate 27649 BLAKE2B f8e27a1902302946cf46beb03f3cc7779fd90c3902f38a442c722346e89309be3a150ffd24c932ed9ad67f50cea5215359f993e423ed62ee4ab1cece16c4114f SHA512 ac6a7004281c99306dfb6ab75e8a66c300c0b6ef5db84098eb76369d2e9939b59ba2e4a175abe2cd9c243d61e19fb5948cfe30d72adb60d53304306340f5cedc
 DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
 DIST clircle-0.3.0.crate 9837 BLAKE2B adeb2d11238c343363475f9e517d01c9b596fa61b7d520f9c92de038f0a106e48263d06045e7f9d0cb5538384d4b2cffc2c969e9a129045b8839bf04ab1bad75 SHA512 a4db35d05ea4ca03155c7308a79b529091dddd4d2d579d787fc3770d80cb7c22ca4a239bcfe7b6a2a85870249754991f8dc960846b80ee7a46b763edfb084b2b
@@ -35,7 +32,6 @@ DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
 DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
@@ -66,7 +62,6 @@ DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
-DIST git-delta-0.13.0.tar.gz 491434 BLAKE2B 85fc3a9d1a661b8bc6ba6e9996a4d93d2a669df956f9ca4387b1bb3e2ec30bec7f48a485ff4cd9421239667147f28bd549abe0267fd28e0463b68647bbc7057b SHA512 d7dbaaab345ef3a8db04fb7ce6337d4cb104d148a069d4b47ffbe46c73ebff197a083a7ac061b51196754a5046dcfc1f71b633e8bfead1ebd9324cc624ba4313
 DIST git-delta-0.14.0.tar.gz 496467 BLAKE2B bb0fa08aa0e05474242518872f1db3f8ebc569dd7cdc399dc1d7eb1837b721e0944df814b8fa4e4669ab24fd9512f82ad50d9faa3ae1129bfff92474b8a811b2 SHA512 5eba901e3b5d06543d30dad49e92ad8ca9ad02d9757d7cfb4edf8ce460c2549bca07dd073dd44443a3befebe32d7d854b19e72dabf4efdced2eac109eedc614e
 DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
@@ -79,13 +74,10 @@ DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST indexmap-1.5.2.crate 47558 BLAKE2B 67d5cbd16bf464bf2a003e13285f559a2f02cf427cbb9d84ce80bea6a57a983c2b7db834a0a7172bb747d003b1d81530bea0c7cc8017cba4b963cedb14f8a1a2 SHA512 6297d720181a41624ad255c2f870abd2de12a7752f7ae4c724a64822c36b37275103cd75e35f6e690e150688171dd34de45b01cebac74a3711be7a3f5728ed6a
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
-DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
@@ -94,15 +86,12 @@ DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
-DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
-DIST nix-0.23.0.crate 185348 BLAKE2B 3b5acd0972755d7e3f724d2429b801d5952f2410d91240f9410a8fcc724421beb8c85c9df35b7b877036bf7bb83977e579293ca473efbf9a34cfaa07ad174fe6 SHA512 0aa28f348b67eb79f6f36410e0be4a888294312350b67717ef462905fddb7cba4d81fc0748515629cfd617535c2244e651b05cb0600a054fdc40ec60346a8c8c
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
 DIST ntapi-0.3.6.crate 127221 BLAKE2B 5e530c90eab66c73fa1864084eb462490bb0cce58ecd9e22659d4933ae94871c722dd2e9b351f9ab620a0e45779cc2030cc65bc6badcf9ccc6263d0850c11447 SHA512 c07f2ae51e4fbbe55de9f617d333e4042a93de69e9bfcdd44acc1b342edd88cc2a360fe6710d9568594e2c0990776004400d0741e61d1a2a1cec4a645c4cb035
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
-DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
 DIST once_cell-1.12.1.crate 31633 BLAKE2B 84253c18e5d8063ea1dba1d523872436db5264e3de5926543170380066342cfc2af827fcf24cd51599a824de4d7b55539dd1a09fdd38da2f15265af1df6b6d8e SHA512 e7d319b7965da22a3ab262e8fc6f1ab343d8f0078fecaeea9e190ceab2e13371e219406eb6f2f09260403574a198bdf48992ac2d810be5cce94732f7c6b2dea6
 DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
 DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
@@ -142,33 +131,26 @@ DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c1
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
-DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
 DIST serde-1.0.138.crate 76271 BLAKE2B 9e5021cbb5e4bdc82f8bdb3f079a24cb7909acad498fcd7e38b03bc75e2675dfd99658507b3208f5b1fde69f79c29f546b16a4b1be17da0e4b155acd92dd6b6a SHA512 e303d863d5ebdef27c38047427789ab6d3c4e1034d3e2bdd4048c09ef0da0e5f5b2cb25d00e1d47269fcc345458cc496af4e1a0ba64a3d627205337144a1c854
-DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
 DIST serde_derive-1.0.138.crate 54841 BLAKE2B 14a21c6492862aa2f7ef82c5668e2aada623c700b2450b547529cb69906d65c557af8414cdda1c4b962b0ffbec48d80b2732cc7ebea5d573860115f5d72a9d02 SHA512 c1dafc5d6ae273b2572eda1e986259393b96b4d37dc21622888546435d63af9117cf0ad4b13d260367a2bfe5cc194481fce624fba27df516e2567428410ef64c
-DIST serde_json-1.0.70.crate 115394 BLAKE2B 7aa3ccbb5a63ecf4e3f322a1b6eb501608bf8689d1deb86ff87a0619f8e014ffc609a17d65a760b9ab9b9aedb5db7d7c8c931932b3775a4e3df736f49222e243 SHA512 c85aa6a5ee6e7dc95f72bec14c427e2b7fcfd438292e61397e7d82f3a252167d0d36e0660f976eece4b9c34791125db88f5c9a92eb919f65ba9f04b782044a8c
 DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
 DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00
 DIST siphasher-0.3.7.crate 10097 BLAKE2B 455b5ca81418aee667b4fe16092435e025353267e14cf4f911f5d48a18d9a46be04452ce1451a272f8b2073ecf606c6834b6d06b49687474bb7ac226383aa7e7 SHA512 4a8ef56085742de7ad638194b21ff3e315aef6de9b7590e736071859ffa2aa4a28cdea7e05ecfa781fa35a40505086a36d84bdb3ec40d679f9b83c2edffc4d3d
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
-DIST smol_str-0.1.21.crate 12165 BLAKE2B f9ff6e366a7145e5ee1d2ffbff585467af9052eda4d0a5797c46d15002d0cb470e55981328ca9f136ddb9ecead7eea2c159723167f6bad8cfd13f211b07b9e63 SHA512 b548b21b7eaba6af6173ddbed3f0e808dfc5aec31553ca30a16fe6e487bdd0f01ddf981ffd5157e083e1901780daf2642d4d807af79d4fd1bdfcb4fff778e5ce
 DIST smol_str-0.1.23.crate 13208 BLAKE2B 3ee60b98fec9c8ed6ec765ea47863cecd83cb921b6b0f738b65afbfe8227efe9bbfea6e1e8556cc38fa10e0af92a671fd67039ce547afb58d660a8f251dc817d SHA512 73bd2c20717bc1960021aced0c98654123dbd9b171aff5890374efedb20e4e1e2273f35f6a8d8b584ea6f31ac9da2734f0656a8da0830af0b6a4f45b7b8faba1
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.85.crate 235056 BLAKE2B f72302314edc7a4040cc6e0c95a4b8a7105d81da0cd1788703067b01437a3cad216569d96e6871e5c26ec99bac23eaa077d871f2163ee4b501b4d57eba8502b3 SHA512 f12ac93bfc8f24b2a567485fc738a40ae8c9649515783003e07bc5d0f3e377bc324a4f649d66c7fa2d1272cb0a2fb884ecfb06f8aed98dc3c03329f62d03a44e
 DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e4db9c92d00095607fbdfec0a662deba507afeeee5a173c3c1b99d101268c4692752100198cfaffdda1a64 SHA512 2bdde4584b9d95f93f629083fbedc4a7148aab702775513a602ba2d122ae57a84e6d42c38da820b15ff66743dc49624287daa0c9b6d1fcaeee102b2879ac7a1b
 DIST syntect-5.0.0.crate 809452 BLAKE2B d76194d2234c77decac13d1bd2036862231718ce0ee050469fbbff094a11bc8f4ae2669077f6433d59a113d058c449f6e4d091cf520a985a9ef92dcab058f136 SHA512 b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9
 DIST sys-info-0.9.1.crate 20589 BLAKE2B fb3c43a1368c9206393b28064b38a1560aeb863b9b0bc89c9bf6ccc344a46a590296df3596f421218d78c26ae90d3f869ef0457c8c34e8e8dcb9bbd92fee0450 SHA512 52e23efd5bba1ce07d7fffb8c2d6864a8056b1e8ce1b85c4d2d4b37b9d57dfa5a6c0eae9e2018e07af47469c3f7812ccbd27351cbd6c95a7b788ec87cd544b2e
-DIST sysinfo-0.23.0.crate 118866 BLAKE2B efb09381becc0e13ec993d79635ba58252915e8044dcc28179b692f99bd96326a87368f98d34d670a4dbda2717567b165ef86f5cdeb9cfe8fd65eee6f382bc14 SHA512 e5dc81ab1d0cf37797a3c50da99ccd21b2e1f28ca8cd76fb1f4983ec16bd231fead8ba99a00b6ccf25e5b2f871a07116b6ba37c3c98ad8e3bcd3ab88ead7a002
 DIST sysinfo-0.24.5.crate 123862 BLAKE2B 5982525eb3aa9076548f8096ca60626dd37a045a01ecb8fa0428536b80839e8620e6b0c970644e57acfbbd528b746e6b9defbb575283aa862e30ae69b2fa7a08 SHA512 928aa1800724fa8efeb4d2b1f04e171a45a0931526aaf3789141bd218c080efa9fdff7027c1814ea51d009caca594c3af22dcb0b30863bb6d215953967232440
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
@@ -201,6 +183,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.4.1.crate 14034 BLAKE2B 7fd98ef4e1534d13da125a78cb7425318f1f2f0c7e06a8c8045b2145c1696bf86daf820577aa9757af0deb11951315efd382091b1c73dd3853841388927c2b01 SHA512 23e69abbe79a0977900af37feb9f367a82d0ba4e69fc9421e356a5957920e316379355b1c6eeda1235feb3d028f738c41f520d28665f919e775b20240219e07e
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.13.0.ebuild 4271 BLAKE2B 9120c6d25f104a62f715313443c0f57a07c2b8857085c60c6a28a26978c080ee91e89f6566c30b27fbf48adfa672da22a989fa7033bbf3ff439444f92018582f SHA512 ae2723a0cb0b60e7a10ab7eb1acfeff7cd999c1fa2608e13bb0fdd11f9728637649a8bd54206f2d8f1cad7df60514fd6bcfd1ca92df847a61da6088a298eaf80
 EBUILD git-delta-0.14.0.ebuild 4620 BLAKE2B d7deab9af37d7d210e2efbe6c03c24b18905faaeba3e4cee2818a65f36c594de50cb8aae90508634990389e2e311332ba642a2819a80fcca7536597d1e0b93f2 SHA512 22b06a3d5753c3f889274392f4a0e91369b7418e3aee25c0f70fbe895e66e0dc16ef476f62a8b17a9f5e4de9dde03fbc9ab7dba1bb66cb7fa12efaa69019ef55
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
diff --git a/dev-util/git-delta/git-delta-0.13.0.ebuild b/dev-util/git-delta/git-delta-0.13.0.ebuild
deleted file mode 100644
index 1e7213d48cf1..000000000000
--- a/dev-util/git-delta/git-delta-0.13.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	adler-0.2.3
-	aho-corasick-0.7.18
-	ansi_colours-1.1.1
-	ansi_term-0.12.1
-	approx-0.5.0
-	arrayvec-0.5.2
-	atty-0.2.14
-	autocfg-1.0.1
-	base64-0.13.0
-	bat-0.21.0
-	bincode-1.3.1
-	bitflags-1.3.2
-	box_drawing-0.1.2
-	bstr-0.2.15
-	bugreport-0.5.0
-	bytelines-2.2.2
-	bytemuck-1.7.3
-	byteorder-1.3.4
-	bytesize-1.1.0
-	cc-1.0.66
-	cfg-if-0.1.10
-	cfg-if-1.0.0
-	chrono-0.4.19
-	chrono-humanize-0.2.1
-	clap-2.34.0
-	clap-3.0.7
-	clap_derive-3.0.5
-	clircle-0.3.0
-	console-0.15.0
-	content_inspector-0.2.4
-	core-foundation-sys-0.8.3
-	crc32fast-1.2.1
-	ctrlc-3.2.1
-	dirs-4.0.0
-	dirs-next-2.0.0
-	dirs-sys-0.3.6
-	dirs-sys-next-0.1.1
-	either-1.6.1
-	encode_unicode-0.3.6
-	encoding-0.2.33
-	encoding-index-japanese-1.20141219.5
-	encoding-index-korean-1.20141219.5
-	encoding-index-simpchinese-1.20141219.5
-	encoding-index-singlebyte-1.20141219.5
-	encoding_index_tests-0.1.4
-	encoding-index-tradchinese-1.20141219.5
-	error-chain-0.12.4
-	find-crate-0.6.3
-	flate2-1.0.19
-	fnv-1.0.7
-	form_urlencoded-1.0.0
-	getrandom-0.1.16
-	getrandom-0.2.3
-	git2-0.14.2
-	git-version-0.3.5
-	git-version-macro-0.3.5
-	glob-0.3.0
-	globset-0.4.8
-	grep-cli-0.1.6
-	hashbrown-0.8.2
-	heck-0.4.0
-	hermit-abi-0.1.17
-	idna-0.2.0
-	indexmap-1.5.2
-	itertools-0.10.1
-	itoa-0.4.7
-	itoa-1.0.1
-	jobserver-0.1.21
-	lazy_static-1.4.0
-	libc-0.2.112
-	libgit2-sys-0.13.2+1.4.2
-	libz-sys-1.1.2
-	line-wrap-0.1.1
-	linked-hash-map-0.5.3
-	log-0.4.11
-	matches-0.1.8
-	memchr-2.4.1
-	memoffset-0.6.4
-	miniz_oxide-0.4.3
-	nix-0.23.0
-	ntapi-0.3.6
-	num-integer-0.1.44
-	num_threads-0.1.6
-	num-traits-0.2.14
-	once_cell-1.10.0
-	onig-6.1.1
-	onig_sys-69.6.0
-	os_str_bytes-6.0.0
-	palette-0.6.0
-	palette_derive-0.6.0
-	path_abs-0.5.1
-	pathdiff-0.2.1
-	percent-encoding-2.1.0
-	phf-0.9.0
-	phf_generator-0.9.1
-	phf_macros-0.9.0
-	phf_shared-0.9.0
-	pkg-config-0.3.19
-	plist-1.3.1
-	ppv-lite86-0.2.15
-	proc-macro2-1.0.36
-	proc-macro-error-1.0.4
-	proc-macro-error-attr-1.0.4
-	proc-macro-hack-0.5.19
-	quote-1.0.14
-	rand-0.8.4
-	rand_chacha-0.3.1
-	rand_core-0.6.3
-	rand_hc-0.3.1
-	redox_syscall-0.1.57
-	redox_syscall-0.2.10
-	redox_users-0.3.5
-	redox_users-0.4.0
-	regex-1.5.5
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	rgb-0.8.31
-	ryu-1.0.5
-	safemem-0.3.3
-	same-file-1.0.6
-	semver-1.0.6
-	serde-1.0.118
-	serde_derive-1.0.118
-	serde_json-1.0.70
-	serde_yaml-0.8.23
-	shell-escape-0.1.5
-	shell-words-1.1.0
-	siphasher-0.3.7
-	smol_str-0.1.21
-	std_prelude-0.2.12
-	strsim-0.10.0
-	strsim-0.8.0
-	syn-1.0.85
-	syntect-5.0.0
-	sysinfo-0.23.0
-	sys-info-0.9.1
-	termcolor-1.1.2
-	terminal_size-0.1.15
-	term_size-0.3.2
-	textwrap-0.11.0
-	textwrap-0.14.2
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
-	time-0.1.44
-	time-0.3.9
-	tinyvec-1.1.0
-	tinyvec_macros-0.1.0
-	toml-0.5.8
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.16
-	unicode-segmentation-1.9.0
-	unicode-width-0.1.9
-	unicode-xid-0.2.1
-	url-2.2.0
-	utf8parse-0.2.0
-	vcpkg-0.2.11
-	vec_map-0.8.2
-	version_check-0.9.2
-	vte-0.10.1
-	vte_generate_state_changes-0.1.1
-	walkdir-2.3.1
-	wasi-0.10.0+wasi-snapshot-preview1
-	wasi-0.9.0+wasi-snapshot-preview1
-	wild-2.0.4
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-util-0.1.5
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	xdg-2.4.1
-	xml-rs-0.8.3
-	yaml-rust-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A syntax-highlighting pager for git"
-HOMEPAGE="https://github.com/dandavison/delta"
-SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-S="${WORKDIR}/${P/git-/}"
-
-LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/libgit2:=
-	dev-libs/oniguruma:=
-"
-RDEPEND="
-	${DEPEND}
-	!app-text/delta
-"
-
-QA_FLAGS_IGNORED="usr/bin/delta"
-
-src_configure() {
-	# Some crates will auto-build and statically link C libraries(!)
-	# Tracker bug #709568
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	# No man page (yet?)
-
-	# Completions
-	newbashcomp "${S}"/etc/completion/completion.bash delta
-
-	insinto /usr/share/zsh/site-functions
-	newins "${S}"/etc/completion/completion.zsh _delta
-}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 12f14f103461..3f90bbaf06d1 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 6b6679df5c5d..7c05948c0f57 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -9,7 +9,7 @@
 # Jeremy Maitin-Shepard <jbms@attbi.com>
 # Christian Faulhammer <fauli@gentoo.org>
 # Ulrich Müller <ulm@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: elisp-common
 # @BLURB: Eclass for Emacs Lisp packages
 # @DESCRIPTION:
@@ -65,7 +65,7 @@
 inherit elisp-common
 
 case ${EAPI} in
-	6|7|8) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -73,10 +73,7 @@ EXPORT_FUNCTIONS src_{unpack,prepare,configure,compile,install} \
 	pkg_{setup,postinst,postrm}
 
 RDEPEND=">=app-editors/emacs-${NEED_EMACS}:*"
-case ${EAPI} in
-	6) DEPEND="${RDEPEND}" ;;
-	*) BDEPEND="${RDEPEND}" ;;
-esac
+BDEPEND="${RDEPEND}"
 
 # @FUNCTION: elisp_pkg_setup
 # @DESCRIPTION:
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 31488db19e99..70743d3a5783 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/abuse/Manifest b/games-action/abuse/Manifest
index 594a80a060e9..93e2b47059e3 100644
--- a/games-action/abuse/Manifest
+++ b/games-action/abuse/Manifest
@@ -1,4 +1,6 @@
 DIST abuse-0.8.tar.gz 6053500 BLAKE2B 4f52256b7bf13e0efa77ef50147a976fdf1fceec4ce20fb4b855a9961a7c816cf08bf51286b424da42072956a137bc3385357cfdb61bf37ff9f907284d99e09c SHA512 5c60dcf6910f9f751da26e919cd289c12349bb82eb925f9a41dc921263ece0d0f5f24c2ab2d1c718c0a5d0315453f92dfcba665fe5082eb4135ed737d2859d18
 DIST abuse-0.9.0.tar.gz 4666196 BLAKE2B 3896f5b986120e0d0385daf194e7ac158a77bea07aa5b508b9beb8ee8f9423b375a0daebd8e66124719b80a57cabb101d0258176d16d63cab030c8332ca2dfcc SHA512 6c8b85920412234986f11b5333a18c85e227ba421843373b5e1d5086e596f1b63adc8c320c657b3cddafd43af9de9b163f4617a9e78a5ea3f2d0281d0408ca1c
+DIST abuse-0.9.1.tar.gz 3189092 BLAKE2B 7af8be86cdd5ede66ac200a193e5e37d188825d648aec8915e3b07608e02afc2be3f58b59dcc675d605c9a0a97b3caf256e46ba5d036e3139c254d281c50f611 SHA512 9b551e5946aba264674d56e34e7a28332676f89e93a66792e3de2cfc85264f074b7ba0d3a9c4b0ffc1ffd0d6023014cb5114c663e5677ab2fb128ca9c3997dc3
 EBUILD abuse-0.9.0.ebuild 790 BLAKE2B 571410abb24ad77068d35752863ac46c57fdee587a320433f5e222231fbe9c852cc90d5f2d15e096ec2d60b7866f31fe80991a0eb1ec9a4353a71c56ec473142 SHA512 9d9a49674f803c34cf2990f7208e185fb6779ea8920fde75c4884f1792bd91f35a5746d63d759dd13391268d9a5dff1c79d6627431ace2aed4b29c67650b2776
+EBUILD abuse-0.9.1.ebuild 1136 BLAKE2B b12a5ad09c1a042ac2f3e0f3c1206b7e6454a6a22c5e32fac6f1470d62df7dfc8317ba22411a27c5c9c187d9a93e7d8dceb5d496e8492d78e8c64d7482011021 SHA512 7bb92629316aac996a9a912f903e25365fb1f6a6f0c8b22e3edbdc98206c45093a4a934ee55ac1a46cb13b71d0e8c7f43dab467eba9f0fadb560e1dc458e94b6
 MISC metadata.xml 336 BLAKE2B 63e05f40e00f8490219901dbed87caccec9d4d328fe22b28513827008a650cddee00cf75717be7486b00fd3100d0a5046457a1f0369316b760b9e7767e4c1467 SHA512 43f5291093dd63917513de2b4031b5e12b64e0b4fe9880270e15f4df6d0efd3c45f2a93e07bf20324e773cf36e359c2323d6d47473699602a2bddd7edeb71d3c
diff --git a/games-action/abuse/abuse-0.9.1.ebuild b/games-action/abuse/abuse-0.9.1.ebuild
new file mode 100644
index 000000000000..a73011793960
--- /dev/null
+++ b/games-action/abuse/abuse-0.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+DATA_PV="0.8"
+
+DESCRIPTION="Port of Abuse by Crack Dot Com"
+HOMEPAGE="https://github.com/Xenoveritas/abuse"
+SRC_URI="https://github.com/Xenoveritas/abuse/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	http://abuse.zoy.org/raw-attachment/wiki/download/${PN}-${DATA_PV}.tar.gz"
+
+LICENSE="GPL-2 public-domain WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-libs/libsdl2-2.0.3[sound,video]
+	media-libs/sdl2-mixer[midi,wav]
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+
+	cp -r ../${PN}-${DATA_PV}/data/{music,sfx} "${ED}"/usr/share/games/abuse/ || die
+	cp -r ../${PN}-${DATA_PV}/data/addon/{aliens,claudio,leon,newart,twist} "${ED}"/usr/share/games/abuse/addon/ || die
+	cp -r ../${PN}-${DATA_PV}/data/levels/frabs* "${ED}"/usr/share/games/abuse/levels/ || die
+
+	doicon data/freedesktop/com.github.Xenoveritas.abuse.png
+	domenu data/freedesktop/com.github.Xenoveritas.abuse.desktop
+	insinto /usr/share/metainfo
+	doins data/freedesktop/com.github.Xenoveritas.abuse.appdata.xml
+}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 206247ac8452..043394752588 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 9dd08cabd61e..dd03dbc64e03 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -23,4 +23,4 @@ EBUILD stone-soup-0.27.1-r1.ebuild 5178 BLAKE2B 6cabd24eaff39e4988672ae897863a00
 EBUILD stone-soup-0.28.0-r1.ebuild 5775 BLAKE2B 878b042ae56335aa271e3a3cf4638d7d58e9422955c40eea2f07b6dbcfd977368c615b837b5e0601e648ae3e4f2893a6d81ade909862261e34d780a84fc11e83 SHA512 c082cac5ab126754c4b925d43a823d93bf6b416832c718c7c79b7a8cc6540732fa274ff889b2247b29a33979cf9d3ea3be557653b059e55d223f7691578db7f1
 EBUILD stone-soup-0.29.0.ebuild 5775 BLAKE2B 3f4cffb59e05aa9f511a34c3a757c83b0c3f31d4eb642055d781e9a1edd6d084ba95511269eca3ae22b3830a79c6634edbc47fa464392d7f4260db37819c8f32 SHA512 da49b04075965aeda7169c47bb00858c5ee6c036df03759933e127fd9d5b904c828761a21dcb18222048c81a35dc582af0fc400e868f500fc732433dc7cd3a67
 EBUILD stone-soup-0.29.1.ebuild 5735 BLAKE2B 5f4422eac10f031e7255ff336e9f7cee665aca9b3f0a636152b1afbd4706679abb4baa42b52dcf252da15b41b40ba418f4008c9848333fab4908f7912e6d9e9c SHA512 b6a61fdbc9255dcb564765ba8b9fae7d6d87bf879d2e7b55a144edad0fd0395c3554de92d1f56d7cb7a861b645b74dfdae19d2ab916ce412e2afd31441779829
-MISC metadata.xml 1684 BLAKE2B 4d3fe12186ce860f5b049b5b2cdb626f9ab095d688163739a972e0f53a7d835c191dbec0ee4868bb575648cbd3c818ed2fdec44b75730855ea5d8bc3eaf4996c SHA512 9dbe6b3c720b81887c74b0a5e81a0ba5e410d947a6560f66cbb4605c090dfa46a897f8550191e6c6ce7ec06a7460d0e3c625afe7f5ee41e32ab3b800887463cd
+MISC metadata.xml 1735 BLAKE2B 7c4c4777bbda596e10acf0eafac0b5682a8d3a6e81562b12ca38ad6d09c66a672933a127b9d5c853122ffcd4feb436667149f5e64732053e002b6e1044e7b1ee SHA512 a252f1ffe9b57659d9c7ee25aca3263d6dd79e95399fde3d888aa6d3fceb8f821ccf2a47fc0fa72eb5e1bab4bac4c861d436732818366d81b8cf7df6f0e659aa
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 1893130c23a1..3aca5487231d 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -13,6 +13,7 @@
 		<doc lang="en">https://crawl.develz.org</doc>
 		<bugs-to>https://crawl.develz.org/mantis</bugs-to>
 		<remote-id type="sourceforge">crawl-ref</remote-id>
+		<remote-id type="github">crawl/crawl</remote-id>
 	</upstream>
 	<use>
 		<flag name="advpng">Use alternate png optimization.
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 96fe23f2d523..a01cb4c8275f 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 de6c994ab52f..a5257bff1b96 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,5 +1,7 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
 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
 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
new file mode 100644
index 000000000000..16dd14a8e660
--- /dev/null
+++ b/games-server/bedrock-server/bedrock-server-1.19.40.02.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
+HOMEPAGE="https://www.minecraft.net/"
+SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="Mojang"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+	acct-group/bedrock
+	acct-user/bedrock
+	app-misc/dtach
+	dev-libs/openssl:0/1.1
+	sys-libs/zlib
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DOCS=(
+	"bedrock_server_how_to.html"
+	"release-notes.txt"
+)
+
+QA_PREBUILT="opt/bedrock-server/bedrock_server"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	exeinto /opt/bedrock-server
+	doexe bedrock_server
+
+	insinto /opt/bedrock-server
+	doins {allowlist,permissions}.json server.properties
+	doins -r {behavior,resource}_packs definitions structures
+
+	dodir /opt/bin
+	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
+
+	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
+	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
+
+	einstalldocs
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 356ed2b93aef..ed2e78bafb01 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gnome-network-displays/Manifest b/gnome-extra/gnome-network-displays/Manifest
new file mode 100644
index 000000000000..2c64728b146b
--- /dev/null
+++ b/gnome-extra/gnome-network-displays/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-network-displays-0.90.5.tar.xz 594196 BLAKE2B 4affeacc21ff581fb49bf29cd7954be7f3fe3531b904f013335d0b8bc25c0384119523a89b3f5f771eb518dfa82deb71ff22d1d5169d99b0799b4129c8586f70 SHA512 c3d4df7cfaba3482936817ad352e6e7185df4381e119236d6c33093356d5ffb12ade1f2afd4677500fa986fa9cac57df93862ac8366f9606fee169b5f8cb98e0
+EBUILD gnome-network-displays-0.90.5.ebuild 1116 BLAKE2B 844ee3a418caf86764307a0c9ac48029371bec09b44e2a4e9ab273d644ba2ebcdb35247dd37c168a6dee6708a64cdf8b8712bc796f57685b7f30f3bb0c1ed99b SHA512 15d85195e547328bc0168dd90e21dd56eab38f3c7dc3d8b0418158ee3c79cc9f52eb576b44516b61ba661ea1a0f8aa42bb7549f1a8850d4c611b3fd5fed225bb
+MISC metadata.xml 288 BLAKE2B a6443c62bf41c8740b57fb21b0cd97d5fe9cd270ef55f7cdad08ad0fd23875ee15d70923b777569969bb2ba850a7d91edc0338aa1d5504288f9146d3159a83d6 SHA512 1282a099493201c50906b9772fcf49bb5787c60aa8fd78c3223b79c0642bca8018b8cf1b69ea5215817ea12697c10a6109a8795a99ad7f0c34a947183aaff2d2
diff --git a/gnome-extra/gnome-network-displays/gnome-network-displays-0.90.5.ebuild b/gnome-extra/gnome-network-displays/gnome-network-displays-0.90.5.ebuild
new file mode 100644
index 000000000000..b0daf152a1a2
--- /dev/null
+++ b/gnome-extra/gnome-network-displays/gnome-network-displays-0.90.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Stream the desktop to Wi-Fi Display capable devices"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-network-displays"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="firewalld"
+
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:3
+	media-libs/gst-rtsp-server
+	media-libs/libpulse[glib]
+	media-plugins/gst-plugins-faac
+	media-plugins/gst-plugins-x264
+	media-plugins/gst-plugins-ximagesrc
+	>=net-misc/networkmanager-1.16.0[wifi]
+	net-dns/dnsmasq
+	net-wireless/wpa_supplicant[p2p]
+	sys-apps/xdg-desktop-portal[screencast]
+	x11-libs/gtk+:3
+	firewalld? ( net-firewall/firewalld )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( README.md )
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use firewalld firewalld_zone)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-network-displays/metadata.xml b/gnome-extra/gnome-network-displays/metadata.xml
new file mode 100644
index 000000000000..d10fc5923031
--- /dev/null
+++ b/gnome-extra/gnome-network-displays/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>pacho@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="firewalld">Install firewalld zones</flag>
+	</use>
+</pkgmetadata>
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index fd423baac7b9..46dfbc3e61f1 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/gdk-pixbuf-loader-webp/Manifest b/gui-libs/gdk-pixbuf-loader-webp/Manifest
index f553dee7329c..fc8bf3f20347 100644
--- a/gui-libs/gdk-pixbuf-loader-webp/Manifest
+++ b/gui-libs/gdk-pixbuf-loader-webp/Manifest
@@ -1,3 +1,5 @@
 DIST gdk-pixbuf-loader-webp-0.0.6.tar.gz 23691 BLAKE2B 0d9ca0898bfd7f1df79883825f0e4f37c3fca578b8424f80a7024c4906567492d1c1dbf5165bd8864ac56a3d6babeb6c8cadd9557e158f355549f70b76c44666 SHA512 983adca9d7b8542e7f657cbd6194275775aa330e8f7de1575cd68f666a2f17db6065434b5e595daba986986d4b276a349937d7dc2f662d82a27ae1d9f6fbb70d
+DIST gdk-pixbuf-loader-webp-0.0.7.tar.gz 21718 BLAKE2B 3087bf7a83830eaac0c2d5b4462f076b0421f124246d818073511dbafcf313548fb81c1383a50c088b68ea3b224a9633e98ee4f719e4d6443daedc7bc65982b8 SHA512 08da9e6d3fd546aa79715dee7cfd153a1bbb70deca6a0cf52e9ffacf6e29882b3ae041c424a024bcc7b6689e9cf12ba0588a58d0542a71f069ef5367e0f38528
 EBUILD gdk-pixbuf-loader-webp-0.0.6.ebuild 1068 BLAKE2B bcdc906a64d931d26355cb47b8841fb3cdaa9f9420c788487caa06cb1c78803f1657187b5a75e7ad2a22de3b8f4a9ef74bb362b933ea601ac2c94517d63556de SHA512 bc89118260fdc3ad86cbfd10345c980f0153b54e12818824b8e4220805cbfe0ee45b8bd2daea712b2f81b7874b1a1d1f71605f4fe5820b67c47df801fc44134e
+EBUILD gdk-pixbuf-loader-webp-0.0.7.ebuild 1054 BLAKE2B 8fa6601c6ee6bece1cd69eb81a92ca776763e4d3bd0d2298554496227a50d482deb3800d256ce807fec7ad2d4e16c1263bea0f9285461aab1c71a1c84093fe43 SHA512 bd795ea2442f56980eaec3f7aa95b64ce7d443402b68b676318b9b6af4191b6fa6af952ac0c3bcee74dd0882773a523ad97beb3e54672d69553e37fcd3979a9c
 MISC metadata.xml 343 BLAKE2B c0eee217ce892c71a14f8960f96d2be35bb4dbdd0592b193d8a6c5663dff8b7a849b676ca0d54093c8b9932c4c0fdaa89c713c878a40d58629170f004493dae9 SHA512 4aff98d342ab95dd3d577dd87bc7e3f2a3177478b7b167488c6156de55b57c9e02c29e4d6d0975bd6023b189fce1a51c7c09fe9cc0eb4b550b9576a65b1c6a6d
diff --git a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.7.ebuild b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.7.ebuild
new file mode 100644
index 000000000000..4341a4977a88
--- /dev/null
+++ b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson-multilib
+
+DESCRIPTION="WebP GDK Pixbuf Loader library"
+HOMEPAGE="https://github.com/aruiz/webp-pixbuf-loader"
+SRC_URI="https://github.com/aruiz/webp-pixbuf-loader/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/webp-pixbuf-loader-${PV}"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>x11-libs/gdk-pixbuf-2.22.0:2[${MULTILIB_USEDEP}]
+	>media-libs/libwebp-0.4.3:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dupdate_cache=false
+	)
+	multilib_foreach_abi meson_src_configure
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 20280cc5fad5..e427f8e67ecd 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 87513bc45d9c..53e18caab4b6 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,10 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
+AUX kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch 5511 BLAKE2B f52bdd1524a3edba622a63f52977423bd49bf8561cdbce8415c1239a660893a4ca3672ba1ddac425347ffb2ca2c0e38ad706f975977b6ccba52c4ae02f66b014 SHA512 8f469da00c995726203f6c26c352de22c5492b97e7813b9f7929eb74fc520ee6d420b3004e499be86d21deaa4764863c016dc9e43a5209f6ff6ed69303317ef2
+AUX kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch 997 BLAKE2B 33d19056200d6f1df3b2cfee8980b2c0a3e326693ed0257c136618356e4462d8b28cee393b15a2efca67ecee516707f87d8e40ceee0f07b08ea61f4fe143c8fd SHA512 88412ef640a10be3a170bfe0e0a38bc154228b52fbcf41a4d78ee1f480b391e44b00d7fda4ec143c84207953306680a9b2b3a044674a80efde13485ffe65154d
+AUX kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch 978 BLAKE2B cd6daeed9eefb0d844f3c99f39d86a5be713b4a51b4b0e09d01680273a59c823439eaa1c8b053546d31776341d7be829699a7e5d0157ce16ef133b9fb5959fba SHA512 f383dd69f1aab7399accdfac607192de7c0bffe4b693664da6cdd95c09e0250a4ebbd3fc731e1679db7746609bc03259b49e03f87af131f5a5634ac3f5b7d489
+AUX kwin-5.26.2.1-x11window-fix-maximise-freeze.patch 1278 BLAKE2B 43d7394a5770d73027408578fc560bfef56fa66dbb80dd63d469f7ff73ab6eba6087b6e10b2557990eb181a024713fd7010265f77c74adec7d64d01b82eb2c2b SHA512 4536071a723488ebd65d032f13d861fb85735744b254f388ae54895477d239db6b3219e696e406999c19191f8d5addf591c3797f27fa63e4d2bc4bf8b51ba451
 DIST kwin-5.25.5.tar.xz 6650756 BLAKE2B e0e08b6f688e0f614635618022142eafc7913935b14e5408927bc69762042e5e6085476ddda24fde2dd51571995709702d8c4aaffcf7004dbe1c77f155e02924 SHA512 7fe60738a02eb097e3f97ec2d93a5bc3788f16de75d2e98e3370db46a83152c9ca52973781049b260ec81f2dab6a6d17e699b58903d897c34f7034fec3a3a0df
 DIST kwin-5.26.2.1.tar.xz 6648564 BLAKE2B cf627cc211a306b73b306df6dd6ea391b0fe9bfdbf99dec556c1624b2b0e4a70b7ebf455f92b8584a0b7d2e2bd71bc541913c5fbc3acce71d9ec0f55d218995a SHA512 2caa3a5f461999422cd8160397ff5795c6f6f5bac7c8e8b8cd0667b959302bb2c9639bc18f5b2ca6f49970694c5b0d4e62d91da7a1f55fd64feeb5ce7693b950
 EBUILD kwin-5.25.5.ebuild 4181 BLAKE2B 200e4ca4c472127436e65e533e796406d90d5250f0886f141112731e4b10c0876fbb29e850ed1cc35a4bc6eb6e90faa1fb5ceada88d9d7db57398392e6ed7c91 SHA512 73e6d766634337cfe9965d069036a2537c7f916a6be2560bdd09d9f48b2429dcb5784b838cdae2c8fa2be6e99fc9652e8a71691af41ab2b789d2be010fc9f505
-EBUILD kwin-5.26.2.1.ebuild 4219 BLAKE2B 879432c59d752556b90ed44943b4aa27bbe860133cfc5dbbc3dc1079294de659269b5c901714e98748e945d25dcc81ed3723c65fb741813e53bcd07a8be579d2 SHA512 ecec81cf2f29b1b993d52eebc2f275bf80748875b8f43b8bac6d1a8db81f8db1bc67943181dc008fb6722c0513dca3e6981bcfd4d691ee4a4d2266f1e9ef399e
+EBUILD kwin-5.26.2.1-r1.ebuild 4534 BLAKE2B 7150f475039f21b14dbe045af893c957fc227934c143a34f71ef0d1ec4ddce16f5f69c6ba9983a10dfe5b019054b0ca531d76864d5e9f1fc12c2163dbaeae49d SHA512 b93adea05859762213fb9bfb49b7c68a76ff2cd1e1f342875ab885cd591975370641aaee4173b3d6eb8308356b69522616bb29b4934a07d5b74371dcc27a393d
 MISC metadata.xml 505 BLAKE2B 41f9200ff14d77161bb0863065be67315f5459fa8232da5f0cf18aacd8abb15f7e858277a59a219e59f777fbd2d2d1f035c941d1a06e459b01935b70921e678d SHA512 19c2af1c8b56be6989b617adc24fc0a8bc33d4913eecf22a4ecef3c1a2cf2994e814655f3a885a75ad17613af1dc41b6babb5e4375a3e217f0cc5842ba969a29
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch
new file mode 100644
index 000000000000..4378d850c6ba
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-nightcolormanager-emit-timing-chang-only-when-changed.patch
@@ -0,0 +1,147 @@
+From 2465dfe8ce94e1afeed3e3210adef9019e76383b Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kai_uwe.broulik@mbition.io>
+Date: Fri, 28 Oct 2022 10:28:32 +0200
+Subject: [PATCH] nightcolormanager: Emit timing change only when they have
+ actually changed
+
+Avoids pointless DBus traffic.
+
+Signed-off-by: Victoria Fischer <victoria.fischer@mbition.io>
+
+
+(cherry picked from commit 0902d91a4254c4b3076e07b8479bb516884b21e4)
+---
+ src/plugins/nightcolor/nightcolormanager.cpp | 93 ++++++++++----------
+ 1 file changed, 47 insertions(+), 46 deletions(-)
+
+diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp
+index ffa8ee8291..725623ed87 100644
+--- a/src/plugins/nightcolor/nightcolormanager.cpp
++++ b/src/plugins/nightcolor/nightcolormanager.cpp
+@@ -518,17 +518,15 @@ void NightColorManager::updateTargetTemperature()
+ 
+ void NightColorManager::updateTransitionTimings(bool force)
+ {
++    const auto oldPrev = m_prev;
++    const auto oldNext = m_next;
++
+     if (m_mode == NightColorMode::Constant) {
+         m_next = DateTimes();
+         m_prev = DateTimes();
+-        Q_EMIT previousTransitionTimingsChanged();
+-        Q_EMIT scheduledTransitionTimingsChanged();
+-        return;
+-    }
+-
+-    const QDateTime todayNow = QDateTime::currentDateTime();
++    } else if (m_mode == NightColorMode::Timings) {
++        const QDateTime todayNow = QDateTime::currentDateTime();
+ 
+-    if (m_mode == NightColorMode::Timings) {
+         const QDateTime nextMorB = QDateTime(todayNow.date().addDays(m_morning < todayNow.time()), m_morning);
+         const QDateTime nextMorE = nextMorB.addSecs(m_trTime * 60);
+         const QDateTime nextEveB = QDateTime(todayNow.date().addDays(m_evening < todayNow.time()), m_evening);
+@@ -543,58 +541,61 @@ void NightColorManager::updateTransitionTimings(bool force)
+             m_next = DateTimes(nextMorB, nextMorE);
+             m_prev = DateTimes(nextEveB.addDays(-1), nextEveE.addDays(-1));
+         }
+-        Q_EMIT previousTransitionTimingsChanged();
+-        Q_EMIT scheduledTransitionTimingsChanged();
+-        return;
+-    }
+-
+-    double lat, lng;
+-    if (m_mode == NightColorMode::Automatic) {
+-        lat = m_latAuto;
+-        lng = m_lngAuto;
+     } else {
+-        lat = m_latFixed;
+-        lng = m_lngFixed;
+-    }
++        const QDateTime todayNow = QDateTime::currentDateTime();
+ 
+-    if (!force) {
+-        // first try by only switching the timings
+-        if (m_prev.first.date() == m_next.first.date()) {
+-            // next is evening
+-            m_daylight = true;
+-            m_prev = m_next;
+-            m_next = getSunTimings(todayNow, lat, lng, false);
++        double lat, lng;
++        if (m_mode == NightColorMode::Automatic) {
++            lat = m_latAuto;
++            lng = m_lngAuto;
+         } else {
+-            // next is morning
+-            m_daylight = false;
+-            m_prev = m_next;
+-            m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
++            lat = m_latFixed;
++            lng = m_lngFixed;
+         }
+-    }
+ 
+-    if (force || !checkAutomaticSunTimings()) {
+-        // in case this fails, reset them
+-        DateTimes morning = getSunTimings(todayNow, lat, lng, true);
+-        if (todayNow < morning.first) {
+-            m_daylight = false;
+-            m_prev = getSunTimings(todayNow.addDays(-1), lat, lng, false);
+-            m_next = morning;
+-        } else {
+-            DateTimes evening = getSunTimings(todayNow, lat, lng, false);
+-            if (todayNow < evening.first) {
++        if (!force) {
++            // first try by only switching the timings
++            if (m_prev.first.date() == m_next.first.date()) {
++                // next is evening
+                 m_daylight = true;
+-                m_prev = morning;
+-                m_next = evening;
++                m_prev = m_next;
++                m_next = getSunTimings(todayNow, lat, lng, false);
+             } else {
++                // next is morning
+                 m_daylight = false;
+-                m_prev = evening;
++                m_prev = m_next;
+                 m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
+             }
+         }
++
++        if (force || !checkAutomaticSunTimings()) {
++            // in case this fails, reset them
++            DateTimes morning = getSunTimings(todayNow, lat, lng, true);
++            if (todayNow < morning.first) {
++                m_daylight = false;
++                m_prev = getSunTimings(todayNow.addDays(-1), lat, lng, false);
++                m_next = morning;
++            } else {
++                DateTimes evening = getSunTimings(todayNow, lat, lng, false);
++                if (todayNow < evening.first) {
++                    m_daylight = true;
++                    m_prev = morning;
++                    m_next = evening;
++                } else {
++                    m_daylight = false;
++                    m_prev = evening;
++                    m_next = getSunTimings(todayNow.addDays(1), lat, lng, true);
++                }
++            }
++        }
+     }
+ 
+-    Q_EMIT previousTransitionTimingsChanged();
+-    Q_EMIT scheduledTransitionTimingsChanged();
++    if (oldPrev != m_prev) {
++        Q_EMIT previousTransitionTimingsChanged();
++    }
++    if (oldNext != m_next) {
++        Q_EMIT scheduledTransitionTimingsChanged();
++    }
+ }
+ 
+ DateTimes NightColorManager::getSunTimings(const QDateTime &dateTime, double latitude, double longitude, bool morning) const
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch
new file mode 100644
index 000000000000..9de1f3db128f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_NO_GLIB-1.patch
@@ -0,0 +1,34 @@
+From 4c5830ba149ec4462587a95f78624dfc981d281c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Tue, 25 Oct 2022 15:49:27 +0200
+Subject: [PATCH] x11: Don't force QT_NO_GLIB=1
+
+This breaks certain apps, e.g. KDE System Settings when launched from
+overview effect.
+
+BUG: 460980
+
+
+(cherry picked from commit c2b4f03f9671c0ad9fc1929426df5f79db414aa7)
+---
+ src/main_x11.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index 21cfab94b3..c175d8729e 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -337,10 +337,6 @@ int main(int argc, char *argv[])
+ 
+     signal(SIGPIPE, SIG_IGN);
+ 
+-    // Disable the glib event loop integration, since it seems to be responsible
+-    // for several bug reports about high CPU usage (bug #239963)
+-    setenv("QT_NO_GLIB", "1", true);
+-
+     // enforce xcb plugin, unfortunately command line switch has precedence
+     setenv("QT_QPA_PLATFORM", "xcb", true);
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch
new file mode 100644
index 000000000000..e5e222436060
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11-dont-force-QT_QPA_PLATFORM-xcb.patch
@@ -0,0 +1,30 @@
+From 8633f9952507c3e99175a43b4d813cc1669f8db9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Thu, 27 Oct 2022 00:42:24 +0200
+Subject: [PATCH] x11: Don't force QT_QPA_PLATFORM=xcb
+
+This is basically a cherry pick of 77ec43d5e (Don't force
+QT_QPA_PLATFORM=wayland), except for X11.
+
+
+(cherry picked from commit a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd)
+---
+ src/main_x11.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index 086ba79dba..21cfab94b3 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -361,6 +361,8 @@ int main(int argc, char *argv[])
+ 
+     KWin::ApplicationX11 a(argc, argv);
+     a.setupTranslator();
++    // reset QT_QPA_PLATFORM so we don't propagate it to our children (e.g. apps launched from the overview effect)
++    qunsetenv("QT_QPA_PLATFORM");
+ 
+     KSignalHandler::self()->watchSignal(SIGTERM);
+     KSignalHandler::self()->watchSignal(SIGINT);
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch b/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch
new file mode 100644
index 000000000000..8a4de9426ca6
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.26.2.1-x11window-fix-maximise-freeze.patch
@@ -0,0 +1,35 @@
+From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 26 Oct 2022 21:43:41 +0200
+Subject: [PATCH] x11window: revert more from 3a28c02f
+
+BUG: 461032
+
+
+(cherry picked from commit 2997fb24bb8171145ce1107df85eb3a3a4c0cf74)
+---
+ src/x11window.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/x11window.cpp b/src/x11window.cpp
+index c02d33b338..b7a180d317 100644
+--- a/src/x11window.cpp
++++ b/src/x11window.cpp
+@@ -4519,11 +4519,10 @@ void X11Window::changeMaximize(bool horizontal, bool vertical, bool adjust)
+                 }
+             }
+             r.moveTopLeft(rules()->checkPosition(r.topLeft()));
+-            // The above code tries to center align the window followed by setting top and bottom
+-            // it's possible that we're in between two pixels
+-            r.setX(Xcb::nativeFloor(r.x()));
+-            r.setY(Xcb::nativeFloor(r.y()));
+         }
++        // The above code tries to center align the window followed by setting top and bottom
++        // it's possible that we're in between two pixels
++        r = Xcb::nativeFloor(r);
+ 
+         moveResize(r);
+         if (options->electricBorderMaximize() && r.top() == clientArea.top()) {
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.26.2.1.ebuild b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
index d399374cdddc..5456ecfa6511 100644
--- a/kde-plasma/kwin/kwin-5.26.2.1.ebuild
+++ b/kde-plasma/kwin/kwin-5.26.2.1-r1.ebuild
@@ -103,6 +103,13 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
 
+PATCHES=(
+	"${FILESDIR}/${P}-x11window-fix-maximise-freeze.patch" # KDE-bug 461032
+	"${FILESDIR}/${P}-x11-dont-force-QT_NO_GLIB-1.patch" # KDE-bug 450000
+	"${FILESDIR}/${P}-x11-dont-force-QT_QPA_PLATFORM-xcb.patch" # KDE-bug 460980
+	"${FILESDIR}/${P}-nightcolormanager-emit-timing-chang-only-when-changed.patch"
+)
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 53e01624b9cb..5400963cb21e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 38e45de40282..0657fc1b8f10 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,6 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 AUX graphicsmagick-1.3.38-configure-bashism.patch 1203 BLAKE2B 0aa4a6cccd1f7e392446db33446b706df0e5a82b77abba3901ea7e8190ed592a4ce17b0544f08b59900cd48b3e57e029862ef94120ceca75536959fba15b9f7f SHA512 e45bc482381e4c58cd854d9d28b8a3a7bf83bc707f5d3a6290f28b1b333c84778c5e185f0a637348a2fbaac56790d6b9ddee1f2ee660ba67912300039d872330
 DIST GraphicsMagick-1.3.38.tar.xz 5958352 BLAKE2B 132c8b2303690dbe84b0e9ab33db0c0861845ef0260915e33197912dbcae02ae70c27bce634cfe0ab6b739ef6f3e828cbea9043fc90be993fb2c4a5e33e20ee9 SHA512 478f9e2907d4cb1099b0cbd1a73e4ab58aef94edf6cb1636ce48a378084ec1671599fd4f369455e5af898e94d1386f7149f6933b7c668027a6f6952bc763ec3a
 DIST GraphicsMagick-1.3.38.tar.xz.sig 119 BLAKE2B 166b7bb6de30af22d1f2317812f76dee43dd69c5557613deea35de3767624466c07001fe029ec9d33d0c61ed2fe5ca3f48bf435853374c722963a1293bfaa7a1 SHA512 c6dfee7e4b63b646460f9045ca5c8f3105d1a761ec3cd3471b53293178ed9a963884539c8026d934ce1915654d517a9b30232d7260a13f6d7dbeb5a592485b09
-EBUILD graphicsmagick-1.3.38-r2.ebuild 3899 BLAKE2B 5fe2b2e0ba13f0abad75a5d3e7cd0d3d5fe7961ae1eb69aaa6cc2cd6f08a38c8040f80ee5f7067b5c51ced031a6937615a185770de988e54f2c20df256a748b5 SHA512 8d60e395f9c89559038b372e766339f58534b7e3964198d8f0153e82eba76e155dacecc34aa7181d5409df1bd85a5abc66168b0e5ca755c896a0a17a3e86c485
 EBUILD graphicsmagick-1.3.38-r3.ebuild 3886 BLAKE2B b505f1bee7f36743d1e3e1da903bcc7bd2de92127b6c366dfd397a29a4b783395f61200e62ece858b322186703c9adcd1a92ce11e51ead10525ed81e9c482635 SHA512 8831c4252414b3712a53bd82125d719baaa58470d32de45781effc289c6147c7afb568f4730accfa17cc1fb78d3737613c517f7cdba979ea1839c0bd8a4a9b68
 EBUILD graphicsmagick-9999.ebuild 3850 BLAKE2B bb31d53b6a222d7ce4785880415dbdf17ca1ec4d2dbb2f8feebc63cec4316dd85aa33c5896d307500898fd91d7eb143d1910ab21acf690b13978536d515d8883 SHA512 0e15cfb1b4ac09717c5951a9f9e96d94a912e73f3f625ee02018bfa34f2b35bbf8a9865226542ea32418df9734872b73780aa067e04737c4171c687c792475bf
 MISC metadata.xml 1354 BLAKE2B 06f26407c7bbdbea6bb6ed510c3f497960a3ce8bf2ec296d3ff69eea8377774b7f7a1b37cb43eb63f7e7a31c4f74d978bb1ef863db9f87dba8d769aeca5e80c5 SHA512 9caa2359b6b15b397ce6108ebe941fd029e6b3d371c779a7bb3df5e0276b681067502aa10d12f5ab3eb427679818fdaa525dfdfba09c1fccf2511e23156aef7c
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
deleted file mode 100644
index 1fe3f2eda5e8..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
-	inherit verify-sig
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype"
-IUSE+=" webp wmf X zlib zstd"
-
-RDEPEND="
-	dev-libs/libltdl
-	bzip2? ( app-arch/bzip2 )
-	fpx? ( media-libs/libfpx )
-	heif? ( media-libs/libheif:= )
-	imagemagick? ( !media-gfx/imagemagick )
-	jbig? ( media-libs/jbigkit )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpegxl? ( media-libs/libjxl:= )
-	lcms? ( media-libs/lcms:2 )
-	lzma? ( app-arch/xz-utils )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:= )
-	postscript? ( app-text/ghostscript-gpl )
-	svg? ( dev-libs/libxml2 )
-	tcmalloc? ( dev-util/google-perftools:= )
-	tiff? ( media-libs/tiff )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-	)
-	webp? ( media-libs/libwebp:= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.36-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-	"${FILESDIR}"/${P}-configure-bashism.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local myeconfargs=(
-		--enable-largefile
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug prof)
-		$(use_enable debug gcov)
-		$(use_enable imagemagick magick-compat)
-		$(use_enable openmp)
-		$(use_with threads)
-		$(use_with dynamic-loading modules)
-		--with-quantum-depth=${depth}
-		--without-frozenpaths
-		$(use_with cxx magick-plus-plus)
-		$(use_with heif)
-		$(use_with jpegxl jxl)
-		$(use_with perl)
-		--with-perl-options=INSTALLDIRS=vendor
-		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
-		$(use_with fpx)
-		$(use_with jbig)
-		$(use_with webp)
-		$(use_with jpeg)
-		# Needs last-rited/unpackaged jasper
-		--without-jp2
-		$(use_with lcms lcms2)
-		$(use_with lzma)
-		$(use_with png)
-		$(use_with tcmalloc)
-		$(use_with tiff)
-		--without-trio
-		$(use_with truetype ttf)
-		$(use_with wmf)
-		--with-fontpath="${EPREFIX}"/usr/share/fonts
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
-		$(use_with svg xml)
-		$(use_with zlib)
-		$(use_with zstd)
-		$(use_with X x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-
-	default
-}
-
-src_install() {
-	default
-
-	if use perl ; then
-		emake -C PerlMagick DESTDIR="${D}" install
-
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index ef8c9ad3668e..3847eaaf6228 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/freealut/Manifest b/media-libs/freealut/Manifest
index 975497c7b04d..c0882ccd52fb 100644
--- a/media-libs/freealut/Manifest
+++ b/media-libs/freealut/Manifest
@@ -1,3 +1,3 @@
 DIST freealut-1.1.0.tar.gz 461830 BLAKE2B e19c800e2d678dd41b9e41153e0f99d84300b3f6d0226bd81e7724515597a2641fc2203e46b193dd506a1c90e968d2d951f84afa29cf375fbf5acb72999c1305 SHA512 270f74972548b4ac6b98c52c51787ed43c20cf79979063d073bbee7bd08ac4f34c2b579fbf15c09c4e606a5ed38dcd0252f5c46fb3cfe43b727b6b53cf747933
-EBUILD freealut-1.1.0-r4.ebuild 914 BLAKE2B 222786cd56c5475e3a63a543d11f6c42a7f79899065e7834a8e53aa685074cb5a96b8ab6d381fefe34cc78e925dded85ace3ef6ef3c2ba2ae207a192b3143dbb SHA512 2c1eec5a51b7e6efda2891f05b0bf939da476b9c0de26ad0a573e9186875c9bffdbc0316ab847b482e0a0a7461f8dc8433710c7e29c55a39629df4ba32912773
+EBUILD freealut-1.1.0-r5.ebuild 780 BLAKE2B 47a601f75edb41a28b370bb7859e66ec9d6638c1b9dc6b9c63eeffa65168ce8b0506339ca8ddbd80bcdbe64559ee27a0bd7de7c4022d426ed3fa99cf4111f587 SHA512 43711af6e1d822cdf4db137ff19000ab5a523b635b8d140cce09320b68a2c86d8baa69923928610fb4db52de7ae4977cb6315fa7acb2cca8d3a11f9707285a8b
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-libs/freealut/freealut-1.1.0-r4.ebuild b/media-libs/freealut/freealut-1.1.0-r5.ebuild
index 65fca6895af4..95f871e6688e 100644
--- a/media-libs/freealut/freealut-1.1.0-r4.ebuild
+++ b/media-libs/freealut/freealut-1.1.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="The OpenAL Utility Toolkit"
 HOMEPAGE="https://www.openal.org/"
@@ -12,10 +12,9 @@ SRC_URI="http://http.debian.net/debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="
-	>=media-libs/openal-1.15.1[${MULTILIB_USEDEP}]
+	>=media-libs/openal-1.15.1
 "
 DEPEND="${RDEPEND}"
 
@@ -28,12 +27,10 @@ src_prepare() {
 	AT_M4DIR="admin/autotools/m4" eautoreconf
 }
 
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --disable-static
-}
-
-multilib_src_install_all() {
+src_install() {
 	local HTML_DOCS=( doc/. )
-	einstalldocs
-	find "${D}" -name '*.la' -type f -delete || die
+
+	default
+
+	find "${ED}" -name '*.la' -type f -delete || die
 }
diff --git a/media-libs/libharu/Manifest b/media-libs/libharu/Manifest
index 572c4683de27..a97c2fcbd306 100644
--- a/media-libs/libharu/Manifest
+++ b/media-libs/libharu/Manifest
@@ -4,6 +4,6 @@ AUX libharu-2.3.0-3-cmake-fixes.patch 6376 BLAKE2B ec14be6aeda6e0e43a40bc2f1d41f
 AUX libharu-2.3.0-4-Add-support-for-free-form-triangle-Shading-objects.patch 15988 BLAKE2B 6cbd9826317e6d1de126dfdcdd3508bfb6351c34cd58fda8f09fe44efead890d78c67f33750223cb2291312b2299ecf16f7b91e4e20a3024bb6007da96753f86 SHA512 94d1377e529d1d96941a90ac82276748f5bf7f0e248a6770d938394151e453aaa082c0d256c0de28f737e7e995bc0ee60a4eb5562aa450af1dfcc1733b403466
 DIST libharu-2.3.0.tar.gz 1396413 BLAKE2B 7f0c819f17740f12f9bf6c7a7c749eb8c6ada326d98985daeac4d3250733cfc8e085b540e0969cb1b4c3b1055f4d1e148a2ed010d9371685fd265b62a879be9c SHA512 ebcabf1e8488e21185a231e97b4c16f9de742ae0ac2ebc7535b72b6b8e2045c2619bc6a94a820f7f923b0dfeceb217408f4e4c613ef3602104373cdf000d3f41
 DIST libharu-2.4.2.tar.gz 1411029 BLAKE2B 8618803022cc2c745d2517f71cf9da49eeefe16b05c486a5ecaa6ec09f6fb7e0dbe3af6d12018bf1c81d3a06c3be1446617e634ab21ea25a68ee9f9d645b65cb SHA512 faa5c0390f22ae8bbe3dbc2b49e49b475257a70c5772e456cc34df3f98b26e39b65b17b0f982dd844b9774a4217a621337a1a8a810d7be09569a7bffe4ea1f15
-EBUILD libharu-2.3.0-r2.ebuild 982 BLAKE2B a49f62832154f5aa2119ad88a27076c795f027dd9e9aa4dbed47c3573805a751af2c3b34a665363404fcf60b6d65f58d532a7326e3f8f160f88ec9850f185b0d SHA512 1f6857ad77257a1574336b0634f4875e9fa4a29e462f33cd53a8465050e4928cb1e72a42f4a260c5aec37b0f8becc5cf9a8525fe41ef1a4a07dd28c7a681dd5a
-EBUILD libharu-2.4.2.ebuild 750 BLAKE2B 25056885713bea24e89cfe74c217334322e332c47088aaec48f00ee6b02911682a0360a8fd11a9dce7ac62c513e2759fd15c74e9143477468df1b00b81fda52f SHA512 d0d7d33004d1441f3a0630bef990e63fccf98c643fb5cc3c81e7937eb1f58051a5fca8fc2299ab759f204177a249211f234dea13f3beb945e1166014cdf3d1dd
+EBUILD libharu-2.3.0-r3.ebuild 915 BLAKE2B 3ecaecabfb3c495255b3fc79855585cf019650029ea5fd359131836725fba6f8865e99236fb1928d504c854d940d2fec7a5aa6dbbf5dbc09e0ff5a6ad609558e SHA512 934f768be1795013ce7b8b6fe24cbafe0fcebfccd531ab785b0440f4101de07ce2bb61529758f4c5445f2c8cd6e0c0b556053c8ad6567733393a863839088ae9
+EBUILD libharu-2.4.2-r1.ebuild 683 BLAKE2B 4273fb7de88d0e7c1c908b7c0d194a783a71d829be414a070c2f2f890d92c70451cf4a0d14cfe6f3f6dbb103a7c57bf0d8181c1bd37882929f2aaf45f1ea084b SHA512 40c3738773f84820f4b4da38f951de45853f6df91744c50967f3001d04591dec070fb201c51bf6b851e191b46ecd20b8bebabad00eba6fd27fa324403ebafa24
 MISC metadata.xml 878 BLAKE2B 3a663b2bf854d6981de546932e6073c7b314e4f7a2688660a227092d3fa465c009ec473bd0452b0902563d862acd1184dd3c5df93d1de1d3248f08ebabc7708f SHA512 9decbd81a34c575c28c241103c16f03d865ed4b5000874181c29c224bf1395521d1640a89fe74cdb41c4920c50fe05e3d106ffdc283a4003b4f539681851253a
diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r3.ebuild
index 5e62094e2a17..60153140f9a5 100644
--- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
+++ b/media-libs/libharu/libharu-2.3.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 MYP=RELEASE_${PV//./_}
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -13,11 +13,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${MYP}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=
+	sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -30,7 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-4-Add-support-for-free-form-triangle-Shading-objects.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO
diff --git a/media-libs/libharu/libharu-2.4.2.ebuild b/media-libs/libharu/libharu-2.4.2-r1.ebuild
index 87d3e0fccb63..92b8e3624a99 100644
--- a/media-libs/libharu/libharu-2.4.2.ebuild
+++ b/media-libs/libharu/libharu-2.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="C/C++ library for PDF generation"
 HOMEPAGE="http://www.libharu.org/"
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 DEPEND="
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:=
+	sys-libs/zlib:=
 "
 RDEPEND="${DEPEND}"
 
@@ -24,7 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-1-Included-necessary-char-widths-in-generated-PDF.patch
 )
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DLIBHPDF_EXAMPLES=NO # Doesn't work
 		-DLIBHPDF_STATIC=NO
diff --git a/media-libs/libmetalink/Manifest b/media-libs/libmetalink/Manifest
index 95d455fc310a..2b7fb4de405a 100644
--- a/media-libs/libmetalink/Manifest
+++ b/media-libs/libmetalink/Manifest
@@ -1,3 +1,3 @@
 DIST libmetalink-0.1.3.tar.bz2 327482 BLAKE2B 08bf06323e38793a4ecdd3860236fe8a5b97a2deb6d91a63938197fbfc06e38fd6c8fc9968f6fcd883270339ddeba9821711ca3a8acdce5e096c167cec28c9ad SHA512 2c944a00f9460447ecf961685d7cfa80243fec7ad462dc2339fba0e944d0b92ff42bdf07032f2ee0695f0cd004e4c45bfe21e5246e1355a0d43756605894c632
-EBUILD libmetalink-0.1.3-r1.ebuild 977 BLAKE2B 4679bc9a0ea049850dd0c875a96e7876785a194eaa10292d4100eeb6f176df512c369d75e59fb232be3bc0269131d8e59eba5e39e7579a00bd14f7b28e8304ef SHA512 380c3cd0edc328ef3dc7c9d03481eaa9651cf24beb81514b9322e9fccef8965442e6a7241059c68edea56c09621b32935448eab4d98834588993fdde192aefe9
+EBUILD libmetalink-0.1.3-r2.ebuild 859 BLAKE2B 15a933567a8a6bc2ce62f94e7b7415fa206d2e823a46fe68a335e5fb626c91ae5462485288b8ae5cf4227c947dc5bb3622f72d0c59867027f513e0b3d37fb3e0 SHA512 1b55cd2c7841cbb8e049b5265ab07ba6f573d1619455a358deaf2b89c8becfbe3cca12d333c080e8f4fb68dd1b6a72e4497dcc458e3512e080da93127097cd4d
 MISC metadata.xml 247 BLAKE2B 70bbb974a97ea4e78a2093f0de1b39ea1982112d9fbfeb45e4a2b2aa1e7c93762beef35fdcc9fbf24365a3e8a94ed94b33747a7ea2d04058723c12400d9ecf20 SHA512 853d9ccf80460680dfbd3ba01b9760aa52ccd61fd0c7d69a80b64c5a92a7435007ca3dca6f962dc41b785a308f70df7c3f9390134438ad0cb403d2cf5691cabb
diff --git a/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild b/media-libs/libmetalink/libmetalink-0.1.3-r2.ebuild
index 792e57e88ed8..3249cbc0bc35 100644
--- a/media-libs/libmetalink/libmetalink-0.1.3-r1.ebuild
+++ b/media-libs/libmetalink/libmetalink-0.1.3-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-inherit multilib-minimal
+EAPI=8
 
 DESCRIPTION="Library for handling Metalink files"
 HOMEPAGE="https://launchpad.net/libmetalink"
@@ -14,23 +12,25 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86"
 IUSE="expat static-libs test xml"
 
-RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-	 xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+RDEPEND="expat? ( >=dev-libs/expat-2.1.0-r3 )
+	 xml? ( >=dev-libs/libxml2-2.9.1-r4 )"
 DEPEND="${RDEPEND}
-	test? ( >=dev-util/cunit-2.1_p2[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-util/cunit-2.1_p2 )"
 
 REQUIRED_USE="^^ ( expat xml )"
 RESTRICT="!test? ( test )"
 
-multilib_src_configure() {
+src_configure() {
 	local myeconfargs=(
 		$(use_with expat libexpat)
 		$(use_with xml libxml2)
 		$(use_enable static-libs static)
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	econf "${myeconfargs[@]}"
 }
 
-multilib_src_install_all() {
+src_install() {
+	default
+
 	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index 1296bd5cfcd7..2200f67ed182 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,5 +1,3 @@
-DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
-EBUILD libpulse-16.0-r1.ebuild 5641 BLAKE2B 37a7fcc4716d0a1ce8a514f041103e62819042f9734b9e720d935e10a2189c1b63f8aba22ad98e57c828cd731edfd65e1480dbdc9024621e42ac609173abd287 SHA512 ab357aa27deab515b538c37c24547433c6d94bd006c2dee55e7f8402ea7424e25bfe4f3c620e3b7f6ad5ae6c68dc9e41bd0b4b4ceff7a526263e6e87916a4a09
 EBUILD libpulse-16.1-r1.ebuild 5779 BLAKE2B 4477cae3655af8ea4d2e0917cfe3fa4821f824affbefe77ee23f4d560e5c68bc1a8ac15c2fc94682311d466301afd0d9fea6e22e2cf4bf2016a1e1c090e876a9 SHA512 c4b40281466a4284128b5143c7e27ac30c198b562c79f1efe6c828ba9571d73d5d76c1821eda47fe8b6c978a14e15eeef9e0c5abce1cf71a300ad772886d58f4
 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb
diff --git a/media-libs/libpulse/libpulse-16.0-r1.ebuild b/media-libs/libpulse/libpulse-16.0-r1.ebuild
deleted file mode 100644
index 005c74d6e02b..000000000000
--- a/media-libs/libpulse/libpulse-16.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="pulseaudio-${MY_PV}"
-inherit bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-
-DESCRIPTION="Libraries for PulseAudio clients"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
-else
-	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1+"
-
-SLOT="0"
-IUSE="+asyncns dbus doc +glib gtk selinux systemd test valgrind X"
-RESTRICT="!test? ( test )"
-
-# NOTE: libpcre needed in some cases, bug #472228
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
-RDEPEND="
-	dev-libs/libatomic_ops
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	virtual/libc
-	asyncns? ( >=net-libs/libasyncns-0.1[${MULTILIB_USEDEP}] )
-	dbus? ( >=sys-apps/dbus-1.4.12[${MULTILIB_USEDEP}] )
-	elibc_mingw? ( dev-libs/libpcre:3 )
-	glib? ( >=dev-libs/glib-2.28.0:2[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-	)
-	!<media-sound/pulseaudio-15.0-r100
-"
-
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# pulseaudio ships a bundled xmltoman, which uses XML::Parser
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	sys-devel/m4
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-DOCS=( NEWS README )
-
-# patches merged upstream, to be removed with 16.0 bump
-PATCHES=(
-)
-
-src_prepare() {
-	default
-
-	# disable autospawn by client
-	sed -i -e 's:; autospawn = yes:autospawn = no:g' src/pulse/client.conf.in || die
-
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		-Ddaemon=false
-		-Dclient=true
-		$(meson_native_use_bool doc doxygen)
-		-Dgcov=false
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_native_use_bool test tests)
-		-Ddatabase=simple # Not used for non-daemon, simple database avoids external dep checks
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		-Dalsa=disabled
-		$(meson_feature asyncns)
-		-Davahi=disabled
-		-Dbluez5=disabled
-		-Dbluez5-gstreamer=disabled
-		-Dbluez5-native-headset=false
-		-Dbluez5-ofono-headset=false
-		$(meson_feature dbus)
-		-Delogind=disabled
-		-Dfftw=disabled
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		-Dgsettings=disabled
-		-Dgstreamer=disabled
-		$(meson_native_use_feature gtk)
-		-Dhal-compat=false
-		-Dipv6=true
-		-Djack=disabled
-		-Dlirc=disabled
-		-Dopenssl=disabled
-		-Dorc=disabled
-		-Doss-output=disabled
-		-Dsamplerate=disabled # Matches upstream
-		-Dsoxr=disabled
-		-Dspeex=disabled
-		$(meson_native_use_feature systemd)
-		-Dtcpwrap=disabled
-		-Dudev=disabled
-		$(meson_native_use_feature valgrind)
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false
-		-Dwebrtc-aec=disabled
-	)
-
-	if multilib_is_native_abi; then
-		# Make padsp work for non-native ABI, supposedly only possible with glibc;
-		# this is used by /usr/bin/padsp that comes from native build, thus we need
-		# this argument for native build
-		if use elibc_glibc; then
-			emesonargs+=( -Dpulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	else
-		emesonargs+=( -Dman=false )
-		if ! use elibc_glibc; then
-			# Non-glibc multilib is probably non-existent but just in case:
-			ewarn "padsp wrapper for OSS emulation will only work with native ABI applications!"
-		fi
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Generating documentation ..."
-			meson_src_compile doxygen
-		fi
-	fi
-}
-
-multilib_src_install() {
-	# The files referenced in the DOCS array do not exist in the multilib source directory,
-	# therefore clear the variable when calling the function that will access it.
-	DOCS= meson_src_install
-
-	# Upstream installs 'pactl' if client is built, with all symlinks except for
-	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
-	# This trips QA warning, workaround:
-	# - install missing aliases in media-libs/libpulse (client build)
-	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
-	bashcomp_alias pactl pulseaudio
-	bashcomp_alias pactl pacmd
-	bashcomp_alias pactl pasuspender
-
-	if multilib_is_native_abi; then
-		if use doc; then
-			einfo "Installing documentation ..."
-			docinto html
-			dodoc -r doxygen/html/.
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest
index 1ee1187c229c..5a8aff2cbf09 100644
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,4 +1,7 @@
 AUX taglib-1.12-cmake.patch 18074 BLAKE2B f4f9dedd614d7bb2f981f7e4e8dc0b257847e9627e1fdc24d85a615cac7d894402b6901e39297a5a9473d9b1eecb6bc0be6183950abc3196245c1c8921f930aa SHA512 2003f02a843c3982c7c50db77bbda9ca75c36f25a371df03cca5139bd78e2efd7b083672bb06c5f9b0d114253fdaf6adeb995304877ff84085d8d1b07ef2c779
+AUX taglib-1.13-cmake.patch 1340 BLAKE2B 8255f3658c0a8adc386fb7f7aaba6c709b6a09a28219ef62484c9c73b198b6c45f03b7418bcacc6b0037ff8054497eb7aa7d2b18399e1321b40b58f66f49fd07 SHA512 46ff14f714954bcba48cdb9e0a1af3387fea6595cbdf2d6ad5331573d38d67fd0c22c412b67d3be757bd4bd1ef05aa485ae9e270643055cbbb4ccb4f9a009252
 DIST taglib-1.12.tar.gz 1364231 BLAKE2B 414a61a302fbdd1af8dae70fcec96311023d3ef85a659b8dc598c8c73cf31142b4a254c843f4d415eff0fda84e62e18f1bb63921f1868400990f023aa01b1a41 SHA512 63c96297d65486450908bda7cc1583ec338fa5a56a7c088fc37d6e125e1ee76e6d20343556a8f3d36f5b7e5187c58a5d15be964c996e3586ea1438910152b1a6
+DIST taglib-1.13.tar.gz 1371504 BLAKE2B 844aacec1a5a6baf69cc849cd09c53778b618acffc4bffb0b80835e0a0b6481c0492a5b66b51ef6fd15350b3a392f4a473410696534a7c2129cf045de6108156 SHA512 b6e3253d158b41173073c0da1915f5e4a3de947db918660817cb1c755fba7e3723ea1a335fbbc30b0dcf942348a471b493fe2ce1d52d1a808578edee14e1bfc7
 EBUILD taglib-1.12.ebuild 1296 BLAKE2B 1857d3925ded4150600158a518fd38b740dd839b0ec130a1f10d78c18245a3d978feee8acea27aca043a32f7febe213dec4d466e5eb0e27f12f1050759cf788b SHA512 8fbc3be5098ddee48c3cff5e0d00fa311d4a6232f5e1389e439ae7a7c1c903c8326472eb9baff530b86f90eed7d4071b356ff5dc1132bb07b2886a603abf1757
+EBUILD taglib-1.13.ebuild 1285 BLAKE2B 53af71ca59a55ae910360200ded8d74261661860f58cde220c19dba4878cc6de83728fa7791c690a529094d4be051d28d1dcf1eabb505626bf1fe53d53016e3d SHA512 8b04ce648ce3529f841c6b5b8647dfa35879fb5f915ab30f47019027d5eb92408ded498a92227ec0a26b2050f33713839ca0d4e831e30b9c5910cc4a21df9f26
 MISC metadata.xml 385 BLAKE2B ca751efe47d501350e6b6f9b6d9925ed18e4a6f5dd2cacf18e5808b176c287f794251fb1606f86d2777051777b37d84c3c7a3d4a7dc2380f46f0c116500f81da SHA512 755de0d1495371605e6b80012ec736e5a9c9f50dfd7946e0443918f3fe193b5e3127325a5dc5b5e4e3c0db9be287d9db3e2e9d992b539629f2e291dc551963f3
diff --git a/media-libs/taglib/files/taglib-1.13-cmake.patch b/media-libs/taglib/files/taglib-1.13-cmake.patch
new file mode 100644
index 000000000000..5bda305db103
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.13-cmake.patch
@@ -0,0 +1,37 @@
+From 8aa7dd81d8b89bfa48bb32f6cab7df20f79f3562 Mon Sep 17 00:00:00 2001
+From: Ryan Schmidt <git@ryandesign.com>
+Date: Thu, 27 Oct 2022 20:02:04 -0500
+Subject: [PATCH] Fix macOS dylib install name to be absolute path
+
+Closes #1065
+---
+ bindings/c/CMakeLists.txt | 2 +-
+ taglib/CMakeLists.txt     | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
+index 15f4e440a..b517da7b6 100644
+--- a/bindings/c/CMakeLists.txt
++++ b/bindings/c/CMakeLists.txt
+@@ -58,7 +58,7 @@ set_target_properties(tag_c PROPERTIES
+   VERSION 0.0.0
+   SOVERSION 0
+   DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
+-  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
++  INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
+ )
+ install(TARGETS tag_c
+ 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt
+index 527c00738..ea1ab8388 100644
+--- a/taglib/CMakeLists.txt
++++ b/taglib/CMakeLists.txt
+@@ -344,7 +344,7 @@ endif()
+ set_target_properties(tag PROPERTIES
+   VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
+   SOVERSION ${TAGLIB_SOVERSION_MAJOR}
+-  INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
++  INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR}
+   DEFINE_SYMBOL MAKE_TAGLIB_LIB
+   LINK_INTERFACE_LIBRARIES ""
+   PUBLIC_HEADER "${tag_HDRS}"
diff --git a/media-libs/taglib/taglib-1.13.ebuild b/media-libs/taglib/taglib-1.13.ebuild
new file mode 100644
index 000000000000..d5cbedc1aa37
--- /dev/null
+++ b/media-libs/taglib/taglib-1.13.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="Library for reading and editing audio meta data"
+HOMEPAGE="https://taglib.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/taglib-config
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(multilib_native_usex examples)
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_src_compile
+
+	if multilib_is_native_abi; then
+		use doc && cmake_build docs
+	fi
+}
+
+multilib_src_test() {
+	eninja check
+}
+
+multilib_src_install() {
+	cmake_src_install
+
+	if multilib_is_native_abi && use doc; then
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1c8697cd92d6..f7403ac62b41 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 37224609f392..3dbcbe6d0ab1 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -4,8 +4,6 @@ AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d0
 AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
-DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
-EBUILD pulseaudio-daemon-16.0-r1.ebuild 11997 BLAKE2B 7af693e228ee587a7ffa5120bbd788ebf9b779e7fdc9550b04b6706e200a9bf036834fd7eb7ee461b1a62a2f9ca4ac56abdab78dd3b61d78a609629fcac05e8e SHA512 fb36604ef31b93b4077bd809e4edb2697e511eecd62bb029ffb67bf2f2ed8e14fef6f61cc6356a7d5e816586efdf0d4eac121896808610952c92fd43beac9e5f
 EBUILD pulseaudio-daemon-16.1.ebuild 12176 BLAKE2B 9191d042a854771890e77a7824365f10c84d4a3fb96d755ec19d4ee63b4074b725712ca4ee48a45453fd59ed931438bf2e88a9b835acbf15bbf5947beade2a51 SHA512 301dad95a0ce492684dddca6d1b4700e1e2dd4a9c607e26fd802cb63f2685748c68848d43aaeaed050897208ad3e83858ffab47a61f90856397fb6d60eabac0e
 MISC metadata.xml 3570 BLAKE2B 24d7b24a68f5e832708d9879769f55ec4cf146c47a41b5fa0ff33f63a5a9945736e227c6a6afa106f964fd91eb3b0ee441203c92f312ed835ef2197979b6fda9 SHA512 34aa5503ad5483eeff2f7c4713d96322dedbdd56b7d52a17ba0658aba24aef58239d5ee1943a276555c2508fd3d5e18639ec6417044adad512693fa6c673c5df
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
deleted file mode 100644
index 1dc4c81cf6e6..000000000000
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV/_pre*}"
-MY_P="pulseaudio-${MY_PV}"
-inherit bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_BRANCH="master"
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio"
-else
-	SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-
-# +alsa-plugin as discussed in bug #519530
-# TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
-# NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
-IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc
-ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
-
-RESTRICT="!test? ( test )"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-# Basically all IUSE are either ${MULTILIB_USEDEP} for client libs or they belong under !daemon ()
-# We duplicate alsa-plugin, {native,ofono}-headset under daemon to let users deal with them at once
-REQUIRED_USE="
-	?? ( elogind systemd )
-	alsa-plugin? ( alsa )
-	aptx? ( bluetooth )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ldac? ( bluetooth )
-	ofono-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	zeroconf? ( dbus )
-"
-
-# NOTE:
-# - libpcre needed in some cases, bug #472228
-# - media-libs/speexdsp is providing echo canceller implementation and used in resampler
-# TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
-gstreamer_deps="
-	media-libs/gst-plugins-base
-	>=media-libs/gstreamer-1.14
-"
-COMMON_DEPEND="
-	~media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?]
-	dev-libs/libatomic_ops
-	>=media-libs/libsndfile-1.0.20
-	>=media-libs/speexdsp-1.2
-	|| (
-		elibc_glibc? ( virtual/libc )
-		dev-libs/libpcre:3
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	aptx? ( ${gstreamer_deps} )
-	asyncns? ( >=net-libs/libasyncns-0.1 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		media-libs/sbc
-	)
-	dev-libs/libltdl
-	sys-kernel/linux-headers
-	>=sys-libs/libcap-2.22-r2
-	dbus? ( >=sys-apps/dbus-1.4.12 )
-	elogind? ( sys-auth/elogind )
-	equalizer? (
-		sci-libs/fftw:3.0=
-	)
-	fftw? (
-		sci-libs/fftw:3.0=
-	)
-	gdbm? ( sys-libs/gdbm:= )
-	glib? ( >=dev-libs/glib-2.28.0:2 )
-	gstreamer? ( ${gstreamer_deps} )
-	gtk? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )
-	ldac? ( ${gstreamer_deps} )
-	lirc? ( app-misc/lirc )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	selinux? ( sec-policy/selinux-pulseaudio )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	valgrind? ( dev-util/valgrind )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
-	X? (
-		>=x11-libs/libxcb-1.6
-		x11-libs/libICE
-		x11-libs/libSM
-		>=x11-libs/libX11-1.4.0
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	!<media-sound/pulseaudio-15.0-r100
-"
-
-# pulseaudio ships a bundle xmltoman, which uses XML::Parser
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.10 )
-	X? ( x11-base/xorg-proto )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug 155707); TODO: read it
-# NOTE: Only system-wide needs acct-group/audio unless elogind/systemd is not used
-RDEPEND="
-	${COMMON_DEPEND}
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		acct-user/pulse
-		acct-group/audio
-		acct-group/pulse-access
-	)
-	bluetooth? (
-		ldac? ( media-plugins/gst-plugins-ldac )
-		aptx? ( media-plugins/gst-plugins-openaptx )
-	)
-"
-unset gstreamer_deps
-
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-"
-
-BDEPEND="
-	dev-lang/perl
-	dev-perl/XML-Parser
-	sys-devel/gettext
-	virtual/libiconv
-	virtual/libintl
-	virtual/pkgconfig
-	orc? ( >=dev-lang/orc-0.4.15 )
-	system-wide? ( dev-util/unifdef )
-"
-
-DOCS=( NEWS README )
-
-S="${WORKDIR}/${MY_P}"
-
-# patches merged upstream, to be removed with 16.0 bump
-PATCHES=(
-)
-
-src_prepare() {
-	default
-
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local enable_bluez5_gstreamer="disabled"
-	if use aptx || use ldac ; then
-		enable_bluez5_gstreamer="enabled"
-	fi
-
-	local enable_fftw="disabled"
-	if use equalizer || use fftw ; then
-		enable_fftw="enabled"
-	fi
-
-	local emesonargs=(
-		--localstatedir="${EPREFIX}"/var
-
-		-Ddaemon=true
-		-Dclient=false
-		-Ddoxygen=false
-		-Dgcov=false
-		-Dman=true
-		# tests involve random modules, so just do them for the native # TODO: tests should run always
-		$(meson_use test tests)
-		-Ddatabase=$(usex gdbm gdbm simple) # tdb is also an option but no one cares about it
-		-Dstream-restore-clear-old-devices=true
-		-Drunning-from-build-tree=false
-
-		# Paths
-		-Dmodlibexecdir="${EPREFIX}/usr/$(get_libdir)/pulseaudio/modules" # Was $(get_libdir)/${P}
-		-Dsystemduserunitdir=$(systemd_get_userunitdir)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dbashcompletiondir="$(get_bashcompdir)" # Alternatively DEPEND on app-shells/bash-completion for pkg-config to provide the value
-
-		# Optional features
-		$(meson_feature alsa)
-		$(meson_feature asyncns)
-		$(meson_feature zeroconf avahi)
-		$(meson_feature bluetooth bluez5)
-		-Dbluez5-gstreamer=${enable_bluez5_gstreamer}
-		$(meson_use bluetooth bluez5-native-headset)
-		$(meson_use ofono-headset bluez5-ofono-headset)
-		$(meson_feature dbus)
-		$(meson_feature elogind)
-		-Dfftw=${enable_fftw}
-		$(meson_feature glib) # WARNING: toggling this likely changes ABI
-		$(meson_feature glib gsettings) # Supposedly correct?
-		$(meson_feature gstreamer)
-		$(meson_feature gtk)
-		-Dhal-compat=true # Consider disabling on next revbump
-		$(meson_use ipv6)
-		$(meson_feature jack)
-		$(meson_feature lirc)
-		$(meson_feature ssl openssl)
-		$(meson_feature orc)
-		$(meson_feature oss oss-output)
-		-Dsamplerate=disabled # Matches upstream
-		$(meson_feature sox soxr)
-		-Dspeex=enabled
-		$(meson_feature systemd)
-		$(meson_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
-		$(meson_feature udev)
-		$(meson_feature valgrind)
-		$(meson_feature X x11)
-
-		# Echo cancellation
-		-Dadrian-aec=false # Not packaged?
-		$(meson_feature webrtc-aec)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Upstream installs 'pactl' if client is built, with all symlinks except for
-	# 'pulseaudio', 'pacmd' and 'pasuspender' which are installed if server is built.
-	# This trips QA warning, workaround:
-	# - install missing aliases in media-libs/libpulse (client build)
-	# - remove corresponding symlinks in media-sound/pulseaudio-daemonclient (server build)
-	rm "${D}/$(get_bashcompdir)"/pulseaudio || die
-	rm "${D}/$(get_bashcompdir)"/pacmd || die
-	rm "${D}/$(get_bashcompdir)"/pasuspender || die
-
-	if use system-wide; then
-		newconfd "${FILESDIR}"/pulseaudio.conf.d pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo ${1} | tr '[:lower:]' '[:upper:]')}
-
-			use "${1}" && echo "-D${define}" || echo "-U${define}"
-		}
-
-		unifdef -x 1 \
-			$(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}"/pulseaudio.init.d-5 \
-			> "${T}"/pulseaudio \
-			|| die
-
-		doinitd "${T}"/pulseaudio
-
-		systemd_dounit "${FILESDIR}"/pulseaudio.service
-
-		# We need /var/run/pulse, bug 442852
-		newtmpfiles "${FILESDIR}"/pulseaudio.tmpfiles pulseaudio.conf
-	else
-		# Prevent warnings when system-wide is not used, bug 447694
-		if use dbus; then
-			rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf; then
-		sed -i \
-			-e '/module-zeroconf-publish/s:^#::' \
-			"${ED}/etc/pulse/default.pa" \
-			|| die
-	fi
-
-	# Only enable autospawning pulseaudio daemon on systems without systemd
-	if ! use systemd; then
-		insinto /etc/pulse/client.conf.d
-		newins "${FILESDIR}/enable-autospawn.conf" "enable-autospawn.conf"
-	fi
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	use udev && udev_reload
-
-	if use system-wide; then
-		tmpfiles_process "pulseaudio.conf"
-
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog ""
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		elog ""
-	fi
-
-	if use equalizer; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-		elog ""
-	fi
-
-	if use bluetooth; then
-		elog "You have enabled bluetooth USE flag for pulseaudio. Daemon will now handle"
-		elog "bluetooth Headset (HSP HS and HSP AG) and Handsfree (HFP HF) profiles using"
-		elog "native headset backend by default. This can be selectively disabled"
-		elog "via runtime configuration arguments to module-bluetooth-discover"
-		elog "in /etc/pulse/default.pa"
-		elog "To disable HFP HF append enable_native_hfp_hf=false"
-		elog "To disable HSP HS append enable_native_hsp_hs=false"
-		elog "To disable HSP AG append headset=auto or headset=ofono"
-		elog "(note this does NOT require enabling USE ofono)"
-		elog ""
-	fi
-
-	if use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-		elog ""
-	fi
-
-	if use gstreamer; then
-		elog "GStreamer-based RTP implementation modile enabled."
-		elog "To use OPUS payload install media-plugins/gst-plugins-opus"
-		elog "and add enable_opus=1 argument to module-rtp-send"
-		elog ""
-	fi
-
-	if use systemd; then
-		elog "Pulseaudio autospawn by client library is no longer enabled when systemd is available."
-		elog "It's recommended to start pulseaudio via its systemd user units:"
-		elog ""
-		elog "  systemctl --user enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "Root user can change system default configuration for all users:"
-		elog ""
-		elog "  systemctl --global enable pulseaudio.service pulseaudio.socket"
-		elog ""
-		elog "If you would like to enable autospawn by client library, edit autospawn flag in /etc/pulse/client.conf like this:"
-		elog ""
-		elog "  autospawn = yes"
-		elog ""
-		elog "The change from autospawn to user units will take effect after restarting."
-		elog ""
-	fi
-
-	optfeature_header "PulseAudio can be enhanced by installing the following:"
-	use equalizer && optfeature "using the qpaeq script" dev-python/PyQt5[dbus,widgets]
-	use dbus && optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	use udev && udev_reload
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 6307172476a2..9042ea0ed205 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,3 +1,2 @@
-EBUILD pulseaudio-16.0.ebuild 879 BLAKE2B bf99843aea835578905b86529c2bc11d93b28b6457d5ed6b52157e90a98ad5d9be17208c52f9e9d7dfa290e4676fcc79279aa38afa59c51d694579d4f15ec8ee SHA512 644aa3f63973836971e5793451f2e1ea4d81ce46b82c36ec61fcbe3807c5920a3c6ee8684c87f9164a9806bfc1d719b091bf1674b6955c2b3d3d2ca7367203d6
 EBUILD pulseaudio-16.1.ebuild 878 BLAKE2B 0addc95dfcd08dfb038c3cfdd2177f75b293b7c5de5ff826c872f3c9667f70bba90d0aacb9109a82b2d16796edb6042ec16373341784d8afd3728e18eaf895cc SHA512 9f4adb9f425e55a26e85a62b5edd13fd5e9c3c48c689bdca1af3db71f6819db7800677224f7587763732158e857e790c846120adda828f300f13147eceebff45
 MISC metadata.xml 953 BLAKE2B a3a358855135a25b03c43f563fe9717da9eb56fb0bb18fba3c1a24f4e12e3eb97cb92e7582c1a7b4abf2e2496c712b5f514c1a74de85600e35d5196bc4c12574 SHA512 222d58e1ce890721bfab43768a62940e818a85bd100505bc782771d05614570038a8be515bddea0ace47baabcf3fba3529f783c94dbdaea969b84982a8625453
diff --git a/media-sound/pulseaudio/pulseaudio-16.0.ebuild b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
deleted file mode 100644
index 0e728819bd6b..000000000000
--- a/media-sound/pulseaudio/pulseaudio-16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multilib-minimal
-
-DESCRIPTION="A meta package for PulseAudio (networked sound server)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI=""
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-LICENSE="metapackage"
-
-SLOT="0"
-
-# NOTE: bluetooth and ofono-headset are passed through to
-# pulseaudio-daemon dependency to make sure users who have bluetooth enabled
-# just for pulseaudio package will also get these enabled via metapackage.
-IUSE="bluetooth +daemon +glib jack ofono-headset"
-
-RDEPEND="
-	>=media-libs/libpulse-${PV}[glib?,${MULTILIB_USEDEP}]
-	daemon? ( >=media-sound/pulseaudio-daemon-${PV}[bluetooth?,glib?,jack?,ofono-headset?] )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index a4ac77384c6b..69b26b9dd85a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ec476617e676..73a7f701db2d 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,22 +1,8 @@
-AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06
-AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e
 AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e
 AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d
 AUX mkvtoolnix-68.0.0-fmt-9.patch 11851 BLAKE2B 936383fa62ce4bf2d3a08e62854c3c520a2bff8d56efc59c1ab6e75326f06a6af50e716513ca29e080f4579e2501b64d8a502c1d73c56fe270189676deaaf065 SHA512 7431eea6a3c559a802ce07a19e28588bea0842185748c03be1e9f2e70056465dea07ad7dc77cfbc18d39d046b6cdddd70d0cf24748b3fdae69881bde434cacfb
-DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
-DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
-DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582
-DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844
-DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997
-DIST mkvtoolnix-68.0.0.tar.xz 10911424 BLAKE2B e4704592212aa919a7cbd62b3906b5af6c4bb88293299e93a4ad65cc8857615b1654ed554c17daf60e1b001d8e5265afda808e81ee51f372be2f738d737fdd4d SHA512 fd078208f5ef0438f06b3bb19c3f3c477f87561997a847c56a731265ee9627b089cc568e1d31a9a2c7e46f63aeeabccf98a27694b6b4b1586ba93f7656d20838
 DIST mkvtoolnix-69.0.0.tar.xz 10946800 BLAKE2B aed865e723d315aaddbfe6351c98bdafaee8b75968a2c03256e37e96d5ee7324d92ef8a5bb12c559c46264ebdcefd7a802884ac33db59fa5935621769ec9bfd1 SHA512 c7ce69e9a921103da4745c75cd6fa41a49dbb8637f48097233388e5d8be121714d3fde10f745b78e84a8ef70e46f0168f36f069331f04623805c0bda8a90060c
 DIST mkvtoolnix-71.1.0.tar.xz 10989788 BLAKE2B 6b90ac9e103a75f5db76fa06def3593c7dc3c77d1179400aecda7217692fbe7f3866d838a541895d704ab9ddfb9972855c3cdad928356552136f9481cd65cf41 SHA512 f0565813ee4a303f0710b2d8019b6275e5ce7542174475e8ef9d4828c3e5ff5cf8a7940eb0e878b419e0b22a9fd55e2fc41e8e26c1b0777b95caac30d82fad5b
-EBUILD mkvtoolnix-57.0.0.ebuild 2962 BLAKE2B f3a339ece4e0cb98fb0533478cfbe888021ff56f831a3faedbcb67205313df4af7727a6b5f5bb2103234710cec224e55d1421b5d5c423f6b103d27b1fdd60236 SHA512 2aa6f5ffe2fc3fe20ad0bc8b1ffd839c468484f36c8e36821e2a3b1689d2d935d80b9c45f4b1612b39c5b9342fc017b9cb373bf4998a506694e9086d8c76c600
-EBUILD mkvtoolnix-60.0.0.ebuild 2706 BLAKE2B dd751ea20eab19a91848f07ebeeedc411849a409c78d19695b77d1ea45dfd94d19651e7cd6824d8d2e9b061cf82b56a7207e05b2b1dd489ceff02b400c253231 SHA512 ab3106fb27a970c0873717fa402c937af4288ae100d26b1f361e7f0382cda413b1a2159812b1be2b738b241a2e0ddcb621e67e51a4c0b32e034c944dc35ba68b
-EBUILD mkvtoolnix-61.0.0.ebuild 2726 BLAKE2B 2279b0cb4059b76a66af001589060a3206e05c4c90a9e1b313701ceac45d431cb0535824be25a7882c0ae990dfee9384be2dcc60bc36f3cb183c74cab5081341 SHA512 037d0c1c978eb03634f16c39a8c5c09b1a9f0694c8f226ed3335763dd542133902d13f389e1778f6e4ab0ceb5193a02d960deb2d700f01e0c54dcc161a608763
-EBUILD mkvtoolnix-64.0.0.ebuild 2736 BLAKE2B 2f4fcd86ff3a7fc61adbebd1689e7123e4cd36d8c83baa34145ab35c8aab655feae8724392f062e50519199570a1a7fe6ad82df206f24029b8de1f63106646b8 SHA512 8139a1290507588d94e33bd3ce985c5f68912bb5ffd8b0e542a76e54966aedaba4754c70f0a984c9880df7a93f295ab0ae1a916555f01f2a4a006a10b47de39d
-EBUILD mkvtoolnix-67.0.0.ebuild 2946 BLAKE2B 6b4beb782bf52c52314af7b9df19c1920c6c1e54451ebc2cb3d7b56a2eb2628bf3cb3a62b52eb6a3720384858158fce3be596f946c69dc139324a7cd423139b3 SHA512 6103ec8d155a14015e3c01f49618daee3fddc487816e130157ea8f144531cfffa1a4e94012c8028700201dce34a78a254e75f53029f1d06ff1644caf13ad2f9e
-EBUILD mkvtoolnix-68.0.0-r3.ebuild 2973 BLAKE2B 2a3b8f0d5f61ccb1d2cbc69cabd9466fde5c1ef1e36689aac4e5433c66c05f1cc72a3afbb536af5604e0748aeb264f54c1c2193170e64b8f34e304f879c6f32c SHA512 69d1bab3c7e6329468930c5a716dfbecfea61b7360e11e333ce047dc4c082ebee2d15044adcd8c6c3a6700cd53a0e69042d9d665997074f461a6ff2a562d943f
 EBUILD mkvtoolnix-69.0.0.ebuild 2939 BLAKE2B b626b90bd71651f79431cc1cd803f57904c48dacc906a7e220474b602adaf5a8108febe262a08bf56e0c960817e6322413fdc70537a7ae77241c32ca07b85059 SHA512 cafe20ffdc9de60647a63dd4a7cb0806a012582f4d864423650603c6fa3b33658936e2c81ce8d3d4a076e55aefe55f1baaab912701e5d9175971d8492a4a20bc
 EBUILD mkvtoolnix-71.1.0.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
 EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
deleted file mode 100644
index 1c59b2c3827a..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/ac/qt5.m4   2020-07-31 11:25:31.371508129 -0500
-+++ b/ac/qt5.m4   2020-07-31 11:30:14.967322450 -0500
-@@ -14,6 +14,11 @@
- AC_ARG_WITH([qt_pkg_config],
-   AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
-   [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
-+AC_ARG_ENABLE([dbus],
-+  AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+  [],[enable_dbus=yes])
-+
-+
- 
- if test x"$enable_qt" = "xyes" -a \
-   '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
-@@ -169,11 +174,13 @@
-       AC_MSG_RESULT(no: not found by pkg-config)
-     fi
- 
--    if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
--      PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
--      if test x"$dbus_found" = xyes; then
--        with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
--        AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+    if test x"$enable_dbus" = xyes; then
-+      if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-+        PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-+        if test x"$dbus_found" = xyes; then
-+          with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-+          AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+        fi
-       fi
-     fi
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
deleted file mode 100644
index c0f91deed696..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
-https://bugs.gentoo.org/786978#c10
-diff --git a/Rakefile b/Rakefile
-index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args|
-     # Even -O1 causes compilation time & memory usage to skyrocket,
-     # possibly exponentially, with the number of entries to
-     # emplace_back() into the vector.
--    flags.gsub!(%r{ -O\d+ }, ' -O0 ')
-+    flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0')
-   end
- 
-   args = [
diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
deleted file mode 100644
index fff9c5471fbe..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild
+++ /dev/null
@@ -1,131 +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 toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd nls pch qt5 test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	dev-libs/libpcre2:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-		app-text/cmark:0=
-		dbus? ( dev-qt/qtdbus:5 )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/utfcpp
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch )
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# https://bugs.gentoo.org/692018
-	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug 692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		$(use_enable qt5 qt)
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	if use qt5 ; then
-		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
-		myeconfargs+=(
-			--with-moc=$(qt5_get_bindir)/moc
-			--with-uic=$(qt5_get_bindir)/uic
-			--with-rcc=$(qt5_get_bindir)/rcc
-			--with-qmake=$(qt5_get_bindir)/qmake
-		)
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
deleted file mode 100644
index b4be2070e7c0..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
+++ /dev/null
@@ -1,121 +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 toolchain-funcs multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	<dev-libs/libfmt-9.0.0:=
-	dev-libs/libpcre2:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtmultimedia:5
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/utfcpp
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# https://bugs.gentoo.org/692018
-	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug 692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		--disable-qt6
-		--enable-qt5
-		--with-qmake=$(qt5_get_bindir)/qmake
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
deleted file mode 100644
index cfd401ed0150..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
+++ /dev/null
@@ -1,124 +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 multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd nls pch test gui"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-libs/libebml-1.4.0:=
-	>=dev-libs/libfmt-6.1.0:=
-	<dev-libs/libfmt-9.0.0:=
-	dev-libs/libpcre2:=
-	dev-libs/pugixml:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-apps/file
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/utfcpp
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch )
-
-src_prepare() {
-	xdg_src_prepare
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# https://bugs.gentoo.org/692018
-	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug 692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		$(use_enable gui)
-		--disable-qt6
-		--enable-qt5
-		--with-qmake=$(qt5_get_bindir)/qmake
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
deleted file mode 100644
index f827b04ecbae..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
+++ /dev/null
@@ -1,126 +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 multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.2:=
-	>=dev-libs/libfmt-8.0.1:=
-	<dev-libs/libfmt-9.0.0:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# https://bugs.gentoo.org/692018
-	sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-		$(use_enable gui)
-		--disable-qt6
-		--enable-qt5
-		--with-qmake=$(qt5_get_bindir)/qmake
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
deleted file mode 100644
index a27ee5107f3f..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.2:=
-	>=dev-libs/libfmt-8.0.1:=
-	<dev-libs/libfmt-9.0.0:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# Qt (of some version) is always needed, even for non-GUI builds,
-		# to do e.g. MIME detection. See e.g. bug #844097.
-		# But most of the Qt deps are conditional on a GUI build.
-		--disable-qt6
-		--enable-qt5
-		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
deleted file mode 100644
index 07634bd57696..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing qmake-utils xdg
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dbus debug dvd gui nls pch test"
-RESTRICT="!test? ( test )"
-
-# check NEWS.md for build system changes entries for boost/libebml/libmatroska
-# version requirement updates and other packaging info
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/gmp:=
-	>=dev-libs/libebml-1.4.2:=
-	>=dev-libs/libfmt-8.0.1:=
-	>=dev-libs/pugixml-1.11:=
-	media-libs/flac:=
-	>=media-libs/libmatroska-1.6.3:=
-	media-libs/libogg:=
-	media-libs/libvorbis:=
-	sys-libs/zlib
-	dvd? ( media-libs/libdvdread:= )
-	dev-qt/qtcore:5
-	gui? (
-		dev-qt/qtsvg:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtconcurrent:5
-		dev-qt/qtmultimedia:5
-	)
-	app-text/cmark:0=
-	dbus? ( dev-qt/qtdbus:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-cpp/nlohmann_json-3.9.1
-	>=dev-libs/utfcpp-3.1.2
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-ruby/rake
-	virtual/pkgconfig
-	nls? (
-		sys-devel/gettext
-		app-text/po4a
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
-	"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
-	"${FILESDIR}"/${P}-fmt-9.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == *9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# bug #692018
-	sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
-
-	eautoreconf
-
-	# remove bundled libs
-	rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
-}
-
-src_configure() {
-	# bug #692322, use system dev-libs/utfcpp
-	append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp
-
-	local myeconfargs=(
-		$(use_enable debug)
-		$(usex pch "" --disable-precompiled-headers)
-		$(use_enable dbus)
-
-		# Qt (of some version) is always needed, even for non-GUI builds,
-		# to do e.g. MIME detection. See e.g. bug #844097.
-		# But most of the Qt deps are conditional on a GUI build.
-		--disable-qt6
-		--enable-qt5
-		$(use_enable gui)
-		--with-qmake="$(qt5_get_bindir)"/qmake
-
-		$(use_with dvd dvdread)
-		$(use_with nls gettext)
-		$(usex nls "" --with-po4a-translate=false)
-		--disable-update-check
-		--disable-optimization
-		--with-boost="${ESYSROOT}"/usr
-		--with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	rake V=1 -j$(makeopts_jobs) || die
-}
-
-src_test() {
-	rake V=1 -j$(makeopts_jobs) tests:unit || die
-	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
-}
-
-src_install() {
-	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
-
-	einstalldocs
-	dodoc NEWS.md
-	doman doc/man/*.1
-}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 200cec980864..aa72053dc836 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -7,12 +7,9 @@ AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dc
 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.58.tar.gz 1893021 BLAKE2B 65c93b3b5b2594799ceac4e5bd0700a15589dc13f7e8f308731b90f2514888f605f67434ef1d1248c6ce348cdde65839c1e7cf3ed68068f217e769ec78743785 SHA512 06fb308fe6a1573ccb955f6e39aef7e4ab0d1b9f4fdeee11b9d6910940f154fac8ce7f2daae5b3ba7d1eb22771590bd13a38622d316affa2cda71bfd8d91de7b
-DIST pipewire-0.3.59.tar.gz 1909977 BLAKE2B 098a75060799013e9a5e5ac4b0c7c62e788318a85df9616f6c441255b5a50acae9da01887ee20c60995878601c22a0eda4fec640bafc941cfa20e0cf751f6189 SHA512 1183dc083553ece1f9157898f437996b88dc7d13ba69aa43886f5339f330130404274ceb08ac8ec05a5ccb84dfca56b524a1d4b3fb07e28a41741c5c3333eda0
+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.58.ebuild 15765 BLAKE2B 79fdd8c05c6168d9f433c182b986acc0bb27cc19a1024882a77534c045380a5d64b978b431258d519d7c05a964e1d00a3b622ba830ece87ecc1b4992950e9033 SHA512 567219b52c72061d88e3ed70bc479991114a30e0bc63d9b47b0576b92b32f86fbbfce460e569b727db0e6d2c66a8a5e6c60306ab31ee7b570b681b997854fa29
-EBUILD pipewire-0.3.59-r1.ebuild 15857 BLAKE2B 761e60c6eeef8eb3075b71276092f20e9d38d2a28561896d61417663fb94ac6d5e21fa9319a3375d855ddfba583327b455a57ca979852bb80470836c0628a863 SHA512 29982d776489b585ee4b8a94fbcd78fc6b75d8f753e1eacfd50d48f6b4ebc6969adce58da5154be27422ee824616008db4f02bb1c9b1e259322f9c57fab9ffd0
-EBUILD pipewire-0.3.59.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
-EBUILD pipewire-9999.ebuild 15795 BLAKE2B c731accff189f39853293293d1585e57745024027322bf7a3c3119f8e3f09f4fded8a8e13bdc56c883f16a64974b35075b65f087c11c4e52ab2d663e007ed48f SHA512 e30a2dcffd163648267127fcaf5b72418342d6fe5b62886a98c3ec5a52b45bceedf7e4146fbbd7186a991b5c3b9a74a8231e365af2e5682adeb10e21800d4435
+EBUILD pipewire-0.3.59-r2.ebuild 15858 BLAKE2B 26f0a7bf93dab5acc54bfa7ea2ee9d81dd620b1e89e24b982eb94d9d0007eda4246b426d23943681951fc937f71628bf3f653e280a0477b81433a98fff98ae63 SHA512 db2a7685bdda58c88d7049875480685e3d20a9ba331c902bb6a07739c1e88f84c932489b75e66c6f62999a24aebb7765eb4197d103dd6f64e658eb3316df34b4
+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.58.ebuild b/media-video/pipewire/pipewire-0.3.58.ebuild
deleted file mode 100644
index f8327c0c3219..000000000000
--- a/media-video/pipewire/pipewire-0.3.58.ebuild
+++ /dev/null
@@ -1,429 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 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"
-
-# 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)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-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-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	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[${MULTILIB_USEDEP}] )
-	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[${MULTILIB_USEDEP}]
-	)
-	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[${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_feature dbus)
-		$(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 bluez5-codec-opus)
-		$(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
-		# Not yet packaged.
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_native_use_feature flatpak)
-		-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
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	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
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-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
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	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 use sound-server && ( 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 use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	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-r1.ebuild b/media-video/pipewire/pipewire-0.3.59-r2.ebuild
index da8ad2640541..b138b5e03595 100644
--- a/media-video/pipewire/pipewire-0.3.59-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.59-r2.ebuild
@@ -26,7 +26,7 @@ else
 		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"
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/media-video/pipewire/pipewire-0.3.59.ebuild b/media-video/pipewire/pipewire-0.3.59.ebuild
deleted file mode 100644
index 1b29ff8d3bec..000000000000
--- a/media-video/pipewire/pipewire-0.3.59.ebuild
+++ /dev/null
@@ -1,430 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-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 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"
-
-# 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)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-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-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	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[${MULTILIB_USEDEP}] )
-	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[${MULTILIB_USEDEP}]
-	)
-	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[${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_feature dbus)
-		$(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 bluez5-codec-opus)
-		$(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
-		# Not yet packaged.
-		-Dbluez5-codec-lc3=disabled
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		$(meson_native_use_feature flatpak)
-		-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
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	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
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-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
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	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 use sound-server && ( 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 use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	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-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 1b29ff8d3bec..2b66ac34cdf5 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -26,7 +26,7 @@ else
 		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"
+		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c4b51e81a663..95a43325bbd1 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,11 +4,12 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 AUX vlc-3.0.17.3-dav1d-1.0.0.patch 3256 BLAKE2B 49403c38c7b05b80d7bc075debb584fd71d58c9368d32e8da7129d2e50c2a4152cd4a7f2e62426f520665e0c973a66061ed2622f275f9111b1c1b4bf3da17716 SHA512 5b5414e3c4bfaf62aaf479957c1e13f2747362cc26e2569036f8cb6be52e7148289a160366f3ba3a70198e1ac6cbad248d0d13b045db81e5e894490fa315ce63
+AUX vlc-3.0.17.4-gcc13.patch 595 BLAKE2B 7a3099c607db5e81ce7517e70222c9b0416b137de4033fbde3d89d12f30847a4f548e6914fbf022c7577b8be9cc69e67696c267dee4cbe9b82157a239dcdf0ca SHA512 9ea0f70fc07357dd67c13edd559509d9b14c3c61b4f877090c92c8cbdc53672a64b88ee5a863c738963bebc8e15e1911f2f6f0b8cb209ba3ba5742bd593e6cde
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb
-EBUILD vlc-3.0.17.4-r2.ebuild 13574 BLAKE2B c91321192ff76042519bbb12abb2ffd4d046335c15fe208625a257fff6fb509acadfb330900aed579fae2487878c0281f0ff044530a269331b521e25c1ef16cf SHA512 78c2534ef7db1d4493528ea89e83374728a577271175c55096289fb2b049fb9e0d5af2d245a02b497b95251a76003396dffd5c799e0e43d1ae043b28911a4e38
-EBUILD vlc-3.0.9999.ebuild 13436 BLAKE2B 4808a99fe8b12b53b7799e581a844edf7de3538fdd90642b4a4504a3c73d425acadccc43fcc830ba14f8e3688da2d02b8a3260a9b5f1e3fa7fbc650b9068e908 SHA512 d8ca49224e68f7331b0edbfedea272f07d55b54e1eb3ff3612bd5d8d18b2c0bef908ef194d9cbb4741b9bc5f10be6415d6bb531f0422ba57216786c5f7dbd7f0
-EBUILD vlc-9999.ebuild 13486 BLAKE2B 10aa88e4adfee804ca8c6dd2a221298718b0e549db089a3dac85a97505b5088dc9f8c1b97faf1bc5e678d96e327c4e13ae3da25660a93d1d9b1a609603a01f40 SHA512 0def46b73101df3a8525ea7ad2b9f0c392c8330501bfd27345fcfe78622bd910205bd1f45e24420225eb1b9dbc39751eec668e33482c152e20465c4a8ed6b109
+EBUILD vlc-3.0.17.4-r2.ebuild 13629 BLAKE2B 3eb7133d0acea2d9abb614f5fdd72188a603301321e92558312a1850c28ed17a78ad64a13e7cfa7928ac85ef7e12ac478b4089a28f97b0401c944f0f85aba4e8 SHA512 13a7d4d473e14e0e87a7ce17a9db384129ccb53512ac33e326e0b4dc6b262814e68d29e1407c2ea11a28086beedda70a1dc538edb453cf6fe2092095642bbf04
+EBUILD vlc-3.0.9999.ebuild 13443 BLAKE2B 084c205f6514aca8b7b136a4ded87ca6c35e71f38df5a5cbb0158e02bef15c799350356a537fba07d5f56eb61de335de4215b636740d9be804abb12d201d4086 SHA512 ebfd90cdb2278d1a2961f004d2cadb74565b83492fc85eb3e553b379729b03c264c8b7f815256dc32eb5db3374a0d507ef42f31d105c0e2bf51528963e4e62ad
+EBUILD vlc-9999.ebuild 13493 BLAKE2B 9bc1c14043ecd9bd7cf24e70005316842550dfc2d0af4cd72ce33174735972b1e6456ddc0d50a23da8e8b2759f835744a7a9ed713637137226ea0cf9ec814ceb SHA512 5e02498f23db46bd8f6645ba10614a0e792721213ebba44a0c925a3443745e34eb2a857b4b3f5a61741cad645991c7b8bd5bf3bd8a5e15258e6e0818222b540a
 MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
diff --git a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
new file mode 100644
index 000000000000..374cd5ada0ac
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
@@ -0,0 +1,20 @@
+https://code.videolan.org/robUx4/vlc/-/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f
+https://bugs.gentoo.org/875785
+
+From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001
+From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
+Date: Mon, 11 Jul 2022 19:35:57 +0000
+Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t
+
+Fixes #27077.
+--- a/modules/demux/dash/mpd/TemplatedUri.hpp
++++ b/modules/demux/dash/mpd/TemplatedUri.hpp
+@@ -21,6 +21,7 @@
+ #ifndef TEMPLATEDURI_HPP
+ #define TEMPLATEDURI_HPP
+ 
++#include <cstdint>
+ #include <string>
+ 
+ namespace dash
+GitLab
diff --git a/media-video/vlc/vlc-3.0.17.4-r2.ebuild b/media-video/vlc/vlc-3.0.17.4-r2.ebuild
index 2d22452092cf..824a5c251898 100644
--- a/media-video/vlc/vlc-3.0.17.4-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.17.4-r2.ebuild
@@ -232,6 +232,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
 	"${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072
 	"${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787
+	"${FILESDIR}"/${PN}-3.0.17.4-gcc13.patch # bug 875785
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index f0b7f292923b..1bb332e0e8d1 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6761ef800a15..04d660284ef4 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -20,7 +20,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86"
 fi
 inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
 
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 6ede2b635682..0aec1fcb2e68 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,18 +1,10 @@
-AUX wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch 3969 BLAKE2B 9d9fcdf2327834329e120e2322f03acb0a541b3095bba194be132b153769120e59d617bf4b64ebeb4cbc73caaf2fcbe2c6345da3aeef43ab88891edb93750f87 SHA512 406159756795c208ff809489dcd88fd0095681d9867a8c193f73e40709a27ce33a22a635bada6b5594f097113a5af47375d8814016554cbd6ad809ae18ad1502
 AUX wireplumber-0.4.10-config-disable-sound-server-parts.patch 1017 BLAKE2B 09ea7233aaeff88bc7fc0bd0d8345ee15c9377c1a5dca4a1937f00c808def449202186be1ed61cebc05e9d241ad1f8e374b1743f93b2766d7adcf26dc1cf4837 SHA512 d3bc1248bf2ea39ebe7346754f386ec2ab7815beded415c58273372c3e9b2c3b3185e591057aba4233b1320605e08b00702db4de4b78eb4cb833176bb0f16ba5
-AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch 4475 BLAKE2B baa62d342e3a5f753044f4f4f757064792424e05535b540c09ecef4ac70edf32edbae6a4a36ee87d9c041cccdd24d229ba828e50cdc303c50b1f6d4afef7b075 SHA512 4cce604cd7aa754b53d7473f0a12e764449f76932f7ee0fea6e2b5f6b1f11bc2a38a28eedea5f003a112836ecc6a209c3d5e4b29a582749be742d075e51e6518
-AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1
-AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb
-AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d
 AUX wireplumber-0.4.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed
 AUX wireplumber-0.4.11-dbus-reconnect-crash.patch 1553 BLAKE2B 1792743e726f22ff26f751196f620905122545bb8921dcb2398e627ef6756d786497e84cb899dcadac5417207cba7f1d5bc7f0a018156c89393712eafba5b54b SHA512 1603f928867f8ccf83132fb3b09b4d43995bd97a62689917274b01eb75526237ab86b1e58292e7f3b5b296e094995d284be31dfdd13d1c26ca5a41f2d121c71d
 AUX wireplumber-0.4.11-loop.patch 5638 BLAKE2B ebebd5a0c668f9ceb44cedecb9a7c364ed135e78802c619d3c1b328932480b11e2392b7263fb8df472ef1134a451537c82e25e0122bd61f80f33cbb36d538c43 SHA512 4486bb29a0f238b5d3df07bce065be30604fd3ef2d62925b3e3869060c0015d3bcdb45375bf5735e39d48e39e115c8f2029526d1044add8992fe2bc22f45faee
-DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
 DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
-DIST wireplumber-0.4.12.tar.gz 407239 BLAKE2B 10c5156c730bffc6542976f2d9cdd9634fdfcf6b1271cfd9df2357feb61ce9fbbd606728444e927ad060934e76be4ff99ba9db6c73823f6295a23977ed89a55a SHA512 0da81b62810d15264a14c3349596801cbf6f6f7ee21a1aef867e52f639dfb9b823c5181514ffa8124c3f387499fefe7f14d8cb589bcd785edd9c0e196e114601
-EBUILD wireplumber-0.4.10-r4.ebuild 3933 BLAKE2B bccd391fc42848f7f57d5403ae481c554862f4bbc6b11b4f8fc55019044b3b9150ac3704370242a39992c65d88928f2f64d441a19cddd61721c82cd887b9e1ce SHA512 2c5c1977655178717c6ad1158b0af18267cafed7ace937e28dfc08d466efe227c6a4ad7f276a27ded906cf8439ecb0ae7579ebf64b90ccc4bf67fa8eeed08bca
-EBUILD wireplumber-0.4.11-r2.ebuild 4112 BLAKE2B 2f94d975252cb165d86fe23531fa8ea94a54ba44033e506a6785aea9d7be959e5a0f3f1b7b6872566de62475ab3d2a982294c53f7808348166ae6b6db7e44c15 SHA512 8504018873d34dbeb65c3a1acbc2acf68c7074902875bc1dd4f2f1088933edba51551a293345a5aa4ce8b4443fed8405126a197db65d1948ac2839107b29a430
+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.ebuild 4030 BLAKE2B e93cabeffc20578ba0d3c70e02db1d7b1108e76229bad1dfefd48c887d6d60dc704cbb7a323ba04e42f8674d0d48d70926c24adeecc724bc28c647bb9c9e30dc SHA512 c4deb8102d90102f2c66430e178b7cde7bac734243b94e17497ee8b64159879b17a9d59edca0558c9df928f51b52105b8970c1cf6e1f490603b17173342f754e
-EBUILD wireplumber-9999.ebuild 3889 BLAKE2B d44e25f12dc2e6b0d8884b2a670b7fd3c7f1d42b67e6899cff3dd709d8b02d9c9497d4b95beca6f3973e76f54809b042ff6e66058c3de41f39332a022909083d SHA512 07ad0521fbd48382287d6d6f3b62906fa8a29fae84a5a0fb94cdcf8e87da01e6af0ba81f61c8675efb69c038a4fdf62fdde9b9e25b17d4a76b0148de32e457ae
+EBUILD wireplumber-0.4.12-r1.ebuild 4031 BLAKE2B 4b4b58f12c67e03bb0d1073872f70087e5f0da2207c6c56c0532c9083457b497887c7d3ea6d65452c1223fe5e77d57989213b0f0329a76fa9fda53ea0aa9b9a4 SHA512 e1b2136d886679d03d997cc3f9dc234b416b17c7954066130daa417836704d7b7aa44701b72269277ffa4c603230067847294704f59fc37df427fb5aeb7be264
+EBUILD wireplumber-9999.ebuild 3890 BLAKE2B 9c7338d6ecbd671285cc294d00eff12480729ed921bd621b722a050d175c4b4d45eb57e73866a71a4c7bbe40c38b2a258a5b00ff39e5416026915e00794fa993 SHA512 a5431c85044ddd96f8e1735206d1cb3d7c516fe27c92b0c249936240fef68f3728ea79b6518eedc236429aca320e4698511059c4db1ff3fb0b9ad667653c02c4
 MISC metadata.xml 647 BLAKE2B 0370f3c897d7fcab0bd95fe1f97208f911de022e533ac795817289c554cc75d4de686223cbfd255ecb6e930ff0aee6c9419327ab51b3c65b1c4d8ed7597a1f3e SHA512 9708a52cf340caf359c300116b6ec687fba08a3c0fe33895eb10cda08517583ad36b5ff539142d8ba5f625ad34e5b7228f55fc7b85e7a162cf775f8780899f0e
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch
deleted file mode 100644
index 610db0e11e89..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c00c5a6675b6640db13111c808eaa3251917c412
-
-From c00c5a6675b6640db13111c808eaa3251917c412 Mon Sep 17 00:00:00 2001
-From: Julian Bouzas <julian.bouzas@collabora.com>
-Date: Wed, 18 May 2022 10:51:41 -0400
-Subject: [PATCH] alsa.lua: fix device name deduplication when reservation is
- enabled
-
-Fixes #241
----
- src/scripts/monitors/alsa.lua | 47 +++++++++++++++++++----------------
- 1 file changed, 25 insertions(+), 22 deletions(-)
-
-diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua
-index 01d241db..7beed3a8 100644
---- a/src/scripts/monitors/alsa.lua
-+++ b/src/scripts/monitors/alsa.lua
-@@ -11,6 +11,10 @@ local config = ... or {}
- -- ensure config.properties is not nil
- config.properties = config.properties or {}
- 
-+-- unique device/node name tables
-+device_names_table = nil
-+node_names_table = nil
-+
- -- preprocess rules and create Interest objects
- for _, r in ipairs(config.rules or {}) do
-   r.interests = {}
-@@ -41,16 +45,6 @@ function rulesApplyProperties(properties)
-   end
- end
- 
--function findDuplicate(parent, id, property, value)
--  for i = 0, id - 1, 1 do
--    local obj = parent:get_managed_object(i)
--    if obj and obj.properties[property] == value then
--      return true
--    end
--  end
--  return false
--end
--
- function nonempty(str)
-   return str ~= "" and str or nil
- end
-@@ -125,11 +119,11 @@ function createNode(parent, id, type, factory, properties)
- 
-     -- deduplicate nodes with the same name
-     for counter = 2, 99, 1 do
--      if findDuplicate(parent, id, "node.name", properties["node.name"]) then
--        properties["node.name"] = name .. "." .. counter
--      else
-+      if node_names_table[properties["node.name"]] ~= true then
-+        node_names_table[properties["node.name"]] = true
-         break
-       end
-+      properties["node.name"] = name .. "." .. counter
-     end
-   end
- 
-@@ -186,6 +180,10 @@ function createDevice(parent, id, factory, properties)
-   local device = SpaDevice(factory, properties)
-   if device then
-     device:connect("create-object", createNode)
-+    device:connect("object-removed", function (parent, id)
-+      local node = parent:get_managed_object(id)
-+      node_names_table[node.properties["node.name"]] = nil
-+    end)
-     device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND)
-     parent:store_managed_object(id, device)
-   else
-@@ -205,11 +203,11 @@ function prepareDevice(parent, id, type, factory, properties)
- 
-   -- deduplicate devices with the same name
-   for counter = 2, 99, 1 do
--    if findDuplicate(parent, id, "device.name", properties["device.name"]) then
--      properties["device.name"] = name .. "." .. counter
--    else
-+    if device_names_table[properties["device.name"]] ~= true then
-+      device_names_table[properties["device.name"]] = true
-       break
-     end
-+    properties["device.name"] = name .. "." .. counter
-   end
- 
-   -- ensure the device has a description
-@@ -337,16 +335,21 @@ function createMonitor ()
-   -- handle create-object to prepare device
-   m:connect("create-object", prepareDevice)
- 
--  -- if dbus reservation, handle object-removed to destroy device reservations
--  if rd_plugin then
--    m:connect("object-removed", function (parent, id)
--      local device = parent:get_managed_object(id)
-+  -- handle object-removed to destroy device reservations and recycle device name
-+  m:connect("object-removed", function (parent, id)
-+    local device = parent:get_managed_object(id)
-+    if rd_plugin then
-       local rd_name = device.properties["api.dbus.ReserveDevice1"]
-       if rd_name then
-         rd_plugin:call("destroy-reservation", rd_name)
-       end
--    end)
--  end
-+    end
-+    device_names_table[device.properties["device.name"]] = nil
-+  end)
-+
-+  -- reset the name tables to make sure names are recycled
-+  device_names_table = {}
-+  node_names_table = {}
- 
-   -- activate monitor
-   Log.info("Activating ALSA monitor")
--- 
-GitLab
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch
deleted file mode 100644
index 40a486616580..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/1f045309208ab5d927883b5adc2b7d1623fae162
-
-From 1f045309208ab5d927883b5adc2b7d1623fae162 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Thu, 12 May 2022 12:19:38 +0300
-Subject: [PATCH] config: fix enabled property to default to "true" when not
- defined
-
-Fixes backwards compatibility with older config files
-
-Fixes: #254
----
- src/config/bluetooth.lua.d/30-bluez-monitor.lua | 2 +-
- src/config/main.lua.d/20-default-access.lua     | 2 +-
- src/config/main.lua.d/30-alsa-monitor.lua       | 2 +-
- src/config/main.lua.d/30-libcamera-monitor.lua  | 2 +-
- src/config/main.lua.d/30-v4l2-monitor.lua       | 2 +-
- src/config/main.lua.d/40-device-defaults.lua    | 2 +-
- src/config/main.lua.d/40-stream-defaults.lua    | 2 +-
- src/config/policy.lua.d/10-default-policy.lua   | 2 +-
- 8 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-index b40026c2..a870aa5d 100644
---- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-+++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua
-@@ -3,7 +3,7 @@ bluez_monitor.properties = {}
- bluez_monitor.rules = {}
- 
- function bluez_monitor.enable()
--  if not bluez_monitor.enabled then
-+  if bluez_monitor.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/20-default-access.lua b/src/config/main.lua.d/20-default-access.lua
-index a6ffb2ee..0a7eb955 100644
---- a/src/config/main.lua.d/20-default-access.lua
-+++ b/src/config/main.lua.d/20-default-access.lua
-@@ -3,7 +3,7 @@ default_access.properties = {}
- default_access.rules = {}
- 
- function default_access.enable()
--  if not default_access.enabled then
-+  if default_access.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/30-alsa-monitor.lua b/src/config/main.lua.d/30-alsa-monitor.lua
-index da0b2c70..8e45e434 100644
---- a/src/config/main.lua.d/30-alsa-monitor.lua
-+++ b/src/config/main.lua.d/30-alsa-monitor.lua
-@@ -3,7 +3,7 @@ alsa_monitor.properties = {}
- alsa_monitor.rules = {}
- 
- function alsa_monitor.enable()
--  if not alsa_monitor.enabled then
-+  if alsa_monitor.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/30-libcamera-monitor.lua b/src/config/main.lua.d/30-libcamera-monitor.lua
-index 4a8257ff..cd820a83 100644
---- a/src/config/main.lua.d/30-libcamera-monitor.lua
-+++ b/src/config/main.lua.d/30-libcamera-monitor.lua
-@@ -3,7 +3,7 @@ libcamera_monitor.properties = {}
- libcamera_monitor.rules = {}
- 
- function libcamera_monitor.enable()
--  if not libcamera_monitor.enabled then
-+  if libcamera_monitor.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/30-v4l2-monitor.lua b/src/config/main.lua.d/30-v4l2-monitor.lua
-index 7cfd4bcd..3fbdc9e7 100644
---- a/src/config/main.lua.d/30-v4l2-monitor.lua
-+++ b/src/config/main.lua.d/30-v4l2-monitor.lua
-@@ -3,7 +3,7 @@ v4l2_monitor.properties = {}
- v4l2_monitor.rules = {}
- 
- function v4l2_monitor.enable()
--  if not v4l2_monitor.enabled then
-+  if v4l2_monitor.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/40-device-defaults.lua b/src/config/main.lua.d/40-device-defaults.lua
-index 55aafe85..2204c4ac 100644
---- a/src/config/main.lua.d/40-device-defaults.lua
-+++ b/src/config/main.lua.d/40-device-defaults.lua
-@@ -38,7 +38,7 @@ device_defaults.persistent_profiles = {
- }
- 
- function device_defaults.enable()
--  if not device_defaults.enabled then
-+  if device_defaults.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/main.lua.d/40-stream-defaults.lua b/src/config/main.lua.d/40-stream-defaults.lua
-index 2975f4f6..307d83df 100644
---- a/src/config/main.lua.d/40-stream-defaults.lua
-+++ b/src/config/main.lua.d/40-stream-defaults.lua
-@@ -25,7 +25,7 @@ stream_defaults.rules = {
- }
- 
- function stream_defaults.enable()
--  if not stream_defaults.enabled then
-+  if stream_defaults.enabled == false then
-     return
-   end
- 
-diff --git a/src/config/policy.lua.d/10-default-policy.lua b/src/config/policy.lua.d/10-default-policy.lua
-index 7b00e94e..edfdeb1c 100644
---- a/src/config/policy.lua.d/10-default-policy.lua
-+++ b/src/config/policy.lua.d/10-default-policy.lua
-@@ -38,7 +38,7 @@ bluetooth_policy.policy = {
- }
- 
- function default_policy.enable()
--  if not default_policy.enabled then
-+  if default_policy.enabled == false then
-     return
-   end
- 
--- 
-GitLab
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
deleted file mode 100644
index d9c51489a893..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/392cce2136e81ac3146078eacbbae85b694c917a
-
-From 392cce2136e81ac3146078eacbbae85b694c917a Mon Sep 17 00:00:00 2001
-From: Julian Bouzas <julian.bouzas@collabora.com>
-Date: Fri, 20 May 2022 07:38:24 -0400
-Subject: [PATCH] m-default-nodes: don't check if all device nodes are ready
- when finding default node
-
-This check was originally added to avoid a small audio glitch when changing
-default nodes while also changing the device profile (eg Gnome Sound Settings).
-The check is removed because it causes issues when disabling alsa nodes. There
-are plans to fix the audio glitch issue in the future with the planned
-event-dispatcher architecture.
-
-Fixes #279
----
- modules/module-default-nodes.c | 136 ---------------------------------
- 1 file changed, 136 deletions(-)
-
-diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
-index 0fdaed5..577f9bb 100644
---- a/modules/module-default-nodes.c
-+++ b/modules/module-default-nodes.c
-@@ -345,135 +345,6 @@ reevaluate_default_node (WpDefaultNodes * self, WpMetadata *m, gint node_t)
-   }
- }
- 
--static guint
--get_device_total_nodes (WpPipewireObject * proxy)
--{
--  g_autoptr (WpIterator) profiles = NULL;
--  g_auto (GValue) item = G_VALUE_INIT;
--
--  profiles = wp_pipewire_object_enum_params_sync (proxy, "Profile", NULL);
--  if (!profiles)
--    return 0;
--
--  for (; wp_iterator_next (profiles, &item); g_value_unset (&item)) {
--    WpSpaPod *pod = g_value_get_boxed (&item);
--    gint idx = -1;
--    const gchar *name = NULL;
--    g_autoptr (WpSpaPod) classes = NULL;
--
--    /* Parse */
--    if (!wp_spa_pod_get_object (pod, NULL,
--        "index", "i", &idx,
--        "name", "s", &name,
--        "classes", "?P", &classes,
--        NULL))
--      continue;
--    if (!classes)
--      continue;
--
--    /* Parse profile classes */
--    {
--      g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (classes);
--      g_auto (GValue) v = G_VALUE_INIT;
--      gint total_nodes = 0;
--      for (; wp_iterator_next (it, &v); g_value_unset (&v)) {
--        WpSpaPod *entry = g_value_get_boxed (&v);
--        g_autoptr (WpSpaPodParser) pp = NULL;
--        const gchar *media_class = NULL;
--        gint n_nodes = 0;
--        g_return_val_if_fail (entry, 0);
--        if (!wp_spa_pod_is_struct (entry))
--          continue;
--        pp = wp_spa_pod_parser_new_struct (entry);
--        g_return_val_if_fail (pp, 0);
--        g_return_val_if_fail (wp_spa_pod_parser_get_string (pp, &media_class), 0);
--        g_return_val_if_fail (wp_spa_pod_parser_get_int (pp, &n_nodes), 0);
--        wp_spa_pod_parser_end (pp);
--
--        total_nodes += n_nodes;
--      }
--
--      if (total_nodes > 0)
--        return total_nodes;
--    }
--  }
--
--  return 0;
--}
--
--static gboolean
--nodes_ready (WpDefaultNodes * self)
--{
--  g_autoptr (WpIterator) it = NULL;
--  g_auto (GValue) val = G_VALUE_INIT;
--
--  /* Get the total number of nodes for each device and make sure they exist
--   * and have at least 1 port */
--  it = wp_object_manager_new_filtered_iterator (self->rescan_om,
--      WP_TYPE_DEVICE, NULL);
--  for (; wp_iterator_next (it, &val); g_value_unset (&val)) {
--    WpPipewireObject *device = g_value_get_object (&val);
--    guint total_nodes = get_device_total_nodes (device);
--    if (total_nodes > 0) {
--      guint32 device_id = wp_proxy_get_bound_id (WP_PROXY (device));
--      g_autoptr (WpIterator) node_it = NULL;
--      g_auto (GValue) node_val = G_VALUE_INIT;
--      guint ready_nodes = 0;
--
--      node_it = wp_object_manager_new_filtered_iterator (self->rescan_om,
--          WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY,
--          PW_KEY_DEVICE_ID, "=i", device_id, NULL);
--      for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) {
--        WpPipewireObject *node = g_value_get_object (&node_val);
--        g_autoptr (WpPort) port =
--              wp_object_manager_lookup (self->rescan_om,
--              WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY,
--              PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)),
--              NULL);
--        if (port)
--          ready_nodes++;
--      }
--
--      if (ready_nodes < total_nodes) {
--        const gchar *device_name = wp_pipewire_object_get_property (
--            WP_PIPEWIRE_OBJECT (device), PW_KEY_DEVICE_NAME);
--        wp_debug_object (self, "device '%s' is not ready (%d/%d)", device_name,
--            ready_nodes, total_nodes);
--        return FALSE;
--      }
--    }
--  }
--
--  /* Make sure Audio and Video virtual sources have ports */
--  {
--    g_autoptr (WpIterator) node_it = NULL;
--    g_auto (GValue) node_val = G_VALUE_INIT;
--    node_it = wp_object_manager_new_filtered_iterator (self->rescan_om,
--        WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_DEVICE_ID, "-",
--        NULL);
--    for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) {
--      WpPipewireObject *node = g_value_get_object (&node_val);
--      const gchar *media_class = wp_pipewire_object_get_property (
--          WP_PIPEWIRE_OBJECT (node), PW_KEY_MEDIA_CLASS);
--      g_autoptr (WpPort) port =
--          wp_object_manager_lookup (self->rescan_om,
--          WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY,
--          PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)),
--          NULL);
--      if (!port &&
--          (g_strcmp0 ("Audio/Source/Virtual", media_class) == 0 ||
--           g_strcmp0 ("Video/Source/Virtual", media_class) == 0)) {
--        const gchar *node_name = wp_pipewire_object_get_property (
--            WP_PIPEWIRE_OBJECT (node), PW_KEY_NODE_NAME);
--        wp_debug_object (self, "virtual node '%s' is not ready", node_name);
--        return FALSE;
--      }
--    }
--  }
--
--  return TRUE;
--}
--
- static void
- sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self)
- {
-@@ -491,10 +362,6 @@ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self)
-   if (!metadata)
-     return;
- 
--  /* Make sure nodes are ready for current profile */
--  if (!nodes_ready (self))
--    return;
--
-   wp_trace_object (self, "re-evaluating defaults");
-   reevaluate_default_node (self, metadata, AUDIO_SINK);
-   reevaluate_default_node (self, metadata, AUDIO_SOURCE);
-@@ -584,13 +451,10 @@ on_metadata_added (WpObjectManager *om, WpMetadata *metadata, gpointer d)
-   self->rescan_om = wp_object_manager_new ();
-   wp_object_manager_add_interest (self->rescan_om, WP_TYPE_DEVICE, NULL);
-   wp_object_manager_add_interest (self->rescan_om, WP_TYPE_NODE, NULL);
--  wp_object_manager_add_interest (self->rescan_om, WP_TYPE_PORT, NULL);
-   wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_DEVICE,
-       WP_OBJECT_FEATURES_ALL);
-   wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_NODE,
-       WP_OBJECT_FEATURES_ALL);
--  wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_PORT,
--      WP_OBJECT_FEATURES_ALL);
-   g_signal_connect_object (self->rescan_om, "objects-changed",
-       G_CALLBACK (schedule_rescan), self, G_CONNECT_SWAPPED);
-   g_signal_connect_object (self->rescan_om, "object-added",
--- 
-2.35.1
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch
deleted file mode 100644
index c319ac4a617b..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c2f31bb550755acba31da2e9f5bbdf646ed5e805
-
-From c2f31bb550755acba31da2e9f5bbdf646ed5e805 Mon Sep 17 00:00:00 2001
-From: Julian Bouzas <julian.bouzas@collabora.com>
-Date: Mon, 16 May 2022 15:41:10 -0400
-Subject: [PATCH] m-lua-scripting: allow converting GValue holding NULL objects
- to Lua
-
----
- modules/module-lua-scripting/wplua/value.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c
-index 133051a4..e31ae4ac 100644
---- a/modules/module-lua-scripting/wplua/value.c
-+++ b/modules/module-lua-scripting/wplua/value.c
-@@ -314,9 +314,14 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v)
-       wplua_pushboxed (L, G_VALUE_TYPE (v), g_value_dup_boxed (v));
-     break;
-   case G_TYPE_OBJECT:
--  case G_TYPE_INTERFACE:
--    wplua_pushobject (L, g_value_dup_object (v));
-+  case G_TYPE_INTERFACE: {
-+    GObject *object = g_value_dup_object (v);
-+    if (object)
-+      wplua_pushobject (L, g_value_dup_object (v));
-+    else
-+      lua_pushnil (L);
-     break;
-+  }
-   case G_TYPE_ENUM:
-     wplua_enum_to_lua (L, g_value_get_enum (v), G_VALUE_TYPE (v));
-     break;
--- 
-GitLab
-
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch
deleted file mode 100644
index 0b86979ce732..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/7908b8d7be2a2992c57cd549054eda7ce46e4b44
-
-From 13b85bd4a25ab374f5e5e90b7288e6987996856e Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 24 May 2022 11:35:15 +0200
-Subject: [PATCH] m-lua-scripting: fix object refcounting
-
-7908b8d7be2a2992c57cd549054eda7ce46e4b44 ("m-lua-scripting: allow
-converting GValue holding NULL objects to Lua") accidentally added a second
-refcount. As a result, the objects are never freeded.
-
-Remove the second refcount to fix this.
----
- modules/module-lua-scripting/wplua/value.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c
-index e31ae4a..a7927dc 100644
---- a/modules/module-lua-scripting/wplua/value.c
-+++ b/modules/module-lua-scripting/wplua/value.c
-@@ -317,7 +317,7 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v)
-   case G_TYPE_INTERFACE: {
-     GObject *object = g_value_dup_object (v);
-     if (object)
--      wplua_pushobject (L, g_value_dup_object (v));
-+      wplua_pushobject (L, object);
-     else
-       lua_pushnil (L);
-     break;
--- 
-2.35.1
-
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
deleted file mode 100644
index 820d1ed7d4a3..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.10-r4.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.48:=
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch
-	"${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch
-	"${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch
-	"${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
-	"${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r "${ED}"/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	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 WirePlumber 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/wireplumber/wireplumber-0.4.11-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
deleted file mode 100644
index 8cef1f20f182..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.11-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
-#
-# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
-	"${FILESDIR}"/${P}-alsa-lua-crash.patch
-	"${FILESDIR}"/${P}-dbus-reconnect-crash.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r "${ED}"/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	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 WirePlumber 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/wireplumber/wireplumber-0.4.12.ebuild b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild
index ac3004d7449f..59742a6f7bad 100644
--- a/media-video/wireplumber/wireplumber-0.4.12.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.12-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index 2a10e58f8187..270ba536de33 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
+	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 534825ad89ca..f6777b9a24a9 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2f676fedcc0b..ad4dbb65d7a8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 14:09:49 +0000
+Fri, 28 Oct 2022 20:09:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index da2dee31dca7..e151d46edde6 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-28T14:09:52Z
+TIMESTAMP 2022-10-28T20:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDS0w/9Ezwm8CW2rjjSFZaOgKzk64zZXx4MwXTTq1AJUyG5yLgWXHpsi835eN3j
-i2PCtr5kygW5Tri5vWlxuByUE25BWfXsp7VSg88HaA6Bsl8/F8cG2odfOs9LTDQQ
-mR3koiyF0VEUSGZRGm4S53xcp92rHOWw407Fj0AZn/YYjWVXcj8pNy4qRuvaBpNw
-KQ8AbfzdvYsoxh039D0F5WF0kfXaUyXgPMRTqxM/csWQErlkUy097OR/nEh+/Lrb
-2ul6AlLzqJVqvRKtWuRx+kaN4EpzZW8F/S6C+98rRrzcnKGrvORq0DeNjdsNvLdN
-yH/48DazYSChE5ZPiGTi933TDlYVYjLYra2s4c9UUZtwm+eXZN0E1xzvUfnyKiAV
-/73Ke8tu+dem/g5FBCpatl3wHObaNPS0bJoKj8mH27v3Vas7sASPxIcHPhlcWuhD
-pvWaOoCkniUPG1zIir0NJgis2g5j+IHMzFVpBnJIm6U45ob/ZEdCs9y7W+TKDkm4
-7sVFIqe7u8QVfVk5OyCubdF19PAkOKCJ7f+YANIrsvo0HhuW10gf/0J0Ej42hXAn
-BWWHzc23m1Cg6/dxQ7IHhf+tl3mxv0h+9H4yR5+t5zJwltEhtkqrjgT0RnRv9J6/
-6hpDpEa7rjE4Ya3Sb2Wmn0U1Raf3pyr5Ms8r+QTVDx9o89Jhmnw=
-=HSGE
+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
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2f676fedcc0b..ad4dbb65d7a8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 14:09:49 +0000
+Fri, 28 Oct 2022 20:09:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index dca74ee086cc..ca33f0ac467a 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 25dec61e5700..23a37bec0299 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-56.0-r1 b/metadata/md5-cache/app-accessibility/emacspeak-56.0-r1
index 34a1199877f2..0ad572830ea6 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-56.0-r1
+++ b/metadata/md5-cache/app-accessibility/emacspeak-56.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/tvraman/emacspeak/releases/download/56.0/emacspeak-56.0.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=f6d4bb899dbbb6eff1dfe0b89b4ece37
diff --git a/metadata/md5-cache/app-accessibility/emacspeak-9999 b/metadata/md5-cache/app-accessibility/emacspeak-9999
index 65819e9249a2..06fa9a3f5b50 100644
--- a/metadata/md5-cache/app-accessibility/emacspeak-9999
+++ b/metadata/md5-cache/app-accessibility/emacspeak-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ GPL-3+
 PROPERTIES=live
 RDEPEND=dev-lang/tcl:= espeak? ( app-accessibility/espeak-ng ) >=dev-tcltk/tclx-8.4 >=app-editors/emacs-26.1:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=37df216b31876ed15cfd7fb77b5b8311
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.11 b/metadata/md5-cache/app-accessibility/speechd-el-2.11
index 02061e4f7c74..4af6015047bb 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.11
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/brailcom/speechd-el/archive/speechd-el-2.11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=9d8a3eb4d695effd3b503150ec040f6f
diff --git a/metadata/md5-cache/app-accessibility/speechd-el-2.8 b/metadata/md5-cache/app-accessibility/speechd-el-2.8
index 2be31c43eba2..56c61314deb0 100644
--- a/metadata/md5-cache/app-accessibility/speechd-el-2.8
+++ b/metadata/md5-cache/app-accessibility/speechd-el-2.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.7 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.freebsoft.org/pub/projects/speechd-el/speechd-el-2.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fc2e4778154e1931e1c01597b9b65c78
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 534256b932d6..7a16425bf7e2 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/ansible-molecule-4.0.1 b/metadata/md5-cache/app-admin/ansible-molecule-4.0.1
index 87b7e6c0873e..dd70c106d4b6 100644
--- a/metadata/md5-cache/app-admin/ansible-molecule-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-molecule-4.0.1
@@ -1,4 +1,4 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_8(-)] doc? ( app-admin/ansible-core[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_8(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_8(-)] dev-python/filelock[python_targets_python3_8(-)] <dev-python/pexpect-5[python_targets_python3_8(-)] >=dev-python/pytest-html-3.0.0[python_targets_python3_8(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_8(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_8(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_8(-)] dev-util/yamllint ) ) python_single_target_python3_9? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_9(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_9(-)] doc? ( app-admin/ansible-core[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_9(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_9(-)] dev-python/filelock[python_targets_python3_9(-)] <dev-python/pexpect-5[python_targets_python3_9(-)] >=dev-python/pytest-html-3.0.0[python_targets_python3_9(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_9(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_9(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_9(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_9(-)] dev-util/yamllint ) ) python_single_target_python3_10? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_10(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_10(-)] doc? ( app-admin/ansible-core[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_10(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_10(-)] dev-python/filelock[python_targets_python3_10(-)] <dev-python/pexpect-5[python_targets_python3_10(-)] >=dev-python/pytest-html-3.0.0[python_targets_python3_10(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_10(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_10(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_10(-)] dev-util/yamllint ) ) doc? ( python_single_target_python3_8? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_8(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_9(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_10(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)] dev-python/cerberus[python_targets_python3_8(-)] >=dev-python/click-8.0[python_targets_python3_8(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_8(-)] >=dev-python/enrich-1.2.7[python_targets_python3_8(-)] >=dev-python/jinja-2.11.3[python_targets_python3_8(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] <dev-python/pluggy-2.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/rich-9.5.1[python_targets_python3_8(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_8(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_9(-)] dev-python/cerberus[python_targets_python3_9(-)] >=dev-python/click-8.0[python_targets_python3_9(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_9(-)] >=dev-python/enrich-1.2.7[python_targets_python3_9(-)] >=dev-python/jinja-2.11.3[python_targets_python3_9(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] <dev-python/pluggy-2.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/rich-9.5.1[python_targets_python3_9(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_9(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_8(-)] doc? ( app-admin/ansible-core[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_8(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_8(-)] dev-python/filelock[python_targets_python3_8(-)] <dev-python/pexpect-5[python_targets_python3_8(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_8(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_8(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_8(-)] dev-util/yamllint ) ) python_single_target_python3_9? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_9(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_9(-)] doc? ( app-admin/ansible-core[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_9(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_9(-)] dev-python/filelock[python_targets_python3_9(-)] <dev-python/pexpect-5[python_targets_python3_9(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_9(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_9(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_9(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_9(-)] dev-util/yamllint ) ) python_single_target_python3_10? ( >=dev-python/setuptools_scm-3.5.0[python_targets_python3_10(-)] >=dev-python/setuptools_scm_git_archive-1.1[python_targets_python3_10(-)] doc? ( app-admin/ansible-core[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] >=dev-python/simplejson-3.17.2[python_targets_python3_10(-)] ) test? ( >=dev-python/ansi2html-1.6.0[python_targets_python3_10(-)] dev-python/filelock[python_targets_python3_10(-)] <dev-python/pexpect-5[python_targets_python3_10(-)] >=dev-python/pytest-mock-3.3.1[python_targets_python3_10(-)] >=dev-python/pytest-plus-0.2[python_targets_python3_10(-)] >=dev-python/pytest-testinfra-6.1.0[python_targets_python3_10(-)] >=dev-python/pytest-xdist-2.1.0[python_targets_python3_10(-)] dev-util/yamllint ) ) doc? ( python_single_target_python3_8? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_8(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_9(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/sphinx-notfound-page-0.7.1[python_targets_python3_10(-)] <dev-python/sphinx_ansible_theme-0.10.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)] dev-python/cerberus[python_targets_python3_8(-)] >=dev-python/click-8.0[python_targets_python3_8(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_8(-)] >=dev-python/enrich-1.2.7[python_targets_python3_8(-)] >=dev-python/jinja-2.11.3[python_targets_python3_8(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_8(-)] dev-python/packaging[python_targets_python3_8(-)] <dev-python/pluggy-2.0[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] >=dev-python/rich-9.5.1[python_targets_python3_8(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_8(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_9(-)] dev-python/cerberus[python_targets_python3_9(-)] >=dev-python/click-8.0[python_targets_python3_9(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_9(-)] >=dev-python/enrich-1.2.7[python_targets_python3_9(-)] >=dev-python/jinja-2.11.3[python_targets_python3_9(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] <dev-python/pluggy-2.0[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] >=dev-python/rich-9.5.1[python_targets_python3_9(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_9(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( >=dev-python/ansible-compat-2.2.0[python_targets_python3_10(-)] dev-python/cerberus[python_targets_python3_10(-)] >=dev-python/click-8.0[python_targets_python3_10(-)] >=dev-python/click-help-colors-0.9[python_targets_python3_10(-)] >=dev-python/enrich-1.2.7[python_targets_python3_10(-)] >=dev-python/jinja-2.11.3[python_targets_python3_10(-)] >=dev-python/jsonschema-4.9.1[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] <dev-python/pluggy-2.0[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] >=dev-python/rich-9.5.1[python_targets_python3_10(-)] >=dev-util/cookiecutter-1.7.3[python_targets_python3_10(-)] selinux? ( sys-libs/libselinux[python,python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.3.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
 DEFINED_PHASES=compile configure install postinst prepare setup test
 DESCRIPTION=A toolkit designed to aid in the development and testing of Ansible roles
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/m/molecule/molecule-4.0.1.tar.gz -> ansible-molecule-4.0.1.tar.gz
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=03e18ccf5efea5b8e64344adc2101a8d
+_md5_=3371e76eced69406419eb04149af4fba
diff --git a/metadata/md5-cache/app-admin/doas-6.8.2 b/metadata/md5-cache/app-admin/doas-6.8.2
index eb11f4c50979..cf1aeaa8c38a 100644
--- a/metadata/md5-cache/app-admin/doas-6.8.2
+++ b/metadata/md5-cache/app-admin/doas-6.8.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/Duncaen/OpenDoas
 INHERIT=toolchain-funcs
 IUSE=pam persist
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=ISC
 RDEPEND=pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= )
 SLOT=0
 SRC_URI=https://github.com/Duncaen/OpenDoas/archive/v6.8.2.tar.gz -> OpenDoas-6.8.2.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=ad1c65010fe596ec50807b374626b998
+_md5_=bfdd9d6096d0f890cf904d013ae870d0
diff --git a/metadata/md5-cache/app-admin/xtail-2.1-r1 b/metadata/md5-cache/app-admin/xtail-2.1-r1
deleted file mode 100644
index 1fb396440754..000000000000
--- a/metadata/md5-cache/app-admin/xtail-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-arch/unzip
-DESCRIPTION=Tail multiple logfiles at once, even if rotated
-EAPI=6
-HOMEPAGE=http://www.unicom.com/sw/xtail/
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.unicom.com/sw/xtail/xtail-2.1.tar.gz http://www.unicom.com/files/20120219-patch-aalto.zip
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=33a6a021442776d9deb17d86fd529faf
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 15703947743d..91ab1fa6f0b3 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.6 b/metadata/md5-cache/app-arch/xz-utils-5.2.6
deleted file mode 100644
index efe35e987d7f..000000000000
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-lassecollin ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-DESCRIPTION=Utils for managing LZMA compressed files
-EAPI=7
-HOMEPAGE=https://tukaani.org/xz/
-INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
-IUSE=+extra-filters nls 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 split-usr 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=public-domain LGPL-2.1+ GPL-2+
-RDEPEND=!<app-arch/lzma-4.63 !<app-arch/p7zip-4.57 !<app-i18n/man-pages-de-2.16
-RESTRICT=!extra-filters? ( test )
-SLOT=0
-SRC_URI=https://tukaani.org/xz/xz-5.2.6.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.6.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5003237cc172175673191835164dab16
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.2 b/metadata/md5-cache/app-arch/zstd-1.5.2
deleted file mode 100644
index 51cd82a353b3..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.5.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-DESCRIPTION=zstd fast compression library
-EAPI=7
-HOMEPAGE=https://facebook.github.io/zstd/
-INHERIT=multilib-minimal toolchain-funcs
-IUSE=lz4 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~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=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.5.2.tar.gz -> zstd-1.5.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3d93f20fcef80c65080eb673ea7c9ead
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index ec132dbee306..028c67e79677 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.7-r1 b/metadata/md5-cache/app-crypt/gnupg-2.3.7-r1
deleted file mode 100644
index 18e117cfead2..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server 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=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-REQUIRED_USE=test? ( tofu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.7.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.7.tar.bz2.sig )
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=ccf14c0087dc03485855250c355b32e9
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 41b29c7218d7..68563ee7b00d 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/nano-6.3 b/metadata/md5-cache/app-editors/nano-6.3
deleted file mode 100644
index ab382a3c8994..000000000000
--- a/metadata/md5-cache/app-editors/nano-6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install postrm prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v6/nano-6.3.tar.xz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f2e4c07e87662d15c19964f8df9e9c39
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e89d259376b1..302a43d64df4 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/ace-window-0.10.0 b/metadata/md5-cache/app-emacs/ace-window-0.10.0
index d8ef718384a2..cfd6eafdb012 100644
--- a/metadata/md5-cache/app-emacs/ace-window-0.10.0
+++ b/metadata/md5-cache/app-emacs/ace-window-0.10.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/avy >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/abo-abo/ace-window/archive/0.10.0.tar.gz -> ace-window-0.10.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2a6e954ca4cf1f38b82c1b5df2970ef5
diff --git a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527 b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
index 4cd6562485e5..919848d31dca 100644
--- a/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
+++ b/metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/austinhaas/actionscript-mode/archive/65abd58e198458a8e46748c5962c41d80d60c4ea.tar.gz -> actionscript-mode-7.2.2_p20180527.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e6ea45c8f98d76fd35975669c93e9def
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
index 848dc4b9560e..3c3d41c06596 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/adaptive-wrap-0.7.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f597d4059056b3b15e37a2853edafef6
diff --git a/metadata/md5-cache/app-emacs/adaptive-wrap-0.8 b/metadata/md5-cache/app-emacs/adaptive-wrap-0.8
index 12284055c0db..b1c09b97370e 100644
--- a/metadata/md5-cache/app-emacs/adaptive-wrap-0.8
+++ b/metadata/md5-cache/app-emacs/adaptive-wrap-0.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/adaptive-wrap-0.8.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=45bf25014460f42a7d9fd2e25ebcd22c
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1 b/metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1
index 3c223a00461a..95e5fc6939da 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1
+++ b/metadata/md5-cache/app-emacs/all-the-icons-5.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/domtronn/all-the-icons.el/archive/5.0.0.tar.gz -> all-the-icons-5.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	font	bc7d91ca9054e47ad87b5763214665a4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	font	bc7d91ca9054e47ad87b5763214665a4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=e67122495533315abc7cf95931df1366
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-5.0.0_p20220325-r1 b/metadata/md5-cache/app-emacs/all-the-icons-5.0.0_p20220325-r1
index 356c8c990257..43382c8710e5 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-5.0.0_p20220325-r1
+++ b/metadata/md5-cache/app-emacs/all-the-icons-5.0.0_p20220325-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/domtronn/all-the-icons.el/archive/65c496d3d1d1298345beb9845840067bffb2ffd8.tar.gz -> all-the-icons-5.0.0_p20220325.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	font	bc7d91ca9054e47ad87b5763214665a4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	font	bc7d91ca9054e47ad87b5763214665a4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=f1a6a5b5f99a9bd9740121bb7f0832e2
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-dired-2.0 b/metadata/md5-cache/app-emacs/all-the-icons-dired-2.0
index 3e61ddd8cc3b..42d616d063a7 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-dired-2.0
+++ b/metadata/md5-cache/app-emacs/all-the-icons-dired-2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/all-the-icons >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/wyuenho/all-the-icons-dired/archive/2.0.tar.gz -> all-the-icons-dired-2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f37f520189f8d00909006435aafea753
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-ibuffer-1.3.0 b/metadata/md5-cache/app-emacs/all-the-icons-ibuffer-1.3.0
index 2b00ca738ce9..fb1f43e04984 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-ibuffer-1.3.0
+++ b/metadata/md5-cache/app-emacs/all-the-icons-ibuffer-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/all-the-icons >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/seagle0128/all-the-icons-ibuffer/archive/v1.3.0.tar.gz -> all-the-icons-ibuffer-1.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fc42fee327a24445e95af4d77bce6a39
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.7.1 b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.7.1
index 88563daa9c60..66711fb5d375 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.7.1
+++ b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.7.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/all-the-icons app-emacs/ivy-rich >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/seagle0128/all-the-icons-ivy-rich/archive/v1.7.1.tar.gz -> all-the-icons-ivy-rich-1.7.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e4a10b87f1a4b36fffb0af2fa6999326
diff --git a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.8.0 b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.8.0
index 033b149b0931..9d779ec1647b 100644
--- a/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.8.0
+++ b/metadata/md5-cache/app-emacs/all-the-icons-ivy-rich-1.8.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/all-the-icons app-emacs/ivy-rich >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/seagle0128/all-the-icons-ivy-rich/archive/v1.8.0.tar.gz -> all-the-icons-ivy-rich-1.8.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e4a10b87f1a4b36fffb0af2fa6999326
diff --git a/metadata/md5-cache/app-emacs/amx-3.4 b/metadata/md5-cache/app-emacs/amx-3.4
index 5658746eed8d..4139194dcdb7 100644
--- a/metadata/md5-cache/app-emacs/amx-3.4
+++ b/metadata/md5-cache/app-emacs/amx-3.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/s app-emacs/ivy >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/DarwinAwardWinner/amx/archive/v3.4.tar.gz -> amx-3.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6e9b70c7b37280d42ab41158ebc4f350
diff --git a/metadata/md5-cache/app-emacs/analog-1.9.99 b/metadata/md5-cache/app-emacs/analog-1.9.99
index c56ff07c0165..9f851cc45a16 100644
--- a/metadata/md5-cache/app-emacs/analog-1.9.99
+++ b/metadata/md5-cache/app-emacs/analog-1.9.99
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/analog-1.9.99.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=922905ad92a1fb4d4a4bef6c2b782c52
diff --git a/metadata/md5-cache/app-emacs/anaphora-1.0.4 b/metadata/md5-cache/app-emacs/anaphora-1.0.4
index 29ee3f516405..c7d9f8a3409c 100644
--- a/metadata/md5-cache/app-emacs/anaphora-1.0.4
+++ b/metadata/md5-cache/app-emacs/anaphora-1.0.4
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/rolandwalker/anaphora/archive/v1.0.4.tar.gz -> anaphora-1.0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fdb68840d25f085d76e9770763b860d3
diff --git a/metadata/md5-cache/app-emacs/ansi-0.4.1_p20211104 b/metadata/md5-cache/app-emacs/ansi-0.4.1_p20211104
index 8146b01c61b9..2dd7c185964a 100644
--- a/metadata/md5-cache/app-emacs/ansi-0.4.1_p20211104
+++ b/metadata/md5-cache/app-emacs/ansi-0.4.1_p20211104
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rejeep/ansi.el/archive/2367fba7b3b2340364a30cd6de7f3eb6bb9898a3.tar.gz -> ansi-0.4.1_p20211104.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d50092adc1efc77edd6b7b1a946ebcdc
diff --git a/metadata/md5-cache/app-emacs/apache-mode-2.2.0 b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
index aee9201fec87..73402be197c5 100644
--- a/metadata/md5-cache/app-emacs/apache-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/apache-mode-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-php/apache-mode/archive/2.2.0.tar.gz -> apache-mode-2.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9014031c259b08e4280c27eddfc7ae53
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20190407 b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
index 33362a786bdd..bce7e11251c6 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20190407
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20190407
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/d146ddbf8818e81d3577d5eee7825d377bec0c73.tar.gz -> apel-10.8_p20190407.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e292fa96a4d01a2eb7dd47d70b69b474
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20201106 b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
index fd7e108bd303..ebc876938be8 100644
--- a/metadata/md5-cache/app-emacs/apel-10.8_p20201106
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/apel/archive/4e3269b6e702db2dba48cf560563ac883e81e3bf.tar.gz -> apel-10.8_p20201106.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3de0f0267c2fc036e1f272e29196cb5b
diff --git a/metadata/md5-cache/app-emacs/assess-0.6 b/metadata/md5-cache/app-emacs/assess-0.6
index beb698436498..562103dac7ce 100644
--- a/metadata/md5-cache/app-emacs/assess-0.6
+++ b/metadata/md5-cache/app-emacs/assess-0.6
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/m-buffer >=app-editors/emacs-23.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/phillord/assess/archive/v0.6.tar.gz -> assess-0.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=74b63b5eea118918c3fb0c1b35adea85
diff --git a/metadata/md5-cache/app-emacs/async-1.9.3 b/metadata/md5-cache/app-emacs/async-1.9.3
index 13e04e372487..381a0593bfaa 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.3
+++ b/metadata/md5-cache/app-emacs/async-1.9.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.3.tar.gz -> emacs-async-1.9.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=81b51f3b0a83969bc87a3854638d43c7
diff --git a/metadata/md5-cache/app-emacs/async-1.9.4 b/metadata/md5-cache/app-emacs/async-1.9.4
index e6c18b1e3e4a..47023a66eeb4 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.4
+++ b/metadata/md5-cache/app-emacs/async-1.9.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.4.tar.gz -> emacs-async-1.9.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4dc8d2033e65790a9711fc583975db36
diff --git a/metadata/md5-cache/app-emacs/async-1.9.7 b/metadata/md5-cache/app-emacs/async-1.9.7
index 39c532a42de8..c2d43bf71357 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.7
+++ b/metadata/md5-cache/app-emacs/async-1.9.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/emacs-async/archive/v1.9.7.tar.gz -> emacs-async-1.9.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=88246cff68ab48e1af2e33bccd4afc6a
diff --git a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0-r1 b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0-r1
index 2f96e411560e..69a043fe6eee 100644
--- a/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0-r1
+++ b/metadata/md5-cache/app-emacs/atomic-chrome-2.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/websocket >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/alpha22jp/atomic-chrome/archive/v2.0.0.tar.gz -> atomic-chrome-2.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9a4421bf9ebe2288b8a475114f783d6f
diff --git a/metadata/md5-cache/app-emacs/auctex-12.3 b/metadata/md5-cache/app-emacs/auctex-12.3
index 1bc86b68bc48..8fc41c3b7d04 100644
--- a/metadata/md5-cache/app-emacs/auctex-12.3
+++ b/metadata/md5-cache/app-emacs/auctex-12.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-12.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3817cba598317249bc4d3e472ee31a78
diff --git a/metadata/md5-cache/app-emacs/auctex-13.1 b/metadata/md5-cache/app-emacs/auctex-13.1
index b7583f9d4bda..9fa8d1eeae79 100644
--- a/metadata/md5-cache/app-emacs/auctex-13.1
+++ b/metadata/md5-cache/app-emacs/auctex-13.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=virtual/latex-base preview-latex? ( app-text/dvipng app-text/ghostscript-gpl ) >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=mirror://gnu/auctex/auctex-13.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0c2484302b6ef2f174b6a870d8b8ee25
diff --git a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r2 b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r2
index efe60dfef14d..e08ed2efca76 100644
--- a/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r2
+++ b/metadata/md5-cache/app-emacs/auto-complete-1.5.1-r2
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/popup >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/auto-complete/archive/v1.5.1.tar.gz -> auto-complete-1.5.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a7e84bff665586b3aa1e4a83b057b1fc
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1 b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
index 141b5a92293d..99626516bc43 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.69-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ad661555b84484f70d01c300de8683e8
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.71 b/metadata/md5-cache/app-emacs/autoconf-mode-2.71
index 2ade98122262..bdc8cf3489e8 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.71
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.71
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2e578e81f6961e7da5117a8bcf31741e
diff --git a/metadata/md5-cache/app-emacs/avy-0.5.0 b/metadata/md5-cache/app-emacs/avy-0.5.0
index a9141d937b16..1677611920e7 100644
--- a/metadata/md5-cache/app-emacs/avy-0.5.0
+++ b/metadata/md5-cache/app-emacs/avy-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/abo-abo/avy/archive/refs/tags/0.5.0.tar.gz -> avy-0.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7816da6554a0b7ba7ae18d5c4ff90b5e
diff --git a/metadata/md5-cache/app-emacs/basic-toolkit-0.7 b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
index c828677faacb..69ef18603807 100644
--- a/metadata/md5-cache/app-emacs/basic-toolkit-0.7
+++ b/metadata/md5-cache/app-emacs/basic-toolkit-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/windows app-emacs/cycle-buffer app-emacs/css-sort-buffer >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/basic-toolkit-0.7.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4d5de200e57a6627868ee77effd9530a
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2 b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
index 62cb2309da77..cd309f59cbb5 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
+++ b/metadata/md5-cache/app-emacs/bbdb-3.1.2-r2
@@ -11,5 +11,5 @@ RDEPEND=vm? ( app-emacs/vm ) tex? ( virtual/tex-base ) >=app-editors/emacs-23.1:
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/bbdb/bbdb-3.1.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=34f40f4aa226d6c2cbef933a1eba7cdf
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.2.2a-r1 b/metadata/md5-cache/app-emacs/bbdb-3.2.2a-r1
index f1aedaf084a9..3829b391f2ad 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.2.2a-r1
+++ b/metadata/md5-cache/app-emacs/bbdb-3.2.2a-r1
@@ -13,5 +13,5 @@ RDEPEND=vm? ( app-emacs/vm ) wanderlust? ( app-emacs/wanderlust ) >=app-editors/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/bbdb-3.2.2a.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=0759540cfe9b3c60194949860ace6f28
diff --git a/metadata/md5-cache/app-emacs/bbdb-3.2.2b b/metadata/md5-cache/app-emacs/bbdb-3.2.2b
index 4b1c947f3dfe..4e3380c8bbff 100644
--- a/metadata/md5-cache/app-emacs/bbdb-3.2.2b
+++ b/metadata/md5-cache/app-emacs/bbdb-3.2.2b
@@ -13,5 +13,5 @@ RDEPEND=vm? ( app-emacs/vm ) wanderlust? ( app-emacs/wanderlust ) >=app-editors/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.nongnu.org/cgit/bbdb.git/snapshot/bbdb-3.2.2b.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=7d5ed613347dcac4de0ee8d8c11be19a
diff --git a/metadata/md5-cache/app-emacs/biblio-0.2_p20210418-r1 b/metadata/md5-cache/app-emacs/biblio-0.2_p20210418-r1
index aab64bdfed9f..a811b0e81764 100644
--- a/metadata/md5-cache/app-emacs/biblio-0.2_p20210418-r1
+++ b/metadata/md5-cache/app-emacs/biblio-0.2_p20210418-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/dash >=app-editors/emacs-24.4:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cpitclaudel/biblio.el/archive/517ec18f00f91b61481214b178f7ae0b8fbc499b.tar.gz -> biblio-0.2_p20210418.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=de3833b0ccbbc8ba168c1cf7f28f8456
diff --git a/metadata/md5-cache/app-emacs/binclock-1.11 b/metadata/md5-cache/app-emacs/binclock-1.11
index cf9416ae9172..4aa64788fc89 100644
--- a/metadata/md5-cache/app-emacs/binclock-1.11
+++ b/metadata/md5-cache/app-emacs/binclock-1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/binclock.el/archive/v1.11.tar.gz -> binclock-1.11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a3c3e964327bebdfd0a8740363237d8b
diff --git a/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1 b/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1
index 41de2bb1ce05..8c972b523c72 100644
--- a/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1
+++ b/metadata/md5-cache/app-emacs/bind-chord-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/bind-key app-emacs/key-chord >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.1.tar.gz -> use-package-2.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a1c5ee264df84bb659986544a32086ac
diff --git a/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1 b/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1
index 477f813a23c3..0ee34a03f162 100644
--- a/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1
+++ b/metadata/md5-cache/app-emacs/bind-key-2.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.1.tar.gz -> use-package-2.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3eb345e14087e6306639ec0a68501cb4
diff --git a/metadata/md5-cache/app-emacs/bison-mode-0.3-r1 b/metadata/md5-cache/app-emacs/bison-mode-0.3-r1
index 039147448d09..877284381cab 100644
--- a/metadata/md5-cache/app-emacs/bison-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/bison-mode-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~nicolasbock/bison-mode-0.3.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f756d4d69e51974ab5246635b532bbd2
diff --git a/metadata/md5-cache/app-emacs/blogmax-20170321 b/metadata/md5-cache/app-emacs/blogmax-20170321
index c5dcd03c84d4..86b51fe92886 100644
--- a/metadata/md5-cache/app-emacs/blogmax-20170321
+++ b/metadata/md5-cache/app-emacs/blogmax-20170321
@@ -9,5 +9,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/blogmax-20170321.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=075344a425db39cf3b846fd1641cc561
diff --git a/metadata/md5-cache/app-emacs/bm-201905 b/metadata/md5-cache/app-emacs/bm-201905
index da3160455339..a61a3e0d1f78 100644
--- a/metadata/md5-cache/app-emacs/bm-201905
+++ b/metadata/md5-cache/app-emacs/bm-201905
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joodland/bm/archive/201905.tar.gz -> bm-201905.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=541265409ff659bffce3fc87a3de926f
diff --git a/metadata/md5-cache/app-emacs/bnf-mode-0.4.5_pre20220102 b/metadata/md5-cache/app-emacs/bnf-mode-0.4.5_pre20220102
index c0ed31d3a6cb..ae3b74c0bead 100644
--- a/metadata/md5-cache/app-emacs/bnf-mode-0.4.5_pre20220102
+++ b/metadata/md5-cache/app-emacs/bnf-mode-0.4.5_pre20220102
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sergeyklay/bnf-mode/archive/d9329dd90e5d4f629295e85898362d9682047898.tar.gz -> bnf-mode-0.4.5_pre20220102.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a117cebccf657c2a02b521683d87e39f
diff --git a/metadata/md5-cache/app-emacs/bongo-1.1 b/metadata/md5-cache/app-emacs/bongo-1.1
index 6e0c4a091258..1b9902682fe9 100644
--- a/metadata/md5-cache/app-emacs/bongo-1.1
+++ b/metadata/md5-cache/app-emacs/bongo-1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=app-emacs/volume >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/bongo/archive/1.1.tar.gz -> bongo-1.1.tar.gz mplayer? ( mirror://gentoo/bongo-mplayer-20070204.tar.bz2 )
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=71c654d9d1d75d8b68daa86b08e67684
diff --git a/metadata/md5-cache/app-emacs/boogie-friends-20210703 b/metadata/md5-cache/app-emacs/boogie-friends-20210703
index d97957bbf1d5..719816268f90 100644
--- a/metadata/md5-cache/app-emacs/boogie-friends-20210703
+++ b/metadata/md5-cache/app-emacs/boogie-friends-20210703
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/company-mode app-emacs/dash app-emacs/flycheck app-emacs/yasni
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/boogie-org/boogie-friends/archive/1e3b6a8aee9fa7c113468838c5b647080caf3703.tar.gz -> boogie-friends-20210703.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9c4b0c26f56da60b73995fcbf53b6806
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.1 b/metadata/md5-cache/app-emacs/boxquote-2.1
index 41aec33ae382..052cc959cfeb 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.1
+++ b/metadata/md5-cache/app-emacs/boxquote-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.1.tar.gz -> boxquote-2.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0979523451600bffd9967675c43ff5d5
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.2 b/metadata/md5-cache/app-emacs/boxquote-2.2
index 83a79c9f16bf..748b92a1fbfb 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.2
+++ b/metadata/md5-cache/app-emacs/boxquote-2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.2.tar.gz -> boxquote-2.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=74dfd2f5183b5eb4a58a07e1bc28928a
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.3 b/metadata/md5-cache/app-emacs/boxquote-2.3
index 2378cdf24483..183bafd50829 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.3
+++ b/metadata/md5-cache/app-emacs/boxquote-2.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.3.tar.gz -> boxquote-2.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7f55d769161ab0d61b56819394c3cf1d
diff --git a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0 b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
index 968628c57e9a..43c4014a2930 100644
--- a/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
+++ b/metadata/md5-cache/app-emacs/browse-kill-ring-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/browse-kill-ring/browse-kill-ring/archive/2.0.0.tar.gz -> browse-kill-ring-2.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e8cce377e266a6ecc29a5ea15aa18920
diff --git a/metadata/md5-cache/app-emacs/bubblet-0.74-r1 b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
index 4373e374f7d5..6cb52da01722 100644
--- a/metadata/md5-cache/app-emacs/bubblet-0.74-r1
+++ b/metadata/md5-cache/app-emacs/bubblet-0.74-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/bubblet-0.74.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=078dc742e0b2b96682d4b5fc1a532f15
diff --git a/metadata/md5-cache/app-emacs/buffer-extension-0.1-r1 b/metadata/md5-cache/app-emacs/buffer-extension-0.1-r1
index 4a25a5e51888..fb195746d21c 100644
--- a/metadata/md5-cache/app-emacs/buffer-extension-0.1-r1
+++ b/metadata/md5-cache/app-emacs/buffer-extension-0.1-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/basic-toolkit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/buffer-extension-0.1.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3bc360b585abc8ff360297cd97d5b2b1
diff --git a/metadata/md5-cache/app-emacs/bui-1.2.1_p20210108 b/metadata/md5-cache/app-emacs/bui-1.2.1_p20210108
index 2902c0fff28b..e12fd534d0c3 100644
--- a/metadata/md5-cache/app-emacs/bui-1.2.1_p20210108
+++ b/metadata/md5-cache/app-emacs/bui-1.2.1_p20210108
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/dash >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/alezost/bui.el/archive/f3a137628e112a91910fd33c0cff0948fa58d470.tar.gz -> bui-1.2.1_p20210108.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ddb82767b93fd68ff28c1e0872993995
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.25 b/metadata/md5-cache/app-emacs/buttercup-1.25
index 50befc1c8369..822ffcba56be 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.25
+++ b/metadata/md5-cache/app-emacs/buttercup-1.25
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.25.tar.gz -> buttercup-1.25.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c5da25ef5f8b295d465b18e5f9ef2764
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.26 b/metadata/md5-cache/app-emacs/buttercup-1.26
index 9c5019c12726..a52bd59f6ea6 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.26
+++ b/metadata/md5-cache/app-emacs/buttercup-1.26
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.26.tar.gz -> buttercup-1.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a30a086687d49d8c7829e58b07c30dfd
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.27 b/metadata/md5-cache/app-emacs/buttercup-1.27
index 2849405ab7c4..1b4a847f74a0 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.27
+++ b/metadata/md5-cache/app-emacs/buttercup-1.27
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.27.tar.gz -> buttercup-1.27.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c5da25ef5f8b295d465b18e5f9ef2764
diff --git a/metadata/md5-cache/app-emacs/calfw-1.6 b/metadata/md5-cache/app-emacs/calfw-1.6
index 63fce93c571b..a81794b8a36d 100644
--- a/metadata/md5-cache/app-emacs/calfw-1.6
+++ b/metadata/md5-cache/app-emacs/calfw-1.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=howm? ( app-emacs/howm ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-calfw/archive/v1.6.tar.gz -> calfw-1.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=39c928de96cdb0ec10e4c0aa9b786aa2
diff --git a/metadata/md5-cache/app-emacs/cask-0.8.8 b/metadata/md5-cache/app-emacs/cask-0.8.8
index db5c2c2f36c7..0ec755239a21 100644
--- a/metadata/md5-cache/app-emacs/cask-0.8.8
+++ b/metadata/md5-cache/app-emacs/cask-0.8.8
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/ansi app-emacs/commander app-emacs/epl app-emacs/f app-emacs/p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cask/cask/archive/v0.8.8.tar.gz -> cask-0.8.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=144990691856bf57d1fd452bb247e4f9
diff --git a/metadata/md5-cache/app-emacs/cask-mode-0.1 b/metadata/md5-cache/app-emacs/cask-mode-0.1
index 9d4a4e4554f9..9411a833b436 100644
--- a/metadata/md5-cache/app-emacs/cask-mode-0.1
+++ b/metadata/md5-cache/app-emacs/cask-mode-0.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Wilfred/cask-mode/archive/0.1.tar.gz -> cask-mode-0.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0e315c74c37daa03dcad50cac8698dbb
diff --git a/metadata/md5-cache/app-emacs/cfrs-1.6.0-r1 b/metadata/md5-cache/app-emacs/cfrs-1.6.0-r1
index fbdc0b095882..bf408acb5fe5 100644
--- a/metadata/md5-cache/app-emacs/cfrs-1.6.0-r1
+++ b/metadata/md5-cache/app-emacs/cfrs-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/posframe app-emacs/s >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/cfrs/archive/1.6.0.tar.gz -> cfrs-1.6.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=88b9cef276da380354ce81d37b3b05d4
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.4 b/metadata/md5-cache/app-emacs/chess-2.0.4
index 5a01c6aaee1c..21fdfaf21ea5 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.4
+++ b/metadata/md5-cache/app-emacs/chess-2.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.4.tar.xz mirror://gentoo/emacs-chess-sounds-2.0.tar.bz2 mirror://gentoo/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=29fc64e8772698a8e94b4c2183adccca
diff --git a/metadata/md5-cache/app-emacs/chess-2.0.5 b/metadata/md5-cache/app-emacs/chess-2.0.5
index 190353e633ca..18b1072b6005 100644
--- a/metadata/md5-cache/app-emacs/chess-2.0.5
+++ b/metadata/md5-cache/app-emacs/chess-2.0.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.3+
 RDEPEND=|| ( games-board/stockfish games-board/fruit games-board/gnuchess games-board/phalanx games-board/sjeng games-board/crafty ) >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/chess-2.0.5.tar.xz https://dev.gentoo.org/~ulm/distfiles/emacs-chess-sounds-2.0.tar.bz2 https://dev.gentoo.org/~ulm/distfiles/emacs-chess-pieces-2.0.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c0ec273b39d24dd5872ec22bc0f3b1a5
diff --git a/metadata/md5-cache/app-emacs/circe-2.11 b/metadata/md5-cache/app-emacs/circe-2.11
index c14add1ccba0..a165cfa18b2e 100644
--- a/metadata/md5-cache/app-emacs/circe-2.11
+++ b/metadata/md5-cache/app-emacs/circe-2.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.11.tar.gz -> circe-2.11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1a20f4d913fa501c763de9d584c396e5
diff --git a/metadata/md5-cache/app-emacs/circe-2.12 b/metadata/md5-cache/app-emacs/circe-2.12
index a67d21e73b84..3577431b105f 100644
--- a/metadata/md5-cache/app-emacs/circe-2.12
+++ b/metadata/md5-cache/app-emacs/circe-2.12
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/circe/archive/v2.12.tar.gz -> circe-2.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b1bb72ff1c55da74e89946f6e7c1de1f
diff --git a/metadata/md5-cache/app-emacs/citar-1.0 b/metadata/md5-cache/app-emacs/citar-1.0
index e1b79267f9cb..339be4aa024d 100644
--- a/metadata/md5-cache/app-emacs/citar-1.0
+++ b/metadata/md5-cache/app-emacs/citar-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/citeproc-el app-emacs/parsebib >=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-citar/citar/archive/v1.0.tar.gz -> citar-1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a169af51debec25e0653beee004c1c2f
diff --git a/metadata/md5-cache/app-emacs/citeproc-el-0.9.1 b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
index d001811323d1..30c4a6bda4c3 100644
--- a/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
+++ b/metadata/md5-cache/app-emacs/citeproc-el-0.9.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-26:*[libxml2] app-emacs/dash app-emacs/f app-emacs/p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/andras-simonyi/citeproc-el/archive/0.9.1.tar.gz -> citeproc-el-0.9.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=97d03043107578c98c258906effcee53
diff --git a/metadata/md5-cache/app-emacs/cldoc-1.16 b/metadata/md5-cache/app-emacs/cldoc-1.16
index 91071ed4a57c..d019e0bcb705 100644
--- a/metadata/md5-cache/app-emacs/cldoc-1.16
+++ b/metadata/md5-cache/app-emacs/cldoc-1.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/slime >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/cldoc-1.16.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fb64bcd1b5d2c3eb48e6d2edf5b35153
diff --git a/metadata/md5-cache/app-emacs/clojure-mode-5.14.0 b/metadata/md5-cache/app-emacs/clojure-mode-5.14.0
index 2459e136c63b..f2ef8847a6d4 100644
--- a/metadata/md5-cache/app-emacs/clojure-mode-5.14.0
+++ b/metadata/md5-cache/app-emacs/clojure-mode-5.14.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/clojure-mode/archive/v5.14.0.tar.gz -> clojure-mode-5.14.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b7a1d623996cb5dd211977235476af49
diff --git a/metadata/md5-cache/app-emacs/clojure-mode-5.15.0 b/metadata/md5-cache/app-emacs/clojure-mode-5.15.0
index f70d679ec5f8..fd800f53cfc6 100644
--- a/metadata/md5-cache/app-emacs/clojure-mode-5.15.0
+++ b/metadata/md5-cache/app-emacs/clojure-mode-5.15.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/clojure-mode/archive/v5.15.0.tar.gz -> clojure-mode-5.15.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b7a1d623996cb5dd211977235476af49
diff --git a/metadata/md5-cache/app-emacs/clojure-mode-5.15.1 b/metadata/md5-cache/app-emacs/clojure-mode-5.15.1
index 7f8052b95ae8..ee5225bde804 100644
--- a/metadata/md5-cache/app-emacs/clojure-mode-5.15.1
+++ b/metadata/md5-cache/app-emacs/clojure-mode-5.15.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/clojure-mode/archive/v5.15.1.tar.gz -> clojure-mode-5.15.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b7a1d623996cb5dd211977235476af49
diff --git a/metadata/md5-cache/app-emacs/cmake-font-lock-0.1.12 b/metadata/md5-cache/app-emacs/cmake-font-lock-0.1.12
index 47dae6ddf40f..3df4e3f87ade 100644
--- a/metadata/md5-cache/app-emacs/cmake-font-lock-0.1.12
+++ b/metadata/md5-cache/app-emacs/cmake-font-lock-0.1.12
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-util/cmake[emacs] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/Lindydancer/cmake-font-lock/archive/0d6111b36a66013aa9b452e664c93308df3b07e1.tar.gz -> cmake-font-lock-0.1.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e4607d6aeb9d9679923af6fe92eaf8d6
diff --git a/metadata/md5-cache/app-emacs/color-browser-0.3-r1 b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
index a96a98d13b60..25cd2db69a7b 100644
--- a/metadata/md5-cache/app-emacs/color-browser-0.3-r1
+++ b/metadata/md5-cache/app-emacs/color-browser-0.3-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/color-browser-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9198d4b279ec0d292d206c17f78a72ff
diff --git a/metadata/md5-cache/app-emacs/color-moccur-2.73 b/metadata/md5-cache/app-emacs/color-moccur-2.73
index 8a43ae222bed..35e91c4ec183 100644
--- a/metadata/md5-cache/app-emacs/color-moccur-2.73
+++ b/metadata/md5-cache/app-emacs/color-moccur-2.73
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/color-moccur-2.73.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=980d0fa568d60aecff6c43b4954e5d10
diff --git a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2 b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
index 8a7bd753b6e6..e0abc6195214 100644
--- a/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
+++ b/metadata/md5-cache/app-emacs/color-theme-6.6.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases-noredirect/color-theme/color-theme-6.6.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=bf5452351632191d7c2d8894eefe72bc
diff --git a/metadata/md5-cache/app-emacs/commander-0.7.0-r1 b/metadata/md5-cache/app-emacs/commander-0.7.0-r1
index 3567b376447e..906e651e3e75 100644
--- a/metadata/md5-cache/app-emacs/commander-0.7.0-r1
+++ b/metadata/md5-cache/app-emacs/commander-0.7.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/dash app-emacs/f app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rejeep/commander.el/archive/v0.7.0.tar.gz -> commander-0.7.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1caa762b1b804d172fe20b11236b584a
diff --git a/metadata/md5-cache/app-emacs/commenter-0.5.2 b/metadata/md5-cache/app-emacs/commenter-0.5.2
index c87affe7d3f3..1f22905a10bb 100644
--- a/metadata/md5-cache/app-emacs/commenter-0.5.2
+++ b/metadata/md5-cache/app-emacs/commenter-0.5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/yuutayamada/commenter/archive/v0.5.2.tar.gz -> commenter-0.5.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dd5ab7fdf39011a6a38a0cd040e43517
diff --git a/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20210708-r1 b/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20210708-r1
index ff272b2b92d6..30c55e896917 100644
--- a/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20210708-r1
+++ b/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20210708-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/company-math app-emacs/company-mode app-emacs/dash app-emacs/yasnippet app-emacs/proofgeneral >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/cpitclaudel/company-coq/archive/382db93374380e5db56f02934ee32bbe39159019.tar.gz -> company-coq-1.0.1_p20210708.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=17f226d63ee66017ca3fae20fd6aca59
diff --git a/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20220314 b/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20220314
index a865e1280eed..1317c908707d 100644
--- a/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20220314
+++ b/metadata/md5-cache/app-emacs/company-coq-1.0.1_p20220314
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/company-math app-emacs/company-mode app-emacs/dash app-emacs/yasnippet app-emacs/proofgeneral >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/cpitclaudel/company-coq/archive/a6e349e0131f676a885bd14c908fd26054b2df42.tar.gz -> company-coq-1.0.1_p20220314.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=46e6c38e28f82c078ff95cdf3b8d36d5
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.0 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.0
index 9c95b7031a99..51d4c5d82130 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-0.1.0
+++ b/metadata/md5-cache/app-emacs/company-ebuild-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e3d656063c5aebfb4869feca146fb89e
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.1 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.1
index 7bc9e334e53e..c94537f4fdfc 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-0.1.1
+++ b/metadata/md5-cache/app-emacs/company-ebuild-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e3d656063c5aebfb4869feca146fb89e
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
index 248bc24e12f8..9e22b9c56aab 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
+++ b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2d12f1b18d7c0b432b8f593d3179cbb3
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-9999 b/metadata/md5-cache/app-emacs/company-ebuild-9999
index 16fa24d01638..dc4e2470d12c 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-9999
+++ b/metadata/md5-cache/app-emacs/company-ebuild-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
 _md5_=2d12f1b18d7c0b432b8f593d3179cbb3
diff --git a/metadata/md5-cache/app-emacs/company-math-1.4_p20210731 b/metadata/md5-cache/app-emacs/company-math-1.4_p20210731
index 59138c3b595a..4779228cc732 100644
--- a/metadata/md5-cache/app-emacs/company-math-1.4_p20210731
+++ b/metadata/md5-cache/app-emacs/company-math-1.4_p20210731
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/company-mode app-emacs/math-symbol-lists >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/vspinu/company-math/archive/45778f5731c97a21a83e3b965cbde42018709afd.tar.gz -> company-math-1.4_p20210731.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dfa0c4f6e53371595507b7008373d3b8
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.10 b/metadata/md5-cache/app-emacs/company-mode-0.9.10
index c23979d52c4a..c34247fb5552 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.10
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.10
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.10.tar.gz -> company-mode-0.9.10.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7af47fd642b6f3c90e1b7430d7b4703e
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.13 b/metadata/md5-cache/app-emacs/company-mode-0.9.13
index 9afecaf516b4..1d393a0707bd 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.13
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.13
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/0.9.13.tar.gz -> company-mode-0.9.13.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7af47fd642b6f3c90e1b7430d7b4703e
diff --git a/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720 b/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
index 8683c3e61f25..d00b085ad982 100644
--- a/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
+++ b/metadata/md5-cache/app-emacs/company-mode-0.9.13_p20220720
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-mode/archive/16ffeba5ef96c4c8e0cd39860b5402e25e304601.tar.gz -> company-mode-0.9.13_p20220720.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4acd238e35fa0bdecbcfe0e06251f26a
diff --git a/metadata/md5-cache/app-emacs/company-quickhelp-2.3.0 b/metadata/md5-cache/app-emacs/company-quickhelp-2.3.0
index f1cb14333fb0..3785ef765289 100644
--- a/metadata/md5-cache/app-emacs/company-quickhelp-2.3.0
+++ b/metadata/md5-cache/app-emacs/company-quickhelp-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/company-mode app-emacs/pos-tip >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/company-mode/company-quickhelp/archive/2.3.0.tar.gz -> company-quickhelp-2.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=58a2e47af9d6806520be40258ac35ef5
diff --git a/metadata/md5-cache/app-emacs/compat-28.1.1.3 b/metadata/md5-cache/app-emacs/compat-28.1.1.3
index 136af60c03e6..ccacf1143c60 100644
--- a/metadata/md5-cache/app-emacs/compat-28.1.1.3
+++ b/metadata/md5-cache/app-emacs/compat-28.1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/compat/archive/2c3233c0e09ef34176787b6e3da4319751ad91e7.tar.gz -> compat-28.1.1.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=67a5d3da43a6476f4d44282ec62a51e6
diff --git a/metadata/md5-cache/app-emacs/compat-28.1.2.1 b/metadata/md5-cache/app-emacs/compat-28.1.2.1
index 3155eed3ef43..55327d3977f5 100644
--- a/metadata/md5-cache/app-emacs/compat-28.1.2.1
+++ b/metadata/md5-cache/app-emacs/compat-28.1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/compat/archive/28.1.2.1.tar.gz -> compat-28.1.2.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=be4d9afd8b0593487b5b5e9d45f5dbed
diff --git a/metadata/md5-cache/app-emacs/compat-28.1.2.2 b/metadata/md5-cache/app-emacs/compat-28.1.2.2
index 689c36a404d8..47fd34f65711 100644
--- a/metadata/md5-cache/app-emacs/compat-28.1.2.2
+++ b/metadata/md5-cache/app-emacs/compat-28.1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/compat/archive/28.1.2.2.tar.gz -> compat-28.1.2.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=aef9f7da690556570271fff049cd84d5
diff --git a/metadata/md5-cache/app-emacs/consult-0.18 b/metadata/md5-cache/app-emacs/consult-0.18
index 13706513ad6e..21f467f155ba 100644
--- a/metadata/md5-cache/app-emacs/consult-0.18
+++ b/metadata/md5-cache/app-emacs/consult-0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.18.tar.gz -> consult-0.18.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/consult-0.19 b/metadata/md5-cache/app-emacs/consult-0.19
index 7a77fc2f1cf9..197d29672cb1 100644
--- a/metadata/md5-cache/app-emacs/consult-0.19
+++ b/metadata/md5-cache/app-emacs/consult-0.19
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.19.tar.gz -> consult-0.19.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/consult-0.20 b/metadata/md5-cache/app-emacs/consult-0.20
index 438bc44db835..1dd63d34e8f2 100644
--- a/metadata/md5-cache/app-emacs/consult-0.20
+++ b/metadata/md5-cache/app-emacs/consult-0.20
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.20.tar.gz -> consult-0.20.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/consult-flycheck-0.8 b/metadata/md5-cache/app-emacs/consult-flycheck-0.8
index e4d8b5aa1598..813fdb508494 100644
--- a/metadata/md5-cache/app-emacs/consult-flycheck-0.8
+++ b/metadata/md5-cache/app-emacs/consult-flycheck-0.8
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/consult app-emacs/flycheck >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/minad/consult-flycheck/archive/refs/tags/0.8.tar.gz -> consult-flycheck-0.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=967d678526013fef237a8ac8663b007a
diff --git a/metadata/md5-cache/app-emacs/corfu-0.26 b/metadata/md5-cache/app-emacs/corfu-0.26
index 37883d9a7886..ca7c438efd3f 100644
--- a/metadata/md5-cache/app-emacs/corfu-0.26
+++ b/metadata/md5-cache/app-emacs/corfu-0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.26.tar.gz -> corfu-0.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=696d4a3283d8b7451a1c7a0820dc74be
diff --git a/metadata/md5-cache/app-emacs/corfu-0.27 b/metadata/md5-cache/app-emacs/corfu-0.27
index 60deda11a1be..5fcf122b7336 100644
--- a/metadata/md5-cache/app-emacs/corfu-0.27
+++ b/metadata/md5-cache/app-emacs/corfu-0.27
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.27.tar.gz -> corfu-0.27.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3f22940e280e7b8f4220299fb0cc70b6
diff --git a/metadata/md5-cache/app-emacs/corfu-0.28 b/metadata/md5-cache/app-emacs/corfu-0.28
index d95262138163..689bdac9a214 100644
--- a/metadata/md5-cache/app-emacs/corfu-0.28
+++ b/metadata/md5-cache/app-emacs/corfu-0.28
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/minad/corfu/archive/refs/tags/0.28.tar.gz -> corfu-0.28.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3f22940e280e7b8f4220299fb0cc70b6
diff --git a/metadata/md5-cache/app-emacs/counsel-0.13.4 b/metadata/md5-cache/app-emacs/counsel-0.13.4
index 4d07628fb008..b5d73a590b5e 100644
--- a/metadata/md5-cache/app-emacs/counsel-0.13.4
+++ b/metadata/md5-cache/app-emacs/counsel-0.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/ivy-0.13.4 >=app-emacs/swiper-0.13.4 >=app-editors/emacs-24.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abo-abo/swiper/archive/0.13.4.tar.gz -> swiper-0.13.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8619c14980cbf310e32ef0747e07b8a8
diff --git a/metadata/md5-cache/app-emacs/crontab-mode-1.20 b/metadata/md5-cache/app-emacs/crontab-mode-1.20
index 590cec343582..ee8a5a8d3b6c 100644
--- a/metadata/md5-cache/app-emacs/crontab-mode-1.20
+++ b/metadata/md5-cache/app-emacs/crontab-mode-1.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/crontab-mode-1.20.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=de782acfe893333788d350de966286ad
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.92 b/metadata/md5-cache/app-emacs/crypt++-2.92
index fa0eeb67b864..9d8aae935425 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.92
+++ b/metadata/md5-cache/app-emacs/crypt++-2.92
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://debian/pool/main/c/crypt++el/crypt++el_2.92.orig.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=81d8a12dff8369cfdf4807cb29d500b9
diff --git a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430 b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
index 7c9d270cb23d..fda00a0b39b7 100644
--- a/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
+++ b/metadata/md5-cache/app-emacs/crypt++-2.94_pre20080430
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/crypt++-2.94_pre20080430.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7f68bc5bce64fbd16468f002c060cd69
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2 b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
index 84622b1135f7..aa8d62c6fd2d 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
+++ b/metadata/md5-cache/app-emacs/csharp-mode-0.9.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/josteink/csharp-mode/archive/v0.9.2.tar.gz -> csharp-mode-0.9.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=41c54c7b6d88080fef94c04dbbbd1c89
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-1.1.1-r1 b/metadata/md5-cache/app-emacs/csharp-mode-1.1.1-r1
index 4992d7a60bcc..f20c3db163f8 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-1.1.1-r1
+++ b/metadata/md5-cache/app-emacs/csharp-mode-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-csharp/csharp-mode/archive/refs/tags/1.1.1.tar.gz -> csharp-mode-1.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cbdf6076560450b57ea8b08626176c47
diff --git a/metadata/md5-cache/app-emacs/css-mode-0.11-r2 b/metadata/md5-cache/app-emacs/css-mode-0.11-r2
index 6b157cbbf224..5abb4eb36277 100644
--- a/metadata/md5-cache/app-emacs/css-mode-0.11-r2
+++ b/metadata/md5-cache/app-emacs/css-mode-0.11-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/css-mode-0.11.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=96f2db1982cb5f28afd4312739e17287
diff --git a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2 b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
index 32e2d61aae95..6c4ca9cdfc48 100644
--- a/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
+++ b/metadata/md5-cache/app-emacs/css-sort-buffer-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/css-sort-buffer-0.2.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=93df5e2ff021985f8304f2f0efb5d616
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.18 b/metadata/md5-cache/app-emacs/csv-mode-1.18
index 9d80c3992cfb..24fd72d5301c 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.18
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.18.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cafb19e875b7e97f2914867338ee362d
diff --git a/metadata/md5-cache/app-emacs/csv-mode-1.20 b/metadata/md5-cache/app-emacs/csv-mode-1.20
index 291c9b246406..365e94f6634a 100644
--- a/metadata/md5-cache/app-emacs/csv-mode-1.20
+++ b/metadata/md5-cache/app-emacs/csv-mode-1.20
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/csv-mode-1.20.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cafb19e875b7e97f2914867338ee362d
diff --git a/metadata/md5-cache/app-emacs/ctable-0.1.3 b/metadata/md5-cache/app-emacs/ctable-0.1.3
index b46bb3d676cf..0dfd0a6ae2b8 100644
--- a/metadata/md5-cache/app-emacs/ctable-0.1.3
+++ b/metadata/md5-cache/app-emacs/ctable-0.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-ctable/archive/04dbcddeba1da1f39e885bc0d36240ff37d829e9.tar.gz -> ctable-0.1.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=744dd9e59f6539cf881cc62c127189a9
diff --git a/metadata/md5-cache/app-emacs/cycle-buffer-2.16-r1 b/metadata/md5-cache/app-emacs/cycle-buffer-2.16-r1
index 2e55b4558396..9eab81178692 100644
--- a/metadata/md5-cache/app-emacs/cycle-buffer-2.16-r1
+++ b/metadata/md5-cache/app-emacs/cycle-buffer-2.16-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/gavv/distfiles/raw/master/cycle-buffer-2.16.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7e69fb6e2d0ef2e5d911f6006ed31cab
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.10 b/metadata/md5-cache/app-emacs/d-mode-2.0.10
index c68e12cbbd79..018506189fd3 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.10
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.10
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.10.tar.gz -> d-mode-2.0.10.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1ce20f9973ed6636c74609c0b60f2fbb
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.11 b/metadata/md5-cache/app-emacs/d-mode-2.0.11
index 353c34cddb0d..4b4ea540820e 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.11
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.11
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.11.tar.gz -> d-mode-2.0.11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ceca08e13c711654e8e42f684595f9fe
diff --git a/metadata/md5-cache/app-emacs/d-mode-2.0.12 b/metadata/md5-cache/app-emacs/d-mode-2.0.12
index 9f5dcb882829..b67772a6e620 100644
--- a/metadata/md5-cache/app-emacs/d-mode-2.0.12
+++ b/metadata/md5-cache/app-emacs/d-mode-2.0.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/2.0.12.tar.gz -> d-mode-2.0.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c2542b34f4bcee7a9f1158739054ddee
diff --git a/metadata/md5-cache/app-emacs/dap-mode-0.7 b/metadata/md5-cache/app-emacs/dap-mode-0.7
index 1f53a93c84ca..25230522f0eb 100644
--- a/metadata/md5-cache/app-emacs/dap-mode-0.7
+++ b/metadata/md5-cache/app-emacs/dap-mode-0.7
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/bui app-emacs/dash app-emacs/f app-emacs/ht app-emacs/lsp-mode
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/dap-mode/archive/0.7.tar.gz -> dap-mode-0.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=026a2c3dd575a10f4675803a5b5d5226
diff --git a/metadata/md5-cache/app-emacs/dash-2.16.0 b/metadata/md5-cache/app-emacs/dash-2.16.0
index 105bd5d5aa68..37f9ef155592 100644
--- a/metadata/md5-cache/app-emacs/dash-2.16.0
+++ b/metadata/md5-cache/app-emacs/dash-2.16.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.16.0.tar.gz -> dash-2.16.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=458cece7a89bda772136ecc61d30aedb
diff --git a/metadata/md5-cache/app-emacs/dash-2.17.0 b/metadata/md5-cache/app-emacs/dash-2.17.0
index 522b08219d2a..87d3c0ca992e 100644
--- a/metadata/md5-cache/app-emacs/dash-2.17.0
+++ b/metadata/md5-cache/app-emacs/dash-2.17.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.17.0.tar.gz -> dash-2.17.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=51060b3b02c2aa75f2835128c6baceec
diff --git a/metadata/md5-cache/app-emacs/dash-2.18.1 b/metadata/md5-cache/app-emacs/dash-2.18.1
index 5f610f03272f..76c0d32b1b1b 100644
--- a/metadata/md5-cache/app-emacs/dash-2.18.1
+++ b/metadata/md5-cache/app-emacs/dash-2.18.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.18.1.tar.gz -> dash-2.18.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4134404663bef3ce47778ca4e699de9a
diff --git a/metadata/md5-cache/app-emacs/dash-2.19.0 b/metadata/md5-cache/app-emacs/dash-2.19.0
index 90badf3745e9..926bf896ca77 100644
--- a/metadata/md5-cache/app-emacs/dash-2.19.0
+++ b/metadata/md5-cache/app-emacs/dash-2.19.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.19.0.tar.gz -> dash-2.19.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1739ee2204801795d2803b8cfe844936
diff --git a/metadata/md5-cache/app-emacs/dash-2.19.1 b/metadata/md5-cache/app-emacs/dash-2.19.1
index 3ca6e14cd5d9..c93e1eca8438 100644
--- a/metadata/md5-cache/app-emacs/dash-2.19.1
+++ b/metadata/md5-cache/app-emacs/dash-2.19.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/dash.el/archive/2.19.1.tar.gz -> dash-2.19.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4bc121e998d339a8f5ec087cdae0f5b2
diff --git a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220406 b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220406
index 4c77e043adb8..e62535104d3e 100644
--- a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220406
+++ b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220406
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-dashboard/emacs-dashboard/archive/69f98f5a89451c0881d0abb34ad57dd71616006a.tar.gz -> dashboard-1.8.0_pre20220406.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=06e5949f661d6a5a5d45ed80a52cfab8
diff --git a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809 b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
index a5136be738d3..97860257783c 100644
--- a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
+++ b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-dashboard/emacs-dashboard/archive/49e5603cac7d028bfc4c679161a20ca40327956c.tar.gz -> dashboard-1.8.0_pre20220809.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=88805c5dd6b8bdb8e7897061e18fa7da
diff --git a/metadata/md5-cache/app-emacs/ddskk-17.1 b/metadata/md5-cache/app-emacs/ddskk-17.1
index 8226d19d39d7..d210e58ad45c 100644
--- a/metadata/md5-cache/app-emacs/ddskk-17.1
+++ b/metadata/md5-cache/app-emacs/ddskk-17.1
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-i18n/skk-jisyo virtual/skkserv ) ruby? ( || ( dev-lang/ruby:2.7
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/skk-dev/ddskk/archive/ddskk-17.1_Neppu.tar.gz -> ddskk-17.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	ruby-single	4e65f388d03c4681739781edf3bbf119	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
 _md5_=b429b173adf10c557a4ed5317675500d
diff --git a/metadata/md5-cache/app-emacs/deferred-0.5.1 b/metadata/md5-cache/app-emacs/deferred-0.5.1
index d13a64f0dcba..286dd45c39e8 100644
--- a/metadata/md5-cache/app-emacs/deferred-0.5.1
+++ b/metadata/md5-cache/app-emacs/deferred-0.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.4:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-deferred/archive/v0.5.1.tar.gz -> deferred-0.5.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a22663a4b83331a9974a6d80860331bf
diff --git a/metadata/md5-cache/app-emacs/deft-08_p20210707 b/metadata/md5-cache/app-emacs/deft-08_p20210707
index a0fcdc285621..bcc61b44aac6 100644
--- a/metadata/md5-cache/app-emacs/deft-08_p20210707
+++ b/metadata/md5-cache/app-emacs/deft-08_p20210707
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jrblevin/deft/archive/28be94d89bff2e1c7edef7244d7c5ba0636b1296.tar.gz -> deft-08_p20210707.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=988d06f052f6fe442cebfe24b30f616b
diff --git a/metadata/md5-cache/app-emacs/demap-1.4.0 b/metadata/md5-cache/app-emacs/demap-1.4.0
index f6571998b306..d131a515ca2b 100644
--- a/metadata/md5-cache/app-emacs/demap-1.4.0
+++ b/metadata/md5-cache/app-emacs/demap-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/sawyerjgardner/demap.el/-/archive/v1.4.0/demap.el-v1.4.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=72ec36995aa05867826089897d926995
diff --git a/metadata/md5-cache/app-emacs/desktop+-0.2-r2 b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
index d840ef1adc1e..4bb90a5bb674 100644
--- a/metadata/md5-cache/app-emacs/desktop+-0.2-r2
+++ b/metadata/md5-cache/app-emacs/desktop+-0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/dash app-emacs/f >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ffevotte/desktop-plus/archive/v0.2.tar.gz -> desktop+-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=098794d4cd6c17343c24ddd702f19e63
diff --git a/metadata/md5-cache/app-emacs/develock-0.47 b/metadata/md5-cache/app-emacs/develock-0.47
index 8cc79489ad65..b8988c14f878 100644
--- a/metadata/md5-cache/app-emacs/develock-0.47
+++ b/metadata/md5-cache/app-emacs/develock-0.47
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/develock-0.47.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=25f6146ad67bb6e1a6b95e860bae5925
diff --git a/metadata/md5-cache/app-emacs/df-mode-20050509-r1 b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
index b58c243c7385..433c301d4209 100644
--- a/metadata/md5-cache/app-emacs/df-mode-20050509-r1
+++ b/metadata/md5-cache/app-emacs/df-mode-20050509-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/df-mode-20050509.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9d0cfa22df387422eb3c3b3c23065f41
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.10 b/metadata/md5-cache/app-emacs/dictionary-1.10
index 69255d253af7..717d0495932f 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.10
+++ b/metadata/md5-cache/app-emacs/dictionary-1.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.myrkr.in-berlin.de/dictionary/dictionary-1.10.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=14506c1dbe66f42bd3aa4b67e4f8dd79
diff --git a/metadata/md5-cache/app-emacs/dictionary-1.11 b/metadata/md5-cache/app-emacs/dictionary-1.11
index 147af4392ea0..8bdca944ad3e 100644
--- a/metadata/md5-cache/app-emacs/dictionary-1.11
+++ b/metadata/md5-cache/app-emacs/dictionary-1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/myrkr/dictionary-el/archive/refs/tags/v1.11.tar.gz -> dictionary-1.11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2def75f9f58b87ea2be0997879bd21fd
diff --git a/metadata/md5-cache/app-emacs/diff-hl-1.8.8_p20220405 b/metadata/md5-cache/app-emacs/diff-hl-1.8.8_p20220405
index 65224847f878..83352efe029d 100644
--- a/metadata/md5-cache/app-emacs/diff-hl-1.8.8_p20220405
+++ b/metadata/md5-cache/app-emacs/diff-hl-1.8.8_p20220405
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dgutov/diff-hl/archive/9d5dc2ffa1e4c7b43734b03dccb5ae6a80800569.tar.gz -> diff-hl-1.8.8_p20220405.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a32585c25738ff0b06ac2f80c677e777
diff --git a/metadata/md5-cache/app-emacs/diff-hl-1.9.0 b/metadata/md5-cache/app-emacs/diff-hl-1.9.0
index 7db84e4fb15e..0d661ad45737 100644
--- a/metadata/md5-cache/app-emacs/diff-hl-1.9.0
+++ b/metadata/md5-cache/app-emacs/diff-hl-1.9.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dgutov/diff-hl/archive/37b00f3bad841e131d69442a89cbebc3041d996b.tar.gz -> diff-hl-1.9.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=60ae216764731db937f51c1710d1c245
diff --git a/metadata/md5-cache/app-emacs/diminish-0.46_pre20220128 b/metadata/md5-cache/app-emacs/diminish-0.46_pre20220128
index 3cb9f47cc2ee..3f08f8adb5ea 100644
--- a/metadata/md5-cache/app-emacs/diminish-0.46_pre20220128
+++ b/metadata/md5-cache/app-emacs/diminish-0.46_pre20220128
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/myrjola/diminish.el/archive/6b7e837b0cf0129e9d7d6abae48093cf599bb9e8.tar.gz -> diminish-0.46_pre20220128.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=47c8f61a74fbe7d4f5036187f7bb8e4f
diff --git a/metadata/md5-cache/app-emacs/dircolors-1.0-r2 b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
index fdab21722059..87724993ec0c 100644
--- a/metadata/md5-cache/app-emacs/dircolors-1.0-r2
+++ b/metadata/md5-cache/app-emacs/dircolors-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dircolors-1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5083b45b333e3746b6f47e734b1c24d9
diff --git a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26 b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
index dbb7169bef54..c36562f44ae0 100644
--- a/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
+++ b/metadata/md5-cache/app-emacs/dired-sort-menu-1.26
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/dired-sort-menu-1.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ba155b4528c27a3edb8c3198a928e938
diff --git a/metadata/md5-cache/app-emacs/distel-4.1.1 b/metadata/md5-cache/app-emacs/distel-4.1.1
index 6aef2a1a52d8..23d91768fac3 100644
--- a/metadata/md5-cache/app-emacs/distel-4.1.1
+++ b/metadata/md5-cache/app-emacs/distel-4.1.1
@@ -10,5 +10,5 @@ LICENSE=BSD MIT
 RDEPEND=>=dev-lang/erlang-11.2.5[emacs] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/massemanet/distel/archive/4.1.1.tar.gz -> distel-4.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8bbad2669cec464d5be5b9ed3114bc73
diff --git a/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012 b/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012
index 8f0c661a97c7..1c08745f8efc 100644
--- a/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012
+++ b/metadata/md5-cache/app-emacs/docker-2.2.0_p20221012
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/transient-0.3.7_p20220918 app-emacs/dash app-emacs/docker-tramp app-emacs/emacs-aio app-emacs/s app-emacs/tablist >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/Silex/docker.el/archive/3173403a2d51a2af36f7fdb0b7d2bec9e202e772.tar.gz -> docker.el-2.2.0_p20221012.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=97aa1027f170f17312a180e391c045a2
diff --git a/metadata/md5-cache/app-emacs/docker-tramp-0.1.1 b/metadata/md5-cache/app-emacs/docker-tramp-0.1.1
index e61e0ef027b0..bec5b55fd5a0 100644
--- a/metadata/md5-cache/app-emacs/docker-tramp-0.1.1
+++ b/metadata/md5-cache/app-emacs/docker-tramp-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/emacs-pe/docker-tramp.el/archive/v0.1.1.tar.gz -> docker-tramp-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c0aae341ee052c026941232c7d748efa
diff --git a/metadata/md5-cache/app-emacs/dockerfile-mode-1.6-r1 b/metadata/md5-cache/app-emacs/dockerfile-mode-1.6-r1
index 33da8a19d6de..abca1c293469 100644
--- a/metadata/md5-cache/app-emacs/dockerfile-mode-1.6-r1
+++ b/metadata/md5-cache/app-emacs/dockerfile-mode-1.6-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/spotify/dockerfile-mode/archive/v1.6.tar.gz -> dockerfile-mode-1.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9a6cf52dde7214f40f038e608c321732
diff --git a/metadata/md5-cache/app-emacs/dockerfile-mode-1.7-r1 b/metadata/md5-cache/app-emacs/dockerfile-mode-1.7-r1
index 6966b35efd44..e5a61e05ddb5 100644
--- a/metadata/md5-cache/app-emacs/dockerfile-mode-1.7-r1
+++ b/metadata/md5-cache/app-emacs/dockerfile-mode-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/spotify/dockerfile-mode/archive/v1.7.tar.gz -> dockerfile-mode-1.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9a6cf52dde7214f40f038e608c321732
diff --git a/metadata/md5-cache/app-emacs/dockerfile-mode-1.8-r1 b/metadata/md5-cache/app-emacs/dockerfile-mode-1.8-r1
index 149486ce92de..fd3ea92416d8 100644
--- a/metadata/md5-cache/app-emacs/dockerfile-mode-1.8-r1
+++ b/metadata/md5-cache/app-emacs/dockerfile-mode-1.8-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/spotify/dockerfile-mode/archive/v1.8.tar.gz -> dockerfile-mode-1.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9a6cf52dde7214f40f038e608c321732
diff --git a/metadata/md5-cache/app-emacs/doctest-mode-0.4 b/metadata/md5-cache/app-emacs/doctest-mode-0.4
index 6e38c43f6990..da8e3351e0ee 100644
--- a/metadata/md5-cache/app-emacs/doctest-mode-0.4
+++ b/metadata/md5-cache/app-emacs/doctest-mode-0.4
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://python-mode.svn.sourceforge.net/viewvc/*checkout*/python-mode/trunk/python-mode/doctest-mode.el?revision=460 -> doctest-mode.el
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=812a49f35f41eba94928569f822e3e49
diff --git a/metadata/md5-cache/app-emacs/doom-themes-2.1.6_p20220505 b/metadata/md5-cache/app-emacs/doom-themes-2.1.6_p20220505
index a66c1f7cd01e..a79402823fb5 100644
--- a/metadata/md5-cache/app-emacs/doom-themes-2.1.6_p20220505
+++ b/metadata/md5-cache/app-emacs/doom-themes-2.1.6_p20220505
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/doomemacs/themes/archive/e9bdd137116fa2037ed60037b8421cf68c64888d.tar.gz -> doom-themes-2.1.6_p20220505.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=668a8ab4c5910fbf8ee86b909d560d44
diff --git a/metadata/md5-cache/app-emacs/doom-themes-2.3.0 b/metadata/md5-cache/app-emacs/doom-themes-2.3.0
index c862c8885113..7fe74e5de4d3 100644
--- a/metadata/md5-cache/app-emacs/doom-themes-2.3.0
+++ b/metadata/md5-cache/app-emacs/doom-themes-2.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/doomemacs/themes/archive/v2.3.0.tar.gz -> doom-themes-2.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=474c845181fca9b63d912ce13a93a830
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
index 6d6eaa4a9553..3776ea352194 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r4
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libxml2-2.6.13 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e0255f9454f782e31e26e29bb993044b
diff --git a/metadata/md5-cache/app-emacs/dropdown-list-20120329 b/metadata/md5-cache/app-emacs/dropdown-list-20120329
index 57b31bed6329..99bebe7298dd 100644
--- a/metadata/md5-cache/app-emacs/dropdown-list-20120329
+++ b/metadata/md5-cache/app-emacs/dropdown-list-20120329
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dropdown-list-20120329.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=96ec52ab3306c474bae9d1e0a225c5f4
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103 b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
index b8958e6c7dec..084694674a6a 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.0_pre20161103
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/bgamari/dts-mode/archive/9ee0854446dcc6c53d2b8d2941051768dba50344.tar.gz -> dts-mode-0.1.0_pre20161103.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e8b695cc744fac577ee31bc10b1aff7b
diff --git a/metadata/md5-cache/app-emacs/dts-mode-0.1.1 b/metadata/md5-cache/app-emacs/dts-mode-0.1.1
index e5a8f54baaaf..2ed495860345 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-0.1.1
+++ b/metadata/md5-cache/app-emacs/dts-mode-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/dts-mode-0.1.1.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e62d304eb7f72482075b538ccb5d6d1a
diff --git a/metadata/md5-cache/app-emacs/dts-mode-1.0 b/metadata/md5-cache/app-emacs/dts-mode-1.0
index 037f7fcd00b4..7039fd04e747 100644
--- a/metadata/md5-cache/app-emacs/dts-mode-1.0
+++ b/metadata/md5-cache/app-emacs/dts-mode-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/dts-mode-1.0.tar
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d480fafa9b3c8296ffe97488f8fe59e3
diff --git a/metadata/md5-cache/app-emacs/dune-format-0.1 b/metadata/md5-cache/app-emacs/dune-format-0.1
index 0439dbf3b427..104c1ea21417 100644
--- a/metadata/md5-cache/app-emacs/dune-format-0.1
+++ b/metadata/md5-cache/app-emacs/dune-format-0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/reformatter dev-ml/dune >=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/emacs-dune-format/archive/0.1.tar.gz -> dune-format-0.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0147df07a460c9f620d96a0e09f045a5
diff --git a/metadata/md5-cache/app-emacs/dwarf-mode-2.39-r1 b/metadata/md5-cache/app-emacs/dwarf-mode-2.39-r1
index f070a80ed366..42b5a4c001cf 100644
--- a/metadata/md5-cache/app-emacs/dwarf-mode-2.39-r1
+++ b/metadata/md5-cache/app-emacs/dwarf-mode-2.39-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=!sys-devel/binutils[emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/binutils/binutils-2.39.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5774b59a66016b36b8606c6366278cbb
diff --git a/metadata/md5-cache/app-emacs/ebib-2.36.1 b/metadata/md5-cache/app-emacs/ebib-2.36.1
index d18e5dd5b838..038f33130a4e 100644
--- a/metadata/md5-cache/app-emacs/ebib-2.36.1
+++ b/metadata/md5-cache/app-emacs/ebib-2.36.1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/parsebib >=app-editors/emacs-26.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/ebib/archive/2.36.1.tar.gz -> ebib-2.36.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=62295e9969c0872a831b0b2264eb78ec
diff --git a/metadata/md5-cache/app-emacs/ebib-2.38 b/metadata/md5-cache/app-emacs/ebib-2.38
index 37c45caf7621..bde90272d2ad 100644
--- a/metadata/md5-cache/app-emacs/ebib-2.38
+++ b/metadata/md5-cache/app-emacs/ebib-2.38
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/parsebib >=app-editors/emacs-26.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/ebib/archive/2.38.tar.gz -> ebib-2.38.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=62295e9969c0872a831b0b2264eb78ec
diff --git a/metadata/md5-cache/app-emacs/ebib-2.38.1 b/metadata/md5-cache/app-emacs/ebib-2.38.1
index dfbd04d502c7..29bd3183c3a5 100644
--- a/metadata/md5-cache/app-emacs/ebib-2.38.1
+++ b/metadata/md5-cache/app-emacs/ebib-2.38.1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/parsebib >=app-editors/emacs-26.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/ebib/archive/0e243a78f435038dda31953c5b48cbddf2a89e27.tar.gz -> ebib-2.38.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=df2b17660b9c2c445ad471ac2064a55a
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.56 b/metadata/md5-cache/app-emacs/ebuild-mode-1.56
index 72fb894094d8..b57e53397720 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.56
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.56
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.56.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=ae2d1d5c1436892e11dc4ae535eb71b1
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.60 b/metadata/md5-cache/app-emacs/ebuild-mode-1.60
index a42cc27e1586..21df2f01772c 100644
--- a/metadata/md5-cache/app-emacs/ebuild-mode-1.60
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.60
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.60.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=5c886e4c5080ca675a64ca991ae17dad
diff --git a/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713 b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
index 63a0e9d2e229..5fad20bb10a1 100644
--- a/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
+++ b/metadata/md5-cache/app-emacs/ebuild-run-mode-20210713
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/ebuild-mode-1.53 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://gitlab.com/akater/emacs-ebuild-run-mode/-/archive/v20210713/emacs-ebuild-run-mode-v20210713.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=16ccef65393baab3927330d3b9ba1c26
diff --git a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728 b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
index 2dac64dc5eee..072a4e40b9b6 100644
--- a/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
+++ b/metadata/md5-cache/app-emacs/ecb-2.50_pre20170728
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ecb-2.50_pre20170728.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=aca7824ff1468519c38785d386d983f3
diff --git a/metadata/md5-cache/app-emacs/ecukes-0.6.18-r1 b/metadata/md5-cache/app-emacs/ecukes-0.6.18-r1
index e096b5687936..ebd278258945 100644
--- a/metadata/md5-cache/app-emacs/ecukes-0.6.18-r1
+++ b/metadata/md5-cache/app-emacs/ecukes-0.6.18-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/ansi app-emacs/commander app-emacs/dash app-emacs/espuds app-e
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ecukes/ecukes/archive/v0.6.18.tar.gz -> ecukes-0.6.18.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ad38bbd910f3cc00e7adb46241d51270
diff --git a/metadata/md5-cache/app-emacs/edb-1.34 b/metadata/md5-cache/app-emacs/edb-1.34
index d973aeacd1bc..f7d25d204c89 100644
--- a/metadata/md5-cache/app-emacs/edb-1.34
+++ b/metadata/md5-cache/app-emacs/edb-1.34
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.gnuvola.org/software/edb/edb-1.34.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=576cef1a8bfee130598b47695b809722
diff --git a/metadata/md5-cache/app-emacs/edit-list-0.3 b/metadata/md5-cache/app-emacs/edit-list-0.3
index d7a1612de022..866f296e2bbb 100644
--- a/metadata/md5-cache/app-emacs/edit-list-0.3
+++ b/metadata/md5-cache/app-emacs/edit-list-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/edit-list-0.3.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=027e0de24fa4258414e07822717aa374
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.15 b/metadata/md5-cache/app-emacs/edit-server-1.15
index ca89cdbfb657..2e538a0f166b 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.15
+++ b/metadata/md5-cache/app-emacs/edit-server-1.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.15.tar.gz -> emacs_chrome-1.15.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c4ba721291f40f8820688ec4f7d711c4
diff --git a/metadata/md5-cache/app-emacs/edit-server-1.16 b/metadata/md5-cache/app-emacs/edit-server-1.16
index 269ebc197688..8152a8ba3da4 100644
--- a/metadata/md5-cache/app-emacs/edit-server-1.16
+++ b/metadata/md5-cache/app-emacs/edit-server-1.16
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/stsquad/emacs_chrome/archive/v1.16.tar.gz -> emacs_chrome-1.16.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3b6c814941b66e20c044e183526e9560
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r3 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r3
index 1741f4055c9c..2f7c9a2a55fe 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r3
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r3
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.7.8.tar.gz -> editorconfig-emacs-0.7.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=b78a78b6812195c340c981b9cd77464a
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
index 0dbba7035de4..c21cdc54ef55 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.8.2.tar.gz -> editorconfig-emacs-0.8.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=9d6c06891a317064d83c9b98025cebc0
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
index 7c91e1c3095f..e98af23be0fb 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.9.0.tar.gz -> editorconfig-emacs-0.9.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=d50134f7705d4eb1346ecbaafe621639
diff --git a/metadata/md5-cache/app-emacs/eglot-1.6-r1 b/metadata/md5-cache/app-emacs/eglot-1.6-r1
index 561be76b86ed..5eda007a1793 100644
--- a/metadata/md5-cache/app-emacs/eglot-1.6-r1
+++ b/metadata/md5-cache/app-emacs/eglot-1.6-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/joaotavora/eglot/archive/refs/tags/1.6.tar.gz -> eglot-1.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=509f0b8a786b2ad9fefd782b70ec9514
diff --git a/metadata/md5-cache/app-emacs/eglot-1.8-r1 b/metadata/md5-cache/app-emacs/eglot-1.8-r1
index fc956917f27e..3777c1b4c9e8 100644
--- a/metadata/md5-cache/app-emacs/eglot-1.8-r1
+++ b/metadata/md5-cache/app-emacs/eglot-1.8-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/joaotavora/eglot/archive/refs/tags/1.8.tar.gz -> eglot-1.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=509f0b8a786b2ad9fefd782b70ec9514
diff --git a/metadata/md5-cache/app-emacs/eglot-1.9 b/metadata/md5-cache/app-emacs/eglot-1.9
index c3019853c9d4..dd96e8193174 100644
--- a/metadata/md5-cache/app-emacs/eglot-1.9
+++ b/metadata/md5-cache/app-emacs/eglot-1.9
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/joaotavora/eglot/archive/refs/tags/1.9.tar.gz -> eglot-1.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=509f0b8a786b2ad9fefd782b70ec9514
diff --git a/metadata/md5-cache/app-emacs/el-mock-1.25.1 b/metadata/md5-cache/app-emacs/el-mock-1.25.1
index cce918960675..b14983730e25 100644
--- a/metadata/md5-cache/app-emacs/el-mock-1.25.1
+++ b/metadata/md5-cache/app-emacs/el-mock-1.25.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/rejeep/el-mock.el/archive/v1.25.1.tar.gz -> el-mock-1.25.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e8614819dc63d602540173b575a12e44
diff --git a/metadata/md5-cache/app-emacs/eldev-1.1.3 b/metadata/md5-cache/app-emacs/eldev-1.1.3
index b25310c18759..ee29b826e75a 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.1.3
+++ b/metadata/md5-cache/app-emacs/eldev-1.1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/doublep/eldev/archive/1.1.3.tar.gz -> eldev-1.1.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emacs/eldev-1.2.1 b/metadata/md5-cache/app-emacs/eldev-1.2.1
index 623cc6c8773d..b1802312aed2 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.2.1
+++ b/metadata/md5-cache/app-emacs/eldev-1.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/doublep/eldev/archive/1.2.1.tar.gz -> eldev-1.2.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emacs/eldev-1.2.2 b/metadata/md5-cache/app-emacs/eldev-1.2.2
index 296dbcb114dc..96c556268641 100644
--- a/metadata/md5-cache/app-emacs/eldev-1.2.2
+++ b/metadata/md5-cache/app-emacs/eldev-1.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/doublep/eldev/archive/1.2.2.tar.gz -> eldev-1.2.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=248b21ab3868a0f8d85d2cea4d8cc553
diff --git a/metadata/md5-cache/app-emacs/elfeed-3.4.1_p20210822 b/metadata/md5-cache/app-emacs/elfeed-3.4.1_p20210822
index 085a796b3b0a..2656b29b4364 100644
--- a/metadata/md5-cache/app-emacs/elfeed-3.4.1_p20210822
+++ b/metadata/md5-cache/app-emacs/elfeed-3.4.1_p20210822
@@ -9,5 +9,5 @@ LICENSE=Unlicense
 RDEPEND=net-misc/curl[ssl] >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/skeeto/elfeed/archive/162d7d545ed41c27967d108c04aa31f5a61c8e16.tar.gz -> elfeed-3.4.1_p20210822.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8dc52b09b57b6417abd66edfcd24ba19
diff --git a/metadata/md5-cache/app-emacs/elixir-mode-2.3.2_p20220314 b/metadata/md5-cache/app-emacs/elixir-mode-2.3.2_p20220314
index 69f9df8429f1..e7ddc82f1217 100644
--- a/metadata/md5-cache/app-emacs/elixir-mode-2.3.2_p20220314
+++ b/metadata/md5-cache/app-emacs/elixir-mode-2.3.2_p20220314
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/elixir-editors/emacs-elixir/archive/e0d0466d83ec80ddb412bb1473908a21baad1ec3.tar.gz -> elixir-mode-2.3.2_p20220314.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=17403cd28180f51947d8c4f9d19b720b
diff --git a/metadata/md5-cache/app-emacs/elpher-3.3.3 b/metadata/md5-cache/app-emacs/elpher-3.3.3
index f9cb48087d81..edcd9bec6e96 100644
--- a/metadata/md5-cache/app-emacs/elpher-3.3.3
+++ b/metadata/md5-cache/app-emacs/elpher-3.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=snapshot;h=ab75cff;sf=tgz -> elpher-3.3.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=39338e987dc62eb33dd6f295cd438b2d
diff --git a/metadata/md5-cache/app-emacs/elpher-3.4.1 b/metadata/md5-cache/app-emacs/elpher-3.4.1
index 48d88193f506..fb845c105136 100644
--- a/metadata/md5-cache/app-emacs/elpher-3.4.1
+++ b/metadata/md5-cache/app-emacs/elpher-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=snapshot;h=bf0dd36;sf=tgz -> elpher-3.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8ad933f9923305383d5bbab61343f8f6
diff --git a/metadata/md5-cache/app-emacs/elpher-3.4.2 b/metadata/md5-cache/app-emacs/elpher-3.4.2
index c93394335d8b..1b64b7258933 100644
--- a/metadata/md5-cache/app-emacs/elpher-3.4.2
+++ b/metadata/md5-cache/app-emacs/elpher-3.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://thelambdalab.xyz/gitweb/index.cgi?p=elpher.git;a=snapshot;h=f117f2f;sf=tgz -> elpher-3.4.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=382642ceae1ec9146f9bf299bd6a577b
diff --git a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321 b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
index f9b5cf8f4bd6..298517bade5a 100644
--- a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
+++ b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220321
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/elpy/archive/1746e7009000b7635c0ea6f1559018143aa61642.tar.gz -> elpy-1.35.0_p20220321.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=fb99fe65e002dca72cf397ab73309fa1
diff --git a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627 b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
index 5a8be7114150..886cedd7bc57 100644
--- a/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
+++ b/metadata/md5-cache/app-emacs/elpy-1.35.0_p20220627
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/elpy/archive/de31d30003c515c25ff7bfd3a361c70c298f78bb.tar.gz -> elpy-1.35.0_p20220627.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=6f7fdfe94787f40c50780f8548e3ac7f
diff --git a/metadata/md5-cache/app-emacs/elscreen-20180321 b/metadata/md5-cache/app-emacs/elscreen-20180321
index a147af775600..36bf265c7cd5 100644
--- a/metadata/md5-cache/app-emacs/elscreen-20180321
+++ b/metadata/md5-cache/app-emacs/elscreen-20180321
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=wanderlust? ( app-emacs/wanderlust ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/knu/elscreen/archive/20180321.tar.gz -> elscreen-20180321.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=762284baff9387cb5cc2ccad2a046618
diff --git a/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610 b/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610
index ed1ae50a384c..eea455e265fa 100644
--- a/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610
+++ b/metadata/md5-cache/app-emacs/emacs-aio-1.0_p20200610
@@ -9,5 +9,5 @@ LICENSE=Unlicense
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/skeeto/emacs-aio/archive/da93523e235529fa97d6f251319d9e1d6fc24a41.tar.gz -> emacs-aio-1.0_p20200610.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e6b7ced9f38fac4a05e164170e54c0ff
diff --git a/metadata/md5-cache/app-emacs/emacs-bazel-mode-0_p20220707 b/metadata/md5-cache/app-emacs/emacs-bazel-mode-0_p20220707
index 4cd8c76b3225..0485656065c2 100644
--- a/metadata/md5-cache/app-emacs/emacs-bazel-mode-0_p20220707
+++ b/metadata/md5-cache/app-emacs/emacs-bazel-mode-0_p20220707
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/emacs-bazel-mode/archive/8f7875998f233d248097006df224a33873bbc4f2.tar.gz -> emacs-bazel-mode-0_p20220707.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2cac7c26af5dcb87a978a58abbfbd903
diff --git a/metadata/md5-cache/app-emacs/emacs-ccls-0_pre20220510-r1 b/metadata/md5-cache/app-emacs/emacs-ccls-0_pre20220510-r1
index 03dab09e7f2f..54c4a533af60 100644
--- a/metadata/md5-cache/app-emacs/emacs-ccls-0_pre20220510-r1
+++ b/metadata/md5-cache/app-emacs/emacs-ccls-0_pre20220510-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-emacs/dash app-emacs/lsp-mode >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/emacs-ccls/archive/ae74a39303457a5e6976dd1c6816cde97d357a0d.tar.gz -> emacs-ccls-0_pre20220510.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=aeb0381d6fd18ebe2fe60d02de1940bb
diff --git a/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1 b/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
index a2717360c0e6..70361c74d44c 100644
--- a/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
+++ b/metadata/md5-cache/app-emacs/emacs-daemon-0.22-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/emacs/emacs-daemon-0.22.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=17826ceace360bb9a24ab4e2aa742fa5
diff --git a/metadata/md5-cache/app-emacs/emacs-eix-0.0.0 b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
index b8aba3c9bf71..84fccd99b759 100644
--- a/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
+++ b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/emacs-eix.git/snapshot/emacs-eix-0.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0177cf7c7f69f795e16afd0e0c33bf69
diff --git a/metadata/md5-cache/app-emacs/emacs-eix-9999 b/metadata/md5-cache/app-emacs/emacs-eix-9999
index fc250e267ed1..b2ca666668bf 100644
--- a/metadata/md5-cache/app-emacs/emacs-eix-9999
+++ b/metadata/md5-cache/app-emacs/emacs-eix-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
 _md5_=0177cf7c7f69f795e16afd0e0c33bf69
diff --git a/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1 b/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
index 89abfc69f9b0..109d385b1f2b 100644
--- a/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
+++ b/metadata/md5-cache/app-emacs/emacs-ipython-notebook-0.17.0_p20220419-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/millejoh/emacs-ipython-notebook/archive/388c8f753cfb99b4f82acbdff26bbe27189d2299.tar.gz -> emacs-ipython-notebook-0.17.0_p20220419.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=ac75773b8101301e1abae2156e4d8953
diff --git a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92 b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
index 88a33473fdc8..4b3a18bad97d 100644
--- a/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
+++ b/metadata/md5-cache/app-emacs/emacs-jabber-0.8.92
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/hexrgb >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-jabber/emacs-jabber-0.8.92.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3ef0cf4391335a763bd4598f730de298
diff --git a/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0 b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
index 529b997228f5..e6ed5f4b626a 100644
--- a/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
+++ b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/emacs-openrc.git/snapshot/emacs-openrc-0.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0960f83dc2236ec843ff8c01ba7cad5a
diff --git a/metadata/md5-cache/app-emacs/emacs-openrc-9999 b/metadata/md5-cache/app-emacs/emacs-openrc-9999
index fa8e60119424..37d50062fa3b 100644
--- a/metadata/md5-cache/app-emacs/emacs-openrc-9999
+++ b/metadata/md5-cache/app-emacs/emacs-openrc-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
 _md5_=0960f83dc2236ec843ff8c01ba7cad5a
diff --git a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112 b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
index 0dbb38e3a3ec..d3edbe6b3c25 100644
--- a/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
+++ b/metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=virtual/w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emacs-w3m-1.4.632_pre20181112.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=bb29eb789e50daec73b475684b35cdbb
diff --git a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1 b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
index b4338dfa3d4d..9e834bb4102f 100644
--- a/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
+++ b/metadata/md5-cache/app-emacs/emacs-wget-0.5.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=net-misc/wget-1.8.2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/emacs-wget-0.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f99c7d791d70edd27f142a4429e75895
diff --git a/metadata/md5-cache/app-emacs/emhacks-20070920-r2 b/metadata/md5-cache/app-emacs/emhacks-20070920-r2
index 16b0a24c1f9c..6b27138356aa 100644
--- a/metadata/md5-cache/app-emacs/emhacks-20070920-r2
+++ b/metadata/md5-cache/app-emacs/emhacks-20070920-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emhacks-20070920.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=369f70234db717a37e9e8c9148693a01
diff --git a/metadata/md5-cache/app-emacs/emms-10 b/metadata/md5-cache/app-emacs/emms-10
index 932d784800a3..76215d0eb4b5 100644
--- a/metadata/md5-cache/app-emacs/emms-10
+++ b/metadata/md5-cache/app-emacs/emms-10
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/emms-10.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=40b6c355593561c86f004455ae7a407c
diff --git a/metadata/md5-cache/app-emacs/emms-11 b/metadata/md5-cache/app-emacs/emms-11
index 030002b25d0e..194ebfbe5034 100644
--- a/metadata/md5-cache/app-emacs/emms-11
+++ b/metadata/md5-cache/app-emacs/emms-11
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/emms.git/snapshot/emms-11.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=cf03e1b431cb7eb5d1f439cfc55cff92
diff --git a/metadata/md5-cache/app-emacs/emms-12 b/metadata/md5-cache/app-emacs/emms-12
index dcbdbc726ed8..d6ca38d64e37 100644
--- a/metadata/md5-cache/app-emacs/emms-12
+++ b/metadata/md5-cache/app-emacs/emms-12
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=media-libs/taglib >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/emms.git/snapshot/emms-12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b7aca6580b9a763ea03f0448ef097e0a
diff --git a/metadata/md5-cache/app-emacs/emojify-1.2 b/metadata/md5-cache/app-emacs/emojify-1.2
index c35dee289b00..9dcbb587ffc7 100644
--- a/metadata/md5-cache/app-emacs/emojify-1.2
+++ b/metadata/md5-cache/app-emacs/emojify-1.2
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/ht >=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iqbalansari/emacs-emojify/archive/v1.2.tar.gz -> emojify-1.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4570a349a1d9a6164f88c09a607da42e
diff --git a/metadata/md5-cache/app-emacs/emojify-1.2_p20210309 b/metadata/md5-cache/app-emacs/emojify-1.2_p20210309
index 481aa6878f1b..816fdd75e021 100644
--- a/metadata/md5-cache/app-emacs/emojify-1.2_p20210309
+++ b/metadata/md5-cache/app-emacs/emojify-1.2_p20210309
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/ht >=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iqbalansari/emacs-emojify/archive/1b726412f19896abf5e4857d4c32220e33400b55.tar.gz -> emojify-1.2_p20210309.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=79d469400819a63c08be83bf5c39f84d
diff --git a/metadata/md5-cache/app-emacs/epc-0.1.1 b/metadata/md5-cache/app-emacs/epc-0.1.1
index 8ef35a7cc5b7..14c6ca2dc83e 100644
--- a/metadata/md5-cache/app-emacs/epc-0.1.1
+++ b/metadata/md5-cache/app-emacs/epc-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/ctable app-emacs/deferred >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/kiwanami/emacs-epc/archive/0.1.1.tar.gz -> epc-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f0bd276fb98ef0e6ab2b363c3043ea9d
diff --git a/metadata/md5-cache/app-emacs/epl-0.9-r2 b/metadata/md5-cache/app-emacs/epl-0.9-r2
index eb20a71a23e4..6ef5b70df54a 100644
--- a/metadata/md5-cache/app-emacs/epl-0.9-r2
+++ b/metadata/md5-cache/app-emacs/epl-0.9-r2
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cask/epl/archive/refs/tags/0.9.tar.gz -> epl-0.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0921a5bed7a4cae4aeaf436a97c108b8
diff --git a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1 b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
index 7440396aaaa2..be48f4f7afd3 100644
--- a/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
+++ b/metadata/md5-cache/app-emacs/erobot-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/erobot-2.1.0.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d32cf1551c3d22302002a54690e6b724
diff --git a/metadata/md5-cache/app-emacs/ert-async-0.1.2_p20200105 b/metadata/md5-cache/app-emacs/ert-async-0.1.2_p20200105
index ab9a8f162641..af764d93cdcb 100644
--- a/metadata/md5-cache/app-emacs/ert-async-0.1.2_p20200105
+++ b/metadata/md5-cache/app-emacs/ert-async-0.1.2_p20200105
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/rejeep/ert-async.el/archive/948cf2faa10e085bda3739034ca5ea1912893433.tar.gz -> ert-async-0.1.2_p20200105.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e14b27866fd44b3618a3a6027187e40a
diff --git a/metadata/md5-cache/app-emacs/ert-runner-0.8.0 b/metadata/md5-cache/app-emacs/ert-runner-0.8.0
index 0202b5f68780..172348ac989e 100644
--- a/metadata/md5-cache/app-emacs/ert-runner-0.8.0
+++ b/metadata/md5-cache/app-emacs/ert-runner-0.8.0
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/ansi app-emacs/commander app-emacs/dash app-emacs/f app-emacs/
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/ert-runner.el/archive/v0.8.0.tar.gz -> ert-runner-0.8.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f99c8c9a0409071045963a6bfea4b2b7
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17 b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
index 8a2b9d772593..b535a2f73676 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
+++ b/metadata/md5-cache/app-emacs/eselect-mode-1.4.17
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.17.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=647d36372c77c6acefd9602215e0f7a2
diff --git a/metadata/md5-cache/app-emacs/eselect-mode-9999 b/metadata/md5-cache/app-emacs/eselect-mode-9999
index cc14ead680c5..5784facd842c 100644
--- a/metadata/md5-cache/app-emacs/eselect-mode-9999
+++ b/metadata/md5-cache/app-emacs/eselect-mode-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
 _md5_=e3d3c03f5ad385a9a46cf8471acaee5c
diff --git a/metadata/md5-cache/app-emacs/espuds-0.3.3_p20171111 b/metadata/md5-cache/app-emacs/espuds-0.3.3_p20171111
index e19d283f1182..b275fd22f795 100644
--- a/metadata/md5-cache/app-emacs/espuds-0.3.3_p20171111
+++ b/metadata/md5-cache/app-emacs/espuds-0.3.3_p20171111
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/dash app-emacs/f app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ecukes/espuds/archive/78fc53feaf77a98d63894cd410faee2a18107b00.tar.gz -> espuds-0.3.3_p20171111.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2c249fdd762990a14a63d9d0b4c6b53a
diff --git a/metadata/md5-cache/app-emacs/ess-18.10.2-r1 b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
index ad51728a7141..cfa64bdec13f 100644
--- a/metadata/md5-cache/app-emacs/ess-18.10.2-r1
+++ b/metadata/md5-cache/app-emacs/ess-18.10.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ess.r-project.org/downloads/ess/ess-18.10.2.tgz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=8ee4f9d8b0cc490384a1a0726d64a433
diff --git a/metadata/md5-cache/app-emacs/esup-0.7.1_p20220203 b/metadata/md5-cache/app-emacs/esup-0.7.1_p20220203
index 21d9dc452ee3..a39672f5c221 100644
--- a/metadata/md5-cache/app-emacs/esup-0.7.1_p20220203
+++ b/metadata/md5-cache/app-emacs/esup-0.7.1_p20220203
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/s >=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jschaf/esup/archive/4b49c8d599d4cc0fbf994e9e54a9c78e5ab62a5f.tar.gz -> esup-0.7.1_p20220203.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=02a17c6c0de0318e90be56ce6886f323
diff --git a/metadata/md5-cache/app-emacs/evil-1.14.0 b/metadata/md5-cache/app-emacs/evil-1.14.0
index 65b1d1e7ef56..f8052e55a511 100644
--- a/metadata/md5-cache/app-emacs/evil-1.14.0
+++ b/metadata/md5-cache/app-emacs/evil-1.14.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.14.0.tar.gz -> evil-1.14.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=50b8e1d32b3f2d831bc8aed12898d21a
diff --git a/metadata/md5-cache/app-emacs/evil-1.14.2 b/metadata/md5-cache/app-emacs/evil-1.14.2
index 28354b66b9f0..9969154c52e6 100644
--- a/metadata/md5-cache/app-emacs/evil-1.14.2
+++ b/metadata/md5-cache/app-emacs/evil-1.14.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/undo-tree-0.6.3 >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-evil/evil/archive/1.14.2.tar.gz -> evil-1.14.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=abc1c5b9945fcc856db1bb71e4405a77
diff --git a/metadata/md5-cache/app-emacs/exec-path-from-shell-1.12 b/metadata/md5-cache/app-emacs/exec-path-from-shell-1.12
index 2f2d6be77e99..5b4c5e190aac 100644
--- a/metadata/md5-cache/app-emacs/exec-path-from-shell-1.12
+++ b/metadata/md5-cache/app-emacs/exec-path-from-shell-1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/exec-path-from-shell/archive/1.12.tar.gz -> exec-path-from-shell-1.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=641c1075f05d0eeff719a57de1110e3b
diff --git a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1 b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
index 34eb12064d27..d851dafc99bc 100644
--- a/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
+++ b/metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/expand-region.el/archive/0.11.0.tar.gz -> expand-region-0.11.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4177c3f6403c66872818d877654d51b6
diff --git a/metadata/md5-cache/app-emacs/exwm-0.26 b/metadata/md5-cache/app-emacs/exwm-0.26
index 1b047e4f71de..48aea4082188 100644
--- a/metadata/md5-cache/app-emacs/exwm-0.26
+++ b/metadata/md5-cache/app-emacs/exwm-0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/xelb >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ch11ng/exwm/archive/0.26.tar.gz -> exwm-0.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a598f956f8378f6b326dde09587d1e93
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0-r1 b/metadata/md5-cache/app-emacs/f-0.19.0-r1
index 12532e45830d..f572f1558d96 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0-r1
+++ b/metadata/md5-cache/app-emacs/f-0.19.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=99fe4fe0e4e9d428ce1f07a888d2cf35
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0-r1 b/metadata/md5-cache/app-emacs/f-0.20.0-r1
index 923ba2cc03ef..717e5cf718d8 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0-r1
+++ b/metadata/md5-cache/app-emacs/f-0.20.0-r1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=46163ed11c0be28ced248fd31a941661
diff --git a/metadata/md5-cache/app-emacs/fennel-mode-0.4.1-r1 b/metadata/md5-cache/app-emacs/fennel-mode-0.4.1-r1
index 24b8b7efd58b..be6b399e0115 100644
--- a/metadata/md5-cache/app-emacs/fennel-mode-0.4.1-r1
+++ b/metadata/md5-cache/app-emacs/fennel-mode-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/technomancy/fennel-mode/-/archive/0.4.1/fennel-mode-0.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=78ff3de6f79e5459d5226dc045cef988
diff --git a/metadata/md5-cache/app-emacs/fennel-mode-0.5.0 b/metadata/md5-cache/app-emacs/fennel-mode-0.5.0
index bf71891e62cb..86f175a8ac8d 100644
--- a/metadata/md5-cache/app-emacs/fennel-mode-0.5.0
+++ b/metadata/md5-cache/app-emacs/fennel-mode-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~technomancy/fennel-mode/archive/b3c52964eda7c0267f6e3f0ad6c690c3a1e89da1.tar.gz -> fennel-mode-0.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=204de61aab956b419c6fa4c44597c5f3
diff --git a/metadata/md5-cache/app-emacs/fff-20050517 b/metadata/md5-cache/app-emacs/fff-20050517
index d6ceecaed241..f22cc2e476eb 100644
--- a/metadata/md5-cache/app-emacs/fff-20050517
+++ b/metadata/md5-cache/app-emacs/fff-20050517
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=sys-apps/mlocate >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/fff-20050517.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1f2c072727cbe6a2ef352f5435a97880
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12-r2 b/metadata/md5-cache/app-emacs/filladapt-2.12-r2
index b6fd03eea72e..d5416c3a0df2 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12-r2
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/filladapt-2.12.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=4d7ab429da39013ba96d143e6dd2739f
diff --git a/metadata/md5-cache/app-emacs/filladapt-2.12.2 b/metadata/md5-cache/app-emacs/filladapt-2.12.2
index 3bcc206e5de0..50cf7f0617fa 100644
--- a/metadata/md5-cache/app-emacs/filladapt-2.12.2
+++ b/metadata/md5-cache/app-emacs/filladapt-2.12.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/filladapt-2.12.2.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=590ad82623af6d6e34781cc57d45fc20
diff --git a/metadata/md5-cache/app-emacs/flashcard-2.3.3 b/metadata/md5-cache/app-emacs/flashcard-2.3.3
index bdabcc2244bc..9cd4c2acb7eb 100644
--- a/metadata/md5-cache/app-emacs/flashcard-2.3.3
+++ b/metadata/md5-cache/app-emacs/flashcard-2.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/flashcard-2.3.3.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=81f03c744ab65161f1f33fa89ac493ea
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
index 34563e149c88..058843f6904c 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20190526
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 !app-emacs/limit >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/e4bd54fd7d335215b54f7ef27ed974c8cd68d472.tar.gz -> flim-1.14.9_p20190526.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ab46a9f2a6f2c3df86e85a352697a42b
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
index 9ca75b42d0d4..98bf5911b3eb 100644
--- a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/flim/archive/02735dede6603987e8309a76d0bc7a9ff9a5a227.tar.gz -> flim-1.14.9_p20210529.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fac35bb10b671c92e596783847e7f3e7
diff --git a/metadata/md5-cache/app-emacs/flycheck-32_p20210825 b/metadata/md5-cache/app-emacs/flycheck-32_p20210825
index a501a526b7f8..53c91bfdbfc0 100644
--- a/metadata/md5-cache/app-emacs/flycheck-32_p20210825
+++ b/metadata/md5-cache/app-emacs/flycheck-32_p20210825
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/dash-2.12.1 >=app-emacs/pkg-info-0.4 >=app-editors/emacs-24.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flycheck/flycheck/archive/784f184cdd9f9cb4e3dbb997c09d93e954142842.tar.gz -> flycheck-32_p20210825.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=eedca46d004329bd03b51cf5d0b19642
diff --git a/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1 b/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
index a8a463b169b1..8dab8740b664 100644
--- a/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
+++ b/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/dash-2.12.1 >=app-emacs/pkg-info-0.4 >=app-editors/emacs-24.
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flycheck/flycheck/archive/3b5b4248074f016922c2674789d4a242528cf4c7.tar.gz -> flycheck-32_p20220328.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=80a6f9e2c02a11f5784f09067a4a63ae
diff --git a/metadata/md5-cache/app-emacs/flycheck-guile-0.2-r1 b/metadata/md5-cache/app-emacs/flycheck-guile-0.2-r1
index 84ff2fa07d3f..bb5dec6649ac 100644
--- a/metadata/md5-cache/app-emacs/flycheck-guile-0.2-r1
+++ b/metadata/md5-cache/app-emacs/flycheck-guile-0.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/flycheck app-emacs/geiser-guile >=dev-scheme/guile-2.0.0 >=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/flatwhatson/flycheck-guile/archive/0.2.tar.gz -> flycheck-guile-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0c20b97240ea4a1f5fdd1803278e5986
diff --git a/metadata/md5-cache/app-emacs/flycheck-guile-0.4 b/metadata/md5-cache/app-emacs/flycheck-guile-0.4
index d0da3857bf12..0ed42eb3675c 100644
--- a/metadata/md5-cache/app-emacs/flycheck-guile-0.4
+++ b/metadata/md5-cache/app-emacs/flycheck-guile-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/flycheck app-emacs/geiser-guile >=dev-scheme/guile-2.0.0 >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/flatwhatson/flycheck-guile/archive/0.4.tar.gz -> flycheck-guile-0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c1d469a501a2759162ea09534bc3d9cc
diff --git a/metadata/md5-cache/app-emacs/flycheck-inline-0_pre20200808 b/metadata/md5-cache/app-emacs/flycheck-inline-0_pre20200808
index fa19ea1d728a..b3637671c663 100644
--- a/metadata/md5-cache/app-emacs/flycheck-inline-0_pre20200808
+++ b/metadata/md5-cache/app-emacs/flycheck-inline-0_pre20200808
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/flycheck >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/flycheck/flycheck-inline/archive/8e00b4c5951a9515a450a14aefe92e9f6ddcfbde.tar.gz -> flycheck-inline-0_pre20200808.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b50b20a52759af81808c7231f56065b4
diff --git a/metadata/md5-cache/app-emacs/flycheck-nimsuggest-0.8.1_p20171027-r1 b/metadata/md5-cache/app-emacs/flycheck-nimsuggest-0.8.1_p20171027-r1
index a0cc699657fc..7452e4950060 100644
--- a/metadata/md5-cache/app-emacs/flycheck-nimsuggest-0.8.1_p20171027-r1
+++ b/metadata/md5-cache/app-emacs/flycheck-nimsuggest-0.8.1_p20171027-r1
@@ -10,5 +10,5 @@ PDEPEND=app-emacs/nim-mode
 RDEPEND=app-emacs/flycheck dev-lang/nim >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/yuutayamada/flycheck-nimsuggest/archive/dc9a5de1cb3ee05db5794d824610959a1f603bc9.tar.gz -> flycheck-nimsuggest-0.8.1_p20171027.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e3af40e4e970d3d683897e7620372378
diff --git a/metadata/md5-cache/app-emacs/flycheck-package-0.14 b/metadata/md5-cache/app-emacs/flycheck-package-0.14
index 17eeb2687ab1..7e6675322757 100644
--- a/metadata/md5-cache/app-emacs/flycheck-package-0.14
+++ b/metadata/md5-cache/app-emacs/flycheck-package-0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/flycheck app-emacs/package-lint >=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/flycheck-package/archive/0.14.tar.gz -> flycheck-package-0.14.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f97758f68d6c807c87a3a9ffc3748e8d
diff --git a/metadata/md5-cache/app-emacs/folding-2019.0524.1621 b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
index 49733d901cbf..74581578a2ae 100644
--- a/metadata/md5-cache/app-emacs/folding-2019.0524.1621
+++ b/metadata/md5-cache/app-emacs/folding-2019.0524.1621
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/jaalto/project-emacs--folding-mode/archive/a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a.tar.gz -> folding-2019.0524.1621.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5bfed2527b21ef3c903362f80c4906ec
diff --git a/metadata/md5-cache/app-emacs/fsharp-mode-1.10_p20211229 b/metadata/md5-cache/app-emacs/fsharp-mode-1.10_p20211229
index 91de1bd3a8b9..c675be981ec2 100644
--- a/metadata/md5-cache/app-emacs/fsharp-mode-1.10_p20211229
+++ b/metadata/md5-cache/app-emacs/fsharp-mode-1.10_p20211229
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/s >=app-editors/emacs-25:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fsharp/emacs-fsharp-mode/archive/b3aa4c53fc9e98648b25ad036e657632ae2fe192.tar.gz -> fsharp-mode-1.10_p20211229.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=18a987585a91eb7b675fc1e0e2992525
diff --git a/metadata/md5-cache/app-emacs/fsharp-mode-2.0 b/metadata/md5-cache/app-emacs/fsharp-mode-2.0
index 4353d4ad90e6..494c5b299ee2 100644
--- a/metadata/md5-cache/app-emacs/fsharp-mode-2.0
+++ b/metadata/md5-cache/app-emacs/fsharp-mode-2.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fsharp/emacs-fsharp-mode/archive/2.0.tar.gz -> fsharp-mode-2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1da56d6883dd20d3285ae3a127c6957c
diff --git a/metadata/md5-cache/app-emacs/geiser-0.25.1 b/metadata/md5-cache/app-emacs/geiser-0.25.1
index 28b9e9521ee4..d3493d5f49c0 100644
--- a/metadata/md5-cache/app-emacs/geiser-0.25.1
+++ b/metadata/md5-cache/app-emacs/geiser-0.25.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/transient >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/geiser/-/archive/0.25.1/geiser-0.25.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=212d17796be4bc5f2f4d095cb533357b
diff --git a/metadata/md5-cache/app-emacs/geiser-0.26 b/metadata/md5-cache/app-emacs/geiser-0.26
index 812c9d0cca3e..3afc43dc1b75 100644
--- a/metadata/md5-cache/app-emacs/geiser-0.26
+++ b/metadata/md5-cache/app-emacs/geiser-0.26
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/transient >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/geiser/-/archive/0.26/geiser-0.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=212d17796be4bc5f2f4d095cb533357b
diff --git a/metadata/md5-cache/app-emacs/geiser-0.26.1 b/metadata/md5-cache/app-emacs/geiser-0.26.1
index fa88695bc89f..1f8323f52ac9 100644
--- a/metadata/md5-cache/app-emacs/geiser-0.26.1
+++ b/metadata/md5-cache/app-emacs/geiser-0.26.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/transient >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/geiser/-/archive/0.26.1/geiser-0.26.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=212d17796be4bc5f2f4d095cb533357b
diff --git a/metadata/md5-cache/app-emacs/geiser-0.27 b/metadata/md5-cache/app-emacs/geiser-0.27
index 161b1787c622..ad27d4cb7c48 100644
--- a/metadata/md5-cache/app-emacs/geiser-0.27
+++ b/metadata/md5-cache/app-emacs/geiser-0.27
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/transient >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/geiser/-/archive/0.27/geiser-0.27.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=212d17796be4bc5f2f4d095cb533357b
diff --git a/metadata/md5-cache/app-emacs/geiser-chez-0.17 b/metadata/md5-cache/app-emacs/geiser-chez-0.17
index 47e5d5588897..b91fb9299617 100644
--- a/metadata/md5-cache/app-emacs/geiser-chez-0.17
+++ b/metadata/md5-cache/app-emacs/geiser-chez-0.17
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser dev-scheme/chez >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/chez/-/archive/0.17/chez-0.17.tar.gz -> geiser-chez-0.17.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cbb97125e2ea1d4f595780fcb3cad60f
diff --git a/metadata/md5-cache/app-emacs/geiser-chicken-0.17 b/metadata/md5-cache/app-emacs/geiser-chicken-0.17
index 7abc32d0d905..3c788b4b7fd7 100644
--- a/metadata/md5-cache/app-emacs/geiser-chicken-0.17
+++ b/metadata/md5-cache/app-emacs/geiser-chicken-0.17
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser dev-scheme/chicken >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/chicken/-/archive/0.17/chicken-0.17.tar.gz -> geiser-chicken-0.17.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6f8a5345583280335862ba1c7c211f7c
diff --git a/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1 b/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1
index 79a174401bf8..b159bc6480f8 100644
--- a/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1
+++ b/metadata/md5-cache/app-emacs/geiser-gambit-0.18.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser >=dev-scheme/gambit-4.9.4 >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/gambit/-/archive/0.18.1/gambit-0.18.1.tar.gz -> geiser-gambit-0.18.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=97ee2a024f8c6c20410394dcb6edb21a
diff --git a/metadata/md5-cache/app-emacs/geiser-guile-0.23.2 b/metadata/md5-cache/app-emacs/geiser-guile-0.23.2
index 4636ed509e6f..8fec2eea8481 100644
--- a/metadata/md5-cache/app-emacs/geiser-guile-0.23.2
+++ b/metadata/md5-cache/app-emacs/geiser-guile-0.23.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser dev-scheme/guile >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/guile/-/archive/0.23.2/guile-0.23.2.tar.gz -> geiser-guile-0.23.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=99d5bb94b5dfeadb3b581ecd30cfa87e
diff --git a/metadata/md5-cache/app-emacs/geiser-guile-0.26.1 b/metadata/md5-cache/app-emacs/geiser-guile-0.26.1
index e0093951b51f..a5a026bc5609 100644
--- a/metadata/md5-cache/app-emacs/geiser-guile-0.26.1
+++ b/metadata/md5-cache/app-emacs/geiser-guile-0.26.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser dev-scheme/guile >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/guile/-/archive/0.26.1/guile-0.26.1.tar.gz -> geiser-guile-0.26.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=99d5bb94b5dfeadb3b581ecd30cfa87e
diff --git a/metadata/md5-cache/app-emacs/geiser-mit-0.15 b/metadata/md5-cache/app-emacs/geiser-mit-0.15
index 16d1ef214528..1553a4fbb7b1 100644
--- a/metadata/md5-cache/app-emacs/geiser-mit-0.15
+++ b/metadata/md5-cache/app-emacs/geiser-mit-0.15
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/geiser dev-scheme/mit-scheme >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://gitlab.com/emacs-geiser/mit/-/archive/0.15/mit-0.15.tar.gz -> geiser-mit-0.15.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8fc09250abb684056f6627b20718808d
diff --git a/metadata/md5-cache/app-emacs/ghub-3.5.4 b/metadata/md5-cache/app-emacs/ghub-3.5.4
index e9201c0a44b2..48b56d33ca46 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.5.4
+++ b/metadata/md5-cache/app-emacs/ghub-3.5.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.5.4.tar.gz -> ghub-3.5.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9dfc0298848a02aa14f3fcbbf48e2e63
diff --git a/metadata/md5-cache/app-emacs/ghub-3.5.6 b/metadata/md5-cache/app-emacs/ghub-3.5.6
index 012555004482..d7e9b3bb7d02 100644
--- a/metadata/md5-cache/app-emacs/ghub-3.5.6
+++ b/metadata/md5-cache/app-emacs/ghub-3.5.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/treepy-0.1.1 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/ghub/archive/v3.5.6.tar.gz -> ghub-3.5.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=524ac34fb04ad04360859556917e9218
diff --git a/metadata/md5-cache/app-emacs/git-modes-1.4.0 b/metadata/md5-cache/app-emacs/git-modes-1.4.0
index f77465fb17af..b21de77d4672 100644
--- a/metadata/md5-cache/app-emacs/git-modes-1.4.0
+++ b/metadata/md5-cache/app-emacs/git-modes-1.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/magit/git-modes/archive/1.4.0.tar.gz -> git-modes-1.4.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e802c025ff5e28fc83e5ebb1735de19d
diff --git a/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0 b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
index 1fcaf8227efe..30212877cdf3 100644
--- a/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
+++ b/metadata/md5-cache/app-emacs/gnuplot-mode-0.8.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ gnuplot
 RDEPEND=sci-visualization/gnuplot[-emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/gnuplot/archive/refs/tags/0.8.0.tar.gz -> gnuplot-mode-0.8.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=a24744531a8c153496eae7d9cc6459ec
diff --git a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5 b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
index 6af91e658ff8..e84e2cb502d4 100644
--- a/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
+++ b/metadata/md5-cache/app-emacs/gnuserv-3.12.8-r5
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-eselect/eselect-emacs-1.15 X? ( x11-libs/libXau ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://web.archive.org/web/20150908031821/http://martin.meltin.net/sites/martin.meltin.net/files/hacks/gnuserv-3.12.8.tar.gz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=557793878b3ae88060488483737e695b
diff --git a/metadata/md5-cache/app-emacs/go-mode-1.6.0 b/metadata/md5-cache/app-emacs/go-mode-1.6.0
index 64fbdde08fe7..0b4e564f81a8 100644
--- a/metadata/md5-cache/app-emacs/go-mode-1.6.0
+++ b/metadata/md5-cache/app-emacs/go-mode-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~matthew/distfiles/go-mode-1.6.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=00a67e2f20d40584f735c095bf8b9957
diff --git a/metadata/md5-cache/app-emacs/google-c-style-20140929 b/metadata/md5-cache/app-emacs/google-c-style-20140929
index 0048bdd27a14..4cb1aff3f57c 100644
--- a/metadata/md5-cache/app-emacs/google-c-style-20140929
+++ b/metadata/md5-cache/app-emacs/google-c-style-20140929
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-1+ Artistic )
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/google-c-style-20140929.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=10e1327d7989e968aa4cbf0e692fb9b2
diff --git a/metadata/md5-cache/app-emacs/graphql-0.1.1 b/metadata/md5-cache/app-emacs/graphql-0.1.1
index f8f012589eb4..d01dcd4b2e77 100644
--- a/metadata/md5-cache/app-emacs/graphql-0.1.1
+++ b/metadata/md5-cache/app-emacs/graphql-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-25:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vermiculus/graphql.el/archive/0.1.1.tar.gz -> graphql-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=213055d4f50aa71cc25333214677bbc0
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
index c9aae2052db0..cfe87596e6f6 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/v0.4.tar.gz -> graphviz-dot-mode-0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7b0fcfa9a7f0aa959a9ee262ecc7a306
diff --git a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118 b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
index b64724b8efd2..1d775daf11bb 100644
--- a/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
+++ b/metadata/md5-cache/app-emacs/graphviz-dot-mode-0.4.20181118
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ppareit/graphviz-dot-mode/archive/243de72e09ddd5cdc4863613af8b749827a5e1cd.tar.gz -> graphviz-dot-mode-0.4.20181118.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9c0190d653c5ef147a1e76149558a263
diff --git a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1 b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
index b8974f0831d5..f0c415ca55ad 100644
--- a/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
+++ b/metadata/md5-cache/app-emacs/h4x0r-0.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/h4x0r-0.13.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=830a4e8cc567efec467d7205993cecbc
diff --git a/metadata/md5-cache/app-emacs/haskell-mode-17.2 b/metadata/md5-cache/app-emacs/haskell-mode-17.2
index 03ca15425c8f..bb6765fb2a18 100644
--- a/metadata/md5-cache/app-emacs/haskell-mode-17.2
+++ b/metadata/md5-cache/app-emacs/haskell-mode-17.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/haskell/haskell-mode/archive/17.2.tar.gz -> haskell-mode-17.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=305a16486a263963d95526aa52364f0e
diff --git a/metadata/md5-cache/app-emacs/haxe-mode-0.3.3 b/metadata/md5-cache/app-emacs/haxe-mode-0.3.3
index 661360dd5c1d..cbc4840c2713 100644
--- a/metadata/md5-cache/app-emacs/haxe-mode-0.3.3
+++ b/metadata/md5-cache/app-emacs/haxe-mode-0.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/haxe-mode/archive/0.3.3.tar.gz -> haxe-mode-0.3.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=58864161772735bd678f18cf4bf8cb75
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.5 b/metadata/md5-cache/app-emacs/helm-3.8.5
index 25280d320605..16f5676332d5 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.5
+++ b/metadata/md5-cache/app-emacs/helm-3.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.5.tar.gz -> helm-3.8.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=95075992688a41a1d16a800f1b1ebe68
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.6 b/metadata/md5-cache/app-emacs/helm-3.8.6
index 3d4273e1ac20..3011d3f6bb3a 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.6
+++ b/metadata/md5-cache/app-emacs/helm-3.8.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.6.tar.gz -> helm-3.8.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=95075992688a41a1d16a800f1b1ebe68
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.7 b/metadata/md5-cache/app-emacs/helm-3.8.7
index 6171adfe205d..c682f4542b47 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.7
+++ b/metadata/md5-cache/app-emacs/helm-3.8.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.7.tar.gz -> helm-3.8.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9999545c33495d7fdb4f11a42a27ec9a
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.8 b/metadata/md5-cache/app-emacs/helm-3.8.8
index 127d189cdff4..96debad954dc 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.8
+++ b/metadata/md5-cache/app-emacs/helm-3.8.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/async app-emacs/popup >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm/archive/v3.8.8.tar.gz -> helm-3.8.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=49f4cc5e960c86b737864f6e1d5d5f2e
diff --git a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1 b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
index 72b863159a2d..40658305cc2e 100644
--- a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
+++ b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/helm >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm-system-packages/archive/v1.10.1.tar.gz -> helm-system-packages-1.10.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6f546d7e5e02da8bd885b0f6d354c7fe
diff --git a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.2 b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.2
index c4394e8fd431..878d2d466481 100644
--- a/metadata/md5-cache/app-emacs/helm-system-packages-1.10.2
+++ b/metadata/md5-cache/app-emacs/helm-system-packages-1.10.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/helm >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-helm/helm-system-packages/archive/v1.10.2.tar.gz -> helm-system-packages-1.10.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=51471f578d40f6fb2e410fad6f9c8cb7
diff --git a/metadata/md5-cache/app-emacs/hexrgb-0_p1019 b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
index fb7fe7f350f4..8a9e06905f02 100644
--- a/metadata/md5-cache/app-emacs/hexrgb-0_p1019
+++ b/metadata/md5-cache/app-emacs/hexrgb-0_p1019
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/hexrgb-0_p1019.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=18e63a7ffc3d28dc8bfa50a432aeb73c
diff --git a/metadata/md5-cache/app-emacs/highlight-indentation-0.7.0_p20210221 b/metadata/md5-cache/app-emacs/highlight-indentation-0.7.0_p20210221
index de7a2a0451bb..b61ed922fa05 100644
--- a/metadata/md5-cache/app-emacs/highlight-indentation-0.7.0_p20210221
+++ b/metadata/md5-cache/app-emacs/highlight-indentation-0.7.0_p20210221
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/Highlight-Indentation-for-Emacs/archive/d88db4248882da2d4316e76ed673b4ac1fa99ce3.tar.gz -> highlight-indentation-0.7.0_p20210221.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=751b8e30bc7648949957e97d6d581eaa
diff --git a/metadata/md5-cache/app-emacs/highline-7.2.2 b/metadata/md5-cache/app-emacs/highline-7.2.2
index e5349636aada..0306e04a58e5 100644
--- a/metadata/md5-cache/app-emacs/highline-7.2.2
+++ b/metadata/md5-cache/app-emacs/highline-7.2.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/highline-7.2.2.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c63463b7b8e6ffdb5d9a7814345b0f89
diff --git a/metadata/md5-cache/app-emacs/hl-todo-3.4.1 b/metadata/md5-cache/app-emacs/hl-todo-3.4.1
index ae573d6dcd4a..1cfe419a0fcb 100644
--- a/metadata/md5-cache/app-emacs/hl-todo-3.4.1
+++ b/metadata/md5-cache/app-emacs/hl-todo-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/tarsius/hl-todo/archive/refs/tags/v3.4.1.tar.gz -> hl-todo-3.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=39d139fdadd59f79ff437056e5f4b41c
diff --git a/metadata/md5-cache/app-emacs/hl-todo-3.4.2 b/metadata/md5-cache/app-emacs/hl-todo-3.4.2
index 8a09e94c927b..35b8461f21a9 100644
--- a/metadata/md5-cache/app-emacs/hl-todo-3.4.2
+++ b/metadata/md5-cache/app-emacs/hl-todo-3.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/tarsius/hl-todo/archive/refs/tags/v3.4.2.tar.gz -> hl-todo-3.4.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1bc349637411dc11589333ed710d394e
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.5 b/metadata/md5-cache/app-emacs/howm-1.4.5
index e4f28d73c049..875b653de7ae 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.5
+++ b/metadata/md5-cache/app-emacs/howm-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=62be48057c4c7105d16dadd69c26a138
diff --git a/metadata/md5-cache/app-emacs/howm-1.4.8 b/metadata/md5-cache/app-emacs/howm-1.4.8
index c52c45df6a0a..b9a8e62cf032 100644
--- a/metadata/md5-cache/app-emacs/howm-1.4.8
+++ b/metadata/md5-cache/app-emacs/howm-1.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-1+ GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://howm.sourceforge.jp/a/howm-1.4.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=982826936504c37589d6b380fff5d381
diff --git a/metadata/md5-cache/app-emacs/ht-2.3 b/metadata/md5-cache/app-emacs/ht-2.3
index 315858874356..12ba4905ccd3 100644
--- a/metadata/md5-cache/app-emacs/ht-2.3
+++ b/metadata/md5-cache/app-emacs/ht-2.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/dash-2.12.0 >=app-editors/emacs-23.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Wilfred/ht.el/archive/2.3.tar.gz -> ht-2.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=aa0661851308814ebb3747ec603001be
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.55 b/metadata/md5-cache/app-emacs/htmlize-1.55
index ddb85f1824cf..0b4bcfdd79aa 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.55
+++ b/metadata/md5-cache/app-emacs/htmlize-1.55
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.55.tar.gz -> htmlize-1.55.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=579775b743a32685d3eb2ddcb2b96c23
diff --git a/metadata/md5-cache/app-emacs/htmlize-1.56 b/metadata/md5-cache/app-emacs/htmlize-1.56
index b0fe93482c2a..653d4bfbc959 100644
--- a/metadata/md5-cache/app-emacs/htmlize-1.56
+++ b/metadata/md5-cache/app-emacs/htmlize-1.56
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hniksic/emacs-htmlize/archive/release/1.56.tar.gz -> htmlize-1.56.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=242160f7eda1eaa3bc0b0397fdf72ee0
diff --git a/metadata/md5-cache/app-emacs/httpd-1.1 b/metadata/md5-cache/app-emacs/httpd-1.1
index 2ba929d5c486..7178ac51b496 100644
--- a/metadata/md5-cache/app-emacs/httpd-1.1
+++ b/metadata/md5-cache/app-emacs/httpd-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/httpd-1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d911d2d0190f6f5eddaf43f438cb6d0f
diff --git a/metadata/md5-cache/app-emacs/hydra-0.15.0 b/metadata/md5-cache/app-emacs/hydra-0.15.0
index 8a4b502a7934..ab8f34033540 100644
--- a/metadata/md5-cache/app-emacs/hydra-0.15.0
+++ b/metadata/md5-cache/app-emacs/hydra-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/lv >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/abo-abo/hydra/archive/0.15.0.tar.gz -> hydra-0.15.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1a3f2ff2de660c55c177b284b31588ff
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733 b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
index a98d1c1bc677..849c230a9bae 100644
--- a/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
+++ b/metadata/md5-cache/app-emacs/icicles-2018.02.13.23733
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/icicles-2018.02.13.23733.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2d73a2a1b120177c8ca359abc399f902
diff --git a/metadata/md5-cache/app-emacs/icicles-2018.10.15.23738 b/metadata/md5-cache/app-emacs/icicles-2018.10.15.23738
index 17e1a6dc6694..fe6c0bc6ea3c 100644
--- a/metadata/md5-cache/app-emacs/icicles-2018.10.15.23738
+++ b/metadata/md5-cache/app-emacs/icicles-2018.10.15.23738
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/icicles/archive/9e9c37d2a54771c635d00d1fe171cef5eab4d95d.tar.gz -> icicles-2018.10.15.23738.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0f785180c8c44a1bcc7095156c07c1b8
diff --git a/metadata/md5-cache/app-emacs/igrep-2.113 b/metadata/md5-cache/app-emacs/igrep-2.113
index c960a1fec959..53a14b3e9803 100644
--- a/metadata/md5-cache/app-emacs/igrep-2.113
+++ b/metadata/md5-cache/app-emacs/igrep-2.113
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/igrep-2.113.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=af5bb823f1db18171030d95d7bd2570d
diff --git a/metadata/md5-cache/app-emacs/inf-clojure-3.1.0 b/metadata/md5-cache/app-emacs/inf-clojure-3.1.0
index 1c12f4a34b7a..ce65281b823a 100644
--- a/metadata/md5-cache/app-emacs/inf-clojure-3.1.0
+++ b/metadata/md5-cache/app-emacs/inf-clojure-3.1.0
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/clojure-mode >=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/inf-clojure/archive/v3.1.0.tar.gz -> inf-clojure-3.1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3662851772423db660b8ff25565f6e1b
diff --git a/metadata/md5-cache/app-emacs/inf-clojure-3.2.0 b/metadata/md5-cache/app-emacs/inf-clojure-3.2.0
index 4e96bb8ec3a6..123e1288e1f8 100644
--- a/metadata/md5-cache/app-emacs/inf-clojure-3.2.0
+++ b/metadata/md5-cache/app-emacs/inf-clojure-3.2.0
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/clojure-mode >=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/inf-clojure/archive/v3.2.0.tar.gz -> inf-clojure-3.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3662851772423db660b8ff25565f6e1b
diff --git a/metadata/md5-cache/app-emacs/inf-clojure-3.2.1 b/metadata/md5-cache/app-emacs/inf-clojure-3.2.1
index 963821b85c40..8fc92feb419f 100644
--- a/metadata/md5-cache/app-emacs/inf-clojure-3.2.1
+++ b/metadata/md5-cache/app-emacs/inf-clojure-3.2.1
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/clojure-mode >=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/clojure-emacs/inf-clojure/archive/v3.2.1.tar.gz -> inf-clojure-3.2.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3662851772423db660b8ff25565f6e1b
diff --git a/metadata/md5-cache/app-emacs/inform-mode-1.6.2 b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
index 3b57b0331f8f..cb6d1ca7482c 100644
--- a/metadata/md5-cache/app-emacs/inform-mode-1.6.2
+++ b/metadata/md5-cache/app-emacs/inform-mode-1.6.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://rupert-lane.org/inform-mode/releases/inform-mode-1.6.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=028ef9627de61306d9d99b64f27fefe6
diff --git a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919 b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
index c2cf10210d28..80e2b5b33eb0 100644
--- a/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
+++ b/metadata/md5-cache/app-emacs/initsplit-1.8_pre20160919
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dabrahams/initsplit/archive/c941d436eb2b10b01c76a582c5a2b23fb30751aa.tar.gz -> initsplit-1.8_pre20160919.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=9bd99c5892d24e3013e6b9ebc7d8f86a
diff --git a/metadata/md5-cache/app-emacs/ivy-0.13.4 b/metadata/md5-cache/app-emacs/ivy-0.13.4
index 55dba0c71433..35c8a1bb3bde 100644
--- a/metadata/md5-cache/app-emacs/ivy-0.13.4
+++ b/metadata/md5-cache/app-emacs/ivy-0.13.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/abo-abo/swiper/archive/0.13.4.tar.gz -> swiper-0.13.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=384dd15cfae845a68307036651701ba2
diff --git a/metadata/md5-cache/app-emacs/ivy-rich-0.1.6_p20210409 b/metadata/md5-cache/app-emacs/ivy-rich-0.1.6_p20210409
index 6217f40ca1e4..8da926f59162 100644
--- a/metadata/md5-cache/app-emacs/ivy-rich-0.1.6_p20210409
+++ b/metadata/md5-cache/app-emacs/ivy-rich-0.1.6_p20210409
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/ivy >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/Yevgnen/ivy-rich/archive/600b8183ed0be8668dcc548cc2c8cb94b001363b.tar.gz -> ivy-rich-0.1.6_p20210409.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=01e88cdd305b4dd02aa29a7e771fe8ec
diff --git a/metadata/md5-cache/app-emacs/jam-mode-0.3 b/metadata/md5-cache/app-emacs/jam-mode-0.3
index abc2442f9eda..bfa738ed1eaf 100644
--- a/metadata/md5-cache/app-emacs/jam-mode-0.3
+++ b/metadata/md5-cache/app-emacs/jam-mode-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/jam-mode-0.3.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a0facb6928de9a7bc9a0e704bd21f26c
diff --git a/metadata/md5-cache/app-emacs/jasmin-1.2-r2 b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
index d4df8f91ac14..ca7fed6fee29 100644
--- a/metadata/md5-cache/app-emacs/jasmin-1.2-r2
+++ b/metadata/md5-cache/app-emacs/jasmin-1.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/jasmin-1.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=99a55fd8e15c19a56138e33f98866d94
diff --git a/metadata/md5-cache/app-emacs/jq-mode-0.5.0_p20220610 b/metadata/md5-cache/app-emacs/jq-mode-0.5.0_p20220610
index 194996be75a5..317916ef205c 100644
--- a/metadata/md5-cache/app-emacs/jq-mode-0.5.0_p20220610
+++ b/metadata/md5-cache/app-emacs/jq-mode-0.5.0_p20220610
@@ -10,5 +10,5 @@ RDEPEND=app-misc/jq >=app-editors/emacs-25.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ljos/jq-mode/archive/071c1c29bac30351ad338136f2b625e5601365cd.tar.gz -> jq-mode-0.5.0_p20220610.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f0ed2b3664a702f74c948ca851ad79cb
diff --git a/metadata/md5-cache/app-emacs/js-comint-1.2.0 b/metadata/md5-cache/app-emacs/js-comint-1.2.0
index acbc471849f9..0850def8bec6 100644
--- a/metadata/md5-cache/app-emacs/js-comint-1.2.0
+++ b/metadata/md5-cache/app-emacs/js-comint-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/redguardtoo/js-comint/archive/1.2.0.tar.gz -> js-comint-1.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f68500bd1e578fcda2ec93a0633c6a7c
diff --git a/metadata/md5-cache/app-emacs/js2-mode-20220710 b/metadata/md5-cache/app-emacs/js2-mode-20220710
index c6c9a484a714..1057aef56b79 100644
--- a/metadata/md5-cache/app-emacs/js2-mode-20220710
+++ b/metadata/md5-cache/app-emacs/js2-mode-20220710
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/mooz/js2-mode/archive/20220710.tar.gz -> js2-mode-20220710.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=bee3828f4f17baa8d2592dedbf4beee6
diff --git a/metadata/md5-cache/app-emacs/julia-mode-0.4_p20211023 b/metadata/md5-cache/app-emacs/julia-mode-0.4_p20211023
index 8f5c906f4e0e..f890cf9a064d 100644
--- a/metadata/md5-cache/app-emacs/julia-mode-0.4_p20211023
+++ b/metadata/md5-cache/app-emacs/julia-mode-0.4_p20211023
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/JuliaEditorSupport/julia-emacs/archive/47f43f7d839019cac3ba6559d93b29487ca118cb.tar.gz -> julia-mode-0.4_p20211023.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cedacc75d70019f36bcc5196051b1e7c
diff --git a/metadata/md5-cache/app-emacs/julia-repl-1.3.0_p20220225 b/metadata/md5-cache/app-emacs/julia-repl-1.3.0_p20220225
index 0aa5e5a0750a..686f81a72269 100644
--- a/metadata/md5-cache/app-emacs/julia-repl-1.3.0_p20220225
+++ b/metadata/md5-cache/app-emacs/julia-repl-1.3.0_p20220225
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=app-emacs/s app-emacs/julia-mode >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/tpapp/julia-repl/archive/6c1d63511fb2b3b3f2e342eff6a375d78be6c12c.tar.gz -> julia-repl-1.3.0_p20220225.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	optfeature	1a2157392a869265b2afcb63a26c12ac
 _md5_=ae275a6ed0b00a1002e2fe30b4c61972
diff --git a/metadata/md5-cache/app-emacs/key-chord-0.6_p20201222 b/metadata/md5-cache/app-emacs/key-chord-0.6_p20201222
index 1ad5766a6e17..81f0384b10f8 100644
--- a/metadata/md5-cache/app-emacs/key-chord-0.6_p20201222
+++ b/metadata/md5-cache/app-emacs/key-chord-0.6_p20201222
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/key-chord/archive/7f7fd7c5bd2b996fa054779357e1566f7989e07d.tar.gz -> key-chord-0.6_p20201222.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cb6fa3ce6fed404ec7caf0de47316c93
diff --git a/metadata/md5-cache/app-emacs/keywiz-1.4 b/metadata/md5-cache/app-emacs/keywiz-1.4
index b8e4d41585d7..20c8de764c3e 100644
--- a/metadata/md5-cache/app-emacs/keywiz-1.4
+++ b/metadata/md5-cache/app-emacs/keywiz-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/keywiz-1.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8c7e9326fd6af3c423f7bf2ebc18288a
diff --git a/metadata/md5-cache/app-emacs/lean-mode-20211220-r1 b/metadata/md5-cache/app-emacs/lean-mode-20211220-r1
index 26a544c4d449..625f73580392 100644
--- a/metadata/md5-cache/app-emacs/lean-mode-20211220-r1
+++ b/metadata/md5-cache/app-emacs/lean-mode-20211220-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/dash-2.18.1 >=app-emacs/f-0.19.0 >=app-emacs/flycheck-32 >=app-emacs/s-1.10.0 sci-mathematics/lean:0/3 >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/leanprover/lean-mode/archive/a4205749d20a09871f0951c34f919d4ee5fbdb55.tar.gz -> lean-mode-20211220.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8c6b24c4176d876ba236e3f63c09d6be
diff --git a/metadata/md5-cache/app-emacs/lean-mode-20220124-r1 b/metadata/md5-cache/app-emacs/lean-mode-20220124-r1
index a92f9bcee294..7bf87c3082ea 100644
--- a/metadata/md5-cache/app-emacs/lean-mode-20220124-r1
+++ b/metadata/md5-cache/app-emacs/lean-mode-20220124-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/dash-2.18.1 >=app-emacs/f-0.19.0 >=app-emacs/flycheck-32 >=app-emacs/s-1.10.0 sci-mathematics/lean:0/3 >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/leanprover/lean-mode/archive/c1c68cc946eb31b6ba8faefdceffce1f77ca52df.tar.gz -> lean-mode-20220124.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c9377b15311bb15c75765a3a67403620
diff --git a/metadata/md5-cache/app-emacs/lean-mode-20220501 b/metadata/md5-cache/app-emacs/lean-mode-20220501
index e5e1edbb9844..63d05f646f46 100644
--- a/metadata/md5-cache/app-emacs/lean-mode-20220501
+++ b/metadata/md5-cache/app-emacs/lean-mode-20220501
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/dash-2.18.1 >=app-emacs/f-0.19.0 >=app-emacs/flycheck-32 >=app-emacs/s-1.10.0 sci-mathematics/lean:0/3 >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/leanprover/lean-mode/archive/362bc6fa3efb1874c525ed6b4b6f24f76af22596.tar.gz -> lean-mode-20220501.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f2b8cd521ee5310b7c7f112f709d7af5
diff --git a/metadata/md5-cache/app-emacs/ledger-mode-4.0.0 b/metadata/md5-cache/app-emacs/ledger-mode-4.0.0
index 701b26d8072e..749cce8c5afb 100644
--- a/metadata/md5-cache/app-emacs/ledger-mode-4.0.0
+++ b/metadata/md5-cache/app-emacs/ledger-mode-4.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ BSD
 RDEPEND=!<app-office/ledger-3.1.2[emacs(-)] >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ledger/ledger-mode/archive/v4.0.0.tar.gz -> ledger-mode-4.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=37629b5802c494fb0f8195bf6c1dbe07
diff --git a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1 b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
index 7559a894fa2b..64fb9ba59939 100644
--- a/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
+++ b/metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/libgit2-1.0.0:= >=app-editors/emacs-26:*[dynamic-loading] >=a
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/magit/libegit2/archive/0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a.tar.gz -> libegit2-0.0.20200515.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d25c4656c1c766092e648447df71eea3
diff --git a/metadata/md5-cache/app-emacs/load-relative-1.3.1 b/metadata/md5-cache/app-emacs/load-relative-1.3.1
index 03e8581bc033..de48e79e4ab6 100644
--- a/metadata/md5-cache/app-emacs/load-relative-1.3.1
+++ b/metadata/md5-cache/app-emacs/load-relative-1.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/rocky/emacs-load-relative/archive/1.3.1.tar.gz -> load-relative-1.3.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=00890b43f0f0fb9f26847e5f46c274f1
diff --git a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209 b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
index 84e5a2cf9914..4632dd3ad0ca 100644
--- a/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
+++ b/metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/lookup2/lookup2/archive/c4f4986aac6c339e03b9e56a5dfc7c8f5c0bb5e0.tar.gz -> lookup-1.99.96_pre20180209.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=c43429b01f078f24a86c9009de00d3f9
diff --git a/metadata/md5-cache/app-emacs/lsp-java-3.1 b/metadata/md5-cache/app-emacs/lsp-java-3.1
index 1a6716148108..abcdc55f413c 100644
--- a/metadata/md5-cache/app-emacs/lsp-java-3.1
+++ b/metadata/md5-cache/app-emacs/lsp-java-3.1
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/dap-mode app-emacs/dash app-emacs/f app-emacs/ht app-emacs/lsp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-java/archive/3.1.tar.gz -> lsp-java-3.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f9da9b6939fc4daa21f1990cc649c646
diff --git a/metadata/md5-cache/app-emacs/lsp-mode-8.0.0-r1 b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0-r1
index 109532cdaa26..af2210765e06 100644
--- a/metadata/md5-cache/app-emacs/lsp-mode-8.0.0-r1
+++ b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/dash-2.18.0 >=app-emacs/f-0.20.0 app-emacs/ht app-emacs/lv a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-mode/archive/8.0.0.tar.gz -> lsp-mode-8.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=974954b8f203d012ba94c298dd21adf0
diff --git a/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620 b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
index 4e3694afb9e8..bef8e56a1978 100644
--- a/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
+++ b/metadata/md5-cache/app-emacs/lsp-mode-8.0.0_p20220620
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/dash-2.18.0 >=app-emacs/f-0.20.0 app-emacs/ht app-emacs/lv a
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-mode/archive/9957623d93b13fabaca8ba35b85da8fcceaeef69.tar.gz -> lsp-mode-8.0.0_p20220620.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=725dfdeccb17b8c8a512863c4985186d
diff --git a/metadata/md5-cache/app-emacs/lsp-treemacs-0.4 b/metadata/md5-cache/app-emacs/lsp-treemacs-0.4
index 0134f3ab74a2..e6ecbe996fed 100644
--- a/metadata/md5-cache/app-emacs/lsp-treemacs-0.4
+++ b/metadata/md5-cache/app-emacs/lsp-treemacs-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/f app-emacs/ht app-emacs/lsp-mode app-emacs/treemacs >=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-treemacs/archive/0.4.tar.gz -> lsp-treemacs-0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8bf5f10b42b413d0a3544911c1c17320
diff --git a/metadata/md5-cache/app-emacs/lsp-ui-8.0.0 b/metadata/md5-cache/app-emacs/lsp-ui-8.0.0
index 1449e196d865..20c23120a94f 100644
--- a/metadata/md5-cache/app-emacs/lsp-ui-8.0.0
+++ b/metadata/md5-cache/app-emacs/lsp-ui-8.0.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/dash-2.18.0 app-emacs/flycheck >=app-emacs/lsp-mode-6.0 >=ap
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-ui/archive/8.0.0.tar.gz -> lsp-ui-8.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dbd33199d6571199c5062e9086cbe88b
diff --git a/metadata/md5-cache/app-emacs/lsp-ui-8.0.1 b/metadata/md5-cache/app-emacs/lsp-ui-8.0.1
index 6ca95ef16768..71e2840a2e68 100644
--- a/metadata/md5-cache/app-emacs/lsp-ui-8.0.1
+++ b/metadata/md5-cache/app-emacs/lsp-ui-8.0.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/dash-2.18.0 app-emacs/flycheck >=app-emacs/lsp-mode-6.0 >=ap
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-lsp/lsp-ui/archive/8.0.1.tar.gz -> lsp-ui-8.0.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0e53f84d9193312dc5f4cabaabb59de2
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20201010 b/metadata/md5-cache/app-emacs/lua-mode-20201010
index 53e23f543fa9..d65879aa5947 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20201010
+++ b/metadata/md5-cache/app-emacs/lua-mode-20201010
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/v20201010.tar.gz -> lua-mode-20201010.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ad0919da46c6340f04f05e66c9552ed8
diff --git a/metadata/md5-cache/app-emacs/lua-mode-20210802 b/metadata/md5-cache/app-emacs/lua-mode-20210802
index 5db120aaecdd..dc860fb5cccd 100644
--- a/metadata/md5-cache/app-emacs/lua-mode-20210802
+++ b/metadata/md5-cache/app-emacs/lua-mode-20210802
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/immerrr/lua-mode/archive/v20210802.tar.gz -> lua-mode-20210802.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ebbf0b01afb67bdf37b570181f3a2626
diff --git a/metadata/md5-cache/app-emacs/lv-0.15.0 b/metadata/md5-cache/app-emacs/lv-0.15.0
index becee2260ce4..32969e36904e 100644
--- a/metadata/md5-cache/app-emacs/lv-0.15.0
+++ b/metadata/md5-cache/app-emacs/lv-0.15.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/abo-abo/hydra/archive/0.15.0.tar.gz -> lv-0.15.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3e4953349fc0c8c7ecc533d269a6461f
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
index 6080c69f7c66..764bf103293a 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20180410
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20180410.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=97854fe50c3d057a2498b86c1ada7c20
diff --git a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226 b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
index 5c25f3dd4b05..5f288d3afac3 100644
--- a/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
+++ b/metadata/md5-cache/app-emacs/lyskom-elisp-client-0.48_p20200226
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/lyskom-elisp-client-0.48_p20200226.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=b15870b18fbaed430a25e9ea31a7a9c1
diff --git a/metadata/md5-cache/app-emacs/m-buffer-0.15 b/metadata/md5-cache/app-emacs/m-buffer-0.15
index 0e5b6a96039c..b1b3b6d4ffad 100644
--- a/metadata/md5-cache/app-emacs/m-buffer-0.15
+++ b/metadata/md5-cache/app-emacs/m-buffer-0.15
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/phillord/m-buffer-el/archive/v0.15.tar.gz -> m-buffer-0.15.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=599f11687569ff04ca16037f5e8e1511
diff --git a/metadata/md5-cache/app-emacs/macrostep-0.9 b/metadata/md5-cache/app-emacs/macrostep-0.9
index 4f1591fdf049..b74ba3c6a5eb 100644
--- a/metadata/md5-cache/app-emacs/macrostep-0.9
+++ b/metadata/md5-cache/app-emacs/macrostep-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/joddie/macrostep/archive/0.9.tar.gz -> macrostep-0.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=90a4a23725dc1f4ecb7dd4c8418bf102
diff --git a/metadata/md5-cache/app-emacs/macrostep-geiser-0.2.0_p20210717 b/metadata/md5-cache/app-emacs/macrostep-geiser-0.2.0_p20210717
index 8a46945d7483..ae9aee45b3ce 100644
--- a/metadata/md5-cache/app-emacs/macrostep-geiser-0.2.0_p20210717
+++ b/metadata/md5-cache/app-emacs/macrostep-geiser-0.2.0_p20210717
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/geiser app-emacs/macrostep >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/nbfalcon/macrostep-geiser/archive/f6a2d5bb96ade4f23df557649af87ebd0cc45125.tar.gz -> macrostep-geiser-0.2.0_p20210717.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9be1be03e4803ae3565220868616f18f
diff --git a/metadata/md5-cache/app-emacs/magit-3.2.0 b/metadata/md5-cache/app-emacs/magit-3.2.0
index fde4061dfc0a..ae8883245c99 100644
--- a/metadata/md5-cache/app-emacs/magit-3.2.0
+++ b/metadata/md5-cache/app-emacs/magit-3.2.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.18.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.4 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.2.0.tar.gz -> magit-3.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=67e67c3027a356bae9d7737460948b5d
diff --git a/metadata/md5-cache/app-emacs/magit-3.3.0 b/metadata/md5-cache/app-emacs/magit-3.3.0
index 6da17f9d7065..0ab453bf368c 100644
--- a/metadata/md5-cache/app-emacs/magit-3.3.0
+++ b/metadata/md5-cache/app-emacs/magit-3.3.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.19.1 app-emacs/libegit2 >=app-emacs/transient-0.3.6 >=app-emacs/with-editor-3.0.5 >=dev-vcs/git-2.0.0 >=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit/archive/v3.3.0.tar.gz -> magit-3.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=89422f3defb8e9632d12589ff72dc366
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.0 b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
index e7fb04fa2bef..4e765e49e3e6 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.0
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.0.tar.gz -> magit-popup-2.13.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e3460323affd0fa1e6ab63f2505e6667
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.2 b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
index a62a49411b92..12587228a3e9 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.2
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.2.tar.gz -> magit-popup-2.13.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=61109e2d12c420d2ade271242509419c
diff --git a/metadata/md5-cache/app-emacs/magit-popup-2.13.3 b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
index de0cd15e0add..df65462d2b51 100644
--- a/metadata/md5-cache/app-emacs/magit-popup-2.13.3
+++ b/metadata/md5-cache/app-emacs/magit-popup-2.13.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=!!<app-emacs/magit-2.12.1 >=app-emacs/dash-2.13.0 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/magit-popup/archive/v2.13.3.tar.gz -> magit-popup-2.13.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=25e6ee26456b5194d244e6b95d388ebf
diff --git a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3 b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
index 8b94196169db..9c18190cf57c 100644
--- a/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
+++ b/metadata/md5-cache/app-emacs/mailcrypt-3.5.9-r3
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=686f9fa4bdf240b5fb7b89368ae2a3a2
diff --git a/metadata/md5-cache/app-emacs/marginalia-0.13 b/metadata/md5-cache/app-emacs/marginalia-0.13
index becd0e4889c1..7e8a28a7a9b7 100644
--- a/metadata/md5-cache/app-emacs/marginalia-0.13
+++ b/metadata/md5-cache/app-emacs/marginalia-0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.13.tar.gz -> marginalia-0.13.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5d2549f894b0eeda316b2e0831fa17e4
diff --git a/metadata/md5-cache/app-emacs/marginalia-0.14 b/metadata/md5-cache/app-emacs/marginalia-0.14
index 281c8fc09eac..f8f971d562a9 100644
--- a/metadata/md5-cache/app-emacs/marginalia-0.14
+++ b/metadata/md5-cache/app-emacs/marginalia-0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.14.tar.gz -> marginalia-0.14.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5d2549f894b0eeda316b2e0831fa17e4
diff --git a/metadata/md5-cache/app-emacs/marginalia-0.15 b/metadata/md5-cache/app-emacs/marginalia-0.15
index 78db4ffe9561..e32786d6c806 100644
--- a/metadata/md5-cache/app-emacs/marginalia-0.15
+++ b/metadata/md5-cache/app-emacs/marginalia-0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/minad/marginalia/archive/refs/tags/0.15.tar.gz -> marginalia-0.15.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5d2549f894b0eeda316b2e0831fa17e4
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1 b/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1
index d759c0173bc6..3b4dedefa826 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.4-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( dev-python/markdown2 dev-python/markdown virtual/pandoc ) >=app-edi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.4.tar.gz -> markdown-mode-2.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=276b9c701ad3847e6ed3652d4901d7fa
diff --git a/metadata/md5-cache/app-emacs/markdown-mode-2.5-r1 b/metadata/md5-cache/app-emacs/markdown-mode-2.5-r1
index 1bc0bfd7fe13..7bb47f809f90 100644
--- a/metadata/md5-cache/app-emacs/markdown-mode-2.5-r1
+++ b/metadata/md5-cache/app-emacs/markdown-mode-2.5-r1
@@ -11,5 +11,5 @@ RDEPEND=|| ( dev-python/markdown2 dev-python/markdown virtual/pandoc ) >=app-edi
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jrblevin/markdown-mode/archive/v2.5.tar.gz -> markdown-mode-2.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5f61d9fa0e2c07642fa4f998f9a71387
diff --git a/metadata/md5-cache/app-emacs/mastodon-1.0.0 b/metadata/md5-cache/app-emacs/mastodon-1.0.0
index 3988b1025609..63636c842296 100644
--- a/metadata/md5-cache/app-emacs/mastodon-1.0.0
+++ b/metadata/md5-cache/app-emacs/mastodon-1.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/request >=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://codeberg.org/martianh/mastodon.el/archive/1.0.0.tar.gz -> mastodon-1.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=49262fd39368ac5dd6eca944a0e974e7
diff --git a/metadata/md5-cache/app-emacs/math-symbol-lists-1.3 b/metadata/md5-cache/app-emacs/math-symbol-lists-1.3
index 96bddbb2e1b2..608331a29011 100644
--- a/metadata/md5-cache/app-emacs/math-symbol-lists-1.3
+++ b/metadata/md5-cache/app-emacs/math-symbol-lists-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/vspinu/math-symbol-lists/archive/v1.3.tar.gz -> math-symbol-lists-1.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0e30c7155c8874cf0ea067bd84ce71b4
diff --git a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1 b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
index 506c058f6ab8..1d0aeb01712f 100644
--- a/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
+++ b/metadata/md5-cache/app-emacs/matlab-3.3.6_pre20191010-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/matlab-3.3.6_pre20191010.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=225702323d3fcdd936ee74eb9bf45622
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1 b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
index 826853fba43e..50d49be52d0b 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.2.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.2.9.tar.gz -> mediawiki-2.2.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=46a2f5056f47c4217b4f197fe05133f8
diff --git a/metadata/md5-cache/app-emacs/mediawiki-2.3.1 b/metadata/md5-cache/app-emacs/mediawiki-2.3.1
index d5630f5b4793..c0fef1581b3a 100644
--- a/metadata/md5-cache/app-emacs/mediawiki-2.3.1
+++ b/metadata/md5-cache/app-emacs/mediawiki-2.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/hexmode/mediawiki-el/archive/2.3.1.tar.gz -> mediawiki-2.3.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ee8159500fdf672b023f08aeb8edc783
diff --git a/metadata/md5-cache/app-emacs/meson-mode-0.3 b/metadata/md5-cache/app-emacs/meson-mode-0.3
index 8cec31519932..01372692cf13 100644
--- a/metadata/md5-cache/app-emacs/meson-mode-0.3
+++ b/metadata/md5-cache/app-emacs/meson-mode-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/wentasah/meson-mode/archive/v0.3.tar.gz -> meson-mode-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3e867d52c1972a00b0a4a1458d294ca2
diff --git a/metadata/md5-cache/app-emacs/metamath-mode-0_p20221005 b/metadata/md5-cache/app-emacs/metamath-mode-0_p20221005
index d49b0635a6bd..b7b473280a5f 100644
--- a/metadata/md5-cache/app-emacs/metamath-mode-0_p20221005
+++ b/metadata/md5-cache/app-emacs/metamath-mode-0_p20221005
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/samrushing/metamath-mode/archive/85bd63b88378e9f2dee2f7d5585ec6610bf098a6.tar.gz -> metamath-mode-0_p20221005.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fc0aa4acd4e0622ae712ff830512aad3
diff --git a/metadata/md5-cache/app-emacs/mew-6.8 b/metadata/md5-cache/app-emacs/mew-6.8
index ba8831a82bcb..a7111b763e55 100644
--- a/metadata/md5-cache/app-emacs/mew-6.8
+++ b/metadata/md5-cache/app-emacs/mew-6.8
@@ -12,5 +12,5 @@ RDEPEND=sys-libs/zlib ssl? ( net-misc/stunnel ) >=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.mew.org/Release/mew-6.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=b9d852272c81696f968287068ff7f5b4
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.13 b/metadata/md5-cache/app-emacs/mic-paren-3.13
index 8a8e82761f76..3d0c1fd3e0ce 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.13
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mic-paren-3.13.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e1519b2765a9160347b1a02d9b3183b3
diff --git a/metadata/md5-cache/app-emacs/mic-paren-3.15 b/metadata/md5-cache/app-emacs/mic-paren-3.15
index e12e20db9442..c122f48eb613 100644
--- a/metadata/md5-cache/app-emacs/mic-paren-3.15
+++ b/metadata/md5-cache/app-emacs/mic-paren-3.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mic-paren-3.15.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9ee791152bc6c21a60d11de0c10d1863
diff --git a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2 b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
index 4f9877672c1d..1c4811620d0f 100644
--- a/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
+++ b/metadata/md5-cache/app-emacs/mldonkey-0.0.4b-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.physik.fu-berlin.de/%7Edhansen/mldonkey/files/mldonkey-el-0.0.4b.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=f58cfa15ef884640381e9a4c3b586859
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
index 68f36e928f09..fa99fe59fd09 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.7.tar.gz -> mmm-mode-0.5.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c1273665a04e2ca2496d4b4ed3d17237
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.8 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.8
index e2b50e05ec4c..d2ac158c1ba6 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.8
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/mmm-mode/archive/0.5.8.tar.gz -> mmm-mode-0.5.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ad1983a490d1d825bda33cc14fe51d4a
diff --git a/metadata/md5-cache/app-emacs/moccur-edit-2.16 b/metadata/md5-cache/app-emacs/moccur-edit-2.16
index 9aa3072b0b08..18c14726d6db 100644
--- a/metadata/md5-cache/app-emacs/moccur-edit-2.16
+++ b/metadata/md5-cache/app-emacs/moccur-edit-2.16
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/color-moccur >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/moccur-edit-2.16.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=220e17a2ac4484621fe20637aa03d633
diff --git a/metadata/md5-cache/app-emacs/mocker-0.5.0 b/metadata/md5-cache/app-emacs/mocker-0.5.0
index a58b5a9dbf56..eda8188fcae7 100644
--- a/metadata/md5-cache/app-emacs/mocker-0.5.0
+++ b/metadata/md5-cache/app-emacs/mocker-0.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/sigma/mocker.el/archive/v0.5.0.tar.gz -> mocker-0.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5e355051ceb2552958582eee7ecb37c3
diff --git a/metadata/md5-cache/app-emacs/mpg123-el-1.61 b/metadata/md5-cache/app-emacs/mpg123-el-1.61
index 30ca34d61e09..890e6a0ae331 100644
--- a/metadata/md5-cache/app-emacs/mpg123-el-1.61
+++ b/metadata/md5-cache/app-emacs/mpg123-el-1.61
@@ -9,5 +9,5 @@ LICENSE=mpg123-el
 RDEPEND=media-sound/mpg123 media-sound/alsa-utils >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/mpg123-el-1.61.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a13c78da71249b574ff1c1d456d87668
diff --git a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348 b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
index 956fd2791b86..42819fbee232 100644
--- a/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
+++ b/metadata/md5-cache/app-emacs/mu-cite-8.1_p201808232348
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/apel app-emacs/flim bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.jpl.org/elips/mu/snapshots/mu-cite-201808232348.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=50589a3d4fa464af68770f11e71966df
diff --git a/metadata/md5-cache/app-emacs/multi-term-1.4 b/metadata/md5-cache/app-emacs/multi-term-1.4
index 565100296158..14ce96b1b038 100644
--- a/metadata/md5-cache/app-emacs/multi-term-1.4
+++ b/metadata/md5-cache/app-emacs/multi-term-1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mjo/distfiles/multi-term-1.4.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e0636cae5b688bed903cf4e016f717c1
diff --git a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0 b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
index b0646eb2b584..41047d31ed09 100644
--- a/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
+++ b/metadata/md5-cache/app-emacs/multiple-cursors-1.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/multiple-cursors.el/archive/1.4.0.tar.gz -> multiple-cursors-1.4.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=19934ddda2983416e762476782a23ddd
diff --git a/metadata/md5-cache/app-emacs/muse-3.20-r1 b/metadata/md5-cache/app-emacs/muse-3.20-r1
index 4377d640efe5..8e772b5cc984 100644
--- a/metadata/md5-cache/app-emacs/muse-3.20-r1
+++ b/metadata/md5-cache/app-emacs/muse-3.20-r1
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/alexott/muse/archive/v3.20.tar.gz -> muse-3.20.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a5bc15f35110be375d19b1f58ba9679f
diff --git a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1 b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
index 517377b4c0a2..f7b99cf9362d 100644
--- a/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
+++ b/metadata/md5-cache/app-emacs/nagios-mode-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://michael.orlitzky.com/code/releases/nagios-mode-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8f82a0892d0d20fd4f85f28c83b33440
diff --git a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r2 b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r2
index e8250036bca8..1737a415a7b1 100644
--- a/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r2
+++ b/metadata/md5-cache/app-emacs/navi2ch-1.8.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/navi2ch/navi2ch-1.8.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=c4fb513353d88cec883962702218766b
diff --git a/metadata/md5-cache/app-emacs/nginx-mode-1.1.9 b/metadata/md5-cache/app-emacs/nginx-mode-1.1.9
index b3d31df018ad..4974ada7d10c 100644
--- a/metadata/md5-cache/app-emacs/nginx-mode-1.1.9
+++ b/metadata/md5-cache/app-emacs/nginx-mode-1.1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ajc/nginx-mode/archive/v1.1.9.tar.gz -> nginx-mode-1.1.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2050e5b55587b3de545c90b69fceecbd
diff --git a/metadata/md5-cache/app-emacs/nim-mode-0.4.2_p20211102 b/metadata/md5-cache/app-emacs/nim-mode-0.4.2_p20211102
index 22c8034a7eb6..8fcebcf2ab16 100644
--- a/metadata/md5-cache/app-emacs/nim-mode-0.4.2_p20211102
+++ b/metadata/md5-cache/app-emacs/nim-mode-0.4.2_p20211102
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/commenter app-emacs/epc >=app-editors/emacs-24.4:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/nim-lang/nim-mode/archive/744e076f0bea1c5ddc49f92397d9aa98ffa7eff8.tar.gz -> nim-mode-0.4.2_p20211102.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e685d44dfd6ce743889274a6a82c465f
diff --git a/metadata/md5-cache/app-emacs/noflet-0.0.15_p20141102-r1 b/metadata/md5-cache/app-emacs/noflet-0.0.15_p20141102-r1
index 950ce658942f..943dea16e8d4 100644
--- a/metadata/md5-cache/app-emacs/noflet-0.0.15_p20141102-r1
+++ b/metadata/md5-cache/app-emacs/noflet-0.0.15_p20141102-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/dash >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/nicferrier/emacs-noflet/archive/7ae84dc3257637af7334101456dafe1759c6b68a.tar.gz -> noflet-0.0.15_p20141102.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f8cd23397a47a99d0d0b8381fbe2df8d
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
index f28c29cf927c..362429870764 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.0
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.0/rng/docbookxi.rnc -> docbookxi-5.0.rnc
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1 b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
index 085d5b07b2a4..751f58f5b4a8 100644
--- a/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
+++ b/metadata/md5-cache/app-emacs/nxml-docbook5-schemas-5.1
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://docbook.org/xml/5.1/rng/docbookxi.rnc -> docbookxi-5.1.rnc
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=719e1af9bd0b431db9e5af672913bd04
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
index 120f3305f6b4..e98f68f443ee 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220730
@@ -9,5 +9,5 @@ LICENSE=MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20220730.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=93410d58c5c38babced9242b7d7de9e2
diff --git a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220916 b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220916
index 20b7555c9d81..b5540471b6d7 100644
--- a/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220916
+++ b/metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220916
@@ -9,5 +9,5 @@ LICENSE=MIT GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/nxml-gentoo-schemas-20220916.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3e167a65fe8749819670aca149e37033
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-7.10.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-7.10.0
deleted file mode 100644
index 04aaddf5fa4d..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-7.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/trang >=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://libvirt.org/sources/libvirt-7.10.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=0b09f1203453d0722a150bc066acf2ee
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.7.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.7.0
deleted file mode 100644
index 65cf4c2d58d0..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/trang >=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://libvirt.org/sources/libvirt-8.7.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=de2635fd9f179dc2c588d1e709153fe2
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.8.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.8.0
index a4715ddb5b69..2a79499e5550 100644
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.8.0
+++ b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://libvirt.org/sources/libvirt-8.8.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=de2635fd9f179dc2c588d1e709153fe2
diff --git a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1 b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
index de904fc87171..293d11327fb2 100644
--- a/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
+++ b/metadata/md5-cache/app-emacs/nxml-svg-schemas-1.1.20081123-r1
@@ -9,5 +9,5 @@ LICENSE=HPND
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=1.1
 SRC_URI=http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-1.1.20081123.zip
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=2e3df112cfd4dc76d9f68f3497d6898d
diff --git a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0 b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
index 12b9ce357d64..b432247c4771 100644
--- a/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
+++ b/metadata/md5-cache/app-emacs/ocaml-mode-4.05.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz -> ocaml-4.05.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5dc5484ec85c2e7a2daed9966d2a6822
diff --git a/metadata/md5-cache/app-emacs/orderless-0.7 b/metadata/md5-cache/app-emacs/orderless-0.7
index 3fa39619820e..5f4dac5305b4 100644
--- a/metadata/md5-cache/app-emacs/orderless-0.7
+++ b/metadata/md5-cache/app-emacs/orderless-0.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/oantolin/orderless/archive/refs/tags/0.7.tar.gz -> orderless-0.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=ab6bf7e60647c90c379d055a27b318fd
diff --git a/metadata/md5-cache/app-emacs/org-appear-0.3.0 b/metadata/md5-cache/app-emacs/org-appear-0.3.0
index d51060386cc3..c4b2ef063b41 100644
--- a/metadata/md5-cache/app-emacs/org-appear-0.3.0
+++ b/metadata/md5-cache/app-emacs/org-appear-0.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/awth13/org-appear/archive/0.3.0.tar.gz -> org-appear-0.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1c08e391ca7cbacd399c01b6eed2455a
diff --git a/metadata/md5-cache/app-emacs/org-contrib-0.2 b/metadata/md5-cache/app-emacs/org-contrib-0.2
index 576ac0249bca..d78a9f3d3d32 100644
--- a/metadata/md5-cache/app-emacs/org-contrib-0.2
+++ b/metadata/md5-cache/app-emacs/org-contrib-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/org-mode-9.5 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~bzg/org-contrib/archive/release_0.2.tar.gz -> org-contrib-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e99c98e119da4dda63dfc563808bc637
diff --git a/metadata/md5-cache/app-emacs/org-contrib-0.3 b/metadata/md5-cache/app-emacs/org-contrib-0.3
index 472a5f0d6894..d07f79afde48 100644
--- a/metadata/md5-cache/app-emacs/org-contrib-0.3
+++ b/metadata/md5-cache/app-emacs/org-contrib-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-emacs/org-mode-9.5 >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~bzg/org-contrib/archive/release_0.3.tar.gz -> org-contrib-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5c2ff3a1210d6c0de43cc33c5b1d1f8d
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.4.6 b/metadata/md5-cache/app-emacs/org-mode-9.4.6
index 39f83d0b9708..67330dfb1557 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.4.6
+++ b/metadata/md5-cache/app-emacs/org-mode-9.4.6
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://orgmode.org/org-9.4.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=35fc378411d8ecce9135d7a40a61a5c4
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.5.3-r1 b/metadata/md5-cache/app-emacs/org-mode-9.5.3-r1
index a868edd25771..d9ff0ec2b102 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.5.3-r1
+++ b/metadata/md5-cache/app-emacs/org-mode-9.5.3-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.5.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=f0c960eb7a3ce6edbde08fb19e0ae68f
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.5.4 b/metadata/md5-cache/app-emacs/org-mode-9.5.4
index eb036499039d..4bfb5e03e741 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.5.4
+++ b/metadata/md5-cache/app-emacs/org-mode-9.5.4
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.5.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=8a979988586e649168c753d7b664053f
diff --git a/metadata/md5-cache/app-emacs/org-mode-9.5.5 b/metadata/md5-cache/app-emacs/org-mode-9.5.5
index 44b589f2e1e0..27d362a166fe 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.5.5
+++ b/metadata/md5-cache/app-emacs/org-mode-9.5.5
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://git.savannah.gnu.org/cgit/emacs/org-mode.git/snapshot/org-mode-release_9.5.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=4681dc7a1cd799589196aef57d5dd2c3
diff --git a/metadata/md5-cache/app-emacs/org-mode-9999 b/metadata/md5-cache/app-emacs/org-mode-9999
index d44b363fcea3..4d067d7d5d32 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9999
+++ b/metadata/md5-cache/app-emacs/org-mode-9999
@@ -10,5 +10,5 @@ PROPERTIES=live
 RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=d1d216549b15e75475d9f7f0dff58bb3
diff --git a/metadata/md5-cache/app-emacs/org-static-blog-1.5.0 b/metadata/md5-cache/app-emacs/org-static-blog-1.5.0
index 52f4f62b8e76..f81f314d4b5c 100644
--- a/metadata/md5-cache/app-emacs/org-static-blog-1.5.0
+++ b/metadata/md5-cache/app-emacs/org-static-blog-1.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/bastibe/org-static-blog/archive/1.5.0.tar.gz -> org-static-blog-1.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=26f212933fe55c4e1b3889177e7ed701
diff --git a/metadata/md5-cache/app-emacs/org-static-blog-1.6.0 b/metadata/md5-cache/app-emacs/org-static-blog-1.6.0
index 96b153bdbcb5..87687ca4123c 100644
--- a/metadata/md5-cache/app-emacs/org-static-blog-1.6.0
+++ b/metadata/md5-cache/app-emacs/org-static-blog-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/bastibe/org-static-blog/archive/1.6.0.tar.gz -> org-static-blog-1.6.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=26f212933fe55c4e1b3889177e7ed701
diff --git a/metadata/md5-cache/app-emacs/org-superstar-mode-1.5.0 b/metadata/md5-cache/app-emacs/org-superstar-mode-1.5.0
index ebfd895c7ba5..b4917d760a0f 100644
--- a/metadata/md5-cache/app-emacs/org-superstar-mode-1.5.0
+++ b/metadata/md5-cache/app-emacs/org-superstar-mode-1.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/integral-dw/org-superstar-mode/archive/v1.5.0.tar.gz -> org-superstar-mode-1.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d2c10b39c551521910e253489e6af51e
diff --git a/metadata/md5-cache/app-emacs/outline-magic-0.9 b/metadata/md5-cache/app-emacs/outline-magic-0.9
index d50dfbdec0fd..a61fb779757f 100644
--- a/metadata/md5-cache/app-emacs/outline-magic-0.9
+++ b/metadata/md5-cache/app-emacs/outline-magic-0.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/outline-magic-0.9.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=76b66b3fec7336bc49333f0d36e9398e
diff --git a/metadata/md5-cache/app-emacs/package-build-2.4 b/metadata/md5-cache/app-emacs/package-build-2.4
index 80311d153235..e8eefa2d1f08 100644
--- a/metadata/md5-cache/app-emacs/package-build-2.4
+++ b/metadata/md5-cache/app-emacs/package-build-2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/melpa/package-build/archive/2.4.tar.gz -> package-build-2.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cf2115dc95f2e85f562b0afc5f8fa351
diff --git a/metadata/md5-cache/app-emacs/package-build-3.0 b/metadata/md5-cache/app-emacs/package-build-3.0
index e16a2059b9b9..7d80f52c88f1 100644
--- a/metadata/md5-cache/app-emacs/package-build-3.0
+++ b/metadata/md5-cache/app-emacs/package-build-3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/melpa/package-build/archive/3.0.tar.gz -> package-build-3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cf2115dc95f2e85f562b0afc5f8fa351
diff --git a/metadata/md5-cache/app-emacs/package-build-3.1 b/metadata/md5-cache/app-emacs/package-build-3.1
index f8265dced6a4..907913f46aaf 100644
--- a/metadata/md5-cache/app-emacs/package-build-3.1
+++ b/metadata/md5-cache/app-emacs/package-build-3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/melpa/package-build/archive/3.1.tar.gz -> package-build-3.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cf2115dc95f2e85f562b0afc5f8fa351
diff --git a/metadata/md5-cache/app-emacs/package-lint-0.16-r1 b/metadata/md5-cache/app-emacs/package-lint-0.16-r1
index a2205870149f..a87f9db4067c 100644
--- a/metadata/md5-cache/app-emacs/package-lint-0.16-r1
+++ b/metadata/md5-cache/app-emacs/package-lint-0.16-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/purcell/package-lint/archive/0.16.tar.gz -> package-lint-0.16.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e0de31fa5a7ac7d9a6aa29998a070e78
diff --git a/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1 b/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1
index 02b2e4c7b825..12c3f3e6ab3c 100644
--- a/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1
+++ b/metadata/md5-cache/app-emacs/pandoc-mode-2.32-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-emacs/dash app-emacs/hydra virtual/pandoc >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joostkremers/pandoc-mode/archive/2.32.tar.gz -> pandoc-mode-2.32.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=eb322e7cfa0032e51616e3bf49aa505d
diff --git a/metadata/md5-cache/app-emacs/paredit-24 b/metadata/md5-cache/app-emacs/paredit-24
index 01b8db204a46..ac79bc6b68ff 100644
--- a/metadata/md5-cache/app-emacs/paredit-24
+++ b/metadata/md5-cache/app-emacs/paredit-24
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/paredit-24.el.xz https://dev.gentoo.org/~ulm/distfiles/paredit-23.html.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=179c461c8c22baaa952b5bfcb8ca2adf
diff --git a/metadata/md5-cache/app-emacs/pariemacs-3.14-r1 b/metadata/md5-cache/app-emacs/pariemacs-3.14-r1
index a9969498a0eb..5f7483d2695a 100644
--- a/metadata/md5-cache/app-emacs/pariemacs-3.14-r1
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=sci-mathematics/pari >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7b1f0ccff9b213713b2b772c54cd1a98
diff --git a/metadata/md5-cache/app-emacs/parsebib-4.1 b/metadata/md5-cache/app-emacs/parsebib-4.1
index 38a266eaed1a..0450d8496d71 100644
--- a/metadata/md5-cache/app-emacs/parsebib-4.1
+++ b/metadata/md5-cache/app-emacs/parsebib-4.1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/parsebib/archive/4.1.tar.gz -> parsebib-4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3fed862797745202c2ba5d1d0bd6bf8d
diff --git a/metadata/md5-cache/app-emacs/parsebib-4.2 b/metadata/md5-cache/app-emacs/parsebib-4.2
index 233df6d087d9..1288df3cfa64 100644
--- a/metadata/md5-cache/app-emacs/parsebib-4.2
+++ b/metadata/md5-cache/app-emacs/parsebib-4.2
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/parsebib/archive/4.2.tar.gz -> parsebib-4.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3fed862797745202c2ba5d1d0bd6bf8d
diff --git a/metadata/md5-cache/app-emacs/parsebib-4.3 b/metadata/md5-cache/app-emacs/parsebib-4.3
index 5b510a16f4d6..2142fcb66946 100644
--- a/metadata/md5-cache/app-emacs/parsebib-4.3
+++ b/metadata/md5-cache/app-emacs/parsebib-4.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/joostkremers/parsebib/archive/4.3.tar.gz -> parsebib-4.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3fed862797745202c2ba5d1d0bd6bf8d
diff --git a/metadata/md5-cache/app-emacs/pdf-tools-1.0.0_pre20220619 b/metadata/md5-cache/app-emacs/pdf-tools-1.0.0_pre20220619
index 91df40b3b140..7264f17e4dea 100644
--- a/metadata/md5-cache/app-emacs/pdf-tools-1.0.0_pre20220619
+++ b/metadata/md5-cache/app-emacs/pdf-tools-1.0.0_pre20220619
@@ -11,5 +11,5 @@ RDEPEND=app-text/poppler:=[cairo,png] dev-libs/glib:2= media-libs/freetype:2= me
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vedang/pdf-tools/archive/fe42da60ad68e806af1677210249caccd7b99451.tar.gz -> pdf-tools-1.0.0_pre20220619.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=c1633c89b853cee6660218191030af18
diff --git a/metadata/md5-cache/app-emacs/pfuture-1.10.3 b/metadata/md5-cache/app-emacs/pfuture-1.10.3
index 9b4ee2d8718c..5fb44f2fac64 100644
--- a/metadata/md5-cache/app-emacs/pfuture-1.10.3
+++ b/metadata/md5-cache/app-emacs/pfuture-1.10.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.2:*
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/pfuture/archive/1.10.3.tar.gz -> pfuture-1.10.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dd900c9f11b5c5e659646993e8ca9104
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.23.0 b/metadata/md5-cache/app-emacs/php-mode-1.23.0
index ed92c7eeecb2..c0707e7ec1e7 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.23.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.23.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.23.0.tar.gz -> php-mode-1.23.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9e663bb65fffba949e3d92d7b090cba4
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.24.0 b/metadata/md5-cache/app-emacs/php-mode-1.24.0
index 18b70651e722..46e648bc5f9f 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.24.0
+++ b/metadata/md5-cache/app-emacs/php-mode-1.24.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ejmr/php-mode/archive/v1.24.0.tar.gz -> php-mode-1.24.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c3c06466320990357d0ec7ac5bb75f75
diff --git a/metadata/md5-cache/app-emacs/php-mode-1.24.1 b/metadata/md5-cache/app-emacs/php-mode-1.24.1
index e2e485342ca9..5897d06676a6 100644
--- a/metadata/md5-cache/app-emacs/php-mode-1.24.1
+++ b/metadata/md5-cache/app-emacs/php-mode-1.24.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/emacs-php/php-mode/archive/v1.24.1.tar.gz -> php-mode-1.24.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=67e39872e36e3a582eddceb4ecafade0
diff --git a/metadata/md5-cache/app-emacs/pkg-info-0.6 b/metadata/md5-cache/app-emacs/pkg-info-0.6
index 51109fc670b0..228c723e74fb 100644
--- a/metadata/md5-cache/app-emacs/pkg-info-0.6
+++ b/metadata/md5-cache/app-emacs/pkg-info-0.6
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/epl-0.8 >=app-editors/emacs-24.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/pkg-info/archive/refs/tags/0.6.tar.gz -> pkg-info-0.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=bf6a2ff345808fee8ddf2d846e67b42b
diff --git a/metadata/md5-cache/app-emacs/planner-3.42-r1 b/metadata/md5-cache/app-emacs/planner-3.42-r1
index 1cbad00a6743..14bc48ab71fc 100644
--- a/metadata/md5-cache/app-emacs/planner-3.42-r1
+++ b/metadata/md5-cache/app-emacs/planner-3.42-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-emacs/muse-3.02.6a app-emacs/bbdb app-emacs/emacs-w3m >=app-editor
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/planner-3.42.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=cddd455a6413785e32fd1056ec109509
diff --git a/metadata/md5-cache/app-emacs/po-mode-0.20.1 b/metadata/md5-cache/app-emacs/po-mode-0.20.1
index 40f2ee7d22d5..765aea777939 100644
--- a/metadata/md5-cache/app-emacs/po-mode-0.20.1
+++ b/metadata/md5-cache/app-emacs/po-mode-0.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.20.1.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=60c26640bd3ce8910af66ba624af0719
diff --git a/metadata/md5-cache/app-emacs/polymode-0.2.2_p20220322 b/metadata/md5-cache/app-emacs/polymode-0.2.2_p20220322
index 675080464a4e..49ec914063bc 100644
--- a/metadata/md5-cache/app-emacs/polymode-0.2.2_p20220322
+++ b/metadata/md5-cache/app-emacs/polymode-0.2.2_p20220322
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/polymode/polymode/archive/2094c92403fe395dfb2b8b2521da1012a966e9ab.tar.gz -> polymode-0.2.2_p20220322.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=297ae82a286897615140f6c7c3ec75d1
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.3 b/metadata/md5-cache/app-emacs/popup-0.5.3
index 20087964fdd2..93d3109951ea 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.3
+++ b/metadata/md5-cache/app-emacs/popup-0.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.3.tar.gz -> popup-el-0.5.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=11a11ed473142833a48348ad547402dc
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.8 b/metadata/md5-cache/app-emacs/popup-0.5.8
index ae2e7dfe1919..101e7b948606 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.8
+++ b/metadata/md5-cache/app-emacs/popup-0.5.8
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.8.tar.gz -> popup-el-0.5.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=bcd9aa94ab1510ae06f8fc66d90e51b9
diff --git a/metadata/md5-cache/app-emacs/popup-0.5.9 b/metadata/md5-cache/app-emacs/popup-0.5.9
index b013560c7f64..90327c30959a 100644
--- a/metadata/md5-cache/app-emacs/popup-0.5.9
+++ b/metadata/md5-cache/app-emacs/popup-0.5.9
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/auto-complete/popup-el/archive/v0.5.9.tar.gz -> popup-el-0.5.9.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f1119cd15182789f93cde3e38c8d654e
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.0 b/metadata/md5-cache/app-emacs/popwin-1.0.0
index 143e681963a5..3193bb0e4584 100644
--- a/metadata/md5-cache/app-emacs/popwin-1.0.0
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/m2ym/popwin-el/archive/v1.0.0.tar.gz -> popwin-1.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5c43cabeca2c46d5ddc270e090a292aa
diff --git a/metadata/md5-cache/app-emacs/popwin-1.0.2 b/metadata/md5-cache/app-emacs/popwin-1.0.2
index 942c8724359f..0a6e94b7abcf 100644
--- a/metadata/md5-cache/app-emacs/popwin-1.0.2
+++ b/metadata/md5-cache/app-emacs/popwin-1.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacsorphanage/popwin/archive/refs/tags/1.0.2.tar.gz -> popwin-1.0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dcf831307b12310245dfa45caafa3f36
diff --git a/metadata/md5-cache/app-emacs/pos-tip-0.4.6 b/metadata/md5-cache/app-emacs/pos-tip-0.4.6
index f4364f751ea2..736dbf70a901 100644
--- a/metadata/md5-cache/app-emacs/pos-tip-0.4.6
+++ b/metadata/md5-cache/app-emacs/pos-tip-0.4.6
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/pitkali/pos-tip/archive/0.4.6.tar.gz -> pos-tip-0.4.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3afe14b6758c177a01b7a1a99b3e06fd
diff --git a/metadata/md5-cache/app-emacs/pos-tip-0.4.6_p20191227 b/metadata/md5-cache/app-emacs/pos-tip-0.4.6_p20191227
index 05c5a99dc401..7ea270088b48 100644
--- a/metadata/md5-cache/app-emacs/pos-tip-0.4.6_p20191227
+++ b/metadata/md5-cache/app-emacs/pos-tip-0.4.6_p20191227
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/pitkali/pos-tip/archive/179cc126b363f72ca12fab1e0dc462ce0ee79742.tar.gz -> pos-tip-0.4.6_p20191227.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3f9ba5a1b429871c921342c71e0729c8
diff --git a/metadata/md5-cache/app-emacs/posframe-0.8.5 b/metadata/md5-cache/app-emacs/posframe-0.8.5
index f5b5987f535c..61eba234fb81 100644
--- a/metadata/md5-cache/app-emacs/posframe-0.8.5
+++ b/metadata/md5-cache/app-emacs/posframe-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/tumashu/posframe/archive/refs/tags/v0.8.5.tar.gz -> posframe-0.8.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f13080367fc1a4d01075c92b3a69b8c2
diff --git a/metadata/md5-cache/app-emacs/posframe-1.1.7 b/metadata/md5-cache/app-emacs/posframe-1.1.7
index edcd2e3ddafc..e9a4039f4320 100644
--- a/metadata/md5-cache/app-emacs/posframe-1.1.7
+++ b/metadata/md5-cache/app-emacs/posframe-1.1.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/tumashu/posframe/archive/refs/tags/v1.1.7.tar.gz -> posframe-1.1.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5781fcb1ed24a430814f786de1ac1152
diff --git a/metadata/md5-cache/app-emacs/posframe-1.1.8 b/metadata/md5-cache/app-emacs/posframe-1.1.8
index d7b46cc1da2f..8b26a615752a 100644
--- a/metadata/md5-cache/app-emacs/posframe-1.1.8
+++ b/metadata/md5-cache/app-emacs/posframe-1.1.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://github.com/tumashu/posframe/archive/refs/tags/v1.1.8.tar.gz -> posframe-1.1.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5781fcb1ed24a430814f786de1ac1152
diff --git a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1 b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
index 271300449df0..c7e487aaa7d0 100644
--- a/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
+++ b/metadata/md5-cache/app-emacs/pov-mode-3.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ FDL-1.2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/emacsmirror/pov-mode/archive/v3.3.tar.gz -> pov-mode-3.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6706411cec44ff9cd9285b46de710bb9
diff --git a/metadata/md5-cache/app-emacs/powershell-0.3_pre20220402 b/metadata/md5-cache/app-emacs/powershell-0.3_pre20220402
index 204c77744cff..8dff13e6e4ea 100644
--- a/metadata/md5-cache/app-emacs/powershell-0.3_pre20220402
+++ b/metadata/md5-cache/app-emacs/powershell-0.3_pre20220402
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/jschaf/powershell.el/archive/77b27faf8a292f1dc9f54c872241dc53b6791bf1.tar.gz -> powershell-0.3_pre20220402.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8c1b2fac915dec970007360a4d13a729
diff --git a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1 b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
index 50745110dc5f..17f276b6975d 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
+++ b/metadata/md5-cache/app-emacs/projectile-2.5.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.5.0.tar.gz -> projectile-2.5.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6180b27d7622cc98d7e80fe059d0e259
diff --git a/metadata/md5-cache/app-emacs/projectile-2.6.0 b/metadata/md5-cache/app-emacs/projectile-2.6.0
index d5a65436483c..56d720e6dca1 100644
--- a/metadata/md5-cache/app-emacs/projectile-2.6.0
+++ b/metadata/md5-cache/app-emacs/projectile-2.6.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-25.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bbatsov/projectile/archive/refs/tags/v2.6.0.tar.gz -> projectile-2.6.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6180b27d7622cc98d7e80fe059d0e259
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.4 b/metadata/md5-cache/app-emacs/proofgeneral-4.4
index 1cd0892ec30b..fea3f55abfe4 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.4
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-emacs/mmm-mode-0.4.8-r2 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.4.tar.gz -> proofgeneral-4.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=57c64b4e5b7267dd222c582bca407b58
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.5 b/metadata/md5-cache/app-emacs/proofgeneral-4.5
index 40273c464889..3e057841e830 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.5
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/v4.5.tar.gz -> proofgeneral-4.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=163db2ff177f74b072feb52927d10fa2
diff --git a/metadata/md5-cache/app-emacs/proofgeneral-4.5_pre20220228 b/metadata/md5-cache/app-emacs/proofgeneral-4.5_pre20220228
index f0d074af672c..c1217754022c 100644
--- a/metadata/md5-cache/app-emacs/proofgeneral-4.5_pre20220228
+++ b/metadata/md5-cache/app-emacs/proofgeneral-4.5_pre20220228
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-2 GPL-3+ HPND CC-BY-SA-3.0
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ProofGeneral/PG/archive/fe8b9fccb3690178be7fc455202c941c4c674ac3.tar.gz -> proofgeneral-4.5_pre20220228.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=197e57b3d9116e393ebdcdcfd108688b
diff --git a/metadata/md5-cache/app-emacs/protbuf-1.7-r1 b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
index 43135975abbb..ad4c8f739c1b 100644
--- a/metadata/md5-cache/app-emacs/protbuf-1.7-r1
+++ b/metadata/md5-cache/app-emacs/protbuf-1.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/protbuf-1.7.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=bfe0b38989c433c89989919a7cb5d016
diff --git a/metadata/md5-cache/app-emacs/psgml-1.4.1 b/metadata/md5-cache/app-emacs/psgml-1.4.1
index 38ad307b4955..126415a85036 100644
--- a/metadata/md5-cache/app-emacs/psgml-1.4.1
+++ b/metadata/md5-cache/app-emacs/psgml-1.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=app-text/openjade >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/psgml-1.4.1.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=67138fb6db302c799196d2563d4fc2f5
diff --git a/metadata/md5-cache/app-emacs/puppet-mode-0.4 b/metadata/md5-cache/app-emacs/puppet-mode-0.4
index 233de510e214..04ae48da9da7 100644
--- a/metadata/md5-cache/app-emacs/puppet-mode-0.4
+++ b/metadata/md5-cache/app-emacs/puppet-mode-0.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/voxpupuli/puppet-mode/archive/0.4.tar.gz -> puppet-mode-0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=817ce93dafaec871b21b6eb29de8139b
diff --git a/metadata/md5-cache/app-emacs/pymacs-0.26-r3 b/metadata/md5-cache/app-emacs/pymacs-0.26-r3
index 1e51d6f4b672..9ed4fed1191f 100644
--- a/metadata/md5-cache/app-emacs/pymacs-0.26-r3
+++ b/metadata/md5-cache/app-emacs/pymacs-0.26-r3
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:* python_targets_python3_8? ( >=dev-lang/python
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/dgentry/Pymacs/archive/v0.26.tar.gz -> pymacs-0.26.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=eabca7c534e762c389e0f61e93a498ed
diff --git a/metadata/md5-cache/app-emacs/python-mode-6.3.0 b/metadata/md5-cache/app-emacs/python-mode-6.3.0
index 1d44cde81112..4a1df320495a 100644
--- a/metadata/md5-cache/app-emacs/python-mode-6.3.0
+++ b/metadata/md5-cache/app-emacs/python-mode-6.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://gitlab.com/python-mode-devs/python-mode/-/archive/6.3.0/python-mode-6.3.0.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=43e392ae710f27475ae074f69556bae2
diff --git a/metadata/md5-cache/app-emacs/pyvenv-1.21 b/metadata/md5-cache/app-emacs/pyvenv-1.21
index 63b067193e00..495e9b4d5c4e 100644
--- a/metadata/md5-cache/app-emacs/pyvenv-1.21
+++ b/metadata/md5-cache/app-emacs/pyvenv-1.21
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/pyvenv/archive/v1.21.tar.gz -> pyvenv-1.21.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=668c7edae54687cf6869324e5b2c770e
diff --git a/metadata/md5-cache/app-emacs/quack-0.48 b/metadata/md5-cache/app-emacs/quack-0.48
index 7faf8b2affb9..b4397edec614 100644
--- a/metadata/md5-cache/app-emacs/quack-0.48
+++ b/metadata/md5-cache/app-emacs/quack-0.48
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/quack-0.48.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6f686db065171041cf8bab133ce4c2d0
diff --git a/metadata/md5-cache/app-emacs/queue-0.2 b/metadata/md5-cache/app-emacs/queue-0.2
index 85817b31d3a5..4b62f9330551 100644
--- a/metadata/md5-cache/app-emacs/queue-0.2
+++ b/metadata/md5-cache/app-emacs/queue-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~matthew/distfiles/queue-0.2.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=45743e463f936fde05b952dabaea5dc1
diff --git a/metadata/md5-cache/app-emacs/quilt-el-0.66 b/metadata/md5-cache/app-emacs/quilt-el-0.66
index bd4f8452729f..a4d64a09b69f 100644
--- a/metadata/md5-cache/app-emacs/quilt-el-0.66
+++ b/metadata/md5-cache/app-emacs/quilt-el-0.66
@@ -9,5 +9,5 @@ LICENSE=GPL-1+
 RDEPEND=dev-util/quilt >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://nongnu/quilt/quilt-0.66.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a8551252d8db374d478c9c753b390cd8
diff --git a/metadata/md5-cache/app-emacs/qwerty-1.1 b/metadata/md5-cache/app-emacs/qwerty-1.1
index 48e21901e1ae..983a498f4ae3 100644
--- a/metadata/md5-cache/app-emacs/qwerty-1.1
+++ b/metadata/md5-cache/app-emacs/qwerty-1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/qwerty-1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=97bc49dbcab0065ca9521eca2590a456
diff --git a/metadata/md5-cache/app-emacs/racket-mode-20220411-r1 b/metadata/md5-cache/app-emacs/racket-mode-20220411-r1
index e7de20a732f9..c6c9f2d30a6d 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-20220411-r1
+++ b/metadata/md5-cache/app-emacs/racket-mode-20220411-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/e7efbb52fdf2219532230a199153d8a33889c26f.tar.gz -> racket-mode-20220411.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3062aff03098786be41640f7d0575b84
diff --git a/metadata/md5-cache/app-emacs/racket-mode-20220505-r1 b/metadata/md5-cache/app-emacs/racket-mode-20220505-r1
index 6e59bdcaaabc..f1a8dadece2e 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-20220505-r1
+++ b/metadata/md5-cache/app-emacs/racket-mode-20220505-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/fbb4a4664e2cc2b5d21eee62735f73b7f0272e60.tar.gz -> racket-mode-20220505.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6a8768f6d56aa0ad09d21d1d16e3f8e0
diff --git a/metadata/md5-cache/app-emacs/racket-mode-20220804 b/metadata/md5-cache/app-emacs/racket-mode-20220804
index bf45bfb8934e..13cecef1c0ff 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-20220804
+++ b/metadata/md5-cache/app-emacs/racket-mode-20220804
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/89238bde54b3e9b6c85c6ce8437aa44a73fb71e1.tar.gz -> racket-mode-20220804.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=21cf2bc0e4787f6550b56aeec0ced6af
diff --git a/metadata/md5-cache/app-emacs/racket-mode-20220830 b/metadata/md5-cache/app-emacs/racket-mode-20220830
index 938751cc0dbd..92f054736239 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-20220830
+++ b/metadata/md5-cache/app-emacs/racket-mode-20220830
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/db7baebe64d5c1620c06e9bfca267a81ddc64aca.tar.gz -> racket-mode-20220830.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8e1684bf3ec84c0662d9877aadd83c04
diff --git a/metadata/md5-cache/app-emacs/rainbow-delimiters-2.1.5 b/metadata/md5-cache/app-emacs/rainbow-delimiters-2.1.5
index ffc36da528ea..3ade1d6df7eb 100644
--- a/metadata/md5-cache/app-emacs/rainbow-delimiters-2.1.5
+++ b/metadata/md5-cache/app-emacs/rainbow-delimiters-2.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/Fanael/rainbow-delimiters/archive/2.1.5.tar.gz -> rainbow-delimiters-2.1.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=2481843fa169c8987e3c6dda08998f1f
diff --git a/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6 b/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
index b423721c7ff3..ec8de6477ee5 100644
--- a/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
+++ b/metadata/md5-cache/app-emacs/rainbow-mode-1.0.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c83d5af9d4e46fe4119dabae1e27f37c
diff --git a/metadata/md5-cache/app-emacs/raku-mode-0.2.1_p20211121 b/metadata/md5-cache/app-emacs/raku-mode-0.2.1_p20211121
index 61f450a10c82..57272359be46 100644
--- a/metadata/md5-cache/app-emacs/raku-mode-0.2.1_p20211121
+++ b/metadata/md5-cache/app-emacs/raku-mode-0.2.1_p20211121
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.4:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Raku/raku-mode/archive/977b14a7c1295ebf2aad2f807d3f8e7c27aeb47f.tar.gz -> raku-mode-0.2.1_p20211121.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=20ddf0803fb8c48970a9b3cac95f77d9
diff --git a/metadata/md5-cache/app-emacs/redo+-1.19 b/metadata/md5-cache/app-emacs/redo+-1.19
index ed7be22c6a87..819261021e75 100644
--- a/metadata/md5-cache/app-emacs/redo+-1.19
+++ b/metadata/md5-cache/app-emacs/redo+-1.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/redo+-1.19.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=7377c748b7b3ee970e32b6198d7eb8e2
diff --git a/metadata/md5-cache/app-emacs/reformatter-0.6 b/metadata/md5-cache/app-emacs/reformatter-0.6
index 0739a1e5acd1..4401e25cda74 100644
--- a/metadata/md5-cache/app-emacs/reformatter-0.6
+++ b/metadata/md5-cache/app-emacs/reformatter-0.6
@@ -10,5 +10,5 @@ RDEPEND=>=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/purcell/emacs-reformatter/archive/0.6.tar.gz -> reformatter-0.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c6e5532468656a89f1870703b9f7bed8
diff --git a/metadata/md5-cache/app-emacs/regress-1.5.1 b/metadata/md5-cache/app-emacs/regress-1.5.1
index dfcbcee379f1..da577b5c2b6b 100644
--- a/metadata/md5-cache/app-emacs/regress-1.5.1
+++ b/metadata/md5-cache/app-emacs/regress-1.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-1+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/regress-1.5.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=454d8fdde3e3ea865f8e165779e9cf41
diff --git a/metadata/md5-cache/app-emacs/remember-2.0-r1 b/metadata/md5-cache/app-emacs/remember-2.0-r1
index 46d02da05deb..ae92b1d79408 100644
--- a/metadata/md5-cache/app-emacs/remember-2.0-r1
+++ b/metadata/md5-cache/app-emacs/remember-2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=bbdb? ( app-emacs/bbdb ) planner? ( app-emacs/planner ) >=app-editors/em
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/jwiegley/remember/archive/v2.0.tar.gz -> remember-2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=10210f879c00a3cbf893a8599cc7f0d0
diff --git a/metadata/md5-cache/app-emacs/request-0.3.2 b/metadata/md5-cache/app-emacs/request-0.3.2
index 358dbee0479f..bbf815cb424a 100644
--- a/metadata/md5-cache/app-emacs/request-0.3.2
+++ b/metadata/md5-cache/app-emacs/request-0.3.2
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/deferred >=app-editors/emacs-24.4:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tkf/emacs-request/archive/v0.3.2.tar.gz -> request-0.3.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e9e9120223d168a756211373a47fe13f
diff --git a/metadata/md5-cache/app-emacs/request-0.3.3_p20220318 b/metadata/md5-cache/app-emacs/request-0.3.3_p20220318
index 675a9f0a153e..8c45f95b45b9 100644
--- a/metadata/md5-cache/app-emacs/request-0.3.3_p20220318
+++ b/metadata/md5-cache/app-emacs/request-0.3.3_p20220318
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/deferred >=app-editors/emacs-24.4:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/tkf/emacs-request/archive/c769cf33f2ac0a1a9798b508935c4b260e856ab5.tar.gz -> request-0.3.3_p20220318.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=308735dbc718652672fb5abaff3a063d
diff --git a/metadata/md5-cache/app-emacs/rescript-mode-0.1.0_p20220613 b/metadata/md5-cache/app-emacs/rescript-mode-0.1.0_p20220613
index 7d95ecef9375..c4e8d17b29d5 100644
--- a/metadata/md5-cache/app-emacs/rescript-mode-0.1.0_p20220613
+++ b/metadata/md5-cache/app-emacs/rescript-mode-0.1.0_p20220613
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jjlee/rescript-mode/archive/2aae2fbd4971dff965c758ec19688780ed7bff21.tar.gz -> rescript-mode-0.1.0_p20220613.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=905567539f6fe14606bc52f32cd9d93f
diff --git a/metadata/md5-cache/app-emacs/restclient-0_p20220426 b/metadata/md5-cache/app-emacs/restclient-0_p20220426
index dc2f3c5b3b0c..4606f55244f2 100644
--- a/metadata/md5-cache/app-emacs/restclient-0_p20220426
+++ b/metadata/md5-cache/app-emacs/restclient-0_p20220426
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=app-emacs/helm app-emacs/jq-mode >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/pashky/restclient.el/archive/ae79e7dd283890072da69b8f48aeec1afd0d9442.tar.gz -> restclient-0_p20220426.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f775e98b9f1e8f9e7f75b73f587505a4
diff --git a/metadata/md5-cache/app-emacs/revive-2.24 b/metadata/md5-cache/app-emacs/revive-2.24
index d899abf157f7..b9bd225bf635 100644
--- a/metadata/md5-cache/app-emacs/revive-2.24
+++ b/metadata/md5-cache/app-emacs/revive-2.24
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/revive-2.24.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3dccdc46beff89c1ebb4d15ff43f7acc
diff --git a/metadata/md5-cache/app-emacs/rfcview-0.13 b/metadata/md5-cache/app-emacs/rfcview-0.13
index fd43ad32a49a..219792095260 100644
--- a/metadata/md5-cache/app-emacs/rfcview-0.13
+++ b/metadata/md5-cache/app-emacs/rfcview-0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rfcview-0.13.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7c30a40b350b44dcf6a33b05e6f95a21
diff --git a/metadata/md5-cache/app-emacs/riece-9.0.0-r1 b/metadata/md5-cache/app-emacs/riece-9.0.0-r1
index 32d3f5b27f5b..1b6196a04bca 100644
--- a/metadata/md5-cache/app-emacs/riece-9.0.0-r1
+++ b/metadata/md5-cache/app-emacs/riece-9.0.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/riece/riece-9.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=90e679b73e3471815a6c329c5003fdea
diff --git a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6 b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
index 02a9db5213ae..32e33655c6bb 100644
--- a/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
+++ b/metadata/md5-cache/app-emacs/rnc-mode-1.0.6
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/TreeRex/rnc-mode/archive/1.0.6.tar.gz -> rnc-mode-1.0.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a88ec621d79879fd7772914c6f6f2545
diff --git a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15 b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
index 3ac381963d35..43c169fc435d 100644
--- a/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
+++ b/metadata/md5-cache/app-emacs/rpm-spec-mode-0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rpm-spec-mode-0.15.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ca9805e05a6f18a6dd5e9730536696ab
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3 b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
index df519e08c853..cda4ed88c57f 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.6.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/75bccbb384e6907df47ab69acdccb4536806c890.tar.gz -> ruby-mode-2.6.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1e2f0380f0c5918ba2112f38598bb9cb
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0 b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
index 1469ad77e965..836d4c31f8d6 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-2.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/defe0b586b2a888706507a7bbcdf1201d924cc2d.tar.gz -> ruby-mode-2.7.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0d7dc8966cd29dbaa8d8063947749ac5
diff --git a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0 b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
index c79f82af1991..28fbedc41c2c 100644
--- a/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
+++ b/metadata/md5-cache/app-emacs/ruby-mode-3.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ruby/elisp/archive/586b679b4ae9685a24003502249920e7721c6e24.tar.gz -> ruby-mode-3.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6e9dc89ba856ee8a392a2dcd1faecb89
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.1 b/metadata/md5-cache/app-emacs/rudel-0.3.1
index a847fc040823..f3d3388c5a6a 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.1
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.1.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=c1a209918a690f26dede24b956ebd6d8
diff --git a/metadata/md5-cache/app-emacs/rudel-0.3.2 b/metadata/md5-cache/app-emacs/rudel-0.3.2
index 1ae9f599ed6b..c6af52688b3f 100644
--- a/metadata/md5-cache/app-emacs/rudel-0.3.2
+++ b/metadata/md5-cache/app-emacs/rudel-0.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/rudel-0.3.2.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=174b6213b5605a40dc745fc0ec1021c6
diff --git a/metadata/md5-cache/app-emacs/rust-mode-0.4.0 b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
index 730b6d242742..303731c3a3be 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-0.4.0
+++ b/metadata/md5-cache/app-emacs/rust-mode-0.4.0
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/0.4.0.tar.gz -> rust-mode-0.4.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=46fbeccadc048af1adb746d0660cb358
diff --git a/metadata/md5-cache/app-emacs/rust-mode-1.0.4 b/metadata/md5-cache/app-emacs/rust-mode-1.0.4
index 4e669de8cef8..ebdcf88abbc4 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-1.0.4
+++ b/metadata/md5-cache/app-emacs/rust-mode-1.0.4
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/1.0.4.tar.gz -> rust-mode-1.0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=22f5fa47b45733cd314e2e1092f2c8f9
diff --git a/metadata/md5-cache/app-emacs/rust-mode-1.0.5 b/metadata/md5-cache/app-emacs/rust-mode-1.0.5
index 7929540768ff..04953e1d87b9 100644
--- a/metadata/md5-cache/app-emacs/rust-mode-1.0.5
+++ b/metadata/md5-cache/app-emacs/rust-mode-1.0.5
@@ -9,5 +9,5 @@ LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-mode/archive/1.0.5.tar.gz -> rust-mode-1.0.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=22f5fa47b45733cd314e2e1092f2c8f9
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0-r1 b/metadata/md5-cache/app-emacs/s-1.12.0-r1
index cc8fc7a935dc..a2e62eb8a984 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0-r1
+++ b/metadata/md5-cache/app-emacs/s-1.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=68b8bd7b317ad7b486b0b4c9c2056453
diff --git a/metadata/md5-cache/app-emacs/s-1.13.0 b/metadata/md5-cache/app-emacs/s-1.13.0
index 4bab32eca15b..11300043095b 100644
--- a/metadata/md5-cache/app-emacs/s-1.13.0
+++ b/metadata/md5-cache/app-emacs/s-1.13.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.13.0.tar.gz -> s-1.13.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d79e846f788516e22ecf3911c97a31a9
diff --git a/metadata/md5-cache/app-emacs/scala-mode-2.10.3 b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
index b5819f4890eb..3812a2086fc2 100644
--- a/metadata/md5-cache/app-emacs/scala-mode-2.10.3
+++ b/metadata/md5-cache/app-emacs/scala-mode-2.10.3
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-lang/scala >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://www.scala-lang.org/files/archive/scala-tool-support-2.10.3.tgz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d23eb7d1b7832227d68b59e686e5484b
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
index cb6f2e8ac74c..84c921e49e7e 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.8
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.8.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=691b40f044a1d8813808672c7efb1cda
diff --git a/metadata/md5-cache/app-emacs/scheme-complete-0.9.9 b/metadata/md5-cache/app-emacs/scheme-complete-0.9.9
index fc8bf3c00f82..6d6fe090e569 100644
--- a/metadata/md5-cache/app-emacs/scheme-complete-0.9.9
+++ b/metadata/md5-cache/app-emacs/scheme-complete-0.9.9
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://synthcode.com/emacs/scheme-complete-0.9.9.el.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c491189402a0559461df5fc4b7345862
diff --git a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1 b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
index 3a627d2499a5..db96413d1e70 100644
--- a/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
+++ b/metadata/md5-cache/app-emacs/scim-bridge-el-0.8.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-i18n/scim >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/scim-bridge.el/0.8/0.8.2/+download/scim-bridge-el-0.8.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=ec7289150fac0fb342c2ac2a2265461d
diff --git a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1 b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
index 0b1b65b5b6c3..e2c6d99b0fa4 100644
--- a/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
+++ b/metadata/md5-cache/app-emacs/scss-mode-0.5.0_p20180123-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-ruby/sass >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/antonj/scss-mode/archive/cf58dbec5394280503eb5502938f3b5445d1b53d.tar.gz -> scss-mode-0.5.0_p20180123.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f21b6da45eb524b1fa5e5a33f95afd56
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
index 22d8115cb67c..318e7d9b43b6 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20190517
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/4cf114c95fb49ad75eb6916f678b45b04bad8122.tar.gz -> semi-1.14.7_p20190517.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=36cd2a8cd177d9cf2564e413b9f252f4
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
index 96735d0d67e2..0eda7e9fbcd9 100644
--- a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/semi/archive/509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f.tar.gz -> semi-1.14.7_p20210613.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=df45b860c618af5b17b3c04641775cd1
diff --git a/metadata/md5-cache/app-emacs/servant-0.3.0 b/metadata/md5-cache/app-emacs/servant-0.3.0
index 54938254e322..c5c2a73670db 100644
--- a/metadata/md5-cache/app-emacs/servant-0.3.0
+++ b/metadata/md5-cache/app-emacs/servant-0.3.0
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/ansi app-emacs/commander app-emacs/dash app-emacs/epl app-emac
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/cask/servant/archive/v0.3.0.tar.gz -> servant-0.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=41b67b8261a0c3dbb8ecc3683876dbf7
diff --git a/metadata/md5-cache/app-emacs/session-2.4b b/metadata/md5-cache/app-emacs/session-2.4b
index 28b611752709..b6ce0746b721 100644
--- a/metadata/md5-cache/app-emacs/session-2.4b
+++ b/metadata/md5-cache/app-emacs/session-2.4b
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-session/session-2.4b.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=ecc272b50db98a62134bc1c44d6d8b5e
diff --git a/metadata/md5-cache/app-emacs/setnu-1.06 b/metadata/md5-cache/app-emacs/setnu-1.06
index a3e7be4d5ee2..7358598d10cc 100644
--- a/metadata/md5-cache/app-emacs/setnu-1.06
+++ b/metadata/md5-cache/app-emacs/setnu-1.06
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/setnu-1.06.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f855398be985c9e27b678668fc242604
diff --git a/metadata/md5-cache/app-emacs/setup-1.2.0 b/metadata/md5-cache/app-emacs/setup-1.2.0
index 9daca8475872..cf6c4f042495 100644
--- a/metadata/md5-cache/app-emacs/setup-1.2.0
+++ b/metadata/md5-cache/app-emacs/setup-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/setup/archive/4fc13e309ec1585a7e5033c394fa25a3078e39c5.tar.gz -> setup-1.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=020190de5f0b327197182290e9be9299
diff --git a/metadata/md5-cache/app-emacs/setup-1.3.0 b/metadata/md5-cache/app-emacs/setup-1.3.0
index 858b3e9c737f..147bc731d046 100644
--- a/metadata/md5-cache/app-emacs/setup-1.3.0
+++ b/metadata/md5-cache/app-emacs/setup-1.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/setup/archive/eece09d1151fd641f31d738b8c62742918993e95.tar.gz -> setup-1.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6a537b8e55ee2b9b7398723d327ec257
diff --git a/metadata/md5-cache/app-emacs/setup-1.3.2 b/metadata/md5-cache/app-emacs/setup-1.3.2
index 7f12cf543426..36e09d62934f 100644
--- a/metadata/md5-cache/app-emacs/setup-1.3.2
+++ b/metadata/md5-cache/app-emacs/setup-1.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-26.1:*
 SLOT=0
 SRC_URI=https://git.sr.ht/~pkal/setup/archive/28926bd11eef6118f4e169d10c1c36b8c4e545ae.tar.gz -> setup-1.3.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e01c25cf87b5a0b26fb15f2f9e6198a0
diff --git a/metadata/md5-cache/app-emacs/shell-split-string-0.1 b/metadata/md5-cache/app-emacs/shell-split-string-0.1
index f75840641833..5033c213e687 100644
--- a/metadata/md5-cache/app-emacs/shell-split-string-0.1
+++ b/metadata/md5-cache/app-emacs/shell-split-string-0.1
@@ -9,5 +9,5 @@ LICENSE=Unlicense
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/10sr/shell-split-string-el/archive/v0.1.tar.gz -> shell-split-string-0.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=198b3b95852fa9a5022661c6d75977d2
diff --git a/metadata/md5-cache/app-emacs/shut-up-0.3.3 b/metadata/md5-cache/app-emacs/shut-up-0.3.3
index 2a0f6c887bd8..b1e36edb3b68 100644
--- a/metadata/md5-cache/app-emacs/shut-up-0.3.3
+++ b/metadata/md5-cache/app-emacs/shut-up-0.3.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cask/shut-up/archive/v0.3.3.tar.gz -> shut-up-0.3.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7de3ccd116cc0ae3b41eecfd93a9a2cb
diff --git a/metadata/md5-cache/app-emacs/slime-2.27 b/metadata/md5-cache/app-emacs/slime-2.27
index 3215696bdf56..04e01a6193a3 100644
--- a/metadata/md5-cache/app-emacs/slime-2.27
+++ b/metadata/md5-cache/app-emacs/slime-2.27
@@ -12,5 +12,5 @@ RDEPEND=virtual/commonlisp dev-lisp/asdf >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/slime/slime/archive/v2.27.tar.gz -> slime-2.27.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=28dffc4209654ed257040f9a1fe1e86a
diff --git a/metadata/md5-cache/app-emacs/sly-1.0.43 b/metadata/md5-cache/app-emacs/sly-1.0.43
index 02a836716056..408ccf7053f4 100644
--- a/metadata/md5-cache/app-emacs/sly-1.0.43
+++ b/metadata/md5-cache/app-emacs/sly-1.0.43
@@ -11,5 +11,5 @@ LICENSE=public-domain GPL-2+ GPL-3+ LLGPL-2.1 ZLIB xref? ( xref.lisp )
 RDEPEND=dev-lisp/asdf dev-lisp/sbcl >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joaotavora/sly/archive/1.0.43.tar.gz -> sly-1.0.43.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b61e87bdc835825131078807de4d6549
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.10 b/metadata/md5-cache/app-emacs/sml-mode-6.10
index bd0533e6fb1d..21382d35f288 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.10
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/sml-mode-6.10.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6defd2b5d8249785c6855792345e6b8e
diff --git a/metadata/md5-cache/app-emacs/sml-mode-6.9 b/metadata/md5-cache/app-emacs/sml-mode-6.9
index 1f2276cb882b..4af63ac5a199 100644
--- a/metadata/md5-cache/app-emacs/sml-mode-6.9
+++ b/metadata/md5-cache/app-emacs/sml-mode-6.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/sml-mode-6.9.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8a9aacf862113149ae1d968869d6510f
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4.8 b/metadata/md5-cache/app-emacs/sokoban-1.4.8
index f379229cdd2b..237798f90760 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4.8
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.8.tar
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=22eea890fdfa7f597bc1762942844d34
diff --git a/metadata/md5-cache/app-emacs/sokoban-1.4.9 b/metadata/md5-cache/app-emacs/sokoban-1.4.9
index ae56579e85fd..7dcb8092b045 100644
--- a/metadata/md5-cache/app-emacs/sokoban-1.4.9
+++ b/metadata/md5-cache/app-emacs/sokoban-1.4.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://elpa.gnu.org/packages/sokoban-1.4.9.tar
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8fbaca5dcfaf0a55919d0622497d0316
diff --git a/metadata/md5-cache/app-emacs/spacemacs-theme-0.2 b/metadata/md5-cache/app-emacs/spacemacs-theme-0.2
index c8a29b34de06..afd55437c481 100644
--- a/metadata/md5-cache/app-emacs/spacemacs-theme-0.2
+++ b/metadata/md5-cache/app-emacs/spacemacs-theme-0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/nashamri/spacemacs-theme/archive/0.2.tar.gz -> spacemacs-theme-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c465358a5663d77f47ba88efa42197a8
diff --git a/metadata/md5-cache/app-emacs/spacemacs-theme-0.3 b/metadata/md5-cache/app-emacs/spacemacs-theme-0.3
index a3bb2adae337..f039605c1756 100644
--- a/metadata/md5-cache/app-emacs/spacemacs-theme-0.3
+++ b/metadata/md5-cache/app-emacs/spacemacs-theme-0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/nashamri/spacemacs-theme/archive/0.3.tar.gz -> spacemacs-theme-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0d9764c4ddccfba076df22df385e660b
diff --git a/metadata/md5-cache/app-emacs/spinner-1.7.4 b/metadata/md5-cache/app-emacs/spinner-1.7.4
index 481a05f05e64..c01e7c3b84f6 100644
--- a/metadata/md5-cache/app-emacs/spinner-1.7.4
+++ b/metadata/md5-cache/app-emacs/spinner-1.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/Malabarba/spinner.el/archive/1.7.4.tar.gz -> spinner-1.7.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=437505ef676f1cfcf1d6a302a9694f19
diff --git a/metadata/md5-cache/app-emacs/ssh-20120709 b/metadata/md5-cache/app-emacs/ssh-20120709
index f02d8e5dac17..5daef8ac9afb 100644
--- a/metadata/md5-cache/app-emacs/ssh-20120709
+++ b/metadata/md5-cache/app-emacs/ssh-20120709
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/ssh-20120709.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b2f045a285858cebfeff26c45f702d5e
diff --git a/metadata/md5-cache/app-emacs/string-inflection-1.0.16 b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
index d31b57d7737e..6f50190a6acf 100644
--- a/metadata/md5-cache/app-emacs/string-inflection-1.0.16
+++ b/metadata/md5-cache/app-emacs/string-inflection-1.0.16
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/akicho8/string-inflection/archive/v1.0.16.tar.gz -> string-inflection-1.0.16.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e751cd638166ccfb54c7b0f3e2dc1dce
diff --git a/metadata/md5-cache/app-emacs/stripes-0.2-r2 b/metadata/md5-cache/app-emacs/stripes-0.2-r2
index 65b8fe923c7a..d1ead5853d30 100644
--- a/metadata/md5-cache/app-emacs/stripes-0.2-r2
+++ b/metadata/md5-cache/app-emacs/stripes-0.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/stripes-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=55fa2593b7c9292e9044890eb9ff3a4a
diff --git a/metadata/md5-cache/app-emacs/sumibi-0.7.4 b/metadata/md5-cache/app-emacs/sumibi-0.7.4
index 1dbc3fb638f0..0eb6899b30e9 100644
--- a/metadata/md5-cache/app-emacs/sumibi-0.7.4
+++ b/metadata/md5-cache/app-emacs/sumibi-0.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/sumibi/26504/sumibi-0.7.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c03ed682ab3cf377d43ebdaf661d4b0d
diff --git a/metadata/md5-cache/app-emacs/sunrise-commander-6_p20210927 b/metadata/md5-cache/app-emacs/sunrise-commander-6_p20210927
index d1fa17972895..cdc5997e6f12 100644
--- a/metadata/md5-cache/app-emacs/sunrise-commander-6_p20210927
+++ b/metadata/md5-cache/app-emacs/sunrise-commander-6_p20210927
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/sunrise-commander/sunrise-commander/archive/16e6df7e86c7a383fb4400fae94af32baf9cb24e.tar.gz -> sunrise-commander-6_p20210927.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c159f4dc85761fda9535c2f4be29f624
diff --git a/metadata/md5-cache/app-emacs/swiper-0.13.4 b/metadata/md5-cache/app-emacs/swiper-0.13.4
index 37837c7dfa64..ca81b9ed33cf 100644
--- a/metadata/md5-cache/app-emacs/swiper-0.13.4
+++ b/metadata/md5-cache/app-emacs/swiper-0.13.4
@@ -10,5 +10,5 @@ RDEPEND=>=app-emacs/ivy-0.13.4 >=app-editors/emacs-24.5:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/abo-abo/swiper/archive/0.13.4.tar.gz -> swiper-0.13.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d198119a8b9c9f457e03c3569a9f6abb
diff --git a/metadata/md5-cache/app-emacs/switch-window-1.6.2_p20210808 b/metadata/md5-cache/app-emacs/switch-window-1.6.2_p20210808
index e6b26c1ffb7a..711b898c6214 100644
--- a/metadata/md5-cache/app-emacs/switch-window-1.6.2_p20210808
+++ b/metadata/md5-cache/app-emacs/switch-window-1.6.2_p20210808
@@ -9,5 +9,5 @@ LICENSE=WTFPL-2
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/dimitri/switch-window/archive/8d9fe251d8d38b223d643df975876356ddfc1b98.tar.gz -> switch-window-1.6.2_p20210808.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=56c17c587d7429222ce5dc7474361e22
diff --git a/metadata/md5-cache/app-emacs/system-packages-1.1.0 b/metadata/md5-cache/app-emacs/system-packages-1.1.0
index 7a5e03e3312b..4c67d6cd9cd9 100644
--- a/metadata/md5-cache/app-emacs/system-packages-1.1.0
+++ b/metadata/md5-cache/app-emacs/system-packages-1.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://gitlab.com/jabranham/system-packages/-/archive/1.1.0/system-packages-1.1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1016a64dcc0ad929d8e6de28c0c9743c
diff --git a/metadata/md5-cache/app-emacs/systemd-mode-1.6 b/metadata/md5-cache/app-emacs/systemd-mode-1.6
index fcbb4b2882d1..836a46112b34 100644
--- a/metadata/md5-cache/app-emacs/systemd-mode-1.6
+++ b/metadata/md5-cache/app-emacs/systemd-mode-1.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/holomorph/systemd-mode/archive/v1.6.tar.gz -> systemd-mode-1.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=0dd61e3920d919774d8c29e970cdd5d6
diff --git a/metadata/md5-cache/app-emacs/tablist-1.0 b/metadata/md5-cache/app-emacs/tablist-1.0
index f38b3084b672..8f1de2731761 100644
--- a/metadata/md5-cache/app-emacs/tablist-1.0
+++ b/metadata/md5-cache/app-emacs/tablist-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/politza/tablist/archive/v1.0.tar.gz -> tablist-1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7561c21c08412f094d2bcba68163151f
diff --git a/metadata/md5-cache/app-emacs/teco-7-r2 b/metadata/md5-cache/app-emacs/teco-7-r2
index 2be7d039167f..f9af7873a2fe 100644
--- a/metadata/md5-cache/app-emacs/teco-7-r2
+++ b/metadata/md5-cache/app-emacs/teco-7-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/teco-7.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=86a0a97d8ca852f51babb3586641b6d0
diff --git a/metadata/md5-cache/app-emacs/template-3.3b b/metadata/md5-cache/app-emacs/template-3.3b
index b3df16a65315..dd95a73a4228 100644
--- a/metadata/md5-cache/app-emacs/template-3.3b
+++ b/metadata/md5-cache/app-emacs/template-3.3b
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/emacs-template/template-3.3b.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=23d681966816d0b3bdde17eb4956326a
diff --git a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5 b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
index 50c2617c5b7c..20e0d1c0753d 100644
--- a/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
+++ b/metadata/md5-cache/app-emacs/tempo-snippets-0.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/tempo-snippets-0.1.5.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=52e360f6f6f36839a686d1149cc3a307
diff --git a/metadata/md5-cache/app-emacs/thinks-1.12 b/metadata/md5-cache/app-emacs/thinks-1.12
index de1a2f55397f..f5dadcf957a4 100644
--- a/metadata/md5-cache/app-emacs/thinks-1.12
+++ b/metadata/md5-cache/app-emacs/thinks-1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/thinks.el/archive/v1.12.tar.gz -> thinks-1.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d2d4b38eafb7f7423dbbcbc4f98bde9a
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.6 b/metadata/md5-cache/app-emacs/transient-0.3.6
index d72a2693234c..268a5754b433 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.6
+++ b/metadata/md5-cache/app-emacs/transient-0.3.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.6.tar.gz -> transient-0.3.6.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f4d02aaf594288ab43256f6d65a3c8fe
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.7 b/metadata/md5-cache/app-emacs/transient-0.3.7
index ca77d603d18b..c376b929b6c4 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.7
+++ b/metadata/md5-cache/app-emacs/transient-0.3.7
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/v0.3.7.tar.gz -> transient-0.3.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5a549afa54fe6a7963a84db0d3e2e3ac
diff --git a/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1 b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
index 758ad659a032..89a1b63c8b7f 100644
--- a/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
+++ b/metadata/md5-cache/app-emacs/transient-0.3.7_p20220918-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/compat >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/magit/transient/archive/097f5be6e0c228790a6e78ffee5f0c599cb58b20.tar.gz -> transient-0.3.7_p20220918.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=a9e597373e1b32106aef5bdcd5542eff
diff --git a/metadata/md5-cache/app-emacs/treemacs-2.10-r2 b/metadata/md5-cache/app-emacs/treemacs-2.10-r2
index b5495c48a4dd..27b1d718c3f3 100644
--- a/metadata/md5-cache/app-emacs/treemacs-2.10-r2
+++ b/metadata/md5-cache/app-emacs/treemacs-2.10-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/2.10.tar.gz -> treemacs-2.10.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=9415f00e7944818a02fc726183ef4b52
diff --git a/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2 b/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
index f65654c721b7..4eecb7267fa2 100644
--- a/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
+++ b/metadata/md5-cache/app-emacs/treemacs-2.9.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/2.9.5.tar.gz -> treemacs-2.9.5.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=0a7b81eae8763899e1cd9fe1ffa1fa18
diff --git a/metadata/md5-cache/app-emacs/treemacs-3.0-r1 b/metadata/md5-cache/app-emacs/treemacs-3.0-r1
index bbeee69f93cf..08c66311a39e 100644
--- a/metadata/md5-cache/app-emacs/treemacs-3.0-r1
+++ b/metadata/md5-cache/app-emacs/treemacs-3.0-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Alexander-Miller/treemacs/archive/3.0.tar.gz -> treemacs-3.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b71d61e58a407222ed345aa8a2d9bbe3
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1 b/metadata/md5-cache/app-emacs/treepy-0.1.1
index 5b9611e97d27..94a1db2f90bb 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=aeea164ef25d795b6558eaeed4cdadad
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1 b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
index db745236ab71..bd3886c11891 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.1.tar.gz -> treepy-0.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=01a136a13f8b5e8acdf8d51019a31784
diff --git a/metadata/md5-cache/app-emacs/treepy-0.1.2 b/metadata/md5-cache/app-emacs/treepy-0.1.2
index 22e0f8783021..2592fc399cf1 100644
--- a/metadata/md5-cache/app-emacs/treepy-0.1.2
+++ b/metadata/md5-cache/app-emacs/treepy-0.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/volrath/treepy.el/archive/0.1.2.tar.gz -> treepy-0.1.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=aa68204f68813df9b54124f0ea516bab
diff --git a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0 b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
index 65ddf4f8454e..fce314017479 100644
--- a/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
+++ b/metadata/md5-cache/app-emacs/tuareg-mode-2.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+ ISC
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/ocaml/tuareg/archive/2.2.0.tar.gz -> tuareg-mode-2.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=e76c62edb1664ab0ac7eb25f2ca4ad82
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0-r1 b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0-r1
index 437c79be52f7..45c2e10db381 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-3.0.0-r1
+++ b/metadata/md5-cache/app-emacs/twittering-mode-3.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/twmode/twittering-mode-3.0.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=eaae45563f59779c1cf3c990bc69c214
diff --git a/metadata/md5-cache/app-emacs/twittering-mode-9999 b/metadata/md5-cache/app-emacs/twittering-mode-9999
index f3e0f0a56698..2a3453177743 100644
--- a/metadata/md5-cache/app-emacs/twittering-mode-9999
+++ b/metadata/md5-cache/app-emacs/twittering-mode-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=app-crypt/gnupg >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53
 _md5_=eaae45563f59779c1cf3c990bc69c214
diff --git a/metadata/md5-cache/app-emacs/typescript-mode-0.4 b/metadata/md5-cache/app-emacs/typescript-mode-0.4
index dc7028eed804..7001ce44f961 100644
--- a/metadata/md5-cache/app-emacs/typescript-mode-0.4
+++ b/metadata/md5-cache/app-emacs/typescript-mode-0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/emacs-typescript/typescript.el/archive/v0.4.tar.gz -> typescript-mode-0.4.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=00026d24c4ccef872d6be3090d3f8a11
diff --git a/metadata/md5-cache/app-emacs/typing-1.1.4 b/metadata/md5-cache/app-emacs/typing-1.1.4
index 05475c0c04b7..9e98d508e2aa 100644
--- a/metadata/md5-cache/app-emacs/typing-1.1.4
+++ b/metadata/md5-cache/app-emacs/typing-1.1.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/typing-1.1.4.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=42a54d5ccf1e0c41e970f270e7cad928
diff --git a/metadata/md5-cache/app-emacs/uboat-1.2 b/metadata/md5-cache/app-emacs/uboat-1.2
index 3d64b95ba0b4..a754ed48cf9e 100644
--- a/metadata/md5-cache/app-emacs/uboat-1.2
+++ b/metadata/md5-cache/app-emacs/uboat-1.2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/uboat-1.2.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=33cd4e097598d2913d4db0db81e33e02
diff --git a/metadata/md5-cache/app-emacs/undercover-0.8.1 b/metadata/md5-cache/app-emacs/undercover-0.8.1
index 44702c56aeca..8f5550da0100 100644
--- a/metadata/md5-cache/app-emacs/undercover-0.8.1
+++ b/metadata/md5-cache/app-emacs/undercover-0.8.1
@@ -10,5 +10,5 @@ RDEPEND=app-emacs/dash app-emacs/shut-up >=app-editors/emacs-24:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/undercover-el/undercover.el/archive/v0.8.1.tar.gz -> undercover-0.8.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9166bff4aa513a9b4e958d9e046aa1d0
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.6.6 b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
index c5c9b2ba2973..1152ca56a2a7 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.6.6
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.6.6
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/undo-tree-0.6.6.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=1ab3ccd61c2c1ac84c0473a469b00aca
diff --git a/metadata/md5-cache/app-emacs/undo-tree-0.8.1 b/metadata/md5-cache/app-emacs/undo-tree-0.8.1
index bb48bd4162df..7b3bd44a1473 100644
--- a/metadata/md5-cache/app-emacs/undo-tree-0.8.1
+++ b/metadata/md5-cache/app-emacs/undo-tree-0.8.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/queue >=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://gitlab.com/tsc25/undo-tree/-/archive/release/0.8.1/undo-tree-release-0.8.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=7f2127584c9057a5c04f9c6d9c01d5f9
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.7 b/metadata/md5-cache/app-emacs/uptimes-3.7
index 56cfba73cb8a..31d785f7f82b 100644
--- a/metadata/md5-cache/app-emacs/uptimes-3.7
+++ b/metadata/md5-cache/app-emacs/uptimes-3.7
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.7.tar.gz -> uptimes-3.7.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=204e9669ff84a30760a2cf1e179f7ca5
diff --git a/metadata/md5-cache/app-emacs/uptimes-3.8 b/metadata/md5-cache/app-emacs/uptimes-3.8
index 9d59e4a62a0e..27d78c5c4209 100644
--- a/metadata/md5-cache/app-emacs/uptimes-3.8
+++ b/metadata/md5-cache/app-emacs/uptimes-3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/uptimes.el/archive/v3.8.tar.gz -> uptimes-3.8.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=362ef9746f280ee4ccfd8ff0e8a58f73
diff --git a/metadata/md5-cache/app-emacs/use-package-2.4.1 b/metadata/md5-cache/app-emacs/use-package-2.4.1
index c58533749794..694da6ae392b 100644
--- a/metadata/md5-cache/app-emacs/use-package-2.4.1
+++ b/metadata/md5-cache/app-emacs/use-package-2.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/bind-chord app-emacs/bind-key app-emacs/diminish app-emacs/system-packages >=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/jwiegley/use-package/archive/2.4.1.tar.gz -> use-package-2.4.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=26a8ea19d8d03a0ebe1ce8830f5c7d75
diff --git a/metadata/md5-cache/app-emacs/uxntal-mode-0.2 b/metadata/md5-cache/app-emacs/uxntal-mode-0.2
index 05d3d5d2e006..586593e806e9 100644
--- a/metadata/md5-cache/app-emacs/uxntal-mode-0.2
+++ b/metadata/md5-cache/app-emacs/uxntal-mode-0.2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=app-editors/emacs-27.1:*
 SLOT=0
 SRC_URI=https://github.com/non/uxntal-mode/archive/v0.2.tar.gz -> uxntal-mode-0.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6fb2d6f4f537d7cad3b2310beb2fe868
diff --git a/metadata/md5-cache/app-emacs/vertico-0.26 b/metadata/md5-cache/app-emacs/vertico-0.26
index 3ade2e3dd8a5..471369859649 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.26
+++ b/metadata/md5-cache/app-emacs/vertico-0.26
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.26.tar.gz -> vertico-0.26.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fa56ad84232a6cdecfe80203c7bb7395
diff --git a/metadata/md5-cache/app-emacs/vertico-0.27 b/metadata/md5-cache/app-emacs/vertico-0.27
index 113f495efa4b..dff7bb78d6df 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.27
+++ b/metadata/md5-cache/app-emacs/vertico-0.27
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.27.tar.gz -> vertico-0.27.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fa56ad84232a6cdecfe80203c7bb7395
diff --git a/metadata/md5-cache/app-emacs/vertico-0.28 b/metadata/md5-cache/app-emacs/vertico-0.28
index 1a5925a4d322..70f4fd26ac6b 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.28
+++ b/metadata/md5-cache/app-emacs/vertico-0.28
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
 SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.28.tar.gz -> vertico-0.28.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=fa56ad84232a6cdecfe80203c7bb7395
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
index 54a8b314085b..733ce795d22e 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=69977c84df39b326ed9b198ea40e682a
diff --git a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.3 b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.3
index fc1956fa644b..bb1c9c670d7f 100644
--- a/metadata/md5-cache/app-emacs/vhdl-mode-3.38.3
+++ b/metadata/md5-cache/app-emacs/vhdl-mode-3.38.3
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://iis-people.ee.ethz.ch/~zimmi/emacs/vhdl-mode-3.38.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=d6bff25b9160dd5fb0e02193d345dc72
diff --git a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5 b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
index 6215c0030a58..843d0f09f156 100644
--- a/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
+++ b/metadata/md5-cache/app-emacs/visual-basic-mode-1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/visual-basic-mode-1.5.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4df42e42f6fdf4752515b3f30a519651
diff --git a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1 b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
index 04168e2271af..c85199a5b438 100644
--- a/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
+++ b/metadata/md5-cache/app-emacs/vm-8.2.0_beta-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://launchpad.net/vm/8.2.x/8.2.0b/+download/vm-8.2.0b.tgz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=9bbe4b329ef0101820c50af46c7e1d1d
diff --git a/metadata/md5-cache/app-emacs/vm-9999 b/metadata/md5-cache/app-emacs/vm-9999
index 11a0d5b8aaaf..b72bce0e49b7 100644
--- a/metadata/md5-cache/app-emacs/vm-9999
+++ b/metadata/md5-cache/app-emacs/vm-9999
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 PROPERTIES=live
 RDEPEND=bbdb? ( app-emacs/bbdb ) ssl? ( net-misc/stunnel ) >=app-editors/emacs-23.1:*
 SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bzr	7cb3dc115386774940b4ad76a8d0bfe4	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bzr	7cb3dc115386774940b4ad76a8d0bfe4	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=02dd201365556a860a02209e449a6c09
diff --git a/metadata/md5-cache/app-emacs/volume-1.0-r1 b/metadata/md5-cache/app-emacs/volume-1.0-r1
index a29b2c388281..66f91bcd653b 100644
--- a/metadata/md5-cache/app-emacs/volume-1.0-r1
+++ b/metadata/md5-cache/app-emacs/volume-1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/volume-1.0.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5aa812e0f2f52b201796751703ed8411
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
index 4f65f09f11ec..9379ac21ab4d 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20200713
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/f41849c2c9c1899f22d1c3d4f871ec47c82627ce.tar.gz -> vterm-0.0.1_pre20200713.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=51f2968bbc9fe9ef9255ec396acb05e8
diff --git a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618 b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
index 39190a5b7531..0ef2736b6f98 100644
--- a/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
+++ b/metadata/md5-cache/app-emacs/vterm-0.0.1_pre20210618
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-libs/libvterm >=app-editors/emacs-26:*[dynamic-loading] >=app-editors/emacs-26:*
 SLOT=0
 SRC_URI=https://github.com/akermu/emacs-libvterm/archive/d9dfa624679afdd5db6ad25429ef86d3dd91401e.tar.gz -> vterm-0.0.1_pre20210618.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c166173f7c46a240b71d08ff2319d7fd
diff --git a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3 b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
index 9820e3fbda57..610270d4d25c 100644
--- a/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
+++ b/metadata/md5-cache/app-emacs/w3mnav-0.5-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/emacs-w3m >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/w3mnav-0.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=919189ded4dbe08e72b3e911f4c7c603
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
index 10404f575f55..10753054a222 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20190623
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/b9a529a54b9e7eafa4ed230ad28efffe0d25a20e.tar.gz -> wanderlust-2.15.9_p20190623.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5b15c148c95529b83eb33d507b8ec4db
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
index 0bd1d9c49871..166fdbc25e89 100644
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-24.5:*
 SLOT=0
 SRC_URI=https://github.com/wanderlust/wanderlust/archive/769699d60aa033049804083b459ee562b82db77e.tar.gz -> wanderlust-2.15.9_p20210629.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b35d8cf3e60d974336590853c01c7c1e
diff --git a/metadata/md5-cache/app-emacs/web-mode-17.2.1 b/metadata/md5-cache/app-emacs/web-mode-17.2.1
index 2f642aa99c00..8eb80d202533 100644
--- a/metadata/md5-cache/app-emacs/web-mode-17.2.1
+++ b/metadata/md5-cache/app-emacs/web-mode-17.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/fxbois/web-mode/archive/v17.2.1.tar.gz -> web-mode-17.2.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=32d4d9188e0444d438872a1a88db9c5b
diff --git a/metadata/md5-cache/app-emacs/web-server-0.1.2_p20210708 b/metadata/md5-cache/app-emacs/web-server-0.1.2_p20210708
index 7a5664d61112..e6abfac3834c 100644
--- a/metadata/md5-cache/app-emacs/web-server-0.1.2_p20210708
+++ b/metadata/md5-cache/app-emacs/web-server-0.1.2_p20210708
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.1:*
 SLOT=0
 SRC_URI=https://github.com/eschulte/emacs-web-server/archive/6357a1c2d1718778503f7ee0909585094117525b.tar.gz -> web-server-0.1.2_p20210708.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=3608871308784f2d6b34a57347fe18d1
diff --git a/metadata/md5-cache/app-emacs/webpaste-3.2.2 b/metadata/md5-cache/app-emacs/webpaste-3.2.2
index 73515338518f..5ef63abca170 100644
--- a/metadata/md5-cache/app-emacs/webpaste-3.2.2
+++ b/metadata/md5-cache/app-emacs/webpaste-3.2.2
@@ -11,5 +11,5 @@ RDEPEND=app-emacs/request >=app-editors/emacs-24.4:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/etu/webpaste.el/archive/3.2.2.tar.gz -> webpaste-3.2.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=04bd6698065104a73974fbff5db68ccf
diff --git a/metadata/md5-cache/app-emacs/websocket-1.12 b/metadata/md5-cache/app-emacs/websocket-1.12
index ae894c083966..7bd202df5637 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.12
+++ b/metadata/md5-cache/app-emacs/websocket-1.12
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.12.tar.gz -> websocket-1.12.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=4a502fd7fc4a99799ac2ea62ed0dc485
diff --git a/metadata/md5-cache/app-emacs/websocket-1.13 b/metadata/md5-cache/app-emacs/websocket-1.13
index fa919e1236ad..86e64c562edd 100644
--- a/metadata/md5-cache/app-emacs/websocket-1.13
+++ b/metadata/md5-cache/app-emacs/websocket-1.13
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/1.13.tar.gz -> websocket-1.13.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=dc995bfbcab3887b22fb48d49bf612d6
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.0 b/metadata/md5-cache/app-emacs/wgrep-2.3.0
index 5ca772958285..d23ca33ebfb3 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.0
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.0.tar.gz -> wgrep-2.3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=86de93ca42271781271c75d7bdc492f3
diff --git a/metadata/md5-cache/app-emacs/wgrep-2.3.2 b/metadata/md5-cache/app-emacs/wgrep-2.3.2
index 04ef3fa3b807..54966d7cdc29 100644
--- a/metadata/md5-cache/app-emacs/wgrep-2.3.2
+++ b/metadata/md5-cache/app-emacs/wgrep-2.3.2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/mhayashi1120/Emacs-wgrep/archive/2.3.2.tar.gz -> wgrep-2.3.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=bb27c1fcdc7f6274c98b903d1d218ac3
diff --git a/metadata/md5-cache/app-emacs/which-key-3.6.0 b/metadata/md5-cache/app-emacs/which-key-3.6.0
index 867aa5f22461..37e519555b56 100644
--- a/metadata/md5-cache/app-emacs/which-key-3.6.0
+++ b/metadata/md5-cache/app-emacs/which-key-3.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/justbur/emacs-which-key/archive/v3.6.0.tar.gz -> which-key-3.6.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=23d414314479381c72c255ee6773cc9f
diff --git a/metadata/md5-cache/app-emacs/whine-20091222 b/metadata/md5-cache/app-emacs/whine-20091222
index b65bc54aa231..bc018f02f941 100644
--- a/metadata/md5-cache/app-emacs/whine-20091222
+++ b/metadata/md5-cache/app-emacs/whine-20091222
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/whine-20091222.tar.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7367bfc14b56e1d064d2117d0dd29e4d
diff --git a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2 b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
index 565bc2c9272c..995ae2f1eb07 100644
--- a/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
+++ b/metadata/md5-cache/app-emacs/wikipedia-mode-0.5-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=outline-magic? ( app-emacs/outline-magic ) >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-mode-0.5.el.bz2
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=8654a24ce284787db1207a4bed6c0d4c
diff --git a/metadata/md5-cache/app-emacs/windows-2.53 b/metadata/md5-cache/app-emacs/windows-2.53
index e6c1978a6c60..dcc730fe9e41 100644
--- a/metadata/md5-cache/app-emacs/windows-2.53
+++ b/metadata/md5-cache/app-emacs/windows-2.53
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=app-emacs/revive >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/windows-2.53.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1a414a30b7d0e3a3b47f793ec5adb13b
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.8.3 b/metadata/md5-cache/app-emacs/with-editor-2.8.3
index b94f0170542f..5e858b40609c 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.8.3
+++ b/metadata/md5-cache/app-emacs/with-editor-2.8.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v2.8.3.tar.gz -> with-editor-2.8.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=1dc78804774f7b958baf8bfb95a1df7a
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.0.5 b/metadata/md5-cache/app-emacs/with-editor-3.0.5
index af59b735c497..7549d186c478 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.0.5
+++ b/metadata/md5-cache/app-emacs/with-editor-3.0.5
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.0.5.tar.gz -> with-editor-3.0.5.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=7e08f06fb4e50fdc4952b536e91144c6
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.1.1 b/metadata/md5-cache/app-emacs/with-editor-3.1.1
index 2b83dd58be2a..34c04fbccc6e 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.1.1
+++ b/metadata/md5-cache/app-emacs/with-editor-3.1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.1.1.tar.gz -> with-editor-3.1.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=6b734049010eaec5026638352205f2f0
diff --git a/metadata/md5-cache/app-emacs/with-editor-3.2.0 b/metadata/md5-cache/app-emacs/with-editor-3.2.0
index 42df60af88b0..a0573e94794f 100644
--- a/metadata/md5-cache/app-emacs/with-editor-3.2.0
+++ b/metadata/md5-cache/app-emacs/with-editor-3.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24:*
 SLOT=0
 SRC_URI=https://github.com/magit/with-editor/archive/v3.2.0.tar.gz -> with-editor-3.2.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5c1d4fcab272108ee4fb4ca92148e6e5
diff --git a/metadata/md5-cache/app-emacs/with-simulated-input-3.0 b/metadata/md5-cache/app-emacs/with-simulated-input-3.0
index 11b74de33848..215f5345df43 100644
--- a/metadata/md5-cache/app-emacs/with-simulated-input-3.0
+++ b/metadata/md5-cache/app-emacs/with-simulated-input-3.0
@@ -11,5 +11,5 @@ RDEPEND=>=app-editors/emacs-24.4:*
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/DarwinAwardWinner/with-simulated-input/archive/v3.0.tar.gz -> with-simulated-input-3.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=f5cabdb0a3cc8bd31ffe576c8269e103
diff --git a/metadata/md5-cache/app-emacs/xclip-1.11 b/metadata/md5-cache/app-emacs/xclip-1.11
index 54fcda27b2ab..9892409cdb56 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.11
+++ b/metadata/md5-cache/app-emacs/xclip-1.11
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.11.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=c51068e90e4201144b6006f51fd28e6c
diff --git a/metadata/md5-cache/app-emacs/xclip-1.9 b/metadata/md5-cache/app-emacs/xclip-1.9
index 5c965f784e1d..347e811ee110 100644
--- a/metadata/md5-cache/app-emacs/xclip-1.9
+++ b/metadata/md5-cache/app-emacs/xclip-1.9
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=x11-misc/xclip >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xclip-1.9.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=57b70a562ce082462abc1dc0139f38f1
diff --git a/metadata/md5-cache/app-emacs/xelb-0.18 b/metadata/md5-cache/app-emacs/xelb-0.18
index 39facbf981cc..4d5da1107242 100644
--- a/metadata/md5-cache/app-emacs/xelb-0.18
+++ b/metadata/md5-cache/app-emacs/xelb-0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-editors/emacs[gui] x11-apps/xauth >=app-editors/emacs-24.4:*
 SLOT=0
 SRC_URI=https://github.com/ch11ng/xelb/archive/0.18.tar.gz -> xelb-0.18.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b8882a8d70f937833bea61a747f714a4
diff --git a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1 b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
index c032660242b9..3d8cfb30eec7 100644
--- a/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
+++ b/metadata/md5-cache/app-emacs/xrdb-mode-3.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/distfiles/xrdb-mode-3.0.el.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=17f5122b6437dc01a28e212b9b84265f
diff --git a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1 b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
index 45e90377c75c..74f2e386a1bb 100644
--- a/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
+++ b/metadata/md5-cache/app-emacs/xslide-0.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://sourceforge/xslide/xslide-0.2.2.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5fdb7ec5aa56571e886290e0813b71cb
diff --git a/metadata/md5-cache/app-emacs/yaml-0.5.1 b/metadata/md5-cache/app-emacs/yaml-0.5.1
index 3c4a6521d01e..23a16a7ffbf8 100644
--- a/metadata/md5-cache/app-emacs/yaml-0.5.1
+++ b/metadata/md5-cache/app-emacs/yaml-0.5.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/zkry/yaml.el/archive/v0.5.1.tar.gz -> yaml-0.5.1.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=26548ee7a937507b25c835ef403f6580
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
index 0769886e345b..9b52af6e7041 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.14.tar.gz -> yaml-mode-0.0.14.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=b537b8a5f7a6b955104ba49d1def4dc4
diff --git a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15 b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
index 4a96518edc0c..68495af83c32 100644
--- a/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
+++ b/metadata/md5-cache/app-emacs/yaml-mode-0.0.15
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/yoshiki/yaml-mode/archive/0.0.15.tar.gz -> yaml-mode-0.0.15.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=5f52e78d199c5b19c8e988b2ca48b0d2
diff --git a/metadata/md5-cache/app-emacs/yasnippet-0.14.0 b/metadata/md5-cache/app-emacs/yasnippet-0.14.0
index 64dc03c31d85..cf878ed79f69 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-0.14.0
+++ b/metadata/md5-cache/app-emacs/yasnippet-0.14.0
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/joaotavora/yasnippet/archive/0.14.0.tar.gz -> yasnippet-0.14.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=fa5655d2ed006ca257a923a6c9d3cd13
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3-r1 b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3-r1
index 412de43c5cda..065841136e2c 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3-r1
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/yasnippet >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/0.3.tar.gz -> yasnippet-snippets-0.3.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c2e92ea2e7c9518303a1e65fe62830e6
diff --git a/metadata/md5-cache/app-emacs/yasnippet-snippets-1.0-r2 b/metadata/md5-cache/app-emacs/yasnippet-snippets-1.0-r2
index 6bbb544b0648..4c87281d82f2 100644
--- a/metadata/md5-cache/app-emacs/yasnippet-snippets-1.0-r2
+++ b/metadata/md5-cache/app-emacs/yasnippet-snippets-1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=app-emacs/yasnippet >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/AndreaCrotti/yasnippet-snippets/archive/1.0.tar.gz -> yasnippet-snippets-1.0.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=c2e92ea2e7c9518303a1e65fe62830e6
diff --git a/metadata/md5-cache/app-emacs/yatex-1.82 b/metadata/md5-cache/app-emacs/yatex-1.82
index c10e1926cf6f..8b1deb2c96f2 100644
--- a/metadata/md5-cache/app-emacs/yatex-1.82
+++ b/metadata/md5-cache/app-emacs/yatex-1.82
@@ -10,5 +10,5 @@ LICENSE=BSD-2
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=http://www.yatex.org/yatex1.82.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
 _md5_=90aa5c660a090405c90f393b11c6f664
diff --git a/metadata/md5-cache/app-emacs/zenburn-20110907-r1 b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
index 56888a191808..c6631cbc7387 100644
--- a/metadata/md5-cache/app-emacs/zenburn-20110907-r1
+++ b/metadata/md5-cache/app-emacs/zenburn-20110907-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=app-emacs/color-theme >=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dbrock/zenburn-el/archive/2b0672b04ef3e95c25f849dceb10d669296a188b.tar.gz -> zenburn-20110907.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=fe565a3144e8e5005c6464547441fa30
diff --git a/metadata/md5-cache/app-emacs/zenirc-2.112-r1 b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
index 3d4be3928657..e8c5e3c516f4 100644
--- a/metadata/md5-cache/app-emacs/zenirc-2.112-r1
+++ b/metadata/md5-cache/app-emacs/zenirc-2.112-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=ftp://ftp.zenirc.org/pub/zenirc/zenirc-2.112.tar.gz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=1c4731458aa3e285a538bcf2ae02301e
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 86090d14b160..9c0fa6b984f0 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.7.0-r2 b/metadata/md5-cache/app-emulation/libvirt-7.7.0-r2
deleted file mode 100644
index 4291d3304290..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-7.7.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( <net-analyzer/wireshark-3.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( <net-analyzer/wireshark-3.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/7.7.0
-SRC_URI=https://libvirt.org/sources/libvirt-7.7.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.7.0.tar.xz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9bf3d059a0d93ab12174e1061a762090
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.2.0 b/metadata/md5-cache/app-emulation/libvirt-8.2.0
deleted file mode 100644
index 542221fbe2f3..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.2.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.2.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.2.0.tar.xz.asc )
-_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b3bac41e724ab15ace2b4da3b9ab7bcd
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.7.0 b/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1
index 51a1c2e63347..b5b638675418 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.7.0
+++ b/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
@@ -8,9 +8,9 @@ INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.7.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.7.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.7.0.tar.xz.asc )
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2fef2d01a74032f3a72a72eea66feaf1
+_md5_=322a0a8a880d3c023f624da4f8bac904
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.8.0 b/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1
index dfb46a3fdf52..de223068f9a9 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.8.0
+++ b/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1
@@ -1,6 +1,6 @@
 BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
@@ -8,9 +8,9 @@ INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.8.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.8.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.8.0.tar.xz.asc )
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5c328fb2930866a657ea3f2dc64a2167
+_md5_=b65c12b0ed646ff577d7024345b8a4dc
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 85b6df312df8..82d2ff3c8089 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -1,6 +1,6 @@
 BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
+DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
 DESCRIPTION=C toolkit to manipulate virtual machines
 EAPI=8
 HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
@@ -8,8 +8,8 @@ INHERIT=meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig git-
 IUSE=apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
+RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/9999
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=cfa3884c1cc2c82d8099a68b746aa0a8
+_md5_=96c4bd190862fa9071691e5e19005471
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index b3e2f149b386..21b15a640094 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.7.2 b/metadata/md5-cache/app-office/libreoffice-7.3.7.2
new file mode 100644
index 000000000000..742d95259f87
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.7.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-apps/which sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig clang? ( || ( ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ) ) odk? ( >=app-doc/doxygen-1.8.4 ) 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 postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) >=dev-libs/libatomic_ops-7.2d dev-perl/Archive-Zip >=dev-util/cppunit-1.14.0 >=dev-util/gperf-3.1 dev-util/mdds:1/2.0 media-libs/glm sys-devel/ucpp x11-base/xorg-proto x11-libs/libXt x11-libs/libXtst java? ( dev-java/ant-core >=virtual/jdk-11 ) test? ( app-crypt/gnupg dev-util/cppunit media-fonts/dejavu media-fonts/liberation-fonts ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite
+EAPI=8
+HOMEPAGE=https://www.libreoffice.org
+INHERIT=autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+IUSE=accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan libreoffice_extensions_nlpsolver libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript libreoffice_extensions_wiki-publisher java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+PDEPEND==app-office/libreoffice-l10n-7.3*
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),xml(+)] ) app-arch/unzip app-arch/zip app-crypt/gpgme:=[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 >=app-text/libnumbertext-1.0.6 >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes dev-cpp/abseil-cpp:= >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error >=dev-libs/liborcus-0.17.2:0/0.17 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] >=games-engines/box2d-2.4.1:0 media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig >=media-libs/freetype-2.11.0-r1:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libjpeg-turbo:= media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf media-libs/openjpeg:= media-libs/zxing-cpp:= >=net-libs/neon-0.31.1:= net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender accessibility? ( python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) ) bluetooth? ( dev-libs/glib:2 net-wireless/bluez ) coinmp? ( sci-libs/coinor-mp ) cups? ( net-print/cups ) dbus? ( sys-apps/dbus[X] ) eds? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl(+)] x11-libs/gtk+:3[X] x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( >=dev-java/rhino-1.7.14:1.6 ) mariadb? ( dev-db/mariadb-connector-c:= ) !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) acct-group/libreoffice acct-user/libreoffice !app-office/libreoffice-bin !app-office/libreoffice-bin-debug media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-11 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) base? ( firebird java ) bluetooth? ( dbus ) gtk? ( dbus ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/libreoffice-7.3.5.2-patchset-01.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-7.3.7.2.tar.xz https://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-7.3.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.7//libreoffice-7.3.7.2.tar.xz https://download.documentfoundation.org/libreoffice/src/7.3.7//libreoffice-help-7.3.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.7.2/src/libreoffice-7.3.7.2.tar.xz https://downloadarchive.documentfoundation.org/libreoffice/old/7.3.7.2/src/libreoffice-help-7.3.7.2.tar.xz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=a402f9ecd4c57eef4d8f6658d8cbc8d9
diff --git a/metadata/md5-cache/app-office/libreoffice-7.3.9999 b/metadata/md5-cache/app-office/libreoffice-7.3.9999
index 872fc1091063..03d11afd08ca 100644
--- a/metadata/md5-cache/app-office/libreoffice-7.3.9999
+++ b/metadata/md5-cache/app-office/libreoffice-7.3.9999
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) https://dev.gentoo.org/~xen0n/distfiles/app-office/libreoffice/libreoffice-7.3.5.2-patchset-01.tar.xz https://dev-www.libreoffice.org/src//libcmis-0.5.2.tar.xz https://dev-www.libreoffice.org/src//dtoa-20180411.tgz https://dev-www.libreoffice.org/src//skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz base? ( https://dev-www.libreoffice.org/src//commons-logging-1.2-src.tar.gz https://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip https://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip https://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip https://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip https://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip https://dev-www.libreoffice.org/src//db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip https://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip https://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip https://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip https://dev-www.libreoffice.org/src//ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip https://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f0ce2a4324e9b07951166181b35ac3a5
+_md5_=7fc23eb4e9bc3955d70f7e8e8b3f4a16
diff --git a/metadata/md5-cache/app-office/wps-office-11.1.0.10976-r1 b/metadata/md5-cache/app-office/wps-office-11.1.0.11664-r2
index e0df539fcb8b..9f1754865483 100644
--- a/metadata/md5-cache/app-office/wps-office-11.1.0.10976-r1
+++ b/metadata/md5-cache/app-office/wps-office-11.1.0.11664-r2
@@ -4,11 +4,12 @@ EAPI=8
 HOMEPAGE=https://www.wps.com/office/linux/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=unpacker xdg
+IUSE=systemd
 KEYWORDS=~amd64
 LICENSE=WPS-EULA
-RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libbsd || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 ) dev-libs/libgcrypt:0 dev-libs/libgpg-error dev-libs/libpcre:3 dev-libs/nspr dev-libs/nss media-libs/fontconfig:1.0 media-libs/freetype:2 || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/libpng:0 media-sound/pulseaudio net-libs/libasyncns net-print/cups sys-apps/attr sys-apps/util-linux sys-apps/dbus sys-apps/tcp-wrappers sys-libs/libcap sys-libs/zlib:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/libXv x11-libs/libxcb dev-libs/libxslt x11-libs/pango virtual/glu
+RDEPEND=app-arch/bzip2:0 app-arch/xz-utils app-arch/lz4 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libbsd || ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 ) dev-libs/libgcrypt:0 dev-libs/libgpg-error dev-libs/libpcre:3 dev-libs/nspr dev-libs/nss media-libs/fontconfig:1.0 media-libs/freetype:2 || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-libs/libpng:0 media-sound/pulseaudio net-libs/libasyncns net-print/cups sys-apps/attr sys-apps/util-linux sys-apps/dbus sys-apps/tcp-wrappers sys-libs/libcap sys-libs/zlib:0 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXau x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/libXv x11-libs/libxcb dev-libs/libxslt x11-libs/pango virtual/glu systemd? ( sys-apps/systemd )
 RESTRICT=bindist strip mirror
 SLOT=0
-SRC_URI=https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/10976/wps-office_11.1.0.10976.XA_amd64.deb
+SRC_URI=https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/11664/wps-office_11.1.0.11664_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=58e75236db7a0234364bbe062a115a67
+_md5_=64d67934240a78bf0036571ce60e4c03
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 20c7b57b9c0b..9e35856184c7 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.2_p2 b/metadata/md5-cache/app-shells/bash-5.2_p2
deleted file mode 100644
index a7f1b5fd30cf..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.2_p2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=pgo? ( dev-util/gperf ) verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2:= )
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
-INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
-IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +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
-LICENSE=GPL-3+
-RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2:= )
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2.tar.gz.sig ) mirror://gnu//bash-5.2-patches/bash52-001 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001.sig ) mirror://gnu//bash-5.2-patches/bash52-002 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002.sig )
-_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_=384e035b326031c57cde7effa40fb58d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 3d9883919de2..0030963be61e 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/lesspipe-2.05-r1 b/metadata/md5-cache/app-text/lesspipe-2.05-r1
deleted file mode 100644
index a93ab9f716be..000000000000
--- a/metadata/md5-cache/app-text/lesspipe-2.05-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl
-DEFINED_PHASES=compile configure install preinst
-DESCRIPTION=A preprocessor for less
-EAPI=7
-HOMEPAGE=https://github.com/wofr06/lesspipe
-INHERIT=bash-completion-r1
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/wofr06/lesspipe/archive/v2.05.tar.gz -> lesspipe-2.05.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=04248372e8fd6ec3db1bc018a6e627f1
diff --git a/metadata/md5-cache/app-text/sdcv-0.5.4 b/metadata/md5-cache/app-text/sdcv-0.5.4
new file mode 100644
index 000000000000..b90b60ad618a
--- /dev/null
+++ b/metadata/md5-cache/app-text/sdcv-0.5.4
@@ -0,0 +1,16 @@
+BDEPEND=nls? ( >=sys-devel/gettext-0.14.1 ) test? ( app-misc/jq ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/glib-2.36 sys-libs/zlib readline? ( sys-libs/readline:= )
+DESCRIPTION=Console version of Stardict program
+EAPI=7
+HOMEPAGE=https://dushistov.github.io/sdcv/
+INHERIT=cmake plocale
+IUSE=darkterm nls readline test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.36 sys-libs/zlib readline? ( sys-libs/readline:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Dushistov/sdcv/archive/v0.5.4.tar.gz -> sdcv-0.5.4.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8037cb6d0855b502c772be4154b9ebff
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.17 b/metadata/md5-cache/app-text/xapian-omega-1.4.17
deleted file mode 100644
index 86d20adf1833..000000000000
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian: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=7
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.17/xapian-omega-1.4.17.tar.xz
-_md5_=ee9a5e98776422635a40898c0110d149
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.18 b/metadata/md5-cache/app-text/xapian-omega-1.4.18
deleted file mode 100644
index d4cf1b36091a..000000000000
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=~dev-libs/xapian-1.4.18: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=7
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=~dev-libs/xapian-1.4.18:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.18/xapian-omega-1.4.18.tar.xz
-_md5_=f1ebc8141253a4be89a7b74ea430902b
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.19 b/metadata/md5-cache/app-text/xapian-omega-1.4.19
index 999304c455aa..dd79c64e0f27 100644
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.19
+++ b/metadata/md5-cache/app-text/xapian-omega-1.4.19
@@ -3,9 +3,9 @@ DEPEND=~dev-libs/xapian-1.4.19: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.19:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
 SLOT=0
 SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.19/xapian-omega-1.4.19.tar.xz
-_md5_=74fd958659126ada0f12cbe6f3666fed
+_md5_=b5f59ae3da8a69458cda32eeed5bdc37
diff --git a/metadata/md5-cache/app-text/xapian-omega-1.4.20 b/metadata/md5-cache/app-text/xapian-omega-1.4.20
deleted file mode 100644
index 9e1859763441..000000000000
--- a/metadata/md5-cache/app-text/xapian-omega-1.4.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=~dev-libs/xapian-1.4.20: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
-LICENSE=GPL-2
-RDEPEND=~dev-libs/xapian-1.4.20:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.20/xapian-omega-1.4.20.tar.xz
-_md5_=26949e44d3dcffd2ef9c96eaa59248c7
diff --git a/metadata/md5-cache/app-text/xmlto-0.0.28-r8 b/metadata/md5-cache/app-text/xmlto-0.0.28-r8
deleted file mode 100644
index 0722adb8232f..000000000000
--- a/metadata/md5-cache/app-text/xmlto-0.0.28-r8
+++ /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=configure prepare
-DEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra )
-DESCRIPTION=Script for converting XML and DocBook documents to a variety of output formats
-EAPI=7
-HOMEPAGE=https://pagure.io/xmlto
-INHERIT=autotools
-IUSE=latex text
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt || ( sys-apps/util-linux app-misc/getopt ) text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) ) latex? ( dev-texlive/texlive-formatsextra )
-SLOT=0
-SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=01988daffc3ef713a820ca40d7b1f31c
diff --git a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.9 b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.9
index d10922f665ca..1ef65fd5c7da 100644
--- a/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.9
+++ b/metadata/md5-cache/app-text/zathura-pdf-mupdf-0.3.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://git.pwmt.org/pwmt/zathura-pdf-mupdf
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=meson xdg
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 arm x86
 LICENSE=ZLIB
 RDEPEND=>=app-text/mupdf-1.20.0:= >=app-text/zathura-0.3.9 dev-libs/girara dev-libs/glib:2 x11-libs/cairo
 SLOT=0
 SRC_URI=https://git.pwmt.org/pwmt/zathura-pdf-mupdf/-/archive/0.3.9/zathura-pdf-mupdf-0.3.9.tar.gz
 _eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=425c3fbb3a2157c95f65380486efaabc
+_md5_=f25f05e9355d336bce421356f982d965
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 76ea64aca689..ff67d0668675 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/sqlite-3.39.2 b/metadata/md5-cache/dev-db/sqlite-3.39.2
deleted file mode 100644
index 6e1a30c39d54..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.39.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 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 unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=7
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3390200.zip doc? ( https://sqlite.org/2022/sqlite-doc-3390200.zip )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=339b959b8330ade3b4b855e5d2e86fa7
diff --git a/metadata/md5-cache/dev-db/sqlite-3.39.3 b/metadata/md5-cache/dev-db/sqlite-3.39.3
deleted file mode 100644
index 6be59d7497c9..000000000000
--- a/metadata/md5-cache/dev-db/sqlite-3.39.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip >=dev-lang/tcl-8.6:0 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 unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= ) test? ( >=dev-lang/tcl-8.6:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=SQL database engine
-EAPI=7
-HOMEPAGE=https://sqlite.org/
-INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
-IUSE=debug doc icu +readline secure-delete static-libs tcl test tools 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
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0= )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=https://sqlite.org/2022/sqlite-src-3390300.zip doc? ( https://sqlite.org/2022/sqlite-doc-3390300.zip )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=79a3003ea5ffc99ac0510bf5926a21a3
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index bb8a5ff69386..6565ed2953f2 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
new file mode 100644
index 000000000000..8f2acc0bfab4
--- /dev/null
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-apache-commons ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Apache Commons Bytecode Engineering Library
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-bcel/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=415512324afe6f29952739de926eb11a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9f9e170502d0..e9bb85dea7a1 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.18.0-r1 b/metadata/md5-cache/dev-lang/jsonnet-0.18.0-r1
index c65561220fe5..c1cc291334f9 100644
--- a/metadata/md5-cache/dev-lang/jsonnet-0.18.0-r1
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.18.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/jsonnet/archive/v0.18.0.tar.gz -> jsonnet-0.18.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5616af660d4b13e5e538f840cef8c0f3
+_md5_=08a773ad27c577449b8bcb4f0e5d7ad0
diff --git a/metadata/md5-cache/dev-lang/jsonnet-0.19.1 b/metadata/md5-cache/dev-lang/jsonnet-0.19.1
new file mode 100644
index 000000000000..81791cc6cbf9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jsonnet-0.19.1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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 ) ) test? ( dev-cpp/gtest )
+DESCRIPTION=A data templating language for app and tool developers
+EAPI=8
+HOMEPAGE=https://jsonnet.org/
+INHERIT=cmake toolchain-funcs flag-o-matic distutils-r1
+IUSE=custom-optimization doc examples python test test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-cpp/rapidyaml:= dev-cpp/nlohmann_json:= python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) 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 ) )
+REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/jsonnet/archive/v0.19.1.tar.gz -> jsonnet-0.19.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e11458d3a2f748b5f102b5b10508a8f4
diff --git a/metadata/md5-cache/dev-lang/php-8.0.25 b/metadata/md5-cache/dev-lang/php-8.0.25
new file mode 100644
index 000000000000..0d14b6baa6a6
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.0.25
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=7
+HOMEPAGE=https://www.php.net/
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.1:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.0
+SRC_URI=https://www.php.net/distributions/php-8.0.25.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=d141ab2d6ff20753aab0f0c3787fb6f1
diff --git a/metadata/md5-cache/dev-lang/php-8.1.12 b/metadata/md5-cache/dev-lang/php-8.1.12
new file mode 100644
index 000000000000..198c05bf33bb
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/php-8.1.12
@@ -0,0 +1,18 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DESCRIPTION=The PHP language runtime engine
+EAPI=8
+HOMEPAGE=https://www.php.net/
+IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+INHERIT=flag-o-matic systemd autotools
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
+RESTRICT=!test? ( test )
+SLOT=8.1
+SRC_URI=https://www.php.net/distributions/php-8.1.12.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=296a0969ce1b521fb4b715d18426b109
diff --git a/metadata/md5-cache/dev-lang/php-8.2.0_rc3 b/metadata/md5-cache/dev-lang/php-8.2.0_rc5
index 7498b0e0de60..8b7914309257 100644
--- a/metadata/md5-cache/dev-lang/php-8.2.0_rc3
+++ b/metadata/md5-cache/dev-lang/php-8.2.0_rc5
@@ -1,18 +1,18 @@
 BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 sys-devel/automake >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
+DEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) app-arch/xz-utils >=sys-devel/bison-3.0.1
 DESCRIPTION=The PHP language runtime engine
 EAPI=8
 HOMEPAGE=https://www.php.net/
 IDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
 INHERIT=flag-o-matic systemd autotools
-IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp +xml xmlreader xmlwriter xpm xslt zip zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
+RDEPEND=>=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) curl? ( >=net-misc/curl-7.29.0 ) enchant? ( app-text/enchant:2 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( net-libs/c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11:= ) ldap-sasl? ( dev-libs/cyrus-sasl ) libedit? ( dev-libs/libedit ) lmdb? ( dev-db/lmdb:= ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) postgres? ( >=dev-db/postgresql-9.1:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) snmp? ( >=net-analyzer/net-snmp-5.2 ) sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-1.0.2:0= ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.9.0 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) webp? ( gd zlib ) cjk? ( gd zlib ) exif? ( gd zlib ) xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) oci8-instant-client? ( !ldap ) qdbm? ( !gdbm ) session-mm? ( session !threads ) mysql? ( || ( mysqli pdo ) ) firebird? ( pdo ) mssql? ( pdo )
 RESTRICT=!test? ( test )
 SLOT=8.2
-SRC_URI=https://downloads.php.net/~pierrick/php-8.2.0RC3.tar.xz
+SRC_URI=https://downloads.php.net/~pierrick/php-8.2.0RC5.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=956c6291253319ba7c75c3bbb98898b8
+_md5_=dc05623d162ed9a8b65fdd12fe411c95
diff --git a/metadata/md5-cache/dev-lang/squirrel-3.2 b/metadata/md5-cache/dev-lang/squirrel-3.2
new file mode 100644
index 000000000000..00cbbfd81e8d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/squirrel-3.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A interpreted language mainly used for games
+EAPI=8
+HOMEPAGE=http://squirrel-lang.org/
+INHERIT=cmake
+IUSE=examples static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=https://download.sourceforge.net/squirrel/squirrel_3_2_stable.tar.gz -> squirrel-3.2.tar.gz https://raw.githubusercontent.com/albertodemichelis/squirrel/v3.2/squirrel-config.cmake.in -> squirrel-config.cmake.in_3.2
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4080c728977e797a52eff049050a5654
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index bef973d1e3d8..bb0d7fed01ba 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/ding-libs-0.6.1-r1 b/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
deleted file mode 100644
index cf6944f6a008..000000000000
--- a/metadata/md5-cache/dev-libs/ding-libs-0.6.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/check )
-DESCRIPTION=set of utility libraries (mostly used by sssd)
-EAPI=7
-HOMEPAGE=https://pagure.io/SSSD/ding-libs
-INHERIT=multilib-minimal
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux
-LICENSE=LGPL-3 GPL-3
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://releases.pagure.org/SSSD/ding-libs/ding-libs-0.6.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=dbb5540ef530f19b1e68ac65fa5fca27
diff --git a/metadata/md5-cache/dev-libs/ell-0.51 b/metadata/md5-cache/dev-libs/ell-0.51
deleted file mode 100644
index 503ebd4d4c0a..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.51
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-INHERIT=flag-o-matic linux-info multilib-minimal
-IUSE=pie test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.51.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2b5f0f71ab871370e484f95e2c490238
diff --git a/metadata/md5-cache/dev-libs/ell-0.52-r1 b/metadata/md5-cache/dev-libs/ell-0.52-r1
deleted file mode 100644
index 9d404a3550e2..000000000000
--- a/metadata/md5-cache/dev-libs/ell-0.52-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=test? ( sys-apps/dbus )
-DESCRIPTION=Embedded Linux Library provides core, low-level functionality for system daemons
-EAPI=7
-HOMEPAGE=https://01.org/ell
-INHERIT=flag-o-matic linux-info
-IUSE=pie test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-0.52.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7a09b4c29b3c65ce0e120dd341d069ba
diff --git a/metadata/md5-cache/dev-libs/jansson-2.13.1-r1 b/metadata/md5-cache/dev-libs/jansson-2.13.1-r1
deleted file mode 100644
index 719b40657a74..000000000000
--- a/metadata/md5-cache/dev-libs/jansson-2.13.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx )
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=C library for encoding, decoding and manipulating JSON data
-EAPI=7
-HOMEPAGE=https://www.digip.org/jansson/
-INHERIT=multilib-minimal
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.digip.org/jansson/releases/jansson-2.13.1.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=a125aa50c40654fd9df3f8c7f0c66f40
diff --git a/metadata/md5-cache/dev-libs/jansson-2.14 b/metadata/md5-cache/dev-libs/jansson-2.14
deleted file mode 100644
index efe8fdb3b4e1..000000000000
--- a/metadata/md5-cache/dev-libs/jansson-2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( dev-python/sphinx )
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=C library for encoding, decoding and manipulating JSON data
-EAPI=8
-HOMEPAGE=https://www.digip.org/jansson/
-INHERIT=multilib-minimal toolchain-funcs
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=MIT
-SLOT=0/4
-SRC_URI=https://github.com/akheron/jansson/releases/download/v2.14/jansson-2.14.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6f15e423931b0285a23c31a7c1e4d88d
diff --git a/metadata/md5-cache/dev-libs/jansson-2.14-r1 b/metadata/md5-cache/dev-libs/jansson-2.14-r1
new file mode 100644
index 000000000000..8e8d39a4a3d8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/jansson-2.14-r1
@@ -0,0 +1,13 @@
+BDEPEND=doc? ( dev-python/sphinx )
+DEFINED_PHASES=compile configure install
+DESCRIPTION=C library for encoding, decoding and manipulating JSON data
+EAPI=8
+HOMEPAGE=https://www.digip.org/jansson/
+INHERIT=toolchain-funcs
+IUSE=doc static-libs
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+LICENSE=MIT
+SLOT=0/4
+SRC_URI=https://github.com/akheron/jansson/releases/download/v2.14/jansson-2.14.tar.gz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=5b5c88b0359dd1a453926a7397865fa3
diff --git a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r3 b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r3
deleted file mode 100644
index ee2c6e4c10a6..000000000000
--- a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=CORBA tree builder
-EAPI=8
-HOMEPAGE=https://www.gnome.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 multilib-minimal
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=70fed82f7ff362f0af2514acce472e18
diff --git a/metadata/md5-cache/dev-libs/libIDL-0.8.14-r4 b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r4
new file mode 100644
index 000000000000..915d6e9f36d2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libIDL-0.8.14-r4
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.44.1-r1:2
+DESCRIPTION=CORBA tree builder
+EAPI=8
+HOMEPAGE=https://www.gnome.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.44.1-r1:2
+SLOT=0
+SRC_URI=mirror://gnome/sources/libIDL/0.8/libIDL-0.8.14.tar.bz2
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8fad2e4e8c0ab6134b83764dee463479
diff --git a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1 b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r2
index 2436216fb849..368142718ded 100644
--- a/metadata/md5-cache/dev-libs/libbase58-0.1.4-r1
+++ b/metadata/md5-cache/dev-libs/libbase58-0.1.4-r2
@@ -1,16 +1,16 @@
 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 prepare test
-DEPEND=tools? ( dev-libs/libgcrypt ) test? ( app-editors/vim-core dev-libs/libgcrypt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEFINED_PHASES=configure install prepare
+DEPEND=tools? ( dev-libs/libgcrypt ) test? ( app-editors/vim-core dev-libs/libgcrypt )
 DESCRIPTION=C implementation of Bitcoin's base58 encoding
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/luke-jr/libbase58
-INHERIT=autotools multilib-minimal
-IUSE=test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+INHERIT=autotools
+IUSE=test tools
 KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=tools? ( dev-libs/libgcrypt )
 RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=https://github.com/luke-jr/libbase58/archive/v0.1.4.tar.gz -> libbase58-0.1.4.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f2615cc7623401d9732639586bad0e3f
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=113bffd2bda202ff50ce26f828201955
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.2 b/metadata/md5-cache/dev-libs/libfmt-7.1.2
deleted file mode 100644
index 960c678118af..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=7
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz -> libfmt-7.1.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffef7274c0e56e7c5f10020dbba5dbb4
diff --git a/metadata/md5-cache/dev-libs/libfmt-7.1.3 b/metadata/md5-cache/dev-libs/libfmt-7.1.3
deleted file mode 100644
index d61aad366547..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-7.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=7
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz -> libfmt-7.1.3.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ffef7274c0e56e7c5f10020dbba5dbb4
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1 b/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1
deleted file mode 100644
index ff2ec9bf0d5b..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-8.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=7
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=https://github.com/fmtlib/fmt/archive/8.0.0.tar.gz -> libfmt-8.0.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dacfe19f56f2f8ecc6ccdd082253ee02
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1 b/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1
deleted file mode 100644
index a2f8672b4da2..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-8.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=7
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/8.0.1
-SRC_URI=https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz -> libfmt-8.0.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7c433aa54c15f5f701c4571d7af140d4
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.1.1 b/metadata/md5-cache/dev-libs/libfmt-8.1.1
deleted file mode 100644
index 183e4b7696a1..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-8.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=7
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/8.1.1
-SRC_URI=https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz -> libfmt-8.1.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=95b06df282f12321bd523d87dbc323ea
diff --git a/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1 b/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
index 235a69baada1..e241150e9a2b 100644
--- a/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
+++ b/metadata/md5-cache/dev-libs/libfmt-8.1.1-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://github.com/fmtlib/fmt
 INHERIT=cmake-multilib
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/8.1.1
 SRC_URI=https://github.com/fmtlib/fmt/archive/8.1.1.tar.gz -> libfmt-8.1.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8983eb753c48486fcac123142495569b
+_md5_=e39296394bc543a1a620802828b976bb
diff --git a/metadata/md5-cache/dev-libs/libfmt-9.0.0 b/metadata/md5-cache/dev-libs/libfmt-9.0.0
deleted file mode 100644
index 4b6c5a04bffa..000000000000
--- a/metadata/md5-cache/dev-libs/libfmt-9.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Small, safe and fast formatting library
-EAPI=8
-HOMEPAGE=https://github.com/fmtlib/fmt
-INHERIT=cmake-multilib
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0/9.0.0
-SRC_URI=https://github.com/fmtlib/fmt/archive/9.0.0.tar.gz -> libfmt-9.0.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0ab3b202a89e1e9180520dac831eb63e
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.45-r1 b/metadata/md5-cache/dev-libs/libgpg-error-1.45-r1
deleted file mode 100644
index e0f37a527045..000000000000
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.45-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) 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=nls? ( >=virtual/libintl-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(-)?] )
-DESCRIPTION=Contains error handling functions used by GnuPG software
-EAPI=8
-HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
-INHERIT=autotools multilib-minimal toolchain-funcs prefix
-IUSE=common-lisp nls static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-2 LGPL-2.1
-RDEPEND=nls? ( >=virtual/libintl-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(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.45.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2eace62f50f54420336e585fa00d7618
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.0-r1 b/metadata/md5-cache/dev-libs/libksba-1.6.0-r1
deleted file mode 100644
index 3a5b9ce7a459..000000000000
--- a/metadata/md5-cache/dev-libs/libksba-1.6.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/bison
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libgpg-error-1.8
-DESCRIPTION=X.509 and CMS (PKCS#7) library
-EAPI=7
-HOMEPAGE=https://www.gnupg.org/related_software/libksba
-IUSE=static-libs
-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=LGPL-3+ GPL-2+ GPL-3
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libksba/libksba-1.6.0.tar.bz2
-_md5_=0ad8b7911dbb00361e0d4ec93a01d73d
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.1 b/metadata/md5-cache/dev-libs/libksba-1.6.1
deleted file mode 100644
index 95afa8e0e7ad..000000000000
--- a/metadata/md5-cache/dev-libs/libksba-1.6.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison verify-sig? ( sec-keys/openpgp-keys-gnupg ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install unpack
-DEPEND=>=dev-libs/libgpg-error-1.8
-DESCRIPTION=X.509 and CMS (PKCS#7) library
-EAPI=8
-HOMEPAGE=https://www.gnupg.org/related_software/libksba
-INHERIT=toolchain-funcs verify-sig
-IUSE=static-libs 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=LGPL-3+ GPL-2+ GPL-3
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libksba/libksba-1.6.1.tar.bz2 verify-sig? ( mirror://gnupg/libksba/libksba-1.6.1.tar.bz2.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=fb0493137854e64b31d929c161bdccc7
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 b224517f7242..d29cb9689560 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_=160348057728034c653b1c02c1abdc0a
+_md5_=85dee4bc2f60a419793e083c0e0796a9
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18 b/metadata/md5-cache/dev-libs/libsodium-1.0.18
deleted file mode 100644
index de47064086f4..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-jedisct1 ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
-EAPI=7
-HOMEPAGE=https://libsodium.org
-INHERIT=autotools multilib-minimal verify-sig
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes 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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=ISC
-SLOT=0/23
-SRC_URI=https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz verify-sig? ( https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5c3e9abbc835dce4e65c6d8c008b5754
diff --git a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617 b/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
deleted file mode 100644
index 42d4f0d276e9..000000000000
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.18_p20210617
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=verify-sig? ( app-crypt/minisign ) 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 unpack
-DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
-EAPI=7
-HOMEPAGE=https://libsodium.org
-INHERIT=autotools multilib-minimal
-IUSE=+asm minimal static-libs +urandom cpu_flags_x86_aes cpu_flags_x86_sse4_1 verify-sig 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
-LICENSE=ISC
-SLOT=0/23
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz -> libsodium-1.0.18_p20210617.tar.gz verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/libsodium-1.0.18-stable-20210617.tar.gz.minisig -> libsodium-1.0.18_p20210617.tar.gz.minisig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c43b9a04a1b5104cb5f72d5d65819c34
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.14-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
deleted file mode 100644
index 51b06940e169..000000000000
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
+++ /dev/null
@@ -1,17 +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 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=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:= )
-DESCRIPTION=XML C parser and toolkit
-EAPI=7
-HOMEPAGE=http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2
-INHERIT=autotools flag-o-matic python-r1 multilib-minimal gnome.org libtool
-IUSE=debug examples 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
-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 ) )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/libxml2/2.9/libxml2-2.9.14.tar.xz https://dev.gentoo.org/~soap/distfiles/libxml2-2.9.14-patches-r0.tar.bz2 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_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a4e1804903354c297c40dcefe571f106
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.35 b/metadata/md5-cache/dev-libs/libxslt-1.1.35
deleted file mode 100644
index 1175f7218739..000000000000
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.35
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/pkgconfig-1 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=XSLT libraries and tools
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libxslt
-INHERIT=libtool multilib-minimal gnome.org
-IUSE=crypt debug examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=>=dev-libs/libxml2-2.9.11:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libxslt/1.1/libxslt-1.1.35.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=4750687ee950baa4715417351f097ffe
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.10.0 b/metadata/md5-cache/dev-libs/spdlog-1.10.0
index b3a7ed065987..063fc353907b 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.10.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.10.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
 INHERIT=cmake
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz -> spdlog-1.10.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=71c9216cecd90d28f2662df47265ecad
+_md5_=69adc4fd0d2b089f4efd1c266695b409
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1 b/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
deleted file mode 100644
index 3642d656d9fb..000000000000
--- a/metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-8.0.0:=
-DESCRIPTION=Very fast, header only, C++ logging library
-EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-8.0.0:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz -> spdlog-1.9.2.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/spdlog/spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e0bc5ec7becf90aff451538bde8cbfb8
diff --git a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1 b/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1
deleted file mode 100644
index e55dbb6bf910..000000000000
--- a/metadata/md5-cache/dev-libs/userspace-rcu-0.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=test? ( sys-process/time ) 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=Userspace RCU (read-copy-update) library
-EAPI=7
-HOMEPAGE=https://liburcu.org/
-INHERIT=autotools
-IUSE=static-libs test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0/8
-SRC_URI=https://lttng.org/files/urcu/userspace-rcu-0.13.1.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bc1d2299462d3904c8f10e0d1b5fc09f
diff --git a/metadata/md5-cache/dev-libs/xapian-1.2.25-r1 b/metadata/md5-cache/dev-libs/xapian-1.2.25-r1
deleted file mode 100644
index 614675023c3f..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-1.2.25-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?]
-DESCRIPTION=Xapian Probabilistic Information Retrieval library
-EAPI=6
-HOMEPAGE=https://www.xapian.org/
-INHERIT=flag-o-matic multilib-minimal
-IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~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/1.2.22
-SRC_URI=https://oligarchy.co.uk/xapian/1.2.25/xapian-core-1.2.25.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5592e6b2c6cfb57a99eaee5416bc6231
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.17-r1 b/metadata/md5-cache/dev-libs/xapian-1.4.17-r1
deleted file mode 100644
index 3671922ae999..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-1.4.17-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?]
-DESCRIPTION=Xapian Probabilistic Information Retrieval library
-EAPI=7
-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 ~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.17/xapian-core-1.4.17.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9cd203fc2e9eed5012dac737ee753483
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-1.4.18-r1
deleted file mode 100644
index ac82f1cb18c8..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-1.4.18-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?]
-DESCRIPTION=Xapian Probabilistic Information Retrieval library
-EAPI=7
-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 ~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.18/xapian-core-1.4.18.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8646f699005c415151c3bf1cab7818af
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.19 b/metadata/md5-cache/dev-libs/xapian-1.4.19
index 1987732c9e86..d3be3592a201 100644
--- a/metadata/md5-cache/dev-libs/xapian-1.4.19
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.19
@@ -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.19/xapian-core-1.4.19.tar.xz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=27e7d87474e2a8694f68fdfc8c9727bc
+_md5_=a5e7024babadfdcee6365cb475277c43
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.20 b/metadata/md5-cache/dev-libs/xapian-1.4.20
deleted file mode 100644
index a528def9961c..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-1.4.20
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=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(-)?]
-DESCRIPTION=Xapian Probabilistic Information Retrieval library
-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
-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.20/xapian-core-1.4.20.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c1c6ecc699886be111b4b895e90a71d5
diff --git a/metadata/md5-cache/dev-libs/xapian-1.4.21-r1 b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
new file mode 100644
index 000000000000..4f330e5eab1c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xapian-1.4.21-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install test
+DEPEND=sys-apps/util-linux sys-libs/zlib
+DESCRIPTION=Xapian Probabilistic Information Retrieval library
+EAPI=8
+HOMEPAGE=https://www.xapian.org/
+IUSE=doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote
+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 sys-libs/zlib
+SLOT=0/30
+SRC_URI=https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz
+_md5_=e9430d2daf88b3de8fb5abc95dd18e89
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
deleted file mode 100644
index 1716ea08ec19..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.18-r1
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.4.15 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_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[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 ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-DESCRIPTION=SWIG and JNI bindings for Xapian
-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 python_targets_python3_8 python_targets_python3_9 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/xapian-1.4.15 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_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[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.6 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) )
-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 ) ) ruby? ( || ( ruby_targets_ruby27 ruby_targets_ruby30 ) ) php? ( || ( php_targets_php7-4 ) )
-SLOT=0
-SRC_URI=https://oligarchy.co.uk/xapian/1.4.18/xapian-bindings-1.4.18.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_=f1860af6c67f8676e759354e8146fee7
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
index d0db1ddb2b48..fd097ef588a4 100644
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.19
@@ -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.19 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.6 ) 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.19/xapian-bindings-1.4.19.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_=9ccd37fff839af81b33ff999b7bf48e1
+_md5_=7acbf5c9de4353906248a040ce708f4d
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
deleted file mode 100644
index 13e7a4414d1c..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.4.20 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 ) virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) 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 ) )
-DESCRIPTION=SWIG and JNI bindings for Xapian
-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
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/xapian-1.4.20 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.6 ) 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.20/xapian-bindings-1.4.20.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_=15a7c41f2dd9520ac27ab041b60bffff
diff --git a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20-r1 b/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20-r1
deleted file mode 100644
index 2e57b203fdc9..000000000000
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.4.20-r1
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php? ( php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) )
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=>=dev-libs/xapian-1.4.20 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 ) virtual/pkgconfig java? ( >=virtual/jdk-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 ) )
-DESCRIPTION=SWIG and JNI bindings for Xapian
-EAPI=7
-HOMEPAGE=https://www.xapian.org/
-INHERIT=autotools 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
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/xapian-1.4.20 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.20/xapian-bindings-1.4.20.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_=0c485b2e2bd5f9c8dc1fde31aae6735b
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3
deleted file mode 100644
index 6ba9b96b22c1..000000000000
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[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=A lightweight RPC library based on XML and HTTP
-EAPI=7
-HOMEPAGE=http://xmlrpc-c.sourceforge.net/
-INHERIT=multilib-minimal toolchain-funcs
-IUSE=abyss +cgi +curl +cxx +libxml2 threads test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( abyss curl cxx )
-RESTRICT=!test? ( test )
-SLOT=0/4.51
-SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.51.06.tgz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0c4cee8afcb02603630535d0fc29beff
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05
deleted file mode 100644
index 3fbf9936a968..000000000000
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[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=A lightweight RPC library based on XML and HTTP
-EAPI=7
-HOMEPAGE=http://xmlrpc-c.sourceforge.net/
-INHERIT=multilib-minimal
-IUSE=abyss +cgi +curl +cxx +libxml2 threads test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( abyss curl cxx )
-RESTRICT=!test? ( test )
-SLOT=0/4.54
-SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.05.tgz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=96c78d79d86a88e28e6e3f7bd8a17fbd
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1
deleted file mode 100644
index 96826f07f7ca..000000000000
--- a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[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=A lightweight RPC library based on XML and HTTP
-EAPI=7
-HOMEPAGE=http://xmlrpc-c.sourceforge.net/
-INHERIT=multilib-minimal toolchain-funcs
-IUSE=abyss +cgi +curl +cxx +libxml2 threads test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=test? ( abyss curl cxx )
-RESTRICT=!test? ( test )
-SLOT=0/4.54
-SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.05.tgz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=aa1394d581996be6d14728b5c2ce90e0
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r2 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r2
new file mode 100644
index 000000000000..465c83b015a6
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/ncurses:= sys-libs/readline:= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
+DESCRIPTION=A lightweight RPC library based on XML and HTTP
+EAPI=8
+HOMEPAGE=http://xmlrpc-c.sourceforge.net/
+INHERIT=toolchain-funcs
+IUSE=abyss +cgi +curl +cxx +libxml2 threads test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:= sys-libs/readline:= curl? ( net-misc/curl ) libxml2? ( dev-libs/libxml2 )
+REQUIRED_USE=test? ( abyss curl cxx )
+RESTRICT=!test? ( test )
+SLOT=0/4.54
+SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.05.tgz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b2d80fdd38e69b5ed9386639b79a4de2
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 157e39a9b729..95ac19522d13 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4-r1 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4-r1
deleted file mode 100644
index 3d188458e383..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=8
-HOMEPAGE=https://metacpan.org/release/Search-Xapian
-INHERIT=perl-module toolchain-funcs
-IUSE=examples test test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.4.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.4.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=7180d592bdd3053cbd58c92a05471617
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5
deleted file mode 100644
index 818b1347c0b5..000000000000
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl test? ( virtual/perl-Test-Simple )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Devel-Leak ) dev-lang/perl
-DESCRIPTION=Perl XS frontend to the Xapian C++ search library
-EAPI=8
-HOMEPAGE=https://metacpan.org/release/Search-Xapian
-INHERIT=perl-module toolchain-funcs
-IUSE=examples test test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-libs/xapian:0/1.2.22 !dev-libs/xapian-bindings[perl] dev-lang/perl:=
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.5.tar.gz http://oligarchy.co.uk/xapian/1.2.25/Search-Xapian-1.2.25.5.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0c1d91d9f86b5163be76e67d96a9e383
diff --git a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5-r1 b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5-r1
index 8b1b452e188e..605c84e92725 100644
--- a/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5-r1
+++ b/metadata/md5-cache/dev-perl/Search-Xapian-1.2.25.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Search-Xapian
 INHERIT=perl-module toolchain-funcs
 IUSE=examples test test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-libs/xapian-1.4:0= !dev-libs/xapian-bindings[perl] dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/O/OL/OLLY/Search-Xapian-1.2.25.5.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8e91847a54b2e9e2a88a3d2706ca4166
+_md5_=1b600ecd719c75b4a44326a286ffacf3
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index f3f9007f56ef..7bc6e46a77e2 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.5-r1 b/metadata/md5-cache/dev-php/libvirt-php-0.5.5-r1
deleted file mode 100644
index dba5e5a8a22a..000000000000
--- a/metadata/md5-cache/dev-php/libvirt-php-0.5.5-r1
+++ /dev/null
@@ -1,17 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=PHP bindings for libvirt
-EAPI=7
-HOMEPAGE=http://libvirt.org/php/
-INHERIT=php-ext-source-r3 autotools flag-o-matic
-IUSE=doc php_targets_php7-4
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.5.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ed7c53f5e58b090d5801fe8bdaa29d3e
diff --git a/metadata/md5-cache/dev-php/libvirt-php-0.5.5_p20211020 b/metadata/md5-cache/dev-php/libvirt-php-0.5.5_p20211020
deleted file mode 100644
index f4387ce0a08e..000000000000
--- a/metadata/md5-cache/dev-php/libvirt-php-0.5.5_p20211020
+++ /dev/null
@@ -1,16 +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 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-DESCRIPTION=PHP bindings for libvirt
-EAPI=8
-HOMEPAGE=http://libvirt.org/php/
-INHERIT=php-ext-source-r3 autotools
-IUSE=doc php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
-SLOT=0
-SRC_URI=https://gitlab.com/libvirt/libvirt-php/-/archive/23dde4ddc42fabee0b8c6625b80183b3cbe96a67/libvirt-php-23dde4ddc42fabee0b8c6625b80183b3cbe96a67.tar.bz2 -> libvirt-php-0.5.5_p20211020.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=2fbfdae80aaa1eed8f81ff30ccb640d3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ffb0833c1e9b..6a4adce5d13e 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/libvirt-python-7.7.0 b/metadata/md5-cache/dev-python/libvirt-python-7.7.0
deleted file mode 100644
index bfb15aba6d25..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-7.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/7.7.0 ) 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 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/7.7.0 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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.7.0.tar.gz.asc )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=d4381d7cde197f0278e34f26bd0fcb78
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.2.0 b/metadata/md5-cache/dev-python/libvirt-python-8.2.0
deleted file mode 100644
index b514bf815c78..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.2.0 ) 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 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.2.0 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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.2.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.2.0.tar.gz.asc )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=bee62e0a432590f0005a50f9820a4341
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.13.3 b/metadata/md5-cache/dev-python/qscintilla-python-2.13.3
index 8fcc2c189bf9..dfefe8923137 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.13.3
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.13.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/ https://pypi.org/project/QScintilla/
 INHERIT=python-r1 qmake-utils
 IUSE=debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3
 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-python/PyQt5-5.15.5[gui,printsupport,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ~x11-libs/qscintilla-2.13.3:= >=dev-python/PyQt5-sip-12.9:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=53b8f12930d56ae535c7fc8683d524f8
+_md5_=938f3cfd32b7eb79cbf49454a0eca5db
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index b18a31568c54..7ab1c3bd7f81 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r3 b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r3
index b3b475786f32..ec37991e4877 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.5-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.5-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=linux-info qt5-build
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=932f5da3a2cac8557e78724f92b7d0a1
+_md5_=290a66db881fc860f9802bb526542681
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r2 b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r2
index 7b9f3782b5dc..6588ecbda6d3 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.5-r2
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.5-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.5* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.5*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.5* ) eglfs? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) jpeg? ( media-libs/libjpeg-turbo:= ) gles2-only? ( media-libs/libglvnd ) !gles2-only? ( media-libs/libglvnd[X] ) libinput? ( dev-libs/libinput:= x11-libs/libxkbcommon ) png? ( media-libs/libpng:= ) tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( =dev-qt/qtnetwork-5.15.5* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.5* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb:=[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=5/5.15.5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtbase-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.5-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=d9bed4dd4064e5f0d17040230fa1ff7b
+_md5_=66b6cbe52e8b1dbc9143adbbbb91ca54
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index dc5bf69d2e0d..70fc3b6e71f9 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/bear-3.0.17 b/metadata/md5-cache/dev-util/bear-3.0.17
deleted file mode 100644
index 00efc08fe7fa..000000000000
--- a/metadata/md5-cache/dev-util/bear-3.0.17
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( sys-devel/libtool || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-cpp/nlohmann_json-3.7:= >=dev-db/sqlite-3.14:= <dev-libs/libfmt-9.0.0:= dev-libs/protobuf:= >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:= test? ( >=dev-cpp/gtest-1.10 )
-DESCRIPTION=Build EAR generates a compilation database for clang tooling
-EAPI=8
-HOMEPAGE=https://github.com/rizsotto/Bear
-INHERIT=cmake python-any-r1
-IUSE=test
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-cpp/nlohmann_json-3.7:= >=dev-db/sqlite-3.14:= <dev-libs/libfmt-9.0.0:= dev-libs/protobuf:= >=dev-libs/spdlog-1.5 >=net-libs/grpc-1.26:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/rizsotto/Bear/archive/3.0.17.tar.gz -> bear-3.0.17.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=28c3cb46cddf18729942209e9d606188
diff --git a/metadata/md5-cache/dev-util/checkbashisms-2.22.1 b/metadata/md5-cache/dev-util/checkbashisms-2.22.1
deleted file mode 100644
index cb0e27af264c..000000000000
--- a/metadata/md5-cache/dev-util/checkbashisms-2.22.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Perl script to check for commonly used bash features not defined by POSIX
-EAPI=7
-HOMEPAGE=https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl virtual/perl-Getopt-Long
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/devscripts/devscripts_2.22.1.tar.xz
-_md5_=f652b053656c70dd74f73c98cfcfcaec
diff --git a/metadata/md5-cache/dev-util/git-delta-0.13.0 b/metadata/md5-cache/dev-util/git-delta-0.13.0
deleted file mode 100644
index 4ed568084f1c..000000000000
--- a/metadata/md5-cache/dev-util/git-delta-0.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=dev-libs/libgit2:= dev-libs/oniguruma:=
-DESCRIPTION=A syntax-highlighting pager for git
-EAPI=8
-HOMEPAGE=https://github.com/dandavison/delta
-INHERIT=bash-completion-r1 cargo
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv
-LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB
-RDEPEND=dev-libs/libgit2:= dev-libs/oniguruma:= !app-text/delta
-SLOT=0
-SRC_URI=https://github.com/dandavison/delta/archive/0.13.0.tar.gz -> git-delta-0.13.0.tar.gz https://crates.io/api/v1/crates/adler/0.2.3/download -> adler-0.2.3.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.1.1/download -> ansi_colours-1.1.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.0/download -> approx-0.5.0.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bat/0.21.0/download -> bat-0.21.0.crate https://crates.io/api/v1/crates/bincode/1.3.1/download -> bincode-1.3.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/box_drawing/0.1.2/download -> box_drawing-0.1.2.crate https://crates.io/api/v1/crates/bstr/0.2.15/download -> bstr-0.2.15.crate https://crates.io/api/v1/crates/bugreport/0.5.0/download -> bugreport-0.5.0.crate https://crates.io/api/v1/crates/bytelines/2.2.2/download -> bytelines-2.2.2.crate https://crates.io/api/v1/crates/bytemuck/1.7.3/download -> bytemuck-1.7.3.crate https://crates.io/api/v1/crates/byteorder/1.3.4/download -> byteorder-1.3.4.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/cc/1.0.66/download -> cc-1.0.66.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chrono-humanize/0.2.1/download -> chrono-humanize-0.2.1.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/clap/3.0.7/download -> clap-3.0.7.crate https://crates.io/api/v1/crates/clap_derive/3.0.5/download -> clap_derive-3.0.5.crate https://crates.io/api/v1/crates/clircle/0.3.0/download -> clircle-0.3.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/content_inspector/0.2.4/download -> content_inspector-0.2.4.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.2.1/download -> crc32fast-1.2.1.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.1/download -> dirs-sys-next-0.1.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/error-chain/0.12.4/download -> error-chain-0.12.4.crate https://crates.io/api/v1/crates/find-crate/0.6.3/download -> find-crate-0.6.3.crate https://crates.io/api/v1/crates/flate2/1.0.19/download -> flate2-1.0.19.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.0/download -> form_urlencoded-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/git2/0.14.2/download -> git2-0.14.2.crate https://crates.io/api/v1/crates/git-version/0.3.5/download -> git-version-0.3.5.crate https://crates.io/api/v1/crates/git-version-macro/0.3.5/download -> git-version-macro-0.3.5.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/grep-cli/0.1.6/download -> grep-cli-0.1.6.crate https://crates.io/api/v1/crates/hashbrown/0.8.2/download -> hashbrown-0.8.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.17/download -> hermit-abi-0.1.17.crate https://crates.io/api/v1/crates/idna/0.2.0/download -> idna-0.2.0.crate https://crates.io/api/v1/crates/indexmap/1.5.2/download -> indexmap-1.5.2.crate https://crates.io/api/v1/crates/itertools/0.10.1/download -> itertools-0.10.1.crate https://crates.io/api/v1/crates/itoa/0.4.7/download -> itoa-0.4.7.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.21/download -> jobserver-0.1.21.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.112/download -> libc-0.2.112.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.2+1.4.2/download -> libgit2-sys-0.13.2+1.4.2.crate https://crates.io/api/v1/crates/libz-sys/1.1.2/download -> libz-sys-1.1.2.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.3/download -> linked-hash-map-0.5.3.crate https://crates.io/api/v1/crates/log/0.4.11/download -> log-0.4.11.crate https://crates.io/api/v1/crates/matches/0.1.8/download -> matches-0.1.8.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.3/download -> miniz_oxide-0.4.3.crate https://crates.io/api/v1/crates/nix/0.23.0/download -> nix-0.23.0.crate https://crates.io/api/v1/crates/ntapi/0.3.6/download -> ntapi-0.3.6.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/onig/6.1.1/download -> onig-6.1.1.crate https://crates.io/api/v1/crates/onig_sys/69.6.0/download -> onig_sys-69.6.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/palette/0.6.0/download -> palette-0.6.0.crate https://crates.io/api/v1/crates/palette_derive/0.6.0/download -> palette_derive-0.6.0.crate https://crates.io/api/v1/crates/path_abs/0.5.1/download -> path_abs-0.5.1.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.1/download -> phf_generator-0.9.1.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.19/download -> pkg-config-0.3.19.crate https://crates.io/api/v1/crates/plist/1.3.1/download -> plist-1.3.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.15/download -> ppv-lite86-0.2.15.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quote/1.0.14/download -> quote-1.0.14.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/redox_syscall/0.1.57/download -> redox_syscall-0.1.57.crate https://crates.io/api/v1/crates/redox_syscall/0.2.10/download -> redox_syscall-0.2.10.crate https://crates.io/api/v1/crates/redox_users/0.3.5/download -> redox_users-0.3.5.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/rgb/0.8.31/download -> rgb-0.8.31.crate https://crates.io/api/v1/crates/ryu/1.0.5/download -> ryu-1.0.5.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.118/download -> serde-1.0.118.crate https://crates.io/api/v1/crates/serde_derive/1.0.118/download -> serde_derive-1.0.118.crate https://crates.io/api/v1/crates/serde_json/1.0.70/download -> serde_json-1.0.70.crate https://crates.io/api/v1/crates/serde_yaml/0.8.23/download -> serde_yaml-0.8.23.crate https://crates.io/api/v1/crates/shell-escape/0.1.5/download -> shell-escape-0.1.5.crate https://crates.io/api/v1/crates/shell-words/1.1.0/download -> shell-words-1.1.0.crate https://crates.io/api/v1/crates/siphasher/0.3.7/download -> siphasher-0.3.7.crate https://crates.io/api/v1/crates/smol_str/0.1.21/download -> smol_str-0.1.21.crate https://crates.io/api/v1/crates/std_prelude/0.2.12/download -> std_prelude-0.2.12.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.85/download -> syn-1.0.85.crate https://crates.io/api/v1/crates/syntect/5.0.0/download -> syntect-5.0.0.crate https://crates.io/api/v1/crates/sysinfo/0.23.0/download -> sysinfo-0.23.0.crate https://crates.io/api/v1/crates/sys-info/0.9.1/download -> sys-info-0.9.1.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/terminal_size/0.1.15/download -> terminal_size-0.1.15.crate https://crates.io/api/v1/crates/term_size/0.3.2/download -> term_size-0.3.2.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/textwrap/0.14.2/download -> textwrap-0.14.2.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/tinyvec/1.1.0/download -> tinyvec-1.1.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.4/download -> unicode-bidi-0.3.4.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.16/download -> unicode-normalization-0.1.16.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.1/download -> unicode-xid-0.2.1.crate https://crates.io/api/v1/crates/url/2.2.0/download -> url-2.2.0.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.11/download -> vcpkg-0.2.11.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.2/download -> version_check-0.9.2.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/walkdir/2.3.1/download -> walkdir-2.3.1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wild/2.0.4/download -> wild-2.0.4.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/xdg/2.4.1/download -> xdg-2.4.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.3/download -> xml-rs-0.8.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c54f394c6203bf23dc0bc4240bc0a1b3
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index c0fb8faf5015..d7bdecd9591c 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/abuse-0.9.1 b/metadata/md5-cache/games-action/abuse-0.9.1
new file mode 100644
index 000000000000..eebd02052afe
--- /dev/null
+++ b/metadata/md5-cache/games-action/abuse-0.9.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/libsdl2-2.0.3[sound,video] media-libs/sdl2-mixer[midi,wav]
+DESCRIPTION=Port of Abuse by Crack Dot Com
+EAPI=8
+HOMEPAGE=https://github.com/Xenoveritas/abuse
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop xdg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 public-domain WTFPL-2
+RDEPEND=>=media-libs/libsdl2-2.0.3[sound,video] media-libs/sdl2-mixer[midi,wav]
+SLOT=0
+SRC_URI=https://github.com/Xenoveritas/abuse/archive/refs/tags/v0.9.1.tar.gz -> abuse-0.9.1.tar.gz http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=019e9dd7ca50b44be1642c428e3ab3aa
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index ca72b5da84bd..92008941a2fa 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
new file mode 100644
index 000000000000..c8a027a9d494
--- /dev/null
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.40.02
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install
+DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
+EAPI=8
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=-* ~amd64
+LICENSE=Mojang
+RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.40.02.zip
+_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index ce9d52523181..259f56de849c 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gnome-network-displays-0.90.5 b/metadata/md5-cache/gnome-extra/gnome-network-displays-0.90.5
new file mode 100644
index 000000000000..7aa5fdf56c78
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-network-displays-0.90.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3 media-libs/gst-rtsp-server media-libs/libpulse[glib] media-plugins/gst-plugins-faac media-plugins/gst-plugins-x264 media-plugins/gst-plugins-ximagesrc >=net-misc/networkmanager-1.16.0[wifi] net-dns/dnsmasq net-wireless/wpa_supplicant[p2p] sys-apps/xdg-desktop-portal[screencast] x11-libs/gtk+:3 firewalld? ( net-firewall/firewalld )
+DESCRIPTION=Stream the desktop to Wi-Fi Display capable devices
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-network-displays
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=firewalld
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-libs/glib:2 gnome-base/gnome-desktop:3 media-libs/gst-rtsp-server media-libs/libpulse[glib] media-plugins/gst-plugins-faac media-plugins/gst-plugins-x264 media-plugins/gst-plugins-ximagesrc >=net-misc/networkmanager-1.16.0[wifi] net-dns/dnsmasq net-wireless/wpa_supplicant[p2p] sys-apps/xdg-desktop-portal[screencast] x11-libs/gtk+:3 firewalld? ( net-firewall/firewalld )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-network-displays/0.90/gnome-network-displays-0.90.5.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=54220a57288d0dc46468a6f655d86fa6
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index ef3182fed271..adb75a2399a1 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.7 b/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.7
new file mode 100644
index 000000000000..7bfd6d22c773
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>x11-libs/gdk-pixbuf-2.22.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >media-libs/libwebp-0.4.3:=[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=WebP GDK Pixbuf Loader library
+EAPI=8
+HOMEPAGE=https://github.com/aruiz/webp-pixbuf-loader
+INHERIT=gnome2-utils meson-multilib
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>x11-libs/gdk-pixbuf-2.22.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >media-libs/libwebp-0.4.3:=[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://github.com/aruiz/webp-pixbuf-loader/archive/0.0.7.tar.gz -> gdk-pixbuf-loader-webp-0.0.7.tar.gz
+_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=107be8169ab1fb50e31aea8fee8f9384
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index d99c88a24bca..4f219ef0cd78 100644
--- a/metadata/md5-cache/kde-plasma/Manifest.gz
+++ b/metadata/md5-cache/kde-plasma/Manifest.gz
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.26.2.1 b/metadata/md5-cache/kde-plasma/kwin-5.26.2.1-r1
index 1042de0bc0fa..c3b4185e7935 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.26.2.1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.26.2.1-r1
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.26.2/kwin-5.26.2.1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	3dae552f761290722bcc848a12bfb538	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	plasma.kde.org	9622322dda51d66780cf4cfd2b3351b8	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=693e6432dce26d365948676bfe35bc4b
+_md5_=329bff1fc161fa62dfe3c327891abdce
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 020578af2929..ab35ccec302d 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2
deleted file mode 100644
index 34d75a496141..000000000000
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Collection of tools and libraries for many image formats
-EAPI=8
-HOMEPAGE=http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM
-INHERIT=autotools toolchain-funcs verify-sig
-IUSE=bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma openmp perl png postscript q16 q32 static-libs svg tcmalloc threads tiff truetype webp wmf X zlib zstd verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-SLOT=0/1.3
-SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e711308062eac174158b0a17ce7b6ddc
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c0b07f7879a6..4e4404248b2d 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/freealut-1.1.0-r4 b/metadata/md5-cache/media-libs/freealut-1.1.0-r4
deleted file mode 100644
index f18b38f8589a..000000000000
--- a/metadata/md5-cache/media-libs/freealut-1.1.0-r4
+++ /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 prepare test
-DEPEND=>=media-libs/openal-1.15.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=The OpenAL Utility Toolkit
-EAPI=7
-HOMEPAGE=https://www.openal.org/
-INHERIT=autotools multilib-minimal
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2
-RDEPEND=>=media-libs/openal-1.15.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=http://http.debian.net/debian/pool/main/f/freealut/freealut_1.1.0.orig.tar.gz -> freealut-1.1.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f219e79dc8fdd1b83e6f9dab66dc8367
diff --git a/metadata/md5-cache/media-libs/freealut-1.1.0-r5 b/metadata/md5-cache/media-libs/freealut-1.1.0-r5
new file mode 100644
index 000000000000..70048ff33b65
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freealut-1.1.0-r5
@@ -0,0 +1,14 @@
+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
+DEPEND=>=media-libs/openal-1.15.1
+DESCRIPTION=The OpenAL Utility Toolkit
+EAPI=8
+HOMEPAGE=https://www.openal.org/
+INHERIT=autotools
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=>=media-libs/openal-1.15.1
+SLOT=0
+SRC_URI=http://http.debian.net/debian/pool/main/f/freealut/freealut_1.1.0.orig.tar.gz -> freealut-1.1.0.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3739b01aa564a1282ebf9be80d51ef36
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r2 b/metadata/md5-cache/media-libs/libharu-2.3.0-r2
deleted file mode 100644
index 6669c95640b4..000000000000
--- a/metadata/md5-cache/media-libs/libharu-2.3.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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(-)?]
-DESCRIPTION=C/C++ library for PDF generation
-EAPI=7
-HOMEPAGE=http://www.libharu.org/
-INHERIT=cmake-multilib
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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/2.3.0
-SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=85ec840ef606cba865f550a12aeb405e
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.9.2 b/metadata/md5-cache/media-libs/libharu-2.3.0-r3
index 4d52e5656d41..ae57cd9bf029 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.9.2
+++ b/metadata/md5-cache/media-libs/libharu-2.3.0-r3
@@ -1,16 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libfmt-8.0.0:=
-DESCRIPTION=Very fast, header only, C++ logging library
+DEPEND=media-libs/libpng:= sys-libs/zlib:=
+DESCRIPTION=C/C++ library for PDF generation
 EAPI=7
-HOMEPAGE=https://github.com/gabime/spdlog
+HOMEPAGE=http://www.libharu.org/
 INHERIT=cmake
-IUSE=test
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libfmt-8.0.0:=
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://github.com/gabime/spdlog/archive/v1.9.2.tar.gz -> spdlog-1.9.2.tar.gz test? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/spdlog/spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 )
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=media-libs/libpng:= sys-libs/zlib:=
+SLOT=0/2.3.0
+SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3e3faacdd58be3866141c054da4809ac
+_md5_=841a6a0d28161a23b155f2766297dae4
diff --git a/metadata/md5-cache/media-libs/libharu-2.4.2 b/metadata/md5-cache/media-libs/libharu-2.4.2
deleted file mode 100644
index 9dfd47e55d2d..000000000000
--- a/metadata/md5-cache/media-libs/libharu-2.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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(-)?]
-DESCRIPTION=C/C++ library for PDF generation
-EAPI=8
-HOMEPAGE=http://www.libharu.org/
-INHERIT=cmake-multilib
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/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/2.4.2
-SRC_URI=https://github.com/libharu/libharu/archive/v2.4.2.tar.gz -> libharu-2.4.2.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f841c1a58dd93a934ded7267c4ef3a23
diff --git a/metadata/md5-cache/media-libs/libharu-2.4.2-r1 b/metadata/md5-cache/media-libs/libharu-2.4.2-r1
new file mode 100644
index 000000000000..68ea622ef6ce
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libharu-2.4.2-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libpng:= sys-libs/zlib:=
+DESCRIPTION=C/C++ library for PDF generation
+EAPI=8
+HOMEPAGE=http://www.libharu.org/
+INHERIT=cmake
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=media-libs/libpng:= sys-libs/zlib:=
+SLOT=0/2.4.2
+SRC_URI=https://github.com/libharu/libharu/archive/v2.4.2.tar.gz -> libharu-2.4.2.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=437d8da322c07f501c40ea56fb18cf34
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.3-r1 b/metadata/md5-cache/media-libs/libmetalink-0.1.3-r1
deleted file mode 100644
index 1bc31bb72fea..000000000000
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=expat? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-util/cunit-2.1_p2[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 for handling Metalink files
-EAPI=7
-HOMEPAGE=https://launchpad.net/libmetalink
-INHERIT=multilib-minimal
-IUSE=expat static-libs test xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=expat? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=^^ ( expat xml )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.3/+download/libmetalink-0.1.3.tar.bz2
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c7bfc81ef79d8146eaf87e18f863f119
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.3-r2 b/metadata/md5-cache/media-libs/libmetalink-0.1.3-r2
new file mode 100644
index 000000000000..94c795206694
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmetalink-0.1.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=expat? ( >=dev-libs/expat-2.1.0-r3 ) xml? ( >=dev-libs/libxml2-2.9.1-r4 ) test? ( >=dev-util/cunit-2.1_p2 )
+DESCRIPTION=Library for handling Metalink files
+EAPI=8
+HOMEPAGE=https://launchpad.net/libmetalink
+IUSE=expat static-libs test xml
+KEYWORDS=amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv sparc x86
+LICENSE=MIT
+RDEPEND=expat? ( >=dev-libs/expat-2.1.0-r3 ) xml? ( >=dev-libs/libxml2-2.9.1-r4 )
+REQUIRED_USE=^^ ( expat xml )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.3/+download/libmetalink-0.1.3.tar.bz2
+_md5_=cc3bb8b0f5f1ec5a4d25212d7c1c183b
diff --git a/metadata/md5-cache/media-libs/libpulse-16.0-r1 b/metadata/md5-cache/media-libs/libpulse-16.0-r1
deleted file mode 100644
index 29137b26bb08..000000000000
--- a/metadata/md5-cache/media-libs/libpulse-16.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) >=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 test
-DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[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/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_mingw? ( dev-libs/libpcre:3 ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=Libraries for PulseAudio clients
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-IUSE=+asyncns dbus doc +glib gtk selinux systemd test valgrind X 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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[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/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elibc_mingw? ( dev-libs/libpcre:3 ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-sound/pulseaudio-15.0-r100
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f8dcfcb50958f5507b8e001be4c25423
diff --git a/metadata/md5-cache/media-libs/taglib-1.13 b/metadata/md5-cache/media-libs/taglib-1.13
new file mode 100644
index 000000000000..98ed20e564d2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/taglib-1.13
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=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(-)?] test? ( >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Library for reading and editing audio meta data
+EAPI=8
+HOMEPAGE=https://taglib.github.io/
+INHERIT=cmake-multilib
+IUSE=doc examples 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=LGPL-2.1 MPL-1.1
+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(-)?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/taglib/taglib/archive/v1.13.tar.gz -> taglib-1.13.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=469e1b926bcef933248a51413d6da76f
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 57b9fa859067..1f5f1e8dbdc9 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/pulseaudio-16.0 b/metadata/md5-cache/media-sound/pulseaudio-16.0
deleted file mode 100644
index dafa5f14c795..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libpulse-16.0[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.0[bluetooth?,glib?,jack?,ofono-headset?] )
-DESCRIPTION=A meta package for PulseAudio (networked sound server)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=multilib-minimal
-IUSE=bluetooth +daemon +glib jack ofono-headset 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 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=metapackage
-RDEPEND=>=media-libs/libpulse-16.0[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.0[bluetooth?,glib?,jack?,ofono-headset?] )
-SLOT=0
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=91947e9b67c0ac9850fea4b831c49b56
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
deleted file mode 100644
index e613f7945c7a..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=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 postrm prepare test
-DEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer fftw +gdbm +glib gstreamer gtk ipv6 jack ldac lirc ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=~media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd(+)?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) aptx? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0= ) fftw? ( sci-libs/fftw:3.0= ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) ldac? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) virtual/tmpfiles
-REQUIRED_USE=?? ( elogind systemd ) alsa-plugin? ( alsa ) aptx? ( bluetooth ) bluetooth? ( dbus ) equalizer? ( dbus ) ldac? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=50997aaee6b9371e8365e49533eefa62
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 7ee426ca23ec..fce0de354d6e 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/mkvtoolnix-57.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-57.0.0
deleted file mode 100644
index 30d3c19bb065..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-57.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=7
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-INHERIT=autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd nls pch qt5 test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-57.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6d57ee9cbe0183a5aca8c980dab7814c
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-60.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-60.0.0
deleted file mode 100644
index 7d6c496487dc..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-60.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=7
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-INHERIT=autotools flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd nls pch test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-60.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e1834f6a638470b6b40948b77f9f8e77
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-61.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-61.0.0
deleted file mode 100644
index 27c9ff9f8dc1..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-61.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) dev-cpp/nlohmann_json dev-libs/utfcpp test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=7
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd nls pch test gui
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= >=dev-libs/libebml-1.4.0:= >=dev-libs/libfmt-6.1.0:= <dev-libs/libfmt-9.0.0:= dev-libs/libpcre2:= dev-libs/pugixml:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-61.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2d972eb8ca664d9c899f369461cbd116
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-64.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-64.0.0
deleted file mode 100644
index b1d299fedd8d..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-64.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=7
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd gui nls pch test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-64.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=13306d9310a614d90d880ccbd9518a15
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-67.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-67.0.0
deleted file mode 100644
index 1135769eba50..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-67.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=8
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd gui nls pch test
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= <dev-libs/libfmt-9.0.0:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-67.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=acd2ee7b041b72c1c03ddc298b027123
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3 b/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
deleted file mode 100644
index 9bd3ee8d5e34..000000000000
--- a/metadata/md5-cache/media-video/mkvtoolnix-68.0.0-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-ruby/rake virtual/pkgconfig nls? ( sys-devel/gettext app-text/po4a ) 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 postinst postrm preinst prepare test
-DEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) >=dev-cpp/nlohmann_json-3.9.1 >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest )
-DESCRIPTION=Tools to create, alter, and inspect Matroska files
-EAPI=8
-HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
-IUSE=dbus debug dvd gui nls pch test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtsvg:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-68.0.0.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dd11badde67fe83fe9937470db47c8cb
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.58 b/metadata/md5-cache/media-video/pipewire-0.3.58
deleted file mode 100644
index 9d3a5442d1ba..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.58
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta4:3.11 >=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.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=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 postrm prepare setup test
-DEPEND=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 )
-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 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
-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 )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.58/pipewire-0.3.58.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_=b7198c97919b265951588bbe4b6f6819
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.59 b/metadata/md5-cache/media-video/pipewire-0.3.59
deleted file mode 100644
index 6e8a755228e5..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.59
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_beta4:3.11 >=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.11.0_beta4:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=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 postrm prepare setup test
-DEPEND=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 )
-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 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
-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 )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.59/pipewire-0.3.59.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_=43ca35cd8959cf31c34028cef514193f
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.59-r1 b/metadata/md5-cache/media-video/pipewire-0.3.59-r2
index ebed90262974..31ced658fb77 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.59-r1
+++ b/metadata/md5-cache/media-video/pipewire-0.3.59-r2
@@ -13,6 +13,6 @@ RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurse
 REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.59/pipewire-0.3.59.tar.gz
+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_=782a6065a12782c57068eada6b0c30be
+_md5_=40980f8f7ddc8528aa175775983c781f
diff --git a/metadata/md5-cache/media-video/pipewire-9999 b/metadata/md5-cache/media-video/pipewire-9999
index 72f44e5c1ffe..718279e3c96d 100644
--- a/metadata/md5-cache/media-video/pipewire-9999
+++ b/metadata/md5-cache/media-video/pipewire-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-serve
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	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_=43ca35cd8959cf31c34028cef514193f
+_md5_=ae6f4788725a9cdf2fa1f5155337e05d
diff --git a/metadata/md5-cache/media-video/vlc-3.0.17.4-r2 b/metadata/md5-cache/media-video/vlc-3.0.17.4-r2
index 7eb03e4bb32b..a82e2b8fc2b7 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.17.4-r2
+++ b/metadata/md5-cache/media-video/vlc-3.0.17.4-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/5-9
 SRC_URI=https://download.videolan.org/pub/videolan/vlc/3.0.17.4/vlc-3.0.17.4.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8def9a2a7ea70d1cd534872063399620
+_md5_=73c8aea317adb3d46e290942925273b8
diff --git a/metadata/md5-cache/media-video/vlc-3.0.9999 b/metadata/md5-cache/media-video/vlc-3.0.9999
index ffdf55017c72..e9c81b4a21b0 100644
--- a/metadata/md5-cache/media-video/vlc-3.0.9999
+++ b/metadata/md5-cache/media-video/vlc-3.0.9999
@@ -13,4 +13,4 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/5-9
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b8872661ce104d5445fea5850aec3d85
+_md5_=bcaa95e196979dc57bcf7c54772fcd51
diff --git a/metadata/md5-cache/media-video/vlc-9999 b/metadata/md5-cache/media-video/vlc-9999
index 23570df84087..dd45cdfb366f 100644
--- a/metadata/md5-cache/media-video/vlc-9999
+++ b/metadata/md5-cache/media-video/vlc-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=chromecast? ( encode ) directx? ( ffmpeg ) fontconfig? ( truetype )
 RESTRICT=!test? ( test )
 SLOT=0/12-9
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=594cbb1cd675e1829e6e64d113eec795
+_md5_=5eb391393bdcafdb759eb0f2ca93acd6
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r4 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r4
deleted file mode 100644
index 1771bfb21c6b..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=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.48:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Replacement for pipewire-media-session
-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
-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.48:= 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 )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
-_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_=03fb8fa183b6f4a6f45aa77bc0107b0a
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11-r2 b/metadata/md5-cache/media-video/wireplumber-0.4.11-r2
deleted file mode 100644
index 055cac902524..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.11-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=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 )
-DESCRIPTION=Replacement for pipewire-media-session
-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
-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 )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
-_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_=916f35d16775dd0eef8832469c2590f7
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.12 b/metadata/md5-cache/media-video/wireplumber-0.4.12-r1
index 45e489fc9cb6..223e62c38b03 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.12
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.12-r1
@@ -12,6 +12,6 @@ RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4?
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
 RESTRICT=!test? ( test )
 SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.12/wireplumber-0.4.12.tar.gz
+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_=eb5543bde8e42eabb944fbdacf6722cb
+_md5_=008f8c22a8fbc3c953d6c217b9b882fd
diff --git a/metadata/md5-cache/media-video/wireplumber-9999 b/metadata/md5-cache/media-video/wireplumber-9999
index ceb53735aa77..994b2913444d 100644
--- a/metadata/md5-cache/media-video/wireplumber-9999
+++ b/metadata/md5-cache/media-video/wireplumber-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogi
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	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_=c88333c23e1079102a318ab8da0e0e8d
+_md5_=4acd58cda665aa93ab2fa383e0709cd0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index c253c0a639d3..0105f5850b12 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/nmap-7.92-r2 b/metadata/md5-cache/net-analyzer/nmap-7.92-r2
deleted file mode 100644
index 713ff03cef6a..000000000000
--- a/metadata/md5-cache/net-analyzer/nmap-7.92-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-nmap ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) symlink? ( !net-analyzer/netcat !net-analyzer/openbsd-netcat ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
-DESCRIPTION=Network exploration tool and security / port scanner
-EAPI=7
-HOMEPAGE=https://nmap.org/
-INHERIT=autotools lua-single toolchain-funcs verify-sig
-IUSE=ipv6 libssh2 ncat nping +nse ssl symlink +system-lua +lua_single_target_lua5-3 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=|| ( NPSL GPL-2 )
-RDEPEND=dev-libs/liblinear:= dev-libs/libpcre net-libs/libpcap libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) nse? ( sys-libs/zlib ) ssl? ( dev-libs/openssl:0= ) symlink? ( !net-analyzer/netcat !net-analyzer/openbsd-netcat ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3[deprecated] ) )
-REQUIRED_USE=system-lua? ( nse ^^ ( lua_single_target_lua5-3 ) ) symlink? ( ncat )
-SLOT=0
-SRC_URI=https://nmap.org/dist/nmap-7.92.tar.bz2 verify-sig? ( https://nmap.org/dist/sigs/nmap-7.92.tar.bz2.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=fb7476633f91f5985676a1455d4f9b60
diff --git a/metadata/md5-cache/net-analyzer/wireshark-4.0.0-r2 b/metadata/md5-cache/net-analyzer/wireshark-4.0.0-r2
deleted file mode 100644
index 43870b6a2a5c..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-4.0.0-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=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/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) gui? ( qt6? ( dev-qt/qttools:6[linguist] ) !qt6? ( dev-qt/linguist-tools:5 ) ) test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( !qt6? ( dev-qt/qtdeclarative:5 ) )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.50.0:2 dev-libs/libpcre2 >=net-dns/c-ares-1.13.0:= >=dev-libs/libgcrypt-1.8.0:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6:= ) filecaps? ( sys-libs/libcap ) http2? ( >=net-libs/nghttp2-1.11.0:= ) ilbc? ( media-libs/libilbc:= ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) gui? ( x11-misc/xdg-utils qt6? ( dev-qt/qtbase:6[concurrent,dbus,gui,widgets] dev-qt/qt5compat:6 dev-qt/qtmultimedia:6 ) !qt6? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd:= ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp:= ) sshdump? ( >=net-libs/libssh-0.6:= ) ssl? ( >=net-libs/gnutls-3.5.8:= ) wifi? ( >=net-libs/libssh-0.6:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) gui? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) )
-RESTRICT=!test? ( test )
-SLOT=0/4.0.0
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-4.0.0.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=59dc7191f05825939b4e4054d1283b2b
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 4b4d58ca6ae3..5119476e44bb 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
deleted file mode 100644
index a390bc4a8b8e..000000000000
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.13 filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst test unpack
-DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
-EAPI=7
-HOMEPAGE=https://github.com/DNSCrypt/dnscrypt-proxy
-INHERIT=fcaps go-module systemd
-IUSE=+pie +filecaps
-KEYWORDS=amd64 arm arm64 ppc64 x86
-LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
-RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy filecaps? ( sys-libs/libcap )
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/DNSCrypt/dnscrypt-proxy/archive/2.1.1.tar.gz -> dnscrypt-proxy-2.1.1.tar.gz
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=086d4a2b546f4ff702f5a1e496cbd3e2
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 457cef47b908..d6ab37155e2e 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.1.2 b/metadata/md5-cache/net-firewall/firewalld-1.1.2
deleted file mode 100644
index c9902108af18..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-1.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) dev-libs/glib:2
-DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
-EAPI=8
-HOMEPAGE=https://firewalld.org/
-INHERIT=bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-IUSE=gui +nftables +iptables test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) test? ( userpriv )
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/releases/download/v1.1.2/firewalld-1.1.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46db010b456384c76d5274550e368a4d
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.2.0 b/metadata/md5-cache/net-firewall/firewalld-1.2.0
deleted file mode 100644
index 02e6867c3d29..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-1.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) dev-libs/glib:2
-DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
-EAPI=8
-HOMEPAGE=https://firewalld.org/
-INHERIT=bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-IUSE=gui +nftables +iptables test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) test? ( userpriv )
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/releases/download/v1.2.0/firewalld-1.2.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=46db010b456384c76d5274550e368a4d
diff --git a/metadata/md5-cache/net-firewall/nftlb-1.0.7 b/metadata/md5-cache/net-firewall/nftlb-1.0.7
new file mode 100644
index 000000000000..5b732d65d4ea
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/nftlb-1.0.7
@@ -0,0 +1,15 @@
+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=prepare setup test
+DEPEND=net-firewall/nftables:=[modern-kernel] dev-libs/jansson:= dev-libs/libev:=
+DESCRIPTION=nftables load balancer
+EAPI=8
+HOMEPAGE=https://github.com/zevenet/nftlb
+INHERIT=linux-info autotools
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=net-firewall/nftables:=[modern-kernel] dev-libs/jansson:= dev-libs/libev:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/zevenet/nftlb/archive/v1.0.7.tar.gz -> nftlb-1.0.7.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=884d6181424ba8979156022b3beddf57
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 5b91b29f02d8..724ba22d029a 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/irker-2.21 b/metadata/md5-cache/net-irc/irker-2.21
deleted file mode 100644
index 0b6a6500ee33..000000000000
--- a/metadata/md5-cache/net-irc/irker-2.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/xmlto python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl] ) virtual/pkgconfig
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=Submission tools for IRC notifications
-EAPI=8
-HOMEPAGE=http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker
-INHERIT=optfeature python-single-r1 systemd
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 sparc x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=http://www.catb.org/esr/irker/irker-2.21.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=84e9fff90c98eb1fc304c3b4b5243e5a
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c4ea9df473aa..07e42cfaa1b1 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libaccounts-glib-1.26 b/metadata/md5-cache/net-libs/libaccounts-glib-1.26
deleted file mode 100644
index 36f0bcc53071..000000000000
--- a/metadata/md5-cache/net-libs/libaccounts-glib-1.26
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) dev-libs/check dev-util/gdbus-codegen dev-util/glib-utils doc? ( dev-util/gtk-doc ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install 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-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DESCRIPTION=Accounts SSO (Single Sign-On) management library for GLib applications
-EAPI=8
-HOMEPAGE=https://gitlab.com/accounts-sso/libaccounts-glib
-INHERIT=meson python-r1 vala
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=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-db/sqlite:3 dev-libs/glib:2 dev-libs/gobject-introspection:= dev-libs/libxml2 dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/VERSION_1.26/libaccounts-glib-VERSION_1.26.tar.gz -> libaccounts-glib-1.26.tar.gz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vala	160a8a30a6cb9aa601e5441c643a7c61
-_md5_=db1882b67e6b6660bfb58d2da83100b2
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1 b/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1
deleted file mode 100644
index 55d4a7f6a99c..000000000000
--- a/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r1
+++ /dev/null
@@ -1,16 +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 prepare test
-DEPEND=>=dev-libs/jansson-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbase58[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-libs/libgcrypt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=C implementation of Bitcoin's getblocktemplate interface
-EAPI=7
-HOMEPAGE=https://github.com/bitcoin/libblkmaker
-INHERIT=autotools multilib-minimal
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/jansson-2.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbase58[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0/7
-SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.6.0.tar.gz -> libblkmaker-0.6.0-github.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=53748da2f8a08b780ad0d5232c406635
diff --git a/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r2 b/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r2
new file mode 100644
index 000000000000..b2ce0d742a1a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libblkmaker-0.6.0-r2
@@ -0,0 +1,16 @@
+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=prepare
+DEPEND=>=dev-libs/jansson-2.0.0:= dev-libs/libbase58 test? ( dev-libs/libgcrypt )
+DESCRIPTION=C implementation of Bitcoin's getblocktemplate interface
+EAPI=8
+HOMEPAGE=https://github.com/bitcoin/libblkmaker
+INHERIT=autotools
+IUSE=test
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/jansson-2.0.0:= dev-libs/libbase58
+RESTRICT=!test? ( test )
+SLOT=0/7
+SRC_URI=https://github.com/bitcoin/libblkmaker/archive/v0.6.0.tar.gz -> libblkmaker-0.6.0-github.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=c4aa1e39b965fad3a8bb4b36cb500fdd
diff --git a/metadata/md5-cache/net-libs/libyang-2.0.194 b/metadata/md5-cache/net-libs/libyang-2.0.194
deleted file mode 100644
index 70eba1708ecf..000000000000
--- a/metadata/md5-cache/net-libs/libyang-2.0.194
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( dev-util/cmocka )
-DESCRIPTION=YANG data modeling language library
-EAPI=8
-HOMEPAGE=https://github.com/CESNET/libyang
-INHERIT=cmake-multilib
-IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libpcre2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/CESNET/libyang/archive/v2.0.194.tar.gz -> libyang-2.0.194.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30fe275d8d693b0b7b2e9ba8c5a43bdd
diff --git a/metadata/md5-cache/net-libs/libyang-2.0.194-r1 b/metadata/md5-cache/net-libs/libyang-2.0.194-r1
new file mode 100644
index 000000000000..60194e98a2f7
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libyang-2.0.194-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libpcre2 test? ( dev-util/cmocka )
+DESCRIPTION=YANG data modeling language library
+EAPI=8
+HOMEPAGE=https://github.com/CESNET/libyang
+INHERIT=cmake
+IUSE=doc test
+KEYWORDS=amd64 ~arm64 x86
+LICENSE=BSD
+RDEPEND=dev-libs/libpcre2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/CESNET/libyang/archive/v2.0.194.tar.gz -> libyang-2.0.194.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e980d104d3430b0a582b6d3e07a31745
diff --git a/metadata/md5-cache/net-libs/nodejs-14.20.1 b/metadata/md5-cache/net-libs/nodejs-14.20.1
index e8641d31f157..30f4c7c5ad2f 100644
--- a/metadata/md5-cache/net-libs/nodejs-14.20.1
+++ b/metadata/md5-cache/net-libs/nodejs-14.20.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://nodejs.org/dist/v14.20.1/node-v14.20.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a27dc1d0960db88e7a288772a352ac25
+_md5_=7e59feada5550e117124e258b6d18369
diff --git a/metadata/md5-cache/net-libs/nodejs-16.17.1 b/metadata/md5-cache/net-libs/nodejs-16.17.1
index b4db542ba2cb..e58dd873d804 100644
--- a/metadata/md5-cache/net-libs/nodejs-16.17.1
+++ b/metadata/md5-cache/net-libs/nodejs-16.17.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/16
 SRC_URI=https://nodejs.org/dist/v16.17.1/node-v16.17.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e52a367b95ba25d343caa38a2156f228
+_md5_=96eedcc4ff9568fe3ada1b645afa09d7
diff --git a/metadata/md5-cache/net-libs/nodejs-18.10.0 b/metadata/md5-cache/net-libs/nodejs-18.10.0
index 5b1c57c5ca00..7aaa833279a2 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.10.0
+++ b/metadata/md5-cache/net-libs/nodejs-18.10.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.10.0/node-v18.10.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=31bf84978c021b0cf4348cd168a025f3
+_md5_=d198127c2c4263d46ac367946ee50b6d
diff --git a/metadata/md5-cache/net-libs/nodejs-18.9.1 b/metadata/md5-cache/net-libs/nodejs-18.9.1
index 6db7723ed6d1..29c819bb0a22 100644
--- a/metadata/md5-cache/net-libs/nodejs-18.9.1
+++ b/metadata/md5-cache/net-libs/nodejs-18.9.1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/18
 SRC_URI=https://nodejs.org/dist/v18.9.1/node-v18.9.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d22f9d9d7904a0529d986cce08d49fea
+_md5_=81d68bf6e228e5cd0d67b38a120c40c7
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 7e9f076af226..c8949bc45a1f 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/curl-7.86.0-r1 b/metadata/md5-cache/net-misc/curl-7.86.0-r1
new file mode 100644
index 000000000000..f9f75a02a697
--- /dev/null
+++ b/metadata/md5-cache/net-misc/curl-7.86.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) 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 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[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(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A Client that groks URLs
+EAPI=8
+HOMEPAGE=https://curl.haxx.se/
+INHERIT=autotools prefix multilib-minimal verify-sig
+IUSE=+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl nghttp3 quiche 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
+LICENSE=curl
+RDEPEND=ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) openssl? ( dev-libs/openssl:0=[sslv3(-)=,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(-)?] ) nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nss-pem app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[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(-)?] zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://curl.haxx.se/download/curl-7.86.0.tar.xz verify-sig? ( https://curl.haxx.se/download/curl-7.86.0.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=66f855c2d2c6166fea76bb35782c2829
diff --git a/metadata/md5-cache/net-misc/tipcutils-3.0.6 b/metadata/md5-cache/net-misc/tipcutils-3.0.6
new file mode 100644
index 000000000000..47fe9bb9cc50
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tipcutils-3.0.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure
+DEPEND=dev-libs/libdaemon:= net-libs/libmnl:= >=sys-kernel/linux-headers-2.6.39
+DESCRIPTION=Utilities for TIPC (Transparent Inter-Process Communication)
+EAPI=8
+HOMEPAGE=http://tipc.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( BSD-2 GPL-2 )
+RDEPEND=dev-libs/libdaemon:= net-libs/libmnl:=
+SLOT=0
+SRC_URI=mirror://sourceforge/tipc/tipcutils_3.0.6.tgz
+_md5_=4373a2d597f39bb3a83085699e692a3e
diff --git a/metadata/md5-cache/net-misc/vmnet-0.4 b/metadata/md5-cache/net-misc/vmnet-0.4-r1
index d81aaf0f16d2..8591df7c7149 100644
--- a/metadata/md5-cache/net-misc/vmnet-0.4
+++ b/metadata/md5-cache/net-misc/vmnet-0.4-r1
@@ -10,4 +10,4 @@ RDEPEND=sys-apps/net-tools
 SLOT=0
 SRC_URI=ftp://ftp.xos.nl/pub/linux/vmnet/vmnet-0.4.tar.gz mirror://debian/pool/main/v/vmnet/vmnet_0.4-1.diff.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c8e09b42f7a6af2fe7f57c38436e13b9
+_md5_=7c1bfd6a11d3070086a654977ce61e70
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 9e1ca1e37655..ad9a2a85f14a 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/sshuttle-1.1.0 b/metadata/md5-cache/net-proxy/sshuttle-1.1.0
deleted file mode 100644
index 82dfc98c3332..000000000000
--- a/metadata/md5-cache/net-proxy/sshuttle-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( net-firewall/iptables net-firewall/nftables ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) 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-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare setup test
-DESCRIPTION=Transparent proxy server that works as a poor man's VPN using ssh
-EAPI=8
-HOMEPAGE=https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/
-INHERIT=distutils-r1 linux-info
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( net-firewall/iptables net-firewall/nftables ) 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 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/sshuttle/sshuttle-1.1.0.tar.gz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=5230603fdd7c5344a4c6087f2cc75e3b
diff --git a/metadata/md5-cache/net-proxy/tayga-0.9.2-r1 b/metadata/md5-cache/net-proxy/tayga-0.9.2-r1
deleted file mode 100644
index 18efbfc3331e..000000000000
--- a/metadata/md5-cache/net-proxy/tayga-0.9.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=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=out-of-kernel stateless NAT64 implementation based on TUN
-EAPI=6
-HOMEPAGE=http://www.litech.org/tayga/
-INHERIT=autotools
-KEYWORDS=amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6445fddec8944969658fde8853eab04d
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 98055dff9adc..a0794037a7f8 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/kismet-2022.02.1 b/metadata/md5-cache/net-wireless/kismet-2022.02.1
deleted file mode 100644
index 37cfc1c2bdf7..000000000000
--- a/metadata/md5-cache/net-wireless/kismet-2022.02.1
+++ /dev/null
@@ -1,17 +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 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] dev-python/websockets[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/protobuf-python[python_targets_python3_9(-)] dev-python/websockets[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] dev-python/websockets[python_targets_python3_10(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) dev-libs/boost dev-libs/libfmt virtual/pkgconfig
-DESCRIPTION=IEEE 802.11 wireless LAN sniffer
-EAPI=8
-HOMEPAGE=https://www.kismetwireless.net
-INHERIT=autotools python-single-r1 udev systemd
-IUSE=libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=rtlsdr? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) net-wireless/rtl-sdr )
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) acct-user/kismet acct-group/kismet networkmanager? ( net-misc/networkmanager:= ) dev-libs/glib:= dev-libs/elfutils:= sys-libs/zlib:= dev-db/sqlite:= net-libs/libmicrohttpd:= net-libs/libwebsockets:=[client,lejp] kernel_linux? ( sys-libs/libcap dev-libs/libnl:3 net-libs/libpcap ) libusb? ( virtual/libusb:1 ) dev-libs/protobuf-c:= dev-libs/protobuf:= python_single_target_python3_8? ( dev-python/protobuf-python[python_targets_python3_8(-)] dev-python/websockets[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/protobuf-python[python_targets_python3_9(-)] dev-python/websockets[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/protobuf-python[python_targets_python3_10(-)] dev-python/websockets[python_targets_python3_10(-)] ) sys-libs/ncurses:= lm-sensors? ( sys-apps/lm-sensors ) pcre? ( dev-libs/libpcre ) suid? ( sys-libs/libcap ) ubertooth? ( net-wireless/ubertooth:= ) python_single_target_python3_8? ( dev-python/pyserial[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyserial[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyserial[python_targets_python3_10(-)] ) selinux? ( sec-policy/selinux-kismet )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0/2022.02.1
-SRC_URI=https://www.kismetwireless.net/code/kismet-2022-02-R1.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b8b517485826bfcc61db5c4b6049bae7
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 8314e01d4307..e97224f6a095 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.11.0_rc2 b/metadata/md5-cache/sci-visualization/paraview-5.11.0_rc2
new file mode 100644
index 000000000000..3d82d362f98e
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/paraview-5.11.0_rc2
@@ -0,0 +1,18 @@
+BDEPEND=openmp? ( virtual/fortran ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu media-libs/libjpeg-turbo:= x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ffmpeg? ( media-video/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/constantly[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/sip:5[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/constantly[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/sip:5[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/constantly[python_targets_python3_10(-)] dev-python/incremental[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/sip:5[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/zope-interface[python_targets_python3_10(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxmlpatterns:5 ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) webengine? ( dev-qt/qtwebengine:5[widgets] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) boost? ( python_single_target_python3_8? ( dev-libs/boost[mpi?,python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-libs/boost[mpi?,python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/boost[mpi?,python,python_targets_python3_10(-)] ) )
+DESCRIPTION=Powerful scientific data visualization application
+EAPI=8
+HOMEPAGE=https://www.paraview.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake desktop docs python-single-r1 qmake-utils toolchain-funcs xdg
+IUSE=boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine doc python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD MIT PSF-2 VTK
+RDEPEND=app-arch/lz4 dev-libs/expat dev-libs/jsoncpp:= dev-libs/libxml2:2 dev-libs/protobuf:= dev-libs/pugixml media-libs/freetype media-libs/glew:0 media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/cgnslib sci-libs/hdf5:=[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/glu media-libs/libjpeg-turbo:= x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt ffmpeg? ( media-video/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) !offscreen? ( virtual/opengl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/constantly[python_targets_python3_8(-)] dev-python/incremental[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/sip:5[python_targets_python3_8(-)] dev-python/six[python_targets_python3_8(-)] dev-python/twisted[python_targets_python3_8(-)] dev-python/zope-interface[python_targets_python3_8(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/constantly[python_targets_python3_9(-)] dev-python/incremental[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/sip:5[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/zope-interface[python_targets_python3_9(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/constantly[python_targets_python3_10(-)] dev-python/incremental[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/sip:5[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/zope-interface[python_targets_python3_10(-)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,python_targets_python3_10(-)] ) ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5[-gles2-only] dev-qt/qthelp:5 dev-qt/qtopengl:5[-gles2-only] dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtx11extras:5 dev-qt/qtxmlpatterns:5 ) sqlite? ( dev-db/sqlite:3 ) tk? ( dev-lang/tk:0= ) webengine? ( dev-qt/qtwebengine:5[widgets] )
+REQUIRED_USE=python? ( mpi ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) webengine? ( qt5 ) qt5? ( sqlite ) ?? ( offscreen qt5 )
+RESTRICT=mirror test
+SLOT=0
+SRC_URI=https://www.paraview.org/files/v5.11/ParaView-v5.11.0-RC2.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	docs	8ed2a8a28ff109e7a3582c9abb7fe327	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2426490ac2e7746aa6fff600f29fee5b
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 53bc0c98c8cc..b472ebbf35fc 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-commons-20221022 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-commons-20221022
new file mode 100644
index 000000000000..17c44c25a390
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-commons-20221022
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by commons.apache.org
+EAPI=8
+HOMEPAGE=https://logging.apache.org/log4j/2.x/download.html
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=https://downloads.apache.org/commons/KEYS -> openpgp-keys-apache-commons-20221022-KEYS.asc
+_md5_=4b71dfc254761948574744cd2b113aeb
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 92532d7d93c1..4854bfc93481 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/attr-2.5.1 b/metadata/md5-cache/sys-apps/attr-2.5.1
deleted file mode 100644
index 1b6e668078e5..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/binutils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extended attributes tools
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-INHERIT=flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-IUSE=debug nls 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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.5.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fc01409eedefe31352db092277d2012c
diff --git a/metadata/md5-cache/sys-apps/attr-2.5.1-r1 b/metadata/md5-cache/sys-apps/attr-2.5.1-r1
deleted file mode 100644
index 33550a9c4b26..000000000000
--- a/metadata/md5-cache/sys-apps/attr-2.5.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) 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
-DESCRIPTION=Extended attributes tools
-EAPI=8
-HOMEPAGE=https://savannah.nongnu.org/projects/attr
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript libtool
-IUSE=debug nls 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 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://nongnu/attr/attr-2.5.1.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=8a73384b96ca3d38173fb8d0e81b6736
diff --git a/metadata/md5-cache/sys-apps/attr-9999 b/metadata/md5-cache/sys-apps/attr-9999
index dfe58c7be9c6..1b8c86925769 100644
--- a/metadata/md5-cache/sys-apps/attr-9999
+++ b/metadata/md5-cache/sys-apps/attr-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Extended attributes tools
 EAPI=8
 HOMEPAGE=https://savannah.nongnu.org/projects/attr
-INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript autotools git-r3
+INHERIT=flag-o-matic toolchain-funcs multilib-minimal usr-ldscript autotools git-r3
 IUSE=debug nls 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 split-usr
 LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=8a73384b96ca3d38173fb8d0e81b6736
+_md5_=dba70dad62e54c9a31ce8f0d70a14f0e
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.0-r2 b/metadata/md5-cache/sys-apps/coreutils-9.0-r2
deleted file mode 100644
index f82e2ca93cec..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-9.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
-IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-9.0.tar.xz !vanilla? ( mirror://gentoo/coreutils-8.30-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.30-patches-01.tar.xz ) verify-sig? ( mirror://gnu/coreutils/coreutils-9.0.tar.xz.sig )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a4cdddc0b4b5ed7d9e3f234dabe295f1
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.1 b/metadata/md5-cache/sys-apps/coreutils-9.1
deleted file mode 100644
index 3334c7e716e1..000000000000
--- a/metadata/md5-cache/sys-apps/coreutils-9.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl test? ( dev-lang/perl dev-perl/Expect dev-util/strace || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare setup test unpack
-DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) )
-DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/coreutils/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs verify-sig
-IUSE=acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
-LICENSE=GPL-3+
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( sys-apps/attr ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/coreutils/coreutils-9.1.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.1.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=10a5a4b9131b31670effd11b0dbc1d21
diff --git a/metadata/md5-cache/sys-apps/file-5.42-r1 b/metadata/md5-cache/sys-apps/file-5.42-r1
deleted file mode 100644
index 73914f668fd5..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.42-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( 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-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bzip2? ( app-arch/bzip2[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[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 ) 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-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=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(-)?] )
-DESCRIPTION=Identify a file's format by scanning binary data for patterns
-EAPI=8
-HOMEPAGE=https://www.darwinsys.com/file/
-INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
-IUSE=bzip2 lzma python seccomp static-libs zlib 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 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-2
-RDEPEND=bzip2? ( app-arch/bzip2[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[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 ) 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-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=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(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.42.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.42.tar.gz.asc )
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=7764d494147c66f15bc7c12115294a1b
diff --git a/metadata/md5-cache/sys-apps/hwdata-0.362 b/metadata/md5-cache/sys-apps/hwdata-0.362
deleted file mode 100644
index ec5ba9aba7ab..000000000000
--- a/metadata/md5-cache/sys-apps/hwdata-0.362
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Hardware identification and configuration data
-EAPI=8
-HOMEPAGE=https://github.com/vcrhonek/hwdata
-INHERIT=edo
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/vcrhonek/hwdata/archive/refs/tags/v0.362.tar.gz -> hwdata-0.362.tar.gz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3
-_md5_=279179f0474280fe94b7891b61d24fb7
diff --git a/metadata/md5-cache/sys-apps/logwatch-7.6 b/metadata/md5-cache/sys-apps/logwatch-7.6
deleted file mode 100644
index 3d4e89af5da9..000000000000
--- a/metadata/md5-cache/sys-apps/logwatch-7.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Analyzes and Reports on system logs
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/logwatch/
-INHERIT=tmpfiles
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=virtual/cron virtual/mta virtual/mailx dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo virtual/tmpfiles
-SLOT=0
-SRC_URI=mirror://sourceforge/logwatch/logwatch-7.6/logwatch-7.6.tar.gz
-_eclasses_=tmpfiles	216aa76c3a6fcb5d893c23a0de86048f
-_md5_=cbf4784cb63812a140ac0253d5c5001a
diff --git a/metadata/md5-cache/sys-apps/shadow-4.11.1 b/metadata/md5-cache/sys-apps/shadow-4.11.1
deleted file mode 100644
index 4914a4753920..000000000000
--- a/metadata/md5-cache/sys-apps/shadow-4.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-devel/gettext >=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install postinst preinst prepare
-DEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) >=sys-kernel/linux-headers-4.14
-DESCRIPTION=Utilities to deal with user accounts
-EAPI=7
-HOMEPAGE=https://github.com/shadow-maint/shadow
-INHERIT=libtool pam
-IUSE=acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=virtual/libcrypt:= acl? ( sys-apps/acl:0= ) audit? ( >=sys-process/audit-2.6:0= ) cracklib? ( >=sys-libs/cracklib-2.7-r3:0= ) nls? ( virtual/libintl ) pam? ( sys-libs/pam:0= ) skey? ( sys-auth/skey:0= ) selinux? ( >=sys-libs/libselinux-1.28:0= sys-libs/libsemanage:0= ) xattr? ( sys-apps/attr:0= ) !<sys-apps/man-pages-5.11-r1 !=sys-apps/man-pages-5.12-r0 !=sys-apps/man-pages-5.12-r1 nls? ( !<app-i18n/man-pages-it-5.06-r1 !<app-i18n/man-pages-ja-20180315-r1 !<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1 ) pam? ( >=sys-auth/pambase-20150213 ) su? ( !sys-apps/util-linux[su(-)] )
-REQUIRED_USE=?? ( cracklib pam )
-SLOT=0/4
-SRC_URI=https://github.com/shadow-maint/shadow/releases/download/v4.11.1/shadow-4.11.1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2233a1ca20bb4e8824e1dedb919964e7
diff --git a/metadata/md5-cache/sys-apps/sysvinit-2.99-r1 b/metadata/md5-cache/sys-apps/sysvinit-2.99-r1
deleted file mode 100644
index 78d37523de7f..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-2.99-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=selinux ibm static
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-2.99.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=935a906e9417710bfe268046523c618e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-3.01 b/metadata/md5-cache/sys-apps/sysvinit-3.01
deleted file mode 100644
index 8eaa91911a23..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-3.01
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=selinux ibm static
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) selinux? ( sec-policy/selinux-shutdown ) !<sys-apps/openrc-0.13
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-3.01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=935a906e9417710bfe268046523c618e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-3.03 b/metadata/md5-cache/sys-apps/sysvinit-3.03
deleted file mode 100644
index 958688781aa5..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-3.03
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( app-text/po4a ) verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-INHERIT=toolchain-funcs flag-o-matic plocale verify-sig
-IUSE=selinux ibm nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) !<app-i18n/man-pages-l10n-4.12.1-r2 !<sys-apps/openrc-0.13 selinux? ( sec-policy/selinux-shutdown )
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-3.03.tar.xz verify-sig? ( mirror://nongnu/sysvinit/sysvinit-3.03.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=45486ff8f4980e7fed00956b65f6298e
diff --git a/metadata/md5-cache/sys-apps/sysvinit-3.04 b/metadata/md5-cache/sys-apps/sysvinit-3.04
deleted file mode 100644
index 7a22c5708213..000000000000
--- a/metadata/md5-cache/sys-apps/sysvinit-3.04
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=nls? ( app-text/po4a ) verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) virtual/os-headers
-DESCRIPTION=/sbin/init - parent of all processes
-EAPI=7
-HOMEPAGE=https://savannah.nongnu.org/projects/sysvinit
-INHERIT=toolchain-funcs flag-o-matic plocale verify-sig
-IUSE=selinux ibm nls static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=selinux? ( >=sys-libs/libselinux-1.28 ) !<app-i18n/man-pages-l10n-4.12.1-r2 !<sys-apps/openrc-0.13 selinux? ( sec-policy/selinux-shutdown )
-SLOT=0
-SRC_URI=mirror://nongnu/sysvinit/sysvinit-3.04.tar.xz verify-sig? ( mirror://nongnu/sysvinit/sysvinit-3.04.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=45486ff8f4980e7fed00956b65f6298e
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.38 b/metadata/md5-cache/sys-apps/util-linux-2.38
deleted file mode 100644
index a10e38c14641..000000000000
--- a/metadata/md5-cache/sys-apps/util-linux-2.38
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) verify-sig? ( sec-keys/openpgp-keys-karelzak ) >=app-portage/elt-patches-20170815 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( 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(-)?] ) pam? ( sys-libs/pam ) python? ( 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 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) virtual/os-headers
-DESCRIPTION=Various useful Linux utilities
-EAPI=7
-HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux
-INHERIT=toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript pam python-r1 multilib-minimal multiprocessing systemd verify-sig
-IUSE=audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode split-usr python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 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 ~amd64-linux ~x86-linux
-LICENSE=GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=virtual/libcrypt:= audit? ( >=sys-process/audit-2.6:= ) caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 ) hardlink? ( dev-libs/libpcre2:= ) ncurses? ( sys-libs/ncurses:=[unicode(+)?] magic? ( sys-apps/file:0= ) ) nls? ( 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(-)?] ) pam? ( sys-libs/pam ) python? ( 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 ) ) readline? ( sys-libs/readline:0= ) rtas? ( sys-libs/librtas ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) hardlink? ( !app-arch/hardlink ) logger? ( !>=app-admin/sysklogd-2.0[logger] ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) su? ( !<sys-apps/shadow-4.7-r2 !>=sys-apps/shadow-4.7-r2[su] ) !net-wireless/rfkill
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) su? ( pam )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.tar.sign )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1a97384ac6de12c58848c5178a4ac570
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index fab6acb34f7f..8d874aba103f 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-auth/pambase-20210201.1 b/metadata/md5-cache/sys-auth/pambase-20210201.1
deleted file mode 100644
index 88b12958be91..000000000000
--- a/metadata/md5-cache/sys-auth/pambase-20210201.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=configure install postinst setup test
-DESCRIPTION=PAM base configuration files
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/pambase
-INHERIT=pam python-any-r1 readme.gentoo-r1
-IUSE=caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) homed? ( sys-apps/systemd[homed] ) systemd? ( sys-apps/systemd[pam] )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) pwhistory? ( || ( passwdqc pwquality ) ) homed? ( !pam_krb5 ) pam_krb5? ( !homed )
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20210201.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=671a73bc222181af88ab9f131a6d56bb
diff --git a/metadata/md5-cache/sys-auth/pambase-20211218-r1 b/metadata/md5-cache/sys-auth/pambase-20211218-r1
deleted file mode 100644
index 803307c6fb12..000000000000
--- a/metadata/md5-cache/sys-auth/pambase-20211218-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/jinja[python_targets_python3_8(-)] ) )
-DEFINED_PHASES=configure install postinst setup test
-DESCRIPTION=PAM base configuration files
-EAPI=7
-HOMEPAGE=https://github.com/gentoo/pambase
-INHERIT=pam python-any-r1 readme.gentoo-r1
-IUSE=caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd yescrypt
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=sys-libs/pam-1.4.0 elogind? ( sys-auth/elogind[pam] ) gnome-keyring? ( gnome-base/gnome-keyring[pam] ) mktemp? ( sys-auth/pam_mktemp ) pam_krb5? ( >=sys-libs/pam-1.4.0 sys-auth/pam_krb5 ) caps? ( sys-libs/libcap[pam] ) pam_ssh? ( sys-auth/pam_ssh ) passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 ) pwquality? ( dev-libs/libpwquality[pam] ) selinux? ( sys-libs/pam[selinux] ) sha512? ( >=sys-libs/pam-1.4.0 ) homed? ( sys-apps/systemd[homed] ) systemd? ( sys-apps/systemd[pam] ) yescrypt? ( sys-libs/libxcrypt[system] )
-REQUIRED_USE=?? ( elogind systemd ) ?? ( passwdqc pwquality ) ?? ( sha512 yescrypt ) pwhistory? ( || ( passwdqc pwquality ) ) homed? ( !pam_krb5 ) pam_krb5? ( !homed )
-RESTRICT=binchecks
-SLOT=0
-SRC_URI=https://github.com/gentoo/pambase/archive/pambase-20211218.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e83c71824ab30eab35a616451f26ff81
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 0ee0694c4dff..440ff983e9ff 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.7 b/metadata/md5-cache/sys-block/open-iscsi-2.1.7
deleted file mode 100644
index d88600ed60ad..000000000000
--- a/metadata/md5-cache/sys-block/open-iscsi-2.1.7
+++ /dev/null
@@ -1,16 +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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-cluster/rdma-core ) dev-libs/openssl:0= systemd? ( sys-apps/systemd )
-DESCRIPTION=A performant, transport independent, multi-platform implementation of RFC3720
-EAPI=7
-HOMEPAGE=https://www.open-iscsi.com/
-INHERIT=autotools linux-info flag-o-matic toolchain-funcs systemd udev
-IUSE=debug infiniband +tcp rdma systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/kmod sys-block/open-isns:= sys-kernel/linux-headers infiniband? ( sys-cluster/rdma-core ) dev-libs/openssl:0= systemd? ( sys-apps/systemd ) sys-fs/lsscsi sys-apps/util-linux
-REQUIRED_USE=infiniband? ( rdma ) || ( rdma tcp )
-SLOT=0/0.2
-SRC_URI=https://github.com/open-iscsi/open-iscsi/archive/2.1.7.tar.gz -> open-iscsi-2.1.7.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ba661d428dd2a70877efb26c37e7c358
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 739533ea15cd..e31ee5a04285 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/ceph-15.2.17 b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
index 2583dbc67999..fbb60b7f4f05 100644
--- a/metadata/md5-cache/sys-cluster/ceph-15.2.17
+++ b/metadata/md5-cache/sys-cluster/ceph-15.2.17-r1
@@ -7,10 +7,10 @@ HOMEPAGE=https://ceph.com/
 INHERIT=check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles multiprocessing
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk +system-boost systemd +tcmalloc test uring xfs zfs cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
+RDEPEND=acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-libs/leveldb:=[snappy,tcmalloc(-)?] dev-libs/libaio:= dev-libs/libfmt:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/grep sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/sed sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:0= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/expat:= dev-libs/openssl:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?] sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr !python_targets_python3_8 ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw )
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-15.2.17.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d64883b4294910a5b6b132461ba55390
+_md5_=db685fc5702d72e515bb777cb527c5d3
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
index f91d66523b11..0880b75617a6 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.10-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.10-r3
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_10 || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.10.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=51b5885a40478d212bde0672df0d921a
+_md5_=0be2dbfaf31f9ecf96de25bd2432a6aa
diff --git a/metadata/md5-cache/sys-cluster/ceph-16.2.9-r2 b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3
index acb69bbcedb0..8fd396c91d55 100644
--- a/metadata/md5-cache/sys-cluster/ceph-16.2.9-r2
+++ b/metadata/md5-cache/sys-cluster/ceph-16.2.9-r3
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake python-r1 flag-o-matic lua-single ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +lua_single_target_lua5-3
 KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-apps/util-linux sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) !system-boost? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 ) ?? ( jemalloc tcmalloc ) jaeger? ( !system-boost ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) !system-boost? ( python_targets_python3_10 || ( python_targets_python3_8 python_targets_python3_9 ) )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-16.2.9.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=65202e958827ce36a0aaa282f3aef902
+_md5_=350490935355fdbeef863fec007fb636
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.3-r3 b/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4
index 83afd36ca7a1..3f9c0f5c8661 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.3-r3
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.3-r4
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-libs/nss:= dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.3.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b750bd988b7771d38867be2638a659da
+_md5_=79925ee42deaf014dd250724ba167546
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.4 b/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1
index 51d26106f105..857387609f3f 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.4
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.4-r1
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( dev-libs/pmdk:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.4.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ee57e88420572c2671ae7eb704104d9
+_md5_=7c0327de2987ff4e3482c3a532608ff7
diff --git a/metadata/md5-cache/sys-cluster/ceph-17.2.5 b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1
index 68cd869a98c8..b03ebfd2e4af 100644
--- a/metadata/md5-cache/sys-cluster/ceph-17.2.5
+++ b/metadata/md5-cache/sys-cluster/ceph-17.2.5-r1
@@ -8,10 +8,10 @@ INHERIT=check-reqs bash-completion-r1 cmake flag-o-matic lua-single python-r1 ud
 IUSE=babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc jaeger kafka kerberos ldap lttng +mgr +parquet pmdk rabbitmq +radosgw rbd-rwl rbd-ssd rdma rgw-lua +ssl spdk +sqlite +system-boost systemd +tcmalloc test +uring xfs zbd zfs cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_pclmul cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 lua_single_target_lua5-3 lua_single_target_lua5-4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[-device-mapper-only(-)] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
+RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) 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 ) acct-group/ceph acct-user/ceph virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= >=app-arch/snappy-1.1.9-r1 app-arch/zstd:= app-shells/bash:0 app-misc/jq:= dev-libs/crypto++:= dev-cpp/gflags:= dev-lang/jsonnet:= <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] dev-libs/libaio:= >=dev-libs/libfmt-6.2.1:= <dev-libs/libfmt-9:= dev-libs/libnl:3= dev-libs/libxml2:= dev-libs/libevent:= dev-libs/libutf8proc:= dev-libs/nss:= dev-libs/openssl:= <dev-libs/rocksdb-6.15:= dev-libs/thrift:= dev-libs/xmlsec:=[openssl] dev-cpp/yaml-cpp:= dev-python/natsort[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-dns/c-ares:= net-libs/gnutls:= sys-auth/oath-toolkit:= sys-apps/coreutils sys-apps/hwloc:= sys-apps/keyutils:= sys-apps/util-linux:= sys-libs/libcap-ng:= sys-libs/ncurses:0= sys-libs/zlib:= sys-process/numactl:= virtual/libcrypt:= x11-libs/libpciaccess:= babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse:3= ) jemalloc? ( dev-libs/jemalloc:= ) !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) jaeger? ( dev-cpp/nlohmann_json:= dev-cpp/opentelemetry-cpp:=[jaeger] ) kafka? ( dev-libs/librdkafka:= ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap:= ) lttng? ( dev-util/lttng-ust:= ) parquet? ( dev-libs/re2:= ) pmdk? ( >=dev-libs/pmdk-1.10.0:= ) rabbitmq? ( net-libs/rabbitmq-c:= ) radosgw? ( dev-libs/icu:= dev-libs/expat:= net-misc/curl:=[curl_ssl_openssl] ) rbd-rwl? ( dev-libs/pmdk:= ) rdma? ( sys-cluster/rdma-core:= ) spdk? ( dev-util/cunit ) sqlite? ( dev-db/sqlite:= ) system-boost? ( dev-libs/boost:=[context,python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,zlib] ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zbd? ( sys-block/libzbd:= ) zfs? ( sys-fs/zfs:= ) app-admin/sudo net-misc/socat sys-apps/gptfdisk sys-apps/nvme-cli >=sys-apps/smartmontools-7.0 sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cherrypy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pecan[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] mgr? ( dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/routes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] diskprediction? ( >=dev-python/scipy-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) sci-libs/scikit-learn[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( jemalloc tcmalloc ) diskprediction? ( mgr ) kafka? ( radosgw ) mgr? ( cephfs ) rabbitmq? ( radosgw ) rgw-lua? ( radosgw )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://download.ceph.com/tarballs/ceph-17.2.5.tar.gz parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-17.2.5.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=17565b3daa7173c8bda3932320d9a828
+_md5_=e3a159fa581f4983d607f06bd460b528
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d6811a409e91..f49f3563dd83 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-2021.02.19 b/metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
deleted file mode 100644
index df6a7a564050..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
+++ /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 ~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-2021.02.19.tar.xz
-_md5_=08a9851b5fc1c47b8cfb52c6655d98a2
diff --git a/metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1 b/metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
deleted file mode 100644
index 0b13d985d34f..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19-r1
+++ /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 ~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-2021.02.19.tar.xz
-_md5_=9f825eab16a1f95ab92cb4fd9b93f717
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 617ee7869b7c..31434b691cd3 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/e2fsprogs-1.46.5-r1 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r3
index fa13cde83b73..05ca46fdf19e 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r1
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) test? ( 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(-)?] )
+DEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) test? ( 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(-)?] )
 DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
 IUSE=cron fuse lto nls static-libs test +threads +tools split-usr 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 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
-RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
+RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b98ff7ee2cb368836e3a93db2b41bcd
+_md5_=b7738ccebc95918b5158d3c72be67cb5
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r2 b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4
index 39e94d3ecb44..3cae0fea5c6d 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r2
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.46.5-r4
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) test? ( 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(-)?] )
+DEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) test? ( 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(-)?] )
 DESCRIPTION=Standard EXT2/EXT3/EXT4 filesystem utilities
 EAPI=7
 HOMEPAGE=http://e2fsprogs.sourceforge.net/
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
 IUSE=cron fuse lto nls static-libs test +tools split-usr 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 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
-RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
+RDEPEND=!sys-libs/e2fsprogs-libs cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.46.5/e2fsprogs-1.46.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ff6e4eb5750fd96ff4c21eb8ff3839fe
+_md5_=f4524904bfd15b82c8c0f69a8e1857ca
diff --git a/metadata/md5-cache/sys-fs/exfatprogs-1.2.0 b/metadata/md5-cache/sys-fs/exfatprogs-1.2.0
new file mode 100644
index 000000000000..217a18634c36
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/exfatprogs-1.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Userspace utilities for new exfat filesystem (kernel 5.7+)
+EAPI=8
+HOMEPAGE=https://github.com/exfatprogs/exfatprogs
+KEYWORDS=~amd64 ~loong ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-fs/exfat-utils
+SLOT=0
+SRC_URI=https://github.com/exfatprogs/exfatprogs/releases/download/1.2.0/exfatprogs-1.2.0.tar.xz
+_md5_=c115487e46757109181e003b57082a09
diff --git a/metadata/md5-cache/sys-fs/exfatprogs-9999 b/metadata/md5-cache/sys-fs/exfatprogs-9999
index 3c5ce5e72a4f..9628e37b439a 100644
--- a/metadata/md5-cache/sys-fs/exfatprogs-9999
+++ b/metadata/md5-cache/sys-fs/exfatprogs-9999
@@ -1,7 +1,7 @@
 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-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=prepare unpack
 DESCRIPTION=Userspace utilities for new exfat filesystem (kernel 5.7+)
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/exfatprogs/exfatprogs
 INHERIT=autotools git-r3
 LICENSE=GPL-2
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=!sys-fs/exfat-utils
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=cd5e4d39d8fb09278e9fcae1484018ac
+_md5_=c115487e46757109181e003b57082a09
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3 b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r4
index 67e48b288177..2e6443c35e31 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r4
@@ -5,12 +5,12 @@ DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
 EAPI=7
 HOMEPAGE=https://sourceware.org/lvm2/
 INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-IUSE=readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only
+IUSE=readline static static-libs systemd +lvm lvm2create-initrd sanlock selinux +udev +thin
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) >=sys-apps/baselayout-2.2 >=sys-apps/util-linux-2.16 lvm2create-initrd? ( sys-apps/makedev ) !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )
+RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) >=sys-apps/baselayout-2.2 >=sys-apps/util-linux-2.16 lvm2create-initrd? ( sys-apps/makedev ) lvm? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
+REQUIRED_USE=!lvm? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.14.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.14.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=53a728fafddc5c3201f271bf97ccdb9f
+_md5_=9034b43af3fc9898553225507d3f98af
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.16 b/metadata/md5-cache/sys-fs/lvm2-2.03.16
deleted file mode 100644
index 22ae221e8e2d..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.16
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive 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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) static? ( readline? ( sys-libs/readline[static-libs] ) selinux? ( sys-libs/libselinux[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] )
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=7
-HOMEPAGE=https://sourceware.org/lvm2/
-INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-IUSE=readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) >=sys-apps/baselayout-2.2 >=sys-apps/util-linux-2.16 lvm2create-initrd? ( sys-apps/makedev ) !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )
-SLOT=0
-SRC_URI=https://sourceware.org/pub/lvm2/LVM2.2.03.16.tgz https://sourceware.org/pub/lvm2/old/LVM2.2.03.16.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7177129add855b426247e7ca9bc6fd22
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.16-r1 b/metadata/md5-cache/sys-fs/lvm2-2.03.16-r1
new file mode 100644
index 000000000000..8f47031593a4
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive 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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) static? ( lvm? ( dev-libs/libaio[static-libs] sys-apps/util-linux[static-libs] readline? ( sys-libs/readline[static-libs] ) ) selinux? ( sys-libs/libselinux[static-libs] ) )
+DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
+EAPI=8
+HOMEPAGE=https://sourceware.org/lvm2/
+INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
+IUSE=+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=udev? ( virtual/libudev:= ) lvm? ( dev-libs/libaio sys-apps/util-linux readline? ( sys-libs/readline:= ) sanlock? ( sys-cluster/sanlock ) systemd? ( sys-apps/systemd:= ) ) >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles lvm2create-initrd? ( sys-apps/makedev ) thin? ( sys-block/thin-provisioning-tools ) )
+REQUIRED_USE=static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )
+SLOT=0
+SRC_URI=https://sourceware.org/ftp/lvm2/LVM2.2.03.16.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=b5806e6aa09eac0e3c514ca3e631d0f5
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4578a41afd86..ba918562b8b8 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149
deleted file mode 100644
index 068194199a87..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.149
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.149
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-158.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-158.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=6b947f100de5ad16243bd359b71dbe74
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.74 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.74
deleted file mode 100644
index 87dc336a6865..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.74
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.15 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.15.74
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-78.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-78.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-78.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-78.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=837b9828f47c246f8bae6057287780e8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219
deleted file mode 100644
index d08de52746a4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.219
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.219
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-224.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-224.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=48aebcef724e5e5c89a8c712dcd96820
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.3
deleted file mode 100644
index edc6229a1c6c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-6.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 6.0 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.0.3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-4.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-4.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-4.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-6.0-4.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=d7d83f98820282fcb6e94e550d673ef4
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20221012-r1 b/metadata/md5-cache/sys-kernel/linux-firmware-20221012-r1
new file mode 100644
index 000000000000..cf0d13788fd7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20221012-r1
@@ -0,0 +1,16 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+INHERIT=linux-info mount-boot savedconfig multiprocessing
+IUSE=compress initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
+RESTRICT=binchecks strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20221012.tar.xz
+_eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a70b832fe65f871ad1548bee89cbf09
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-99999999 b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
index 1b3b0b6c4e6e..6f71b0fe4263 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-99999999
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-99999999
@@ -1,15 +1,15 @@
 BDEPEND=initramfs? ( app-arch/cpio ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
 DESCRIPTION=Linux firmware files
 EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-INHERIT=mount-boot savedconfig git-r3
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
+INHERIT=linux-info mount-boot savedconfig multiprocessing git-r3
+IUSE=compress initramfs +redistributable savedconfig unknown-license savedconfig
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
 PROPERTIES=live
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	mount-boot	02a45c5e022c08dbc05178522b2772f2	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341
-_md5_=8f5850e317cb0a41115275a2229d391b
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=9a70b832fe65f871ad1548bee89cbf09
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 1e4412c0c23e..d58c57027ae6 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r4 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r4
deleted file mode 100644
index 39644dfcae0a..000000000000
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/xz-utils sys-apps/texinfo virtual/yacc 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=compile configure install prepare pretend setup test
-DEPEND=sys-libs/ncurses:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] selinux? ( sec-policy/selinux-gpm )
-DESCRIPTION=Console-based mouse driver
-EAPI=7
-HOMEPAGE=https://www.nico.schottelius.org/software/gpm/
-INHERIT=autotools linux-info systemd usr-ldscript multilib-minimal
-IUSE=selinux split-usr 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
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] selinux? ( sec-policy/selinux-gpm )
-SLOT=0
-SRC_URI=https://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma mirror://gentoo/gpm-1.20.7-docs.patch.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=46118c9472542fa941da57fad635b69b
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 2eec1feff663..8bc2f0a0d6e9 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.95.0-r1 b/metadata/md5-cache/sys-process/lsof-4.95.0-r1
deleted file mode 100644
index 708e889b0fca..000000000000
--- a/metadata/md5-cache/sys-process/lsof-4.95.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/groff rpc? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=rpc? ( net-libs/libtirpc ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=Lists open files for running Unix processes
-EAPI=7
-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
-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.95.0.tar.gz -> lsof-4.95.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=058c2bb135bb0bb5e74fb45ed42a8f66
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index ba07cb248f30..ef4114d902f0 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/httpd-php-8.2 b/metadata/md5-cache/virtual/httpd-php-8.2
index c395b95c2336..fffbf18b67ad 100644
--- a/metadata/md5-cache/virtual/httpd-php-8.2
+++ b/metadata/md5-cache/virtual/httpd-php-8.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=8
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 RDEPEND=|| ( dev-lang/php:8.2[fpm] dev-lang/php:8.2[apache2] dev-lang/php:8.2[cgi] )
 SLOT=8.2
-_md5_=75f8511fbadd7a15878f1c7a298a746e
+_md5_=9bf611cb223c476be525a3284a65df45
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 90341e68cfc2..24d89959dc1c 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.13.3 b/metadata/md5-cache/x11-libs/qscintilla-2.13.3
index 528fa3e98715..90f433e1a3ff 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.13.3
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.13.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 INHERIT=flag-o-matic qmake-utils
 IUSE=designer doc
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 )
 SLOT=0/15
 SRC_URI=https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.13.3/QScintilla_src-2.13.3.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=186ada1a857516b173d406900592174f
+_md5_=38978608343532ac2284c4280d002840
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f49c3a8f9235..97e800e29c75 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-28T14:09:52Z
+TIMESTAMP 2022-10-28T20:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNb4rBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNcNxFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkkBAAmj3zBDKs/f6T//M2TgJ/DCgvxEBXJde++T6quHbPlSXQJN3AKmCzQyWV
-igwkZ77C8YaXe6x9VILyaoW3o0K+LhqWLtTbMlWPdWlGMQdKC5g6YwNhdGOULwZ5
-oqIc6Su+v5ApxVvCebw5GH5PMkkArp4A1lfK/pKUErlSsUwYfdbPIFYBm3qCTnR/
-ad+2W9TS0D7Ac5EIR6cN4tRJ8tZDPH/OsCd7SwILA9iuiGRBHZKUfqk4GDSNWck0
-Bu61AVv8CAsnYrO9wInvT7KSC8htXDzvg5/c2nFiFSbs8fbzZLN9NICjg8nA/B/g
-5zbQsuREg0QEjJ8Kz2hFBZrgia0zPrwhTkoXxhVL8KfIXWSdytocaUMXA4OHT6yC
-Vk9vDEPzO81MwLOkXAYATqE1sDuvfV3IJGiR65YtL7/b5BSuDhYfL+MRF8f0QRpM
-voaJKwui+YfHvb9v4XwQI6fycHC1Poo9PKM3DJk3X01A5h7PDa+dMeP/yefr66Sm
-+UhEUlJHJvqSC4z79/zziEbuU0LSQBThQvyhQPKaT63Ka19GZQy4wZH+bodUzcnh
-XTulaYWUoFezdI5kZhLGrI8aojM52ZOZh0PveUlsMt/5S10xpFVxyF4KhJQgttWx
-TGoE+umiX2TmxXxitiV6Wa4D96w8VgQ5TpzdYWJ+aixfelXu8WI=
-=3Kud
+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
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2f676fedcc0b..ad4dbb65d7a8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 14:09:49 +0000
+Fri, 28 Oct 2022 20:09:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 25a7ff427a57..7b3457f2e669 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 28 02:09:49 PM UTC 2022
+Fri Oct 28 08:09:50 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index c926f56fb03e..b3cb1b2a8f26 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 14:15:01 +0000
+Fri, 28 Oct 2022 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 238b2f1aad71..1fe489a30247 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-aedea4be9692b07f412a34fe1752c809c8c7302c 1666965742 2022-10-28T14:02:22+00:00
+c2d8ce0e1b6206a225a9f2547bbc65c79218756c 1666987237 2022-10-28T20:00:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d74518ce709a..78d167bcf286 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666966201 Fri 28 Oct 2022 02:10:01 PM UTC
+1666987801 Fri 28 Oct 2022 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2f676fedcc0b..ad4dbb65d7a8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 28 Oct 2022 14:09:49 +0000
+Fri, 28 Oct 2022 20:09:50 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index bfc8e6438f3f..93fc156a69cb 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index d3fca0b64b03..5d85e43cceca 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -10,11 +10,8 @@ AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c
 AUX nmap-7.91-no-FORTIFY_SOURCE.patch 2007 BLAKE2B 708b85b655592e919fde46d2f3e39f72cca6cbfa8bbca775c8677235fa4d2a62392d23d6728ecf86c398a9eb6ab5c85e1cbace965e96d733ef7d5375d957c2bd SHA512 077d76ee9687dfe33d27bf9e12a39dd7f160bed38d054d01809782aece19ff62249543f228b435614c32d6aaeaac6ae053b3f11ca849dffa9e7a1b1cad206e86
 AUX nmap-7.93-openssl-1.1.patch 9229 BLAKE2B 1dc23ee66574296264882a0c99ae671cb31ea629b38884e6e68a15fab4bd5990e58208a4a7dece52724a970f43eff2d05baf955db6f7545076d38316bfd8e99b SHA512 fd7d52c6bf0bfe1c3953e864d328e6b2609a284c202f7be84019a22f79c467e64ec063dd89819cafb930d8526c5ae16e6fa004109cfc886fa46dfbdc2c23ed1c
 AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1
-DIST nmap-7.92.tar.bz2 10498200 BLAKE2B 0f3022e797ffca7d1d3497990c86bb60ac9a80bb93cb4ec7fcfa4f51782cb8d79d4f0aca0fa6119bfd604cfe7b89af3d4223ce13ad3e6c948c021909aebd956b SHA512 7828367f9dc76ff4d1e8c821260e565fb0c3cb6aba0473d24759133a3006cdf2cb087574f0dd7d2ba47a63754ba4f72e0b78cdae1333a58f05c41d428b56ad59
-DIST nmap-7.92.tar.bz2.asc 195 BLAKE2B a8052138e58cd8009341a5f3fb3a31f55af9383b9dbb6c7ce858d80541e000b17953c053e9a3a6d86a5551244cf13f181e6e3943095b86335cbb5dae96e20bdd SHA512 300a22ab097bbff67de354de6b22a8e3287f95dd6318fcabd546ba52158e9589b19ede175587c6e31518c47bc118c7dd05db43755def075d810b16945b65e05a
 DIST nmap-7.93.tar.bz2 10823114 BLAKE2B e9fa0fe0f219258ab29cf59a98f09142ce1e5e70395f6578d57e644d343ff95764a8208f2fd00a686a14217821adb038a1bb4cdf25f355696e68131773cc1995 SHA512 4ec9295e25bd7a215e718c3dbbf09bfe6339b60850f4a8d09b5ad0cbf41a0da8ece0168efc5ca91ba1ecbd83b1d31735d77dacd5f1ec1a9fd212454dd1f0f0fd
 DIST nmap-7.93.tar.bz2.asc 195 BLAKE2B 0c18200507c8c0901df6f0fa3230330eff72dd5e54f2d862d35a1df26b9ff3b189cebe0b91cdf47c4f87fef523cc6d9c3bcc36a42d8fcc8be7830fc861c64b5f SHA512 9bd8e436a6f7010ba2e3578affc4174fae12e2e7b78e523ceeb94ba44ccd928ac2cf5da52d02a00c4f190f71425671cc817b44a6a2f8d0b42b10d535bb1af3a9
-EBUILD nmap-7.92-r2.ebuild 3369 BLAKE2B 0cb845bf418d6d93c42c59e480457cbc002dddb8721983d0ce18e22673a108a00db37f16fae5c0c138e461426191b50ce3e6b70e80c7d938b4d3f1343d436e80 SHA512 bc4f57e19ca735af6cde2459f163f7c99ea094ccca0b72c29f4bf4a6b14d4de96ff9e9bf070ef0f8e890d899e4f0c91e99b05115bdc0225ff7040621a0191d5d
 EBUILD nmap-7.93.ebuild 3598 BLAKE2B f8c000828ba49cf456b44518cf95e48d3845124171cee50efccb439e9285ce275631eba48182370c6011a9f61e54d59b5331eae382f1c0903fbde11ae7e1fe4f SHA512 005b778fba01d7c504a6dcecac540a5d0f0a23fa5ff41d3d60ade333fdf7812dc67fb039be6db96b9385dee8682d8e28bd91e607864057ca66798a97a0aed7f0
 EBUILD nmap-9999.ebuild 3567 BLAKE2B a6858edc41fc1bbf5858a776c43dad936474794cdffa2712801cf4d067e5bd7f69d6fe8fef22df0ca0339c5b0d5ae3bc56935900f58bf133805f618e99164570 SHA512 432cae675dc6320c2960e8b7387e525c02181de0cf1227b5e5fa79605d4a1f4ee2799d1f039b772e16a389b624f8ce20effed61d3a91af3eee49afd5c6e249ed
 MISC metadata.xml 964 BLAKE2B be7a2b72cd346cdcf83df81cab6c28666067a17516e58bb0570572fcc4467258de1e913cb9448635080e0c3915c9efd0a4b2e19c6a480d70afda149574f725eb SHA512 fd3ef56d6a5513553a934348712ad0e9c5a6578f3eb8d9069cb5ea7076eafd58c207a1f5007371bedb60e9319c221280d37f129804eb3072b1fb4adb8e4da184
diff --git a/net-analyzer/nmap/nmap-7.92-r2.ebuild b/net-analyzer/nmap/nmap-7.92-r2.ebuild
deleted file mode 100644
index 699b452ebd6e..000000000000
--- a/net-analyzer/nmap/nmap-7.92-r2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-LUA_REQ_USE="deprecated"
-inherit autotools lua-single toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/nmap/nmap"
-
-	# Just in case for now as future seems undecided.
-	LICENSE="NPSL"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/nmap.asc
-	inherit verify-sig
-
-	SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
-	SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	LICENSE="|| ( NPSL GPL-2 )"
-fi
-
-SLOT="0"
-IUSE="ipv6 libssh2 ncat nping +nse ssl symlink +system-lua"
-REQUIRED_USE="
-	system-lua? ( nse ${LUA_REQUIRED_USE} )
-	symlink? ( ncat )
-"
-
-RDEPEND="
-	dev-libs/liblinear:=
-	dev-libs/libpcre
-	net-libs/libpcap
-	libssh2? (
-		net-libs/libssh2[zlib]
-		sys-libs/zlib
-	)
-	nse? ( sys-libs/zlib )
-	ssl? ( dev-libs/openssl:0= )
-	symlink? (
-		!net-analyzer/netcat
-		!net-analyzer/openbsd-netcat
-	)
-	system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	"${FILESDIR}"/${PN}-5.21-python.patch
-	"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-	"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-7.25-libpcre.patch
-	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
-	"${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch
-)
-
-pkg_setup() {
-	use system-lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
-	cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
-	default
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# we need the original for a Darwin-specific fix, bug #604432
-		mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
-	fi
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_with libssh2) \
-		$(use_with ncat) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		$(usex libssh2 --with-zlib) \
-		$(usex nse --with-liblua=$(usex system-lua yes included '' '') --without-liblua) \
-		$(usex nse --with-zlib) \
-		--cache-file="${S}"/config.cache \
-		--with-libdnet=included \
-		--with-pcre="${ESYSROOT}"/usr \
-		--without-ndiff \
-		--without-zenmap
-}
-
-src_compile() {
-	local directory
-	for directory in . libnetutil nsock/src \
-		$(usex ncat ncat '') \
-		$(usex nping nping '')
-	do
-		emake -C "${directory}" makefile.dep
-	done
-
-	emake \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
-	# See bug #831713 for return of -j1
-	LC_ALL=C emake \
-		-j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use symlink && dosym /usr/bin/ncat /usr/bin/nc
-}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 1c5ff91099ac..b504ebe26f31 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -2,11 +2,9 @@ AUX wireshark-2.6.0-redhat.patch 248 BLAKE2B a3cc5af29cea1b46cc8456c80a1ddf3a0db
 AUX wireshark-3.4.2-cmake-lua-version.patch 304 BLAKE2B 438bd2ee1e0e0121cc673709385ccda88664131d50fb63d48147c83798e9f541efa270c56d30ad4345ef77d59fb16554b0d8de8c19bafd8181c0c96e3c7b1ba9 SHA512 ab4a7f3d64cc402fcf6b1c9b54aad75dbb1104b19282078947a6c4315f48b5a2c0eeff9918e42d98196976d2e1d26ef2e439a1d2811de1a326a4954d54a08bff
 DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B 8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db SHA512 c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
 DIST wireshark-3.6.9.tar.xz 39949356 BLAKE2B 8660e57fc1c9667ecd17bbd35918da7d61f3acb84047d6fda9be0fea456c09e45f0a59c725b405364745cb2b570d8fddb2ffe393ee7b96110a53c404f9c02267 SHA512 abf7adfda1a7aef4944e846bd3edde08b64d841edbba2d86d1bfd121760e90560231f778eeaefa43175c7c6be9b1fe0e0ec58c8704b4c9bdff6bb3598970cddd
-DIST wireshark-4.0.0.tar.xz 41323336 BLAKE2B a3e619dae784d28ed659acf6b2f4710e320806ebbf7c700370558ae81eb0cfdd68ec6cce4c8ae90f43c449e118b7993a78d02bbb1dc7a259a437d34ef6299d60 SHA512 d16b67bacca479af419f47e000800bbc33098a00cdb56c789e6c0f354fbd4f13c3d25c496239a8836c4e5754af2e36d4baf5e8ae55eae71f80c93630b78128bc
 DIST wireshark-4.0.1.tar.xz 41282116 BLAKE2B 63984c5722fe0cbcf2a756efdd0cf44304e3ce25eb1aea87758a28576ba3416b0a8226079a413084e46724fcd4ed9b0f4cbf82cbabbf48f2febe0fbc8446a054 SHA512 10ac8e738b4bd70ba4a1a9124e8c8e6238feb7c5a4cef79a03dae6adef08230700bb8ba700d2f89a5aad28cabdaf06b8825a1124d9d466de4e2e10cc55968525
 EBUILD wireshark-3.6.8.ebuild 7285 BLAKE2B e3a3d761ccf7b6ab9ce27d427f78c39f9866c340cbc7c9ae04ae8df4fb650ac1b59d9d3377bbb1fdbf001afb408ac920bb7dda93a0b8e6fdd89daf86a0ac5ac1 SHA512 641e5d557c9c32cad48d8051e560852ed962d79a51dee1a292e5893ac73effc7897b43726fd4399aa2fb07b11f37a6b0d0c63038e9ac4f805fe7d548123e0efd
 EBUILD wireshark-3.6.9.ebuild 7290 BLAKE2B 9488d17dfd2e7bb6b9664b75ef4f9cc35f3f8faba148701f9a376f43f7f5a01dba5dd145b8a3e822e85d2a2eecb6919b8906f7dca3268a61d85b5d1f204f3c0c SHA512 c97d5d8b388441536cd27ec737312cc0278f05947efb28a9d8a304350b84c103bf642b7668cadb476e599284ecb80c8bd80ade64af57e960cae3d0dde9458bed
-EBUILD wireshark-4.0.0-r2.ebuild 7956 BLAKE2B 6750771da48fece064650a04123d9969152a00d43bf864ae1cd020202844b44e912406bb946366e5c112f7f6979df81b042cca228f1745345606731233427109 SHA512 da835234705cc2f168697cc21fd309e044595aa56fce92dc1feedf31719c5cfb44a238bbe41935c76c870c9a581bd6c55f4991462cd20a992501c29d3fa01344
 EBUILD wireshark-4.0.1.ebuild 7956 BLAKE2B 6750771da48fece064650a04123d9969152a00d43bf864ae1cd020202844b44e912406bb946366e5c112f7f6979df81b042cca228f1745345606731233427109 SHA512 da835234705cc2f168697cc21fd309e044595aa56fce92dc1feedf31719c5cfb44a238bbe41935c76c870c9a581bd6c55f4991462cd20a992501c29d3fa01344
 EBUILD wireshark-9999.ebuild 7956 BLAKE2B 6750771da48fece064650a04123d9969152a00d43bf864ae1cd020202844b44e912406bb946366e5c112f7f6979df81b042cca228f1745345606731233427109 SHA512 da835234705cc2f168697cc21fd309e044595aa56fce92dc1feedf31719c5cfb44a238bbe41935c76c870c9a581bd6c55f4991462cd20a992501c29d3fa01344
 MISC metadata.xml 5596 BLAKE2B 53f6c7722da767bcf47e57b1a2e137d0e11129b993c44a37976e8fb782151d0223823155e5bc1658a60acd509f376e622f65078411394c0db5e8048aa1d1251f SHA512 ef3e445e1c47904f73d74b0f1cff508b26cfa5361c5dea11f6817c1f883508f5f164e3af664e825f3a3ce25cff24018c1a27110a56e96dc6f2b11e92870e44fe
diff --git a/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild b/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
deleted file mode 100644
index 08b136066287..000000000000
--- a/net-analyzer/wireshark/wireshark-4.0.0-r2.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-	fi
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd"
-
-REQUIRED_USE="
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="
-	acct-group/pcap
-	>=dev-libs/glib-2.50.0:2
-	dev-libs/libpcre2
-	>=net-dns/c-ares-1.13.0:=
-	>=dev-libs/libgcrypt-1.8.0:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6:= )
-	filecaps? ( sys-libs/libcap )
-	http2? ( >=net-libs/nghttp2-1.11.0:= )
-	ilbc? ( media-libs/libilbc:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	gui? (
-		x11-misc/xdg-utils
-		qt6? (
-			dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-			dev-qt/qt5compat:6
-			dev-qt/qtmultimedia:6
-		)
-		!qt6? (
-			dev-qt/qtcore:5
-			dev-qt/qtconcurrent:5
-			dev-qt/qtgui:5
-			dev-qt/qtmultimedia:5
-			dev-qt/qtprintsupport:5
-			dev-qt/qtwidgets:5
-		)
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd:= )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp:= )
-	sshdump? ( >=net-libs/libssh-0.6:= )
-	ssl? ( >=net-libs/gnutls-3.5.8:= )
-	wifi? ( >=net-libs/libssh-0.6:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="
-	${RDEPEND}
-	gui? (
-		!qt6? (
-			dev-qt/qtdeclarative:5
-		)
-	)
-"
-# TODO: 4.0.0_rc1 release notes say:
-# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks."
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	gui? (
-		qt6? (
-			dev-qt/qttools:6[linguist]
-		)
-		!qt6? (
-			dev-qt/linguist-tools:5
-		)
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${RDEPEND}
-	gui? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	python_setup
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use gui ; then
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex gui MOC=$(qt5_get_bindir)/moc '')
-		$(usex gui RCC=$(qt5_get_bindir)/rcc '')
-		$(usex gui UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-
-		-DBUILD_wireshark=$(usex gui)
-		-DUSE_qt6=$(usex qt6)
-
-		-DENABLE_WERROR=OFF
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=OFF
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DBUILD_wifidump=$(usex wifi)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	EPYTEST_DESELECT=(
-		# TODO: investigate
-		suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream
-	)
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins "${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use gui ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins resources/icons/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index f0d3ad4ba9d3..d105388dd9cd 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index fe281ffb6d4e..de8e5708b60f 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,13 +1,10 @@
-AUX dnscrypt-proxy-2.1.0-config-full-paths.patch 3569 BLAKE2B 67650961f1e63021aa8b48d52beaf4a117c99f0edae80c3643ac462c937fbbbd64970ddec9261d07ddfc2fc3f715e97c0082cef1eeea55065bbfd390993fc1ac SHA512 e04f693cac2431113b8b4b22d2573f642d073bd5d8ea9abd3408dfb44694e3ebab13dbf9c18a45bd6d7312194a58e1fdb371b6ff881e578ad833f12268304600
 AUX dnscrypt-proxy-2.1.2-config-full-paths.patch 4237 BLAKE2B 6d0e03cb89cd3b57835d4eab8bdb40e65b5382558ef5b65a00b77da22d821f7622988c799058b7874a91d3c5453bd18aebc1aba2e75cadee3eddd94c90cc8dd1 SHA512 64d7d88417bcb412752fb9ae02e85e45ebe88c97a5e6af6d682a2c2e1f58f27cefed9a7edc3d20241b523ba9a9cbbf3542ce20f02b807e6b7362012c858f882b
 AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179a7e2103fdf716711912987961969619e6b6e6b2e201253e90f828ffa5eb011c0870c112a028c4cfd89ce5 SHA512 25ccbc09df7b51bc0fa4587f7a715429ba11517c64db53086dd09df24470da71b81dbacebe227bd41d1f9576b4560dc58729969eb7b33aa233ec6a6a07d573ab
 AUX dnscrypt-proxy.initd 639 BLAKE2B a3d35908a5716ae8ce92a2eacbda99175578d631449a841608ad93f19ae3841ace7feef27c60c75911ea68bc7bd039b0e057bac7b7ba61762418e5a52ddc608f SHA512 f48ba140968a73160e11e137e6d1b3a03ccec96596a91fd2878a0d40b749d4cccca5d2db30fdfff1f75ce42a7a20ac5f8fdef7f282ba26bd1a875905c6751d2b
 AUX dnscrypt-proxy.logrotate 105 BLAKE2B 892cc2acb621bb2c653f4545ac1c58777cc048b9a2f954eac7d92fdf6109b529884d20e4bc14af6aa6cde4d6e0dcac33347216de33e915f5d1ba850fda361602 SHA512 ef5f9886d7c49334e642fa6b0abd748fcff05e171493998559539f7f48f0241607d4923c7b30ed81b2bae1037ae28e49072170000a5b4cbeb6fb77e9dc3a6546
 AUX dnscrypt-proxy.service 1198 BLAKE2B a457e57e2b91e6725fa3a515a2754fc7f39fc3349602861eae8c8747e8cd811440df48f9029da514cd43a4d32a5f001ad6385354c754d0ea36c4a227a5c1f980 SHA512 11769c47ecd44169dd3aab26574a710c07e74f465417081b283f3f2f8b7f64ef77a24359555bc6b94144d38481661bac6087a7f79190bfb67c593e700b2202e5
 AUX dnscrypt-proxy.socket 517 BLAKE2B 959f3c38af826607a297b04c7c3284bb97588c8a8ea88e4502bb464eb791a88f7940f2131701ef071187910302b7c564aee928f1862eb15640c448179a54f066 SHA512 1f3776e37a9583771997f270983bc9430adf089631a94e52cd5f9dba07228584ecc149f37cf51f08b2c7f877d3e9aa430f98cf8d996d0f4cf3545c2c9ac0537d
-DIST dnscrypt-proxy-2.1.1.tar.gz 6114345 BLAKE2B 9d68d94d1fc142d53ed74840080feca56d7abf606b8df9b2ebea7a69b75f13cdc93be53418e6101d30d31d6f4130b3794c1029a5972e129a4c06feeff7dd81e7 SHA512 1118d79aad8d3e3629616c203194a5346f00fcfe88783ebddc6f167d22a82006f26022e728c57905aa82997b87b77f0841f7c1b60e0f8e5335f9df142b759c21
 DIST dnscrypt-proxy-2.1.2.tar.gz 6792121 BLAKE2B f6e69e9b7bba5bcaf49f710c78fc1b9607a8e791ad222da7af2a129de4807ecf87ddb7289aa79132a0d5ada588d2557beff618a79a341d168674bda7c8ba58ee SHA512 1b3598d60abc70141127aaaab5bf8bfaa76239d33e4220664dadd47f09544553e06eba6d82e5daf2c44c6da9c3c21c53683c2ff33db63257b782ad48c534bd54
-EBUILD dnscrypt-proxy-2.1.1.ebuild 2832 BLAKE2B c6fbb2c3e2f802216d42e9b8a53a678c7d48f8345ccca63e6a5fc038634f2c93b3765db249a5da192b38936f72550598bb633223c46ca6b476fbd9bd490ec9bf SHA512 79e14527d18eb85ad2c7ee76d3033e70e67ac1f1f33fce6344bfe8765539320b23ce8787d7fbd88f5496a890e1399a12251407c25b28e53cbdff478e1d32d2c0
 EBUILD dnscrypt-proxy-2.1.2.ebuild 2825 BLAKE2B 4d324490132b59e991507d4770040a2421313098fc582113cea9788368bdc9fcd46b0f448f67ccd99cca2c2ba97e406120e548aa8d68f4f8d905bf116606ba4f SHA512 4a86627354ca3a208fd4d0311f4aaca84ced8b737ab6a2b496d7cbb0719db582513b86b1940eb3a7cbbb829424492f0b0eab5c226fa8e6cb7e0c81bdc62d5427
 EBUILD dnscrypt-proxy-9999.ebuild 2830 BLAKE2B 66fec012aecdbcedd365ec2fb2c19c1a557c9596fab5273edd7b95734bd86717fafb00f38cd7858183281584c1f10ccd63e468a5df69cbfd39bd8ca102e259c7 SHA512 691a6bee407a905ef438b288459fcdc32cdef8f6401b28d926bf20db9cad353988354491372852fe629e08e964bf4a52fb8d031306cfec39cf28aff3eeab4907
 MISC metadata.xml 619 BLAKE2B b8c10931edf8899ef018fc5f9605d3aad94ec2a48cce361ff04f2048d4e8cfd8de1ebff181fb968822e498d85178e3ed412726d3321f06a240eafbfc55b85b3b SHA512 268ab4c1a07bc15039c382586a575cecce6797bc452b635d7ebbd1806f789b8c154eb75164f58e8d9c87f0add8f99000c9dc75959328ad24f0f2c63bf6bd2f1d
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
deleted file mode 100644
index 2f8f698a764a..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.1.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/DNSCrypt/${PN}"
-
-inherit fcaps go-module systemd
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://${EGO_PN}.git"
-else
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc64 x86"
-fi
-
-DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
-HOMEPAGE="https://github.com/DNSCrypt/dnscrypt-proxy"
-
-LICENSE="Apache-2.0 BSD ISC MIT MPL-2.0"
-SLOT="0"
-IUSE="+pie"
-
-BDEPEND=">=dev-lang/go-1.13"
-RDEPEND="
-	acct-group/dnscrypt-proxy
-	acct-user/dnscrypt-proxy
-"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-config-full-paths.patch"
-)
-
-src_compile() {
-	pushd "${PN}" >/dev/null || die
-	go build -v -x -mod=readonly -mod=vendor -buildmode="$(usex pie pie default)" || die
-	popd >/dev/null || die
-}
-
-src_test() {
-	cd "${PN}" || die
-	go test -mod=vendor -buildmode="$(usex pie pie default)" || die "Failed to run tests"
-}
-
-src_install() {
-	pushd "${PN}" >/dev/null || die
-
-	dobin dnscrypt-proxy
-
-	insinto /etc/dnscrypt-proxy
-	newins example-dnscrypt-proxy.toml dnscrypt-proxy.toml
-	doins example-{allowed,blocked}-{ips.txt,names.txt}
-	doins example-{cloaking-rules.txt,forwarding-rules.txt}
-
-	popd >/dev/null || die
-
-	insinto /usr/share/dnscrypt-proxy
-	doins -r "utils/generate-domains-blocklist/."
-
-	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
-	newconfd "${FILESDIR}"/dnscrypt-proxy.confd dnscrypt-proxy
-
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.service dnscrypt-proxy.service
-	systemd_newunit "${FILESDIR}"/dnscrypt-proxy.socket dnscrypt-proxy.socket
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/dnscrypt-proxy.logrotate dnscrypt-proxy
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if ! use filecaps; then
-		ewarn "'filecaps' USE flag is disabled"
-		ewarn "${PN} will fail to listen on port 53"
-		ewarn "please do one the following:"
-		ewarn "1) re-enable 'filecaps'"
-		ewarn "2) change port to > 1024"
-		ewarn "3) configure to run ${PN} as root (not recommended)"
-		ewarn
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "Using systemd socket activation may cause issues with speed"
-		elog "latency and reliability of ${PN} and is discouraged by upstream"
-		elog "Existing installations advised to disable 'dnscrypt-proxy.socket'"
-		elog "It is disabled by default for new installations"
-		elog "check "$(systemd_get_systemunitdir)/${PN}.service" for details"
-		elog
-
-	fi
-
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver 127.0.0.1"
-	elog
-	elog "Also see https://github.com/DNSCrypt/${PN}/wiki"
-}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.0-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.0-config-full-paths.patch
deleted file mode 100644
index b0ab738a57e5..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.1.0-config-full-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-index e180a73..bc330dd 100644
---- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
-+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-@@ -341,7 +341,7 @@ reject_ttl = 10
- 
- ## See the `example-forwarding-rules.txt` file for an example
- 
--# forwarding_rules = 'forwarding-rules.txt'
-+# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
- 
- 
- 
-@@ -355,7 +355,7 @@ reject_ttl = 10
- ##
- ## See the `example-cloaking-rules.txt` file for an example
- 
--# cloaking_rules = 'cloaking-rules.txt'
-+# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
- 
- ## TTL used when serving entries in cloaking-rules.txt
- 
-@@ -408,7 +408,7 @@ cache_neg_max_ttl = 600
- ## check for connectivity and captive portals, along with hard-coded
- ## IP addresses to return.
- 
--# map_file = 'example-captive-portals.txt'
-+# map_file = '/etc/dnscrypt-proxy/example-captive-portals.txt'
- 
- 
- 
-@@ -438,8 +438,8 @@ cache_neg_max_ttl = 600
- ## Certificate file and key - Note that the certificate has to be trusted.
- ## See the documentation (wiki) for more information.
- 
--# cert_file = 'localhost.pem'
--# cert_key_file = 'localhost.pem'
-+# cert_file = '/etc/dnscrypt-proxy/localhost.pem'
-+# cert_key_file = '/etc/dnscrypt-proxy/localhost.pem'
- 
- 
- 
-@@ -688,13 +688,13 @@ cache_neg_max_ttl = 600
- 
-   # [sources.'odoh-servers']
-   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-servers.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-servers.md']
--  #   cache_file = 'odoh-servers.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-servers.md'
-   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-   # [sources.'odoh-relays']
-   #   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-relays.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/odoh-relays.md', 'https://download.dnscrypt.net/resolvers-list/v3/odoh-relays.md']
--  #   cache_file = 'odoh-relays.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/odoh-relays.md'
-   #   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   #   refresh_delay = 24
-   #   prefix = ''
-@@ -704,7 +704,7 @@ cache_neg_max_ttl = 600
-   # [sources.quad9-resolvers]
-   #   urls = ['https://www.quad9.net/quad9-resolvers.md']
-   #   minisign_key = 'RWQBphd2+f6eiAqBsvDZEBXBGHQBJfeG6G+wJPPKxCZMoEQYpmoysKUN'
--  #   cache_file = 'quad9-resolvers.md'
-+  #   cache_file = '/var/cache/dnscrypt-proxy/quad9-resolvers.md'
-   #   prefix = 'quad9-'
- 
-   ## Another example source, with resolvers censoring some websites not appropriate for children
-@@ -712,7 +712,7 @@ cache_neg_max_ttl = 600
- 
-   #  [sources.'parental-control']
-   #    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://ipv6.download.dnscrypt.info/resolvers-list/v3/parental-control.md', 'https://download.dnscrypt.net/resolvers-list/v3/parental-control.md']
--  #    cache_file = 'parental-control.md'
-+  #    cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
-   #    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
- 
- 
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a321396db45a..32cd5e32df05 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index dd3473cf884d..4fc61885f316 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,13 +1,9 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 AUX firewalld.service 581 BLAKE2B b4eb7549305da68bc53f913d5d0a3ff2595e8e482ed2a474ede645f33b8192e142cd1aa964c5c1dcf8a7c336c68d494ee13421ec7566312a4f89330c236cab9c SHA512 b81fb8414619b3661985cbac001a47c76d76b13eebe421919a838fa0396e6470a3109e0d20d88f423ff43b6e48c0537467125a85bf8939ef0ab6ded4d4829b03
 DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
-DIST firewalld-1.1.2.tar.gz 2099245 BLAKE2B ea1e73cf96908ca4981deb86d4c0fad75f36ef321a37bba6d789b3de90b1cbb818f1eda713f41567c2125265b2e19707d411e1b51ab35c6f1af8b6040528f150 SHA512 a82a57d77c2fb5e9758218516912057bfbfb5549b341bcaaa8d40f3c39b8af67a01ca146a3aa09495ca38b315fa09a5d3d32597c40de10ca2da370b81d5598b0
 DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
-DIST firewalld-1.2.0.tar.gz 2120379 BLAKE2B 8c09e9a5e08e9f4dc2b3bfeda35d9078bd464956a30d7fdb5700329755fc307f0664f6a20ff5e941026785f28940b1eeebe747e2b2b3eed150725e014d05f870 SHA512 739ef7e4b85f2f00656434f6b37fb8116b9a93595390667d212820bc30a3e3cfaf5a60be7b18ec1f72be720d35a76224f3ce28856a9ff72557b8a8ae8e83f0a8
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
 EBUILD firewalld-1.1.1.ebuild 5166 BLAKE2B 40802a29a71d688686acdb223f493c0ca2b5552416b5ffb5dad7ca75d5a8af433df72a289a57fd527a97ae6d33173db2059241f4951f0bbdfaceaa8ad734ab20 SHA512 d65f3b8c9c2aedd4d9ee76fb28bcd77e9eebfa23e326b05225e94f84ce9b9b7c6a0491da3ca867ab3c49bbac244aa3a8622b281e3ccfae321889e27a58ab9dfd
-EBUILD firewalld-1.1.2.ebuild 5223 BLAKE2B bc89930ffb3015b4702295d1e47ebfaf707a45e3b940d8c3fc2fc95b361a6e6fe29322bd13a22c2c1a741146a514a949ca595adc2b2d50766b99192135148d7c SHA512 09c8606220d3b779fae7f16d690b4f396ab7e75423e255a4b9985573c439cf51676c29d229365805e1eb19a13b62a7067c2eb663bab48dc47a97aead9600d44a
 EBUILD firewalld-1.1.3.ebuild 5265 BLAKE2B 91fd7d3386b8dd6e253c95eef7b8f34f50e433b5d90ea839308ad54bdb9ec1c0928d89b6d294b94264cc2051a109a9d853ac5f8433faa6a660fa2c30410c2801 SHA512 5f795811c43acb9f516065d6ac32fd47e490581f7f3f82cc93569bae77041462654ede5a3f53ca21e74cbe2a1ba932318e47c310a4c42caae46b4989e0bf81f9
-EBUILD firewalld-1.2.0.ebuild 5223 BLAKE2B bc89930ffb3015b4702295d1e47ebfaf707a45e3b940d8c3fc2fc95b361a6e6fe29322bd13a22c2c1a741146a514a949ca595adc2b2d50766b99192135148d7c SHA512 09c8606220d3b779fae7f16d690b4f396ab7e75423e255a4b9985573c439cf51676c29d229365805e1eb19a13b62a7067c2eb663bab48dc47a97aead9600d44a
 EBUILD firewalld-1.2.1.ebuild 5221 BLAKE2B f502155b95c2da988d9864d31991d74fde09ff33ae61c0e67f9e02fe67a8e6c151f15552dae50de2e33d68ed48f9bbdc6adf1fee68a1852423c4136c23c55354 SHA512 bb9583dbd8fecc9bdf2b2249e78390d69cf77e8815c51879e9c0c799bad4bf66a909726f59a6f7e1d650a450491b717b69eba439f25438981b094140729559d6
 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe
diff --git a/net-firewall/firewalld/firewalld-1.1.2.ebuild b/net-firewall/firewalld/firewalld-1.1.2.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.2.ebuild
+++ /dev/null
@@ -1,212 +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 bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2"
-BDEPEND="app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-1.2.0.ebuild b/net-firewall/firewalld/firewalld-1.2.0.ebuild
deleted file mode 100644
index a1e5b3069d0d..000000000000
--- a/net-firewall/firewalld/firewalld-1.2.0.ebuild
+++ /dev/null
@@ -1,212 +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 bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2"
-BDEPEND="app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/nftlb/Manifest b/net-firewall/nftlb/Manifest
index e0b2b835ec74..66596013812e 100644
--- a/net-firewall/nftlb/Manifest
+++ b/net-firewall/nftlb/Manifest
@@ -2,6 +2,8 @@ AUX nftlb-1.0-musl.patch 1899 BLAKE2B 6c2c51ba355473754ac1aa59e423b367c9eba8c0ae
 AUX nftlb-1.0-tests.patch 1025 BLAKE2B 1c1a3b363d5896799dbc9c789684bcb407cafeee6b7d7d061f28142a718a77b9a7fc11a59ff40f178047d37a8452c66cab904661d36874efc343677ec4a043a4 SHA512 a013fd84528620e61b93b11218edb5fbf4096d0367d802f697048f544751a0a4c9d64ecfa5198b28d8dc732b195db7d7ed5028423aa26c855f116d11665f096b
 DIST nftlb-1.0.4.tar.gz 199236 BLAKE2B 457fc617af75513330b7c6730a3ee67061d5df4d1faf74a0d57ffaa7ef003e882136a9e0300fe61f1f0235ef752a5d695cfdf9a5e1cecf9b57553d4c9151bfd6 SHA512 89b0dba85029236f55289818c7b7ec6fe6e2e1f33003fc7fb9fa3ae763b96395827ba9d8134aa4ac80f8be0da6e17be132e9293b46c9264d9c49062e4db6688a
 DIST nftlb-1.0.6.tar.gz 201767 BLAKE2B d81607ad88c88f3cf97124bf2db6ad8b210fe8f60d72661094dfbbbfc66c4b911985944f08b5483ceec420850b18cb0fe3a8fd6fa7fb76fa4da456870367cecd SHA512 63fa1e9b5fbd18e5c852adb2415dcd6e24bad899fe647641ea6e8dbca4b7c2808c939bdf5f7700a586304f3126088bb74a0fce79c72e8bc92df1e7a9c111feca
+DIST nftlb-1.0.7.tar.gz 201988 BLAKE2B 794778523b3a60a351fd071e6ff129197203ddfb1b80823dd6b05c30cb530040da465a10d2ffbf11cad063c2a453bb9baebd6e689b9166d4fcb0fe9fd17760e8 SHA512 eb1e9847f340e57b75a5b8680774d8208b282faccdef48e316b2bd52b10349eeda70643386e0e899d0f6a2f506964cf1b7a7ec2d86279f83ca87a9afa8f047bc
 EBUILD nftlb-1.0.4.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d
 EBUILD nftlb-1.0.6.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d
-MISC metadata.xml 256 BLAKE2B e4fb7b4732dc88ff20c10bd7e5425beca8310c14d3934046ad6fcd99d8f401ea8610a6df5444d094f5bae4e5120cb7aedc15b45f0862b73f83bd7d5e54617337 SHA512 d37651285ce883fc1c73b41e09e66788d47b2451a4f96ac4237e6bef59643b3171a7a24900f204f0ca1accdbd5961d74e4bd7c8c41e1d29492874e4cbc737611
+EBUILD nftlb-1.0.7.ebuild 1037 BLAKE2B 61b6a5e568945cb063f205b39dc43e36aa4ed1001bdadd592e513f813c376f41eab26309f4a2df4827741fa4eacfa88a8b57c5dfcffae53674fe0a824baf62ff SHA512 43a81b0c731563e4d1cf8a3880b722d9c171d7930b1998cb4251d38f756fcd02bc6860e923db776aca3ca24aff3fd8590c195a009d41399bbe3331c8e7ffed1d
+MISC metadata.xml 338 BLAKE2B 7ac9c5781a06889e69bbde8ed9ccdc15f5a587eb71c0d8835d365c5856fd9d96b492a8ce1090b5b9a3bf282719ac8f5b7001b7c712daeef656f0b09d0019c903 SHA512 87dea1537335a8012ae31a59f9346039896c407b35ec818bcb245d899a75fa60f2e72713c612f8eb94010fba8869ff7814096d63280cc0e642f5f41d59241c8c
diff --git a/net-firewall/nftlb/metadata.xml b/net-firewall/nftlb/metadata.xml
index 7c1651eba3e0..ab906c04250e 100644
--- a/net-firewall/nftlb/metadata.xml
+++ b/net-firewall/nftlb/metadata.xml
@@ -5,4 +5,7 @@
     <email>chutzpah@gentoo.org</email>
     <name>Patrick McLean</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">zevenet/nftlb</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-firewall/nftlb/nftlb-1.0.7.ebuild b/net-firewall/nftlb/nftlb-1.0.7.ebuild
new file mode 100644
index 000000000000..f1e9170bcbc4
--- /dev/null
+++ b/net-firewall/nftlb/nftlb-1.0.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info autotools
+
+DESCRIPTION="nftables load balancer"
+HOMEPAGE="https://github.com/zevenet/nftlb"
+SRC_URI="https://github.com/zevenet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-firewall/nftables:=[modern-kernel]
+	dev-libs/jansson:=
+	dev-libs/libev:=
+"
+RDEPEND="${DEPEND}"
+
+# tests need root access
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/nftlb-1.0-tests.patch"
+	"${FILESDIR}/nftlb-1.0-musl.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="
+		~NF_TABLES
+		~NFT_NUMGEN
+		~NFT_HASH
+		~NF_NAT
+		~IP_NF_NAT
+	"
+
+	linux-info_pkg_setup
+
+	if kernel_is lt 4 19; then
+		eerror "${PN} requires kernel version 4.19 or newer"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_test() {
+	pushd tests >/dev/null || die
+
+	sed -e "s:/var/log/syslog:\"${T}/tests.log\":" \
+		-i exec_tests.sh || die
+
+	./exec_tests.sh || die "tests failed"
+
+	popd >/dev/null || die
+}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 1f8d59893723..b6e6007f1eb3 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index f4b678c0e87e..36f71f5a0968 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -2,8 +2,6 @@ AUX irker-2.22-fix-tcpserver.patch 1068 BLAKE2B e2aaef99a33f5464194feb4dc61e9932
 AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e89200fd71c8a2152bf5ca0dc43e5e93b46dfff6e683d8fc2d364dd27048d16642c4043a4f936d3af SHA512 00656916acb9fa2cbee57442a7a90bfbc7213c03ad3ee38b01314679b66177fa6152400ad3401e87be3711e6e38e09b084ea90cb71ae5774c8eba5cf9ab8e070
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
 AUX irkerd.service 517 BLAKE2B de89f8ff4d98928b8d4035e545a2c0628b849246ce5eae393341cf894a89ec1b33087da6c756d8b3b17784175541bd366dbf0b17c38e1e36cacd2b0da48a2391 SHA512 d31699cef084bfeb2272e49c7eeb050148e942286cd9cb2cd6491a97210628f08f05c04ddd052a8ee9cccba33ecd3e460f99aeb52dd1c1ae1ef65ef8754ddf49
-DIST irker-2.21.tar.gz 45563 BLAKE2B d2bb9ee1c33640c049919a0d0ec92cd01dbd9fd086120123b5344f44180dbd94d6b0beb56387968f6feaf526b8a11300d415d87b3243bcd2d5c1fa5c8d4aaa5d SHA512 d90922abd61fef13d8030ce666a32fd79e17812f06517796c933d62a9b7cd814bdbeb3de11357ca1766bbffafb0379f0a8b2f288a2be58fa6be82cc764e0b225
 DIST irker-2.22.tar.gz 46037 BLAKE2B fbd9deaaa5cc509989b15d16d733bec351b7b2ab9d3bedd8b20713ba110755a43ccb91b1482a6deb0f71497b3b1d6f8ed5faae395c06c33ac4c9ea7da30d2726 SHA512 a3f2ebe113e4fcb4589c31a44c157bc0f91e8792fd7819e9f350fd25847669d2cb3fcd51cc0e09ef352952c5175f8b4eb56ac9969f0bff1544e28268728f0595
-EBUILD irker-2.21.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
 EBUILD irker-2.22-r2.ebuild 1619 BLAKE2B a2f3a6e9831157216d3554bc0c2c371eaf64e5d06904adff97834f7df147739652d90a2d2b41e4d415da37256e4e8c2b3e9bbcac87735c61675ab3bb38709153 SHA512 a053cc1cfbdd7b82fad5341f7a02070e4480c8c8f1a38269331168b2ec81b3d8f93341acde52b2cfd1b5d69aed8f1c0952b836e239a2321785d85b5b0271d220
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/irker-2.21.ebuild b/net-irc/irker/irker-2.21.ebuild
deleted file mode 100644
index 87717d39727a..000000000000
--- a/net-irc/irker/irker-2.21.ebuild
+++ /dev/null
@@ -1,64 +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} )
-PYTHON_REQ_USE="ssl"
-
-inherit optfeature python-single-r1 systemd
-
-DESCRIPTION="Submission tools for IRC notifications"
-HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
-SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Dependency notes:
-# NOTE: No pkgconfig dep here because of the systemd sed below
-# NOTE: No need for asciidoc here as it's only used for the
-# 'release' makefile target.
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	${PYTHON_DEPS}
-"
-RDEPEND="${PYTHON_DEPS}"
-
-DOCS=( NEWS README hacking.adoc security.adoc )
-HTML_DOCS=( irkerd.html irkerhook.html )
-
-src_prepare() {
-	default
-
-	# Rely on systemd eclass for systemd service install
-	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
-		|| die "sed failed"
-
-	# Prefix support
-	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-
-	python_doscript "${ED}"/usr/bin/irkerd
-	# Not installed with the default Makefile
-	python_doscript irk irkerhook.py
-
-	newinitd "${FILESDIR}"/irkerd.initd irkerd
-	newconfd "${FILESDIR}"/irkerd.confd irkerd
-
-	systemd_dounit irkerd.service
-
-	docinto examples
-	dodoc filter-example.py filter-test.py
-}
-
-pkg_postinst() {
-	optfeature "SOCKS5 proxy support" dev-python/PySocks
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 87a8f62c01d3..4da2800e88ef 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libaccounts-glib/Manifest b/net-libs/libaccounts-glib/Manifest
index 6cdf6faf75bd..69989f1e3ac8 100644
--- a/net-libs/libaccounts-glib/Manifest
+++ b/net-libs/libaccounts-glib/Manifest
@@ -3,5 +3,4 @@ AUX libaccounts-glib-1.26-fix-incorrect-cleanup-in-ag_account_finalize.patch 115
 AUX libaccounts-glib-1.26-project-version.patch 350 BLAKE2B 6a2115cd408e425e94b637e029f22ab9ada2739bcf29b7e20e80dfc89e571666f5ad909f5f89e7476d4456c9b2e4ad67287df1aacff86ffe8817a66360717871 SHA512 7755e629309017f69c4c9daf71b3df578739970c06d0193009d0bddaa659b5cbe3531b75d95e36cfbe957134aa9eee3707e8d6f9a5a23676f538c49fedfce429
 DIST libaccounts-glib-1.26.tar.gz 117365 BLAKE2B a3c7bf4058372001079c9c153b30f947882521f1f9680a63db2883307e998335a1e646112dc8a51640824f238d871d96da2c18b4ef175c837cebfe056ded2cbb SHA512 c08a11087745ba771e539b61de57693390960ad6b4e8217c159be49d31bd7f8856fffa835e7a230f352049bbf7cec9184ff225e74bbc195964221d3d9d49743b
 EBUILD libaccounts-glib-1.26-r1.ebuild 1488 BLAKE2B e14ac2d979f24bcd9b4cdd9b8cb25234e15e2244dd1684ca33203ba002df43098d1bbae1b5117220bdac8d18b8dc08af3a22913fcddb65d720ef9a11a9d60421 SHA512 70f3c3c80964cb02ac7bb78668b859f122b70fccf42943bea533df532dbb9c6ca6d71626337e2123f645e8084b9986a2505474adb94893df3acb885e3849d73f
-EBUILD libaccounts-glib-1.26.ebuild 1418 BLAKE2B 7dc205283363854d36b6ff957b13ee4b2033ae210c257a790afdbde4aab5ec814b24f0333d1d8eaa860e3bd90b81fb5c5bd3a489a70908385984cae68772f3e6 SHA512 613812328f776618447e26cbf9ee7b97238209a7fcfb267cfe7829913a26cb7d22ee086cbf42d28dc8928bab550ac89c85f2008544d59f10254d2ed816441309
 MISC metadata.xml 250 BLAKE2B f3e9395137ebb9adf46cd35c1b6156f82c04cfa94f964f6da24fe71eb560cf51b4f70ebfa10daaa4884400ec22782d819ab794dfd29e7a47559f07208397195d SHA512 78c4ff15eed76ba883b457be95dabd41e928a0e64a42b758b5eab4d8a95afca27d5ea6a7cfe0948de578b169153a05f08aadfce1ddd41a88732212a1e76e565f
diff --git a/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild b/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
deleted file mode 100644
index 04e4aa4fa062..000000000000
--- a/net-libs/libaccounts-glib/libaccounts-glib-1.26.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit meson python-r1 vala
-
-DESCRIPTION="Accounts SSO (Single Sign-On) management library for GLib applications"
-HOMEPAGE="https://gitlab.com/accounts-sso/libaccounts-glib"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}/-/archive/VERSION_${PV}/${PN}-VERSION_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-VERSION_${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# fails
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gobject-introspection:=
-	dev-libs/libxml2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/check
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	doc? ( dev-util/gtk-doc )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.25-assert-failure.patch"
-	"${FILESDIR}/${P}-project-version.patch"
-)
-
-src_prepare() {
-	default
-	vala_setup --ignore-use
-
-	use doc || sed -e "/^subdir('docs')$/d" -i meson.build || die
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir meson_src_compile
-}
-
-src_install() {
-	einstalldocs
-	python_foreach_impl run_in_build_dir meson_src_install
-	python_foreach_impl python_optimize
-}
diff --git a/net-libs/libblkmaker/Manifest b/net-libs/libblkmaker/Manifest
index 0e1b60a5b049..3b661c06c973 100644
--- a/net-libs/libblkmaker/Manifest
+++ b/net-libs/libblkmaker/Manifest
@@ -1,3 +1,3 @@
 DIST libblkmaker-0.6.0-github.tgz 28907 BLAKE2B 31b64604040a514ae844564d19e884932fbaa0640d0491cda5ec9e922b0714c89e8810f1da3d0057625633555ea486c15e20f2a32d8528a6795be52e692d4e4f SHA512 3e9028c7c4664491274c241020d507ba6d736b9e9048562434d27d92f6cdd58ec167fae060bc355ee6a7f010a6a8a6ccff1660ecfc616c705c5deb3ed95c5e69
-EBUILD libblkmaker-0.6.0-r1.ebuild 691 BLAKE2B 963f27af1ca59cfdf8461c4b0c99b23011654bd89f335176768b1cb09a47ce0a1e1cddbd0eaccf30005421cadd7c84c706149bae34110e6a8b1e8bef2bc7140e SHA512 21e15b15b6e3c20a31698cb59b498ad37114a6888303efdb267fc9a62bf5b02e2a831aab4d21ce676d8c2ea229cc5243d52beaf1ab54a0c944f5e6dd9a0de8b9
+EBUILD libblkmaker-0.6.0-r2.ebuild 593 BLAKE2B 34f52baf3b8de975205fbd0c8189e53c9871c7c663caa66b5e69e2f8003830c62bbe4b3c26f8a11c970a0543cb770202f744d62cc93ef34ffd0715b3a7e1c6ec SHA512 5e243f09a952eb114ed39d6f6d35b248c4e78055077ebb4257c90b78eb1a62e242277ec0c7b84c8e60f068324f448b68eed384cde2df4ce1000e2ecc22f2e7f3
 MISC metadata.xml 489 BLAKE2B 7c3d3347ec58fdcc8645e02c1f1d5be3c4406bf0306ab05217f6bb8905ee5a00adab844ed1f1be5c48b79a11d325d3e95023824fb4f2e9c3b66d77ce1e0034a6 SHA512 6dcab8cdde1b6ac9056a9004512a9798f072a1d61081338a885b929aa1e768791a3fae24bf7ac53bfdfae2283cf0fab7eca811c0c91750ba0f33f9625cae4e78
diff --git a/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild b/net-libs/libblkmaker/libblkmaker-0.6.0-r2.ebuild
index 96ad5efcab6b..b5558db1cedf 100644
--- a/net-libs/libblkmaker/libblkmaker-0.6.0-r1.ebuild
+++ b/net-libs/libblkmaker/libblkmaker-0.6.0-r2.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools
 
 DESCRIPTION="C implementation of Bitcoin's getblocktemplate interface"
 HOMEPAGE="https://github.com/bitcoin/libblkmaker"
-LICENSE="MIT"
-
 SRC_URI="https://github.com/bitcoin/${PN}/archive/v${PV}.tar.gz -> ${P}-github.tgz"
+
+LICENSE="MIT"
 SLOT="0/7"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/jansson-2.0.0:=[${MULTILIB_USEDEP}]
-	dev-libs/libbase58[${MULTILIB_USEDEP}]
+	>=dev-libs/jansson-2.0.0:=
+	dev-libs/libbase58
 "
 DEPEND="${RDEPEND}
-	test? ( dev-libs/libgcrypt[${MULTILIB_USEDEP}] )
+	test? ( dev-libs/libgcrypt )
 "
 
-ECONF_SOURCE="${S}"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/net-libs/libyang/Manifest b/net-libs/libyang/Manifest
index 2b1735096a2f..f6d40be8ef1c 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,3 +1,3 @@
 DIST libyang-2.0.194.tar.gz 1150705 BLAKE2B aa323b39752ac426f35e1ef17ca4a61d726c48916b740511ed03b06b8132747207dd4620842f9730ff1d05f216086310bc1634f393163067c119f5eec0aa91b1 SHA512 33d043ff696fc59c1cf5265a463b85a17459086162a03c56b1894cc524b7325ded2e14a71fce55ee70d02ea1119eef523190708c5f7b22438ab8ffd014fccefb
-EBUILD libyang-2.0.194.ebuild 869 BLAKE2B 57edaab0859aa89b5b0051f7b2e01ddad32e7a1256eb8565709799e26033ea223d850ee2258e2ac31f31c0acade5698486a94a70baf54e425806a5913d6c810e SHA512 a21c427ceefe5830b8c92b21cd60c451aa46f05a96558b82662ce34ff5a5bc48fb1d4642ffe0502c009dfbfaf622fcf9f145147e703cb807fe85ffb127fcd9c6
+EBUILD libyang-2.0.194-r1.ebuild 803 BLAKE2B de09c48bf684fb9f7af8c46a84e7ac896e4dc91d386f69051209026ea02d745b9c8a44202eccce6f44f16d5dec7b9831ac73d067cc615a8ec0ac90cbb4623205 SHA512 ccbfa21e011b26c04b12f80765a2b6bc561c04d89c9f7987086a0aaad0ca242c2eabcbcf5a1aab889db1fb281e93b4ae34be610e58284ef48c6674e1ffd20f8b
 MISC metadata.xml 435 BLAKE2B 23ee5c217c07799c169828436f3abe2100418ce870a9a2a523b6571d4f789ba5c56b4b74c48d3ce3e9db035efbc7692d5a3eae2dcb6732f6677c81e11122334e SHA512 63ff1dedf5aed1463b90733271f0d623233bd371d19126944b92cea27795f3753a93c2ad328a817bb6f7b9360f20cb838b2518cd156b95151a1a73d6b3478042
diff --git a/net-libs/libyang/libyang-2.0.194.ebuild b/net-libs/libyang/libyang-2.0.194-r1.ebuild
index 975c5453bec1..f08475ffb964 100644
--- a/net-libs/libyang/libyang-2.0.194.ebuild
+++ b/net-libs/libyang/libyang-2.0.194-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib
+inherit cmake
 
 DESCRIPTION="YANG data modeling language library"
 HOMEPAGE="https://github.com/CESNET/libyang"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libpcre2[${MULTILIB_USEDEP}]"
+RDEPEND="dev-libs/libpcre2"
 DEPEND="
 	${RDEPEND}
 	test? ( dev-util/cmocka )
@@ -25,7 +25,7 @@ BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
 "
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_VALGRIND_TESTS=OFF
@@ -33,12 +33,14 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
-multilib_src_compile() {
+src_compile() {
 	cmake_src_compile
 
-	multilib_is_native_abi && use doc && cmake_src_compile doc
+	use doc && cmake_src_compile doc
 }
 
-multilib_src_install_all() {
+src_install() {
+	cmake_src_install
+
 	use doc && dodoc -r doc/.
 }
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 2f04b4b5ff0a..7dd14e3de4eb 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -5,17 +5,18 @@ AUX nodejs-14.19.0-global-npm-config.patch 914 BLAKE2B 015fd323cbdb3548f4858f988
 AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215321315a9a7f2a7b83544fbc4c7c08920d82eccf2ea45530b24aba734b27d82457cd7cf2ef8f780f309f4411ab973738fa3cbfd SHA512 e5dff5f8007716e2c3d6ea5829b2ed42ff9e458b751d06772c51b77a36b188f167c1d637a74ae7cf5c2b97c28436213f02374b0dbef5440607ce4e1c3e586e86
 AUX nodejs-16.4.2-paxmarking.patch 4257 BLAKE2B c088deb4f9207d0cfbc43d71111230ec23a30c6fc86df67ab9bf17b3ca6de276e4d84980b58855bb94f0caa865fa5ab9af19fa4db72b7edb9394798b739fa939 SHA512 a96de4f57589db222eb493fcdcddbd67e051728165cdabde675aeb3bbdce857f13a9708b7495acc64cd88f7fa3994d89ade006a1292895b2299ef6b5162ec6a3
 AUX nodejs-18.3.0-paxmarking.patch 3303 BLAKE2B 627ef3dac873d7967181cbe44b3566080b98bbc08ff7d75dfcf0cbded2e71e8af2ec6ccf2386b4d67ee20f612a49b03d2d81d50c845a5e5447194d94146ae035 SHA512 59be93e86373993fcd5235b7b6fa9fe85df3e2bdd9e61e2374cedccf69a6a36263bf1ce10f3294fdb9bf04a85a6f0dba209d4d7f9dc24b52af83bce48f51b22c
+AUX nodejs-gcc-13.patch 841 BLAKE2B 86150b503987c2c84acfc2967883cd81109cb3117eb8d647c8682cad7ba04e2248b1465acdb188f083bc246e165be336c153ff850236fccf6de8d04115a3577b SHA512 2d8f6c132c2e7a9c9acbf46ad4f7687c3bc0d1382b1966eaf9a4bd30d5eb0e6513c2fe32c73e9ed2bc8ae4cf3ebfcca29251b71e4589df0f898e11f1242fd936
 DIST node-v14.20.1.tar.xz 34482880 BLAKE2B 3d21645c94e194c4a9a499544032643a2b14f507642c8d01bd54b3446c691c6d59109c08713a4b2e210c7418baded496b80308687b31830d2ccee5f8c9a06178 SHA512 27186e6b877189c7976fe566cbc4f5e961941f74af7e2f96a0829d6061b880569095666da70545f61a017f1b520050ab6ef5fc98e2e71e72253633f88a9264fb
 DIST node-v16.17.1.tar.xz 35661452 BLAKE2B 1fd9fad86f4f5161b2e06199a18f4df431b95ca03214cedefa4b76a9703e7153120c8c3f0f9b07fce825015533d2f52cc29e5737308c69d809c3e6edbc0eacee SHA512 f9aefcc72a260cbdc162db8db01885a93b1b2248ff0c20c6e9b98819b8b5e599f7da89eeeb7cfe202764cca3974b6ca48610351176f6767ef6ad630ca7ee8cb7
 DIST node-v16.18.0.tar.xz 35849580 BLAKE2B 42de388144a1bf66bdacf9c0561596b7a6624dec9a48d417a0ba22eb28a87ba97b6af5707d7f9584b937e86f01baf50db83aaa2b4ecd56aa493f1509c43764ae SHA512 4bcd1fd7aeea8ba87c419d6cfacfdc3415205a44ddaf7a744e1457254de6cafe51b6f28071071e2e66834164bc6eb1e956c8124cc63a06fc3bf69a17476f1c05
 DIST node-v18.10.0.tar.xz 38364672 BLAKE2B 0746f9c8bba75a996987c77e6e4c328e56a54517b768280254edf2feffa7d6b578ead54ec86753dd84f764ece6d4b8d22567670d51ef70e70a22d99fc2a835fb SHA512 7dbdb75786a8b85b66a8258ec1754aeaaaed3fed086b6a6caf46940c57fec16305a34931f27c33ed6ac036f16a7dbf010f17a6eec26316d71f3b3086626cf68b
 DIST node-v18.11.0.tar.xz 38437152 BLAKE2B 836af1d07493017fc9863a21a7b38fc7118ec94b0eae5089291cc9819637c40332c21676ddc360af28dbf98c48fc83acd035c6ac5e5f4eb62e0043f340eda311 SHA512 dfb36f438e59913cde540c8bc429bf856078c174a53406de851ac59337f70efbd5988e6a969bd16ab8cb2a197871c6f7353c3ccbdaf492a4c047fc11ede36a78
 DIST node-v18.9.1.tar.xz 38315220 BLAKE2B 515ab64db023c5809c476c1248e2d47a49d46ed273ee0f91ac803791b0e7a51f3dd2f0ee7f30901d9a1fbc9172dd971c9845c86a703c6194bc8f983d3f81567c SHA512 fc570dbd41197363d0f9bc3f329fbdffd0cb5b7382327e206d40b3b4e42a80fa65debb172abd501021bcc5082d8d99fc5f6faa05cf87066170c87be1b15e8734
-EBUILD nodejs-14.20.1.ebuild 7114 BLAKE2B 94d3c03bf705b1eb513f7cfb33ccf55a556114f8147628c6479e609723425bdd33535655dc61d817fdb4fe08050a4f6688923e2696a22ebd7cad5d852a4dc4b4 SHA512 2610f1985f4089096809bd6d7ca8e84e35a869f437dfe512b876c7f9291ffe50257635dccf72302822bc1d195d158eae54285b95d1e53b3e9fff57a51d30cdba
-EBUILD nodejs-16.17.1.ebuild 6728 BLAKE2B 6b42c92e8cb0bdf283c6eff5548eab9321ce0d045cf8499b059cb9708b394ca64e34f16faeddc68076629c922d9b02b363edd37c223bae327f02828dea4c239d SHA512 f4f45fcb35639382a0c13cb6ed9717fb0ab08815738c0e07f8f2ff5d7d8e8c3bda7050df567fdeff754a1adc57fafcfff705eba2dbb03e047719d36f44591ff2
+EBUILD nodejs-14.20.1.ebuild 7148 BLAKE2B b361effbe5645588daffc199e0e67a1ae2de09c8ff36aae5e7c68bcedd154b1ba2feb7bb9f3b9ab276f73254d0004caf644b5928ea55a86802c3a8b5cc3d0c1a SHA512 3151d756b43f2efa91b13a9b7eaa2dc5a714ada13137b90a209cab8ae64b4da954dab598f17c4fa8e1f76824c3a85904f28b95601680c98a0f6e5bdf3c3e1e63
+EBUILD nodejs-16.17.1.ebuild 6762 BLAKE2B d278f9efabb906fbbd301916d13879c6a9a1ecc957c5c6d23d1d8095baca0b22ff61b83e28fc1bf5e034431080cf527bf19437ffe2bd014e41e188d02def11f6 SHA512 797936389325834aef302f428ea66ee5d87c90beb156333f75210bc8b13efb700eb9ca945116e0017d4265ba010975d2fde571ad854a4391d69777f09cf0e85d
 EBUILD nodejs-16.18.0.ebuild 6733 BLAKE2B f22acbdda582845a79560c5deedb44ab8d5989de4992cda35074d34b548c0a6ecc8c40b213f2cd5d0ba69cffc7ae65fbac2297ff0050d4c08438f17b3022b990 SHA512 cfd0e78387fb05b6a1cd59ae631bee3ce5da601390c686bceb606766eec7c6989ceded8a48a727686c48fae9bba3b81407cbd2e2cf3b04c70d9010d74af6dcde
-EBUILD nodejs-18.10.0.ebuild 7489 BLAKE2B dd05c25948178b549e90ad76f6c3967d6dd9b87bc13b8b651e2df1ecf600eefd49f210633bfe50a889f1545cc61929304527269d82e62e2427fe0f9e1dff5f8f SHA512 5ba209d90c25c932ced2a43c0e846703ea0c4d60ad45df67a443f0e2a6e673a02c7684eec1ea0d8869920f68c7177c3917f6a2e5ae7dc7eb172af63f2d4fa81c
+EBUILD nodejs-18.10.0.ebuild 7523 BLAKE2B 46343936ae255ecb47dee86634333bd572418c6ee582669183f87fb0b3d347ccc89900afcb0ee8aced05766e5411941c87dbd345caaf984f749b306b5377b892 SHA512 8f854fa6681f21662d467a300dd750d5e41a6d3e820c76020a0cb869f1ad9644a20bbf8f2682ee85d43d974246e1b88231e7f1c6a15c9573fd5935a9c58d868f
 EBUILD nodejs-18.11.0.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
-EBUILD nodejs-18.9.1.ebuild 7487 BLAKE2B 9af8d590bc94a6500045d43ad407b2c3cb3d66f78148079a4576c301ca9d4f94aee8c54e16393d9e21d537de79cd9c263d011c680827652414bd3cb171891b7a SHA512 ef3a5116f04b6e9e5087bf21d0f5643806a9df503487a8dc95f86373add12892a9fc7d05cc3fb58445dcfb052047691f0597bb50342c47e9493b1d3091762841
+EBUILD nodejs-18.9.1.ebuild 7521 BLAKE2B 4ad01cada842a8e0c22ec469ff4448e9b459b00aa5854d4a811f1ec42f3186aed38af92dbb2f768dd4e9fca8953c914614fce60689382a381dab9c22aa168ccc SHA512 2df578a3d1df8cd76ea21e6b52c22bfe54cae1ccb24144d3aea72ac422352fe3c9172304847b23f836767436928ed8dbc2de2ec526af641eda5734db13176c0e
 EBUILD nodejs-99999999.ebuild 7492 BLAKE2B b4c56a266693fa31370785937c5f898631e3134b7830e3bc675c480f2cc048857612621f2f9962bc29b544bb3875392b2ef654863ce9fc6490dd617d148d01fb SHA512 c7bd59aef5b76beb67c070b5619aab15b9971c68b7414d7eece64dc31668f7b41708eec46985f3a4c522889f37d0d89a174a0fc743c12e7a1973e5fb7c57bb27
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/files/nodejs-gcc-13.patch b/net-libs/nodejs/files/nodejs-gcc-13.patch
new file mode 100644
index 000000000000..13427a6b7407
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-gcc-13.patch
@@ -0,0 +1,27 @@
+https://chromium-review.googlesource.com/c/v8/v8/+/3934140
+adjusted to layout of the node project
+From: WANG Xuerui <git@xen0n.name>
+Date: Tue, 4 Oct 2022 17:21:03 +0800
+Subject: [PATCH] [base] Fix build with gcc-13
+
+See https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes.
+--- a/deps/v8/src/base/logging.h
++++ b/deps/v8/src/base/logging.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_BASE_LOGGING_H_
+ #define V8_BASE_LOGGING_H_
+ 
++#include <cstdint>
+ #include <cstring>
+ #include <sstream>
+ #include <string>
+--- a/deps/v8/src/inspector/v8-string-conversions.h
++++ b/deps/v8/src/inspector/v8-string-conversions.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ 
++#include <cstdint>
+ #include <string>
+ 
+ // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
diff --git a/net-libs/nodejs/nodejs-14.20.1.ebuild b/net-libs/nodejs/nodejs-14.20.1.ebuild
index ec4700ccab22..c2dfc7980d1c 100644
--- a/net-libs/nodejs/nodejs-14.20.1.ebuild
+++ b/net-libs/nodejs/nodejs-14.20.1.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch
 	"${FILESDIR}"/${PN}-14.19.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-gcc-13.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-16.17.1.ebuild b/net-libs/nodejs/nodejs-16.17.1.ebuild
index c1fd507566a4..9492c22083ac 100644
--- a/net-libs/nodejs/nodejs-16.17.1.ebuild
+++ b/net-libs/nodejs/nodejs-16.17.1.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-gcc-13.patch
 )
 
 pkg_pretend() {
diff --git a/net-libs/nodejs/nodejs-18.10.0.ebuild b/net-libs/nodejs/nodejs-18.10.0.ebuild
index 3ffd13f46228..fec5881c4739 100644
--- a/net-libs/nodejs/nodejs-18.10.0.ebuild
+++ b/net-libs/nodejs/nodejs-18.10.0.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-gcc-13.patch
 )
 
 # These are measured on a loong machine with -ggdb on, and only checked
diff --git a/net-libs/nodejs/nodejs-18.9.1.ebuild b/net-libs/nodejs/nodejs-18.9.1.ebuild
index 9d98aef6f3b6..c4fe0dccc534 100644
--- a/net-libs/nodejs/nodejs-18.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-18.9.1.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch
 	"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch
+	"${FILESDIR}"/${PN}-gcc-13.patch
 )
 
 # These are measured on a loong machine with -ggdb on, and only checked
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b11d813205bf..390730350b83 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 3d3fd3007b22..b95fa03f66d6 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,8 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-7.84.0-easylock.patch 856 BLAKE2B a77854a75a06ad66ef4dc7d6a2555fe2678f4bfd170e961c35e5ad2a82a62891d125ead2d15a311e2a8951404732c755a03636dd4bf4dd3ad16e8bf32ff4f7ca SHA512 7b94f941577d5b0a240e4e879a7e4c659dbdd4ff50d67465bd1a0adf30f5e37a0af7f15b71810feb05d19b833359b069f86aa3ac4c396fd8ba8ed2012b60fb8f
 AUX curl-7.84.0-include-sched.patch 625 BLAKE2B 8c7ecdbc8ffd7cafac915c2d12db1ea98acbd166f18eba538ecd4666152653c36784569f1945b095480120c61124573b094e26ce26c8b85f62baedb40e20d758 SHA512 4be64eff67e56c2584f6c9ee0c9c7b7aca55fc15c8d4be6f9f79da9bb3c1bb1532bcb80eb4f87be2db1058dd41a32e366bfe83988d28b4b263fbb6679b5ec806
+AUX curl-7.86.0-proxy-noproxy-match-comma.patch 3143 BLAKE2B 1aa8d62e6082601eae9e3ae7690a1e7ddce7f12be4cf9f20010f32aa51cd5b1c4206be0b731935a9ddd45bb5654ceed3cba3eabb6a1b9dc60112052d7e79ffa7 SHA512 1a0c67bdabeb1ea8cba7a0f93c12ea626bdc329bbe8c3978f03cb25a78c74fa3257a36f2ed53c177b3a256bca2c0dd8081bab1536b0670e1ec9c0541ac23fc11
+AUX curl-7.86.0-proxy-noproxy-tailmatching.patch 2302 BLAKE2B c4199bc1eb04c8c69f8c72397ce526df6c2186151f77d5e13551e589712e9032e1a52720bd1b946a1b5b984f49a01b297410f4cf74814a58bf4bf43701435c76 SHA512 aa211a5428cc746d07cfd37571169d59ccc97560a69e7c6d21cc8b4a133182366264470de540e1813eee51b376d9056ec8dd01f8e95957e58a83f33d37db0442
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.84.0.tar.xz 2477944 BLAKE2B 811a63285f39a598bc4fd73ae4b8e23e5146b93dcf3eea805345792b7dddd85bbd54240d9871a0dc9f058d58fd7ea7f4efbcb82727218e8afaaae3600bad55e1 SHA512 86231866a35593a1637fbc0c6af3b6761bdfd99fb35580cc52970c36f19604f93dce59fea67a1d5bb4b455f719307599c7916c77d14f2b661f6bf7fb1ca716ce
 DIST curl-7.84.0.tar.xz.asc 488 BLAKE2B d74dea89fa89b6ed0a928e01987669f7dde0bcbb30423ea0f3af9f31eea1e059d458629d80455d772264d744fab236d4f506545afa1bfbd6ded7e2b27192a7c8 SHA512 80ff5274277ad97448fa53511bab6e8a1c302bcb25fc0916d78b8dc6c6af43d944c37c4ed46668b651cc639ec4964780725117ca0e85168ea66ad7cc98d29702
@@ -10,5 +12,6 @@ DIST curl-7.86.0.tar.xz 2518356 BLAKE2B a1de7feb229de42bf1deeb5017f97df3b1c10c75
 DIST curl-7.86.0.tar.xz.asc 488 BLAKE2B a9abe2f3af801b3a48be7db09cb82b6bb83bd26a9d5caf51c0d5a4a2e6881fb478f1768a6b71efbd9283563e2c7e2badbc5a6d6df265013e14eee2ec7e9be148 SHA512 9e97d5f44b3c856f401fe30ba713e1ca1f74edfc693dc42f1ce8e43f9f6dd4bf6998c579bc9c5d0f749f475a7d67d232e92ab6f89b95141acdb53e149f2312f0
 EBUILD curl-7.84.0.ebuild 8365 BLAKE2B 60758e9c23ab94612542434e0adb6602602128e455aff50c8f9da2cbdb58e27fa396bfd0011a3c461ac519e6faa25712ec80351bad3b45a7faf758aefdcbade6 SHA512 9d53b069da866f1acf875ee8615a11c8e0d5f8a88011f85ab7c8ec6e301de0d693df09d265670f0ae758aac5b923bd02a79ee0beffe5bc1454830ac876d1a652
 EBUILD curl-7.85.0-r2.ebuild 8204 BLAKE2B ed3363c2ea324f4485c411ccfd7f049126e64ef6a748a9df9f0518f1e3864e4022f5e1689e2534f2eabeadebe12357d516d8c5f39b59d7a13d4e25aee5634ae5 SHA512 e46aa564a0d73a987e6b30d00d89d43e303074130df9aa0b984b929bceba0ec4db2e6564ce7c3b73b64119b59650f5cd304e15e27853890573c15dd2fb6fba44
+EBUILD curl-7.86.0-r1.ebuild 8358 BLAKE2B 3818cbdb66bfceb2be6eee8561f26d63fe4db9ce9efdde451f7d743a7fcc503eb7df8b7ed1829cd0a74d1182e16f6a036a8673e0350aa8d138d32c0a0d219af9 SHA512 98df2ea708001294c9b034259079465e2c1be9c9a3318d2f75d4b4cfeee5d6b0b152a3cb48929d07e30b2b0a2b0080501d6ba22d3e3e8ae97a99fba23ff8a8e4
 EBUILD curl-7.86.0.ebuild 8253 BLAKE2B da0ca8206baead3da48b2a63ba6311933fa5fd8710a54cc4448a221596cdab57b86f1bfd67368c5357e06053de591b21575b7fe655fec6f7569375d569ff639b SHA512 a70e80311df4cd5eee6eaa0960390df71982c3d5465e6392c7e1068abbe97aacef1dddb1a3b1572063f0c7daf383a3bf31e8ea8f96b2c3291829a1bd9944dd3b
 MISC metadata.xml 2103 BLAKE2B beb97305069a47f8eee68278dca5c0f10467d374c9fdab2ea27808b79a68cd921e2ab60bbb2455cbce2cdcada72e8c68290b40ec87ba31dad6ea580820f5c800 SHA512 27c15624622b074926307369bb41ad6cf532300154a70573618a072418358f5fc543eb56873e9836703073e8b42134a0387f3077e741377827a685cbf69faaab
diff --git a/net-misc/curl/curl-7.86.0-r1.ebuild b/net-misc/curl/curl-7.86.0-r1.ebuild
new file mode 100644
index 000000000000..5ab554508bc4
--- /dev/null
+++ b/net-misc/curl/curl-7.86.0-r1.ebuild
@@ -0,0 +1,289 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools prefix multilib-minimal verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz
+	verify-sig? ( https://curl.haxx.se/download/${P}.tar.xz.asc )"
+
+LICENSE="curl"
+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"
+IUSE="+adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
+IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
+IUSE+=" nghttp3 quiche"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/danielstenberg.asc
+
+# Only one default ssl provider can be enabled
+REQUIRED_USE="
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+		)
+	)"
+
+# lead to lots of false negatives, bug #285669
+RESTRICT="!test? ( test )"
+
+RDEPEND="ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		openssl? (
+			dev-libs/openssl:0=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			dev-libs/nss-pem
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0=[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )"
+
+DOCS=( CHANGES README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	"${FILESDIR}"/${P}-proxy-noproxy-tailmatching.patch
+	"${FILESDIR}"/${P}-proxy-noproxy-match-comma.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-ssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	#myconf+=( --without-default-ssl-backend )
+	if use ssl ; then
+		if use gnutls || use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		fi
+		if use mbedtls || use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use nss || use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss --with-nss-deprecated )
+		fi
+		if use openssl || use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+
+		if use curl_ssl_gnutls; then
+			einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "Default SSL provided by nss"
+			myconf+=( --with-default-ssl-backend=nss )
+		elif use curl_ssl_openssl; then
+			einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-crypto-auth
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		--disable-ntlm-wb
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		$(use_enable ipv6)
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--without-fish-functions-dir
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		--without-libpsl
+		--without-msh3
+		$(use_with nghttp3)
+		$(use_with nghttp3 ngtcp2)
+		$(use_with quiche)
+		$(use_with rtmp librtmp)
+		--without-rustls
+		--without-schannel
+		--without-secure-transport
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "quiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
+}
+
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything which breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can disable tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
diff --git a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch
new file mode 100644
index 000000000000..6c8f4067e8d5
--- /dev/null
+++ b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-match-comma.patch
@@ -0,0 +1,86 @@
+https://bugs.gentoo.org/878365#c2
+https://github.com/curl/curl/issues/9813
+https://github.com/curl/curl/commit/efc286b7a62af0568fdcbf3c68791c9955182128
+
+From efc286b7a62af0568fdcbf3c68791c9955182128 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 27 Oct 2022 13:54:27 +0200
+Subject: [PATCH] noproxy: also match with adjacent comma
+
+If the host name is an IP address and the noproxy string contained that
+IP address with a following comma, it would erroneously not match.
+
+Extended test 1614 to verify this combo as well.
+
+Reported-by: Henning Schild
+
+Fixes #9813
+Closes #9814
+--- a/lib/noproxy.c
++++ b/lib/noproxy.c
+@@ -192,18 +192,22 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
+           /* FALLTHROUGH */
+         case TYPE_IPV6: {
+           const char *check = token;
+-          char *slash = strchr(check, '/');
++          char *slash;
+           unsigned int bits = 0;
+           char checkip[128];
++          if(tokenlen >= sizeof(checkip))
++            /* this cannot match */
++            break;
++          /* copy the check name to a temp buffer */
++          memcpy(checkip, check, tokenlen);
++          checkip[tokenlen] = 0;
++          check = checkip;
++
++          slash = strchr(check, '/');
+           /* if the slash is part of this token, use it */
+-          if(slash && (slash < &check[tokenlen])) {
++          if(slash) {
+             bits = atoi(slash + 1);
+-            /* copy the check name to a temp buffer */
+-            if(tokenlen >= sizeof(checkip))
+-              break;
+-            memcpy(checkip, check, tokenlen);
+-            checkip[ slash - check ] = 0;
+-            check = checkip;
++            *slash = 0; /* null terminate there */
+           }
+           if(type == TYPE_IPV6)
+             match = Curl_cidr6_match(name, check, bits);
+--- a/tests/data/test1614
++++ b/tests/data/test1614
+@@ -16,7 +16,7 @@ unittest
+ proxy
+ </features>
+  <name>
+-cidr comparisons
++noproxy and cidr comparisons
+  </name>
+ </client>
+ <errorcode>
+--- a/tests/unit/unit1614.c
++++ b/tests/unit/unit1614.c
+@@ -77,6 +77,20 @@ UNITTEST_START
+     { NULL, NULL, 0, FALSE} /* end marker */
+   };
+   struct noproxy list[]= {
++    { "127.0.0.1", "127.0.0.1,localhost", TRUE},
++    { "127.0.0.1", "127.0.0.1,localhost,", TRUE},
++    { "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},
++    { "127.0.0.1", "127.0.0.1/28,localhost,", TRUE},
++    { "127.0.0.1", "127.0.0.1/31,localhost,", TRUE},
++    { "127.0.0.1", "localhost,127.0.0.1", TRUE},
++    { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
++      "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
++      "0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE},
++    { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
++      "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
++      "0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE},
++    { "localhost", "localhost,127.0.0.1", TRUE},
++    { "localhost", "127.0.0.1,localhost", TRUE},
+     { "foobar", "barfoo", FALSE},
+     { "foobar", "foobar", TRUE},
+     { "192.168.0.1", "foobar", FALSE},
+
diff --git a/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch
new file mode 100644
index 000000000000..15f5e64c91f3
--- /dev/null
+++ b/net-misc/curl/files/curl-7.86.0-proxy-noproxy-tailmatching.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/878365#c2
+https://github.com/curl/curl/issues/9821
+https://github.com/curl/curl/commit/b830f9ba9e94acf672cd191993ff679fa888838b
+
+From b830f9ba9e94acf672cd191993ff679fa888838b Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Fri, 28 Oct 2022 10:51:49 +0200
+Subject: [PATCH] noproxy: fix tail-matching
+
+Also ignore trailing dots in both host name and comparison pattern.
+
+Regression in 7.86.0 (from 1e9a538e05c0)
+
+Extended test 1614 to verify better.
+
+Reported-by: Henning Schild
+Fixes #9821
+Closes #9822
+--- a/lib/noproxy.c
++++ b/lib/noproxy.c
+@@ -153,9 +153,14 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
+     }
+     else {
+       unsigned int address;
++      namelen = strlen(name);
+       if(1 == Curl_inet_pton(AF_INET, name, &address))
+         type = TYPE_IPV4;
+-      namelen = strlen(name);
++      else {
++        /* ignore trailing dots in the host name */
++        if(name[namelen - 1] == '.')
++          namelen--;
++      }
+     }
+ 
+     while(*p) {
+@@ -177,12 +182,23 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
+       if(tokenlen) {
+         switch(type) {
+         case TYPE_HOST:
+-          if(*token == '.') {
+-            ++token;
+-            --tokenlen;
+-            /* tailmatch */
+-            match = (tokenlen <= namelen) &&
+-              strncasecompare(token, name + (namelen - tokenlen), namelen);
++          /* ignore trailing dots in the token to check */
++          if(token[tokenlen - 1] == '.')
++            tokenlen--;
++
++          if(tokenlen && (*token == '.')) {
++            /* A: example.com matches '.example.com'
++               B: www.example.com matches '.example.com'
++               C: nonexample.com DOES NOT match '.example.com'
++            */
++            if((tokenlen - 1) == namelen)
++              /* case A, exact match without leading dot */
++              match = strncasecompare(token + 1, name, namelen);
++            else if(tokenlen < namelen)
++              /* case B, tailmatch with leading dot */
++              match = strncasecompare(token, name + (namelen - tokenlen),
++                                      tokenlen);
++            /* case C passes through, not a match */
+           }
+           else
+             match = (tokenlen == namelen) &&
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 262b56630fea..072755d66de4 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,3 +1,5 @@
 DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
+DIST tipcutils_3.0.6.tgz 84464860 BLAKE2B ff1422a651b74eb74351691510ef9f71453f48c713fae3da5239c4775e3d9c9c65621210827fc4fad6bdd1b794b8f20f550aeb3c600652de2c9e288312bfcc47 SHA512 b17f9d8ebd9a7b1134aacde3a2d8d99247c07dd1cab1be51ad7ba354e7384e50ec1bde02e338cb600746226209f0398ee9b2375fcd73191bdb75723bc66af606
 EBUILD tipcutils-2.0.3.ebuild 398 BLAKE2B 649cbeee11c9342a93121a7b40d7520dd325327bd7a128c66a663aefba6714380221f98cc4d50260fa4847df1b2a32310588b6cb4d6aef919b95bda63055fac0 SHA512 b7d2265876a9076d956d49cee9724cf736c93cb1f0d2e22d08bd56c1dcc12600e785f2deef42b00a9e7510ccc40df1043ff9f208f45d8463f58a063f40ecef06
+EBUILD tipcutils-3.0.6.ebuild 571 BLAKE2B ede4000b56195c3a2c58ea701ad200054040e23238bd450bdc78e3ffa48dd59a5f74df5af9661afcf2c304be50dd3b5d7be4fb297b2efd774bc60baecd29acc6 SHA512 c039b6255b0d0179c441787452e950545f6976618d14bcb443d3b924290766f2447d7fa24115aa582035971949049fe5ac7929f7a3b1efb5c1827108ee9a7824
 MISC metadata.xml 242 BLAKE2B 2463df74d3a1b2a051fe5b0c4c8c451201c383a6fc0d1620cf1af24a00e6b19b746ce44129c03b8c148887792afe1631c76150da5090cbd177ddbba2116bb3c7 SHA512 623c82cb794dff9f0dcca67cb95845c3b571272e31495fbb81008866aad59e56567fe937e64991fc486856b85a24fc77c0877cb1e4d2e5a7532ca3b71affe813
diff --git a/net-misc/tipcutils/tipcutils-3.0.6.ebuild b/net-misc/tipcutils/tipcutils-3.0.6.ebuild
new file mode 100644
index 000000000000..0a1bf93a2d43
--- /dev/null
+++ b/net-misc/tipcutils/tipcutils-3.0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
+HOMEPAGE="http://tipc.sourceforge.net"
+SRC_URI="mirror://sourceforge/tipc/${P/-/_}.tgz"
+S="${WORKDIR}"/${PN}
+
+LICENSE="|| ( BSD-2 GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libdaemon:=
+	net-libs/libmnl:=
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+"
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}"/bin/bash econf
+}
+
+src_compile() {
+	emake clean
+	emake
+}
diff --git a/net-misc/vmnet/Manifest b/net-misc/vmnet/Manifest
index ea53542628e2..a09261fe886e 100644
--- a/net-misc/vmnet/Manifest
+++ b/net-misc/vmnet/Manifest
@@ -1,4 +1,5 @@
+AUX vmnet-0.4-Fix-build-with-Clang-16.patch 745 BLAKE2B 65c71509f65c583d0b816b97599f1c0a913b7d97df6fc2ea9a8b31db588e281590493c0ea3e819af721549346b1cb9dbf0b632f2b8db84e894a71a3eb2e3e411 SHA512 e7966fb5d2650884606f156be84c77df08dc732fefde99567ba5c4cdb5f30311b5e6e6b8089abe9d3a6d8c3a022dd843a9d8b600dd848fb7d45a7371d358424d
 DIST vmnet-0.4.tar.gz 11362 BLAKE2B 5fdf7e44719752cf47d45d254f25b70343d479a1da0b28cd7fd56735aa67830335599d29664d785b4b21a219a58c48cf2c07f1eb635b126142dda226b6c21ce2 SHA512 b5872caf2d0eadd24323901aff527deb6c57b9286d03362c252b87cd84b7dd8db149b86636fbd4b499810caff41aa948fa7b1f2163159d4b665c2feae279375d
 DIST vmnet_0.4-1.diff.gz 5084 BLAKE2B 1388b8b8334b8d8d16ba920f201f7d7f59bf7202418817cd251689370cc97ce6c2c089a397dabcd96f65193358a4ec606fbfdc9061e876f7232303d0601be070 SHA512 d9518917d0c9ebb75ffe82f002c0c5375b3a932fdd31d2cb4818a9956d586fb0e1bfedc166cdad3ab7a5ead8109afdee2893c68fe69b426c57965648188de4af
-EBUILD vmnet-0.4.ebuild 1004 BLAKE2B 42dcf2092cf1aab3b7c5aed2721285fe9177fe4615751ca5a5c392f8f1963280316fbf5dbf4f523dfebb0d0541f0a46f7ee08064cf7140b8072a16948c6a742f SHA512 66728e1e035cd22da0d8d527b7e748e9ee418783b27393575c90b3d0502d30f25b75a92db10f0972aab41cd23518bc26957fa11f865ea50bec1bcfa5f68d4234
+EBUILD vmnet-0.4-r1.ebuild 1061 BLAKE2B 460911986f7729956e2b9417015f416166c2b62b399deb8c7061801083d5be687bbcf3495114da06ca6d95075113628f3427b0d61380509c6b6f0285b04c3e9d SHA512 e3da273a5f179dda9985e82f14268d3194b89057a06d42f37529bededf0131f4e4e064e1bd7136f1526bd14400ef84cabd307900227f4c90b6f07fa7912d190d
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch
new file mode 100644
index 000000000000..058d2f2d5ddb
--- /dev/null
+++ b/net-misc/vmnet/files/vmnet-0.4-Fix-build-with-Clang-16.patch
@@ -0,0 +1,33 @@
+From 6c4416e8c266c7dc10eb3f3af8f913ace1da84e2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 28 Oct 2022 17:16:17 +0100
+Subject: [PATCH] Fix build with Clang 16
+
+Bug: https://bugs.gentoo.org/871171
+--- a/vmnet.c
++++ b/vmnet.c
+@@ -49,12 +49,15 @@
+  * to set up the SLIP connection and parse/generated SLIP packets.
+  */
+ 
++#define _GNU_SOURCE
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <pwd.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <termios.h>
+ #include <sys/ioctl.h>
+ #include <sys/select.h>
+@@ -251,7 +254,7 @@ void tty_setup(slipconn *sc)
+ 	}
+ }
+ 
+-int slip_setup(slipconn *sc)
++void slip_setup(slipconn *sc)
+ {
+ 	int disc, sencap = 0;
+ 
diff --git a/net-misc/vmnet/vmnet-0.4.ebuild b/net-misc/vmnet/vmnet-0.4-r1.ebuild
index 5eaff92b3467..1fadcfdf151c 100644
--- a/net-misc/vmnet/vmnet-0.4.ebuild
+++ b/net-misc/vmnet/vmnet-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,10 +20,11 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="sys-apps/net-tools"
-DEPEND=${RDEPEND}
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${WORKDIR}"/${P/-/_}-1.diff
+	"${FILESDIR}"/${PN}-0.4-Fix-build-with-Clang-16.patch
 )
 
 src_compile() {
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 8211cd460908..bfb457a947d3 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index b83d3b70475b..8c123fd3a04d 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,6 +1,4 @@
-DIST sshuttle-1.1.0.tar.gz 93987 BLAKE2B c81ab591d5f84764a6ed114623ccb1aaf2ff9706bc5f494513b19c4c2eeb218f3777b2bc7042329eb862aa311a5eab56669d88e10d92b019c0ff9ac9381e3903 SHA512 86361dec179c2ae61c338abaec3d0d36a280c1cc719c1df245a98379037315ac71781e8e5599bb50e34f5068dab3e1010cd7d15c614e01f3dc12011b620d43ee
 DIST sshuttle-1.1.1-docs.tar.xz 8048 BLAKE2B f6318110f67a4882a733d9b389c52eefd2e769b70f3282e7699425b6e6d3a9c5a60219978e248aaf1e7f184491db9aea4aab2efad09eb0af3ee095e0cf527d54 SHA512 c2ef822f872f6afd1d9c64e7a412ad65cca0486115dcfa0673a7a1b0554bfd1413f673248e30fa01759daaf1a1a0061f48a42170d7b234448093d3562f757cd9
 DIST sshuttle-1.1.1.tar.gz 93639 BLAKE2B 63725146dd5fcd07f4b291f981ca947a514735014f4f8173023d3982796ce4ef96b9defb39beef026d32b2162d11951742c57dee1f04cd453cf85ca08c8d2468 SHA512 07a3371c4998f37410692f9c5eaa456ff28b2dbffff731a0be3877d96c820b42c83cb386ec3ab54b524d4b333edd1a2289cd949c7d59b98a11b1ee2d6867da4f
-EBUILD sshuttle-1.1.0.ebuild 1252 BLAKE2B ced8a1353a2aeb10d116db303962291ce6c3e8714a41d2e23c2a2aeb7f2e024566b1cfeb8e75a335477f9ba1f35252c5eb3c85b73308a290e0d81e2da4e00ba5 SHA512 c055f8e15533a74f01930d2d9ef7b0352e407e3e2d5c7ca3cafc7cdfab2e5ec5b5a4450ed9099dd9f6a7c40876e0fb70e3b82dde0d0c0b2ea512cc75a39e2c56
 EBUILD sshuttle-1.1.1.ebuild 2119 BLAKE2B 01a9a23ce176a1c37d82a4837b071759e2b779beaf67e83b4421602fdaa1f423cd6d22270b21c56b6b72a146394659e07913f46661cd62f75f93035b2d93554b SHA512 d3c34424644bfb0eedf8b6840724fc9248d56d3dd9b1f0570a2eb7370b19624d83040fb9ed2b7854816cbc26bf32683555960bcf5a702881d7006ed019ed33b8
 MISC metadata.xml 368 BLAKE2B 8781826aa94f38296cb3c0ef628c931875cf7d8c1f3080970be16c3dd01862d067d4051f4d2c271bc63dd9260c4652ba5fd48002eb5747eab68ba9f02a6a3629 SHA512 a4609eb161d14b0b12d93406a257774465e377c432731cd6d72267baa3396545f45e5df9a16577ff143254797e872aa988213af190d47134d9f09de8d820b6d2
diff --git a/net-proxy/sshuttle/sshuttle-1.1.0.ebuild b/net-proxy/sshuttle/sshuttle-1.1.0.ebuild
deleted file mode 100644
index 7a636a151c2c..000000000000
--- a/net-proxy/sshuttle/sshuttle-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 linux-info
-
-DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh"
-HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/sphinx
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-	|| ( net-firewall/iptables net-firewall/nftables )
-"
-
-CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Don't run tests via setup.py pytest
-	sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die
-
-	# Don't require pytest-cov when running tests
-	sed -i "s/^addopts =/#\0/" setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -j1 -C docs html man
-}
-
-python_install_all() {
-	HTML_DOCS=( docs/_build/html/. )
-
-	doman docs/_build/man/*
-
-	distutils-r1_python_install_all
-}
diff --git a/net-proxy/tayga/Manifest b/net-proxy/tayga/Manifest
index a6a32e245f04..525dfaf3fbc4 100644
--- a/net-proxy/tayga/Manifest
+++ b/net-proxy/tayga/Manifest
@@ -5,6 +5,5 @@ AUX tayga-0.9.2-static-EAM.patch 3050 BLAKE2B 23b802862d17f77db42edcf1eae5127801
 AUX tayga.confd 62 BLAKE2B 6f3c58c02f222eac5dcdeff6bc14f2cbb09108ebec9bc982dd973239558116e7b53bd965df1243625da026c4bcc3fc8ad6c2dcff8a457fa47301bc9a66362b07 SHA512 9a555e4e84b279536f203649440ae317fb44aec2a3f5be04ea40069b81e3988571a408ac7e2a2c9195e78d6ffbbce52b6e063058dacc49c641cf5087b7ecc632
 AUX tayga.initd 497 BLAKE2B bb5822727a9df4afa383f89fafd21685e11b21494a6818c90f2b562cbfebe84bccf1379e6f0b7be98cd7538f92bbfed3843fb06f96ddaff5ccb0fd1226726db0 SHA512 ccba3ddf583312b89b3325e4a59c08d717d37dc358afcf6b030b6d6f4c6947d5197731569bc86324c5c4da40c2c81cf45b363564b429d2c1b5d46fb149c027bb
 DIST tayga-0.9.2.tar.bz2 86022 BLAKE2B 9658960e0a8a4a419851a50f131a7dfb0790d0d188ad95ed5078033bd3a19180964a072dc177616b3451bc23dfa2b998058d73cc6aacfbb4b59c0b9173764440 SHA512 a7a81cccb7c3e32f00f142b1bac598b732dd748772b307561239d695418ada5302182d487e51d1cf95ed736c0180c01db2f33409d0b9343d6587b76cbb3bc573
-EBUILD tayga-0.9.2-r1.ebuild 484 BLAKE2B 2987bf7006a153dde6e5db99d4c2e871b504b4eafa3a39faec03623d6f3b42e94c7de837406baa40491ece824f91da95fa59b4f947145fb3d1e6b05ea5189d0d SHA512 65cbdda9b3f612e25456711c9d0614778b64cddc3264ef9dcf2c314fe57cf73439071296e7fd5e184ac95c0c8e3db7299f3447e73b078ca460700e619a5505cb
 EBUILD tayga-0.9.2-r4.ebuild 769 BLAKE2B 4c76a76ec1f6a20471be362f7cc2d78741c2fb33ef1d5d40b65b0fe3760317b172cccda91fd251fdf945bc87ae4b97fd6d95d0b13f66a1cf405037df559d0494 SHA512 86fc9065e11ed5519a38231c00801bbfcbf98e70f096f98b3dab8a6e4423c0add9f067a2a594d63d132c43c9ab4aab7dc41b66cfb65e6879a57f11f19118f937
 MISC metadata.xml 237 BLAKE2B 9d188e82a4bfcea6aebaa716165a99de6540e52501d648a88c86c1a97060d0cf8b1b00d1d50d150736ee24c6739f5527786df95ba03db96a890801e773c4d3b1 SHA512 58054d35e2320b13a8c08b6d652542186827238019972c1736304b7d11e8fe8db562a243a0e0912aee51ed485c64004e89e25978f90974077d6aa74ceabd2f48
diff --git a/net-proxy/tayga/tayga-0.9.2-r1.ebuild b/net-proxy/tayga/tayga-0.9.2-r1.ebuild
deleted file mode 100644
index e8ff90697f75..000000000000
--- a/net-proxy/tayga/tayga-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="out-of-kernel stateless NAT64 implementation based on TUN"
-HOMEPAGE="http://www.litech.org/tayga/"
-SRC_URI="http://www.litech.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -e '/^CFLAGS/d' \
-		-i configure.ac || die "sed failed"
-	eautoreconf
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 21956409691e..560a786cf255 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 94d13982a95c..87edfe06a199 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -4,10 +4,8 @@ AUX kismet-gdb 53 BLAKE2B 8409c5f55c0b35dd13ab122d60baa2e164e158bfaa3579f1da6505
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2021-08-R1.tar.xz 10621004 BLAKE2B 236a43d2073e380c60dadfc4f611465ffa5c7de2a282fa3f45252368cbc65aaa21ad6d33c504685e39ec7913a36364283f6706d6ad8fcecf2f7922c23a4aa792 SHA512 91e86dc1d3b69aa8cb6dff4c4b8bb959dca128f06d1298effe1b23ed24158ce4285abdf2af838f48588b9e71c69f82538d1a002838c4bc1d053868118e394b7a
-DIST kismet-2022-02-R1.tar.xz 10693024 BLAKE2B 30ce64856733991edbe436c4eac96364dc205a60accc68f18c20cd48e2cb193a1b1baa6998f1c81d270ce082da331ee46ac5b0e0eb834e940eb2378ed4e6d22f SHA512 09292096614b9ca3569430ef196cd7cf6fbd2ab7212bdfc653cf5433bdc727ea48c63638220804799f9756a92108a85e8abf0f4e8e0383dbcbe0028bf91a6aee
 DIST kismet-2022-08-R1.tar.xz 10700692 BLAKE2B 9f6b3a651eca34b90e34b8a8357be493a8966cdd5c54f5f1c38383cc3ad74f2c78ab265df882b0a5b985bed98ad61f4741ead7b443d9b79f2769ca7edc72427f SHA512 befca2dcd7016d96a17e97babbd6d88195fa61750ed616d104d10a85828ec160672c33bd2a1eae554d375feb55ea45a040a3e53c4410a3ff8c9bfa4b5c8bcdb1
 EBUILD kismet-2021.08.1-r1.ebuild 5957 BLAKE2B e0aa26ddd1cee3bef68e3f4943e35f5f04762590f68aa5bb2798fa342d5be4ad1df13e75d74950bbd1911e76916605d059c99d081f60314dd85c80745845b208 SHA512 63bfbb54b03f9ce71a146cd9a171803e474e6b0e13bf73e3f7be4f905985ec9426aa7bc2cd1d4a1c110be00f9fa3253daae42922660041e0daf079ebf915be0b
-EBUILD kismet-2022.02.1.ebuild 5907 BLAKE2B 890bbb80e6cb39fb04bb630abbf4c7f65fa105844666abfb2dfd339ad076fb61133606f5eeb363a080f927b4a125f5caccf48f0ee8a1f9fb2b682a8c3f17132d SHA512 06265c5f9ff0d4d71d38e4bf227f69c2919a869105e1d15c50cfd26212751c7e01f8a0ce731589ee5bd85c74db6fc4d9f802f736d31b66ac2410aa465b560b93
 EBUILD kismet-2022.08.1-r1.ebuild 6138 BLAKE2B 52502f33ed01fae65667375d5426f61fb3a0c382326e958138638b5ccf4f959880d5c6a6d92f51f8a4e450ca0f3c6bd64d0d6b27d7d489c5aa8d6fde0758e277 SHA512 22802e341f881ed3679f2ce7c358ccec88a0ee9d02a14ab0514189fc97bc5b9c24b34a562ea336998a668ff4c4747bb5afe345a3f0dcd567e6f2adb6f9f4f243
 EBUILD kismet-9999.ebuild 6179 BLAKE2B 11171238d360ea28246f538398ef04783dd5b9d152f1cf9f8979f7cc12a54e6939806fc317365df0bc58e6a510b16d326f3672c9c214004cf6b8a4904c2d1a04 SHA512 398145f1d6818459d3911fb7b45fdbbc387136d52472cbb47df641d3f2e7719ca03d49cd9e46fd244f7f506aeba39adf22515808340f78164362cf3d0b4d1ee4
 MISC metadata.xml 787 BLAKE2B c7000a14fe4a29247dbb68f535ad8e5b9daffc6cda71176db88f5d55811601a1b3113ad5029fc2cb46f777a16e7c5859de0798fb1a83a03beead91ebf66160a1 SHA512 449e7457a35f11b3c09c917134df48af7896ac9d34892f80102cbd2b2510f78d95331582cbde0be7d24ffe004c58a95fdebc6590ce90522a9f15212d5e70c58b
diff --git a/net-wireless/kismet/kismet-2022.02.1.ebuild b/net-wireless/kismet/kismet-2022.02.1.ebuild
deleted file mode 100644
index e82c719234ad..000000000000
--- a/net-wireless/kismet/kismet-2022.02.1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit autotools python-single-r1 udev systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
-	inherit git-r3
-	RESTRICT="strip"
-else
-	MY_P=${P/\./-}
-	MY_P=${MY_P/_beta/-BETA}
-	MY_P=${MY_P/./-R}
-	S=${WORKDIR}/${MY_P/BETA/beta}
-
-	#normally we want an official release
-	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-
-	#but sometimes we want a git commit
-	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
-	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	${PYTHON_DEPS}
-	acct-user/kismet
-	acct-group/kismet
-	networkmanager? ( net-misc/networkmanager:= )
-	dev-libs/glib:=
-	dev-libs/elfutils:=
-	sys-libs/zlib:=
-	dev-db/sqlite:=
-	net-libs/libmicrohttpd:=
-	net-libs/libwebsockets:=[client,lejp]
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	libusb? ( virtual/libusb:1 )
-	dev-libs/protobuf-c:=
-	dev-libs/protobuf:=
-	$(python_gen_cond_dep '
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/websockets[${PYTHON_USEDEP}]
-	')
-	sys-libs/ncurses:=
-	lm-sensors? ( sys-apps/lm-sensors )
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	ubertooth? ( net-wireless/ubertooth:= )
-	"
-
-DEPEND="${CDEPEND}
-	dev-libs/boost
-	dev-libs/libfmt
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pyserial[${PYTHON_USEDEP}]
-	')
-	selinux? ( sec-policy/selinux-kismet )
-"
-PDEPEND="
-	rtlsdr? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-		net-wireless/rtl-sdr
-	)"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet_logging.conf || die
-
-	#this was added to quiet macosx builds but it makes gcc builds noisier
-	sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
-
-	#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
-
-	rm -r boost || die
-	rm -r fmt || die
-
-	#dev-libs/jsoncpp
-	#rm -r json || die
-	#sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \
-	#	log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \
-	#	log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \
-	#	log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \
-	#	log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
-	#	trackedelement.h trackedelement_workers.h
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in || die
-
-	eapply_user
-
-	#just use set to fix setup.py
-	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
-
-	if [ "${PV}" = "9999" ]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable libusb libusb) \
-		$(use_enable pcre) \
-		$(use_enable lm-sensors lmsensors) \
-		$(use_enable networkmanager libnm) \
-		$(use_enable ubertooth) \
-		--sysconfdir=/etc/kismet \
-		--disable-optimization
-}
-
-src_install() {
-	emake DESTDIR="${D}" commoninstall
-	python_optimize
-	emake DESTDIR="${D}" forceconfigs
-	use udev && udev_dorules packaging/udev/*.rules
-
-	insinto /usr/share/${PN}
-	doins Makefile.inc
-	if [ "${PV}" = "9999" ];then
-		doins "${FILESDIR}"/gdb
-		dobin "${FILESDIR}"/kismet-gdb
-	fi
-
-	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
-	systemd_dounit packaging/systemd/kismet.service
-}
-
-pkg_preinst() {
-	if use suid; then
-		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
-		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
-		fowners root:kismet /usr/bin/kismet_cap_pcapfile
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
-		fperms 4550 /usr/bin/kismet_cap_linux_wifi
-		fperms 4550 /usr/bin/kismet_cap_pcapfile
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
-
-migrate_config() {
-	einfo "Kismet Configuration files are now read from /etc/kismet/"
-	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
-	if [ -n "$(ls "${EROOT}"/etc/kismet_*.conf 2> /dev/null)" ]; then
-		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
-	fi
-	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
-		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
-	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
-		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
-		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
-	fi
-}
-
-pkg_postinst() {
-	if [ -n "${REPLACING_VERSIONS}" ]; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test ${v} -lt 2019.07.2 ; then
-				migrate_config
-				break
-			fi
-			if ver_test ${v} -eq 9999 ; then
-				migrate_config
-				break
-			fi
-		done
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 5dd31b564ae6..29e90bf5210a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index b9031a92a754..a721800b468b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -73,7 +73,6 @@ x11-wm/mutter -video_cards_nvidia
 # Only maxima makes a distinction between the 32-bit and 64-bit
 # USE flags.
 sci-mathematics/fricas -clozurecl
-<sci-mathematics/maxima-5.44.0-r5 -clozurecl
 sci-mathematics/maxima -clozurecl64
 
 # Thomas Deutschmann <whissi@gentoo.org> (2021-02-17)
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index a7c1448efa67..6371a7268bf7 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -99,7 +99,6 @@ kde-apps/pim-data-exporter:5
 kde-apps/pim-sieve-editor:5
 kde-apps/plasma-telepathy-meta:5
 >=kde-misc/kio-gdrive-22.04.3-r1
-kde-misc/kmarkdownwebview:5
 kde-misc/tellico:5
 kde-misc/zanshin:5
 mail-client/kube
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index a1353c95ccc5..f35278ffe81e 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -10,10 +10,6 @@ sci-mathematics/octave sundials
 # nor is sys-cluster/slurm yet
 sys-cluster/openmpi openmpi_rm_pbs openmpi_rm_slurm
 
-# Andreas Sturmlechner <asturm@gentoo.org> (2022-03-03)
-# dev-util/kdevelop-php is not yet stable, bug #834530
-<kde-apps/umbrello-21.11.80 php
-
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # Don't apply stable masks to python-exec since we're forcing every
 # impl there anyway. Please keep this in sync with use.stable.mask.
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index 05fdc27b5c4e..acf4a8ba1a10 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -49,10 +49,6 @@ mail-client/thunderbird clang
 # Requires media-libs/mesa[llvm], which is masked.
 dev-python/pyopengl test
 
-# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-03-11)
-# vc not keyworded on ppc64
-media-gfx/krita vc
-
 # Joonas Niilola <juippis@gentoo.org> (2020-02-01)
 # luajit not keyworded on ppc64, #696222
 dev-libs/efl lua_single_target_luajit
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 559c4a3731a3..d9bf27bdf81d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2176,8 +2176,6 @@ dev-libs/weston:screen-sharing - Enable screen-sharing through RDP
 dev-libs/weston:seatd - Enable support for rootless session via sys-auth/seatd
 dev-libs/weston:wayland-compositor - Enable Wayland compositor support
 dev-libs/weston:xwayland - Enable ability support native X11 applications
-dev-libs/xapian:brass - Enabled brass backend db support
-dev-libs/xapian:chert - Enabled chert backend db support
 dev-libs/xapian:inmemory - Enabled inmemory backend db support
 dev-libs/xapian:remote - Enabled remote backend db support
 dev-libs/xerces-c:iconv - Use iconv (virtual/libiconv) as message loader and transcoder (in general it would be possible to use iconv only as message loader and something else like icu or the native method as transcoder and vice-versa, but this is a less common case and hard to handle)
@@ -3316,6 +3314,7 @@ gnome-extra/gnome-commander:pdf - Add metadata support for PDF
 gnome-extra/gnome-commander:taglib - Add metadata support for ID3, Vorbis, FLAC and APE
 gnome-extra/gnome-commander:unique - Enable single instance support using dev-libs/libunique
 gnome-extra/gnome-contacts:telepathy - Start chat from contact details
+gnome-extra/gnome-network-displays:firewalld - Install firewalld zones
 gnome-extra/gnome-shell-extension-gsconnect:nautilus - Install Nautilus extension for sending files via GSConnect
 gnome-extra/gnome-software:firmware - Enable firmware update support through sys-apps/fwupd
 gnome-extra/gnome-software:flatpak - Enable support for flatpak applications using sys-apps/flatpak
@@ -8367,7 +8366,7 @@ sys-fs/lessfs:filelog - Enable the ability to log to a file instead of syslog
 sys-fs/lessfs:memtrace - Enable leefs to create a report regarding the memory allocation. This feature should be used for debugging purposes to avoid performance degradation
 sys-fs/loop-aes:extra-ciphers - Enable extra ciphers
 sys-fs/loop-aes:keyscrub - Protects the encryption key in memory but takes more cpu resources
-sys-fs/lvm2:device-mapper-only - Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)
+sys-fs/lvm2:lvm - Build all of LVM2, not just device-mapper
 sys-fs/lvm2:lvm2create-initrd - Install lvm2create_initrd script and pull in sys-apps/makedev for the /sbin/MAKEDEV command
 sys-fs/lvm2:sanlock - Enable lvmlockd with support for sanlock
 sys-fs/lvm2:thin - Support for thin volumes
@@ -8404,6 +8403,7 @@ sys-kernel/kpatch:contrib - Enable contrib kpatch services files.
 sys-kernel/kpatch:kmod - Enable a kernel module (.ko file) which provides an interface for the patch modules to register new functions for replacement.
 sys-kernel/kpatch:kpatch - Enable a command-line tool which allows a user to manage a collection of patch modules.
 sys-kernel/kpatch:kpatch-build - Enable tools which convert a source diff patch to a patch module.
+sys-kernel/linux-firmware:compress - Compress firmware using xz (app-arch/xz-utils) before installation
 sys-kernel/linux-firmware:initramfs - Create and install initramfs for early microcode loading in /boot (only AMD for now)
 sys-kernel/linux-firmware:redistributable - Install also non-free (but redistributable) firmware files
 sys-kernel/linux-firmware:savedconfig - Allows individual selection of firmware files
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index e80a5322e7db..96131a03e0bd 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index ee3e7441d246..b242f2c0dc25 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,6 +1,8 @@
 AUX paraview-5.5.0-allow_custom_build_type.patch 1036 BLAKE2B ff00093034196935e9075c5751f8a64027da009679de5c3f5b941681e65df9b91b0a05a3f0201a873313d859f029596739b1c5d705a1c35ae3cc83251312774e SHA512 0c79315d28b98d4cf45bfd48198dbb3315ebf6ffbd05e9720b35e7bdea05bd98c086dbb02cd7ac6d9580f504c7d29f498244d2b30d9e2932e881261a78b020c7
 DIST ParaView-v5.10.1.tar.xz 70218088 BLAKE2B 3134c5df35994a3a153ebd97770066b9963911ae7fb1877681135e01a19c4a879306ae844ef3a29719be5cd509f35117f74eb3c264f1a101fa19180d9a126011 SHA512 1feb855432ea7bc40f77ee214e5877d5170e4f31f520dc7198d72a271506b65a4bc79922875d2c176e54219818a428497c606390a2b9da2770de403bd1593e6c
 DIST ParaView-v5.11.0-RC1.tar.xz 80100552 BLAKE2B 16968e643c8436f9b9c1b5356b42175904fdb8dbc88685420fa7bb6f94833661f0ec03eb4183cabc67348ba11afcbf50c62f18a38929133ac21a5492b0971c5d SHA512 d948b9ee91bb2c3b657ba22103dfed4ce92798266fdfd5aaf596225fb6f0859ecb636145c932ac5fefc64763cfa98ebeef639453b2c7cb73dda82741b6e52478
+DIST ParaView-v5.11.0-RC2.tar.xz 79802928 BLAKE2B 5aefec385f479bfd4709175dce7c98528532068ba576f1f256fe86612f5119576318c4ef73f71e4d0f55c43d4a39ccda2773ec7fd3461acc41a0b9399f4c16fa SHA512 3bbc73d7e6fdd55adc29bdd05caf78d6db1fbd3f295ce63c2c60fa4870880fe4c8534ab5c1ae7cc8748f874b2ffca15cff38bcca2392d14e95ba81fcb9b8a9e5
 EBUILD paraview-5.10.1-r2.ebuild 5699 BLAKE2B e0e4aa3e4903b4c15e7a5d2e0ed1dbb19378e778f76c37ac3ee27f881227e68d55c9013f3b9866613144f19fb7c0f58756d8e891323cdb8ead32ed74fc878e34 SHA512 bc76f88c2e1a220ee4dc9195fd9257312a13877106bfed7b54000889ed6af9498d5e013f712dfd76fe8b61da1be818dc8a8e209e7e490e7518339ef1989f8002
 EBUILD paraview-5.11.0_rc1.ebuild 5805 BLAKE2B 84efe0320c0e4b26020e8c97d4766d62c2f0bf1467d836713785840fb0cf6d248d4dcbc2d33f88535699f8a67c567198f31fd22f56989ae9c7dc778a71f14e92 SHA512 859b39c2145b9b938237edfb674e009ed2887dd39c9c723eef3b02a8c187b642a638c8a8f6fe8e8a620b6a3c6b8fd4bd4b36a3ab6a774a5ee40d411358465196
+EBUILD paraview-5.11.0_rc2.ebuild 5805 BLAKE2B b23d1d12106e7c95cc9b964d1b768df1d5f1453de6e980a888d229999300381f08f843a9f96447611a4ab0175bff3d20352e373feff37bf912540c468e0d1941 SHA512 ef105d87003521bd8bae305c24d32e3a03bb02099392e0d8ffcbafed15c0791e2fb492f86db3fc2ea6e15a0fd8dc5283aab443ff1b8c5f22acc5610eb9e086e0
 MISC metadata.xml 683 BLAKE2B 28b4017609ac733ac1c1ff4cb4ac3b5341f72180f487542b9db3b8bee59357ac9fed25bc0287a2f8c93f7429d098d1b26c74741b86b943564a4caafd7ee8450e SHA512 0bd4a1c8331532529d405f36c4556f57caecc299ceddd4ca8ff23138d96bd450c1d4fade7f02edddd8f9b3062d6b31bcb9a7696b2b628494c1d1b60d0312bc91
diff --git a/sci-visualization/paraview/paraview-5.11.0_rc2.ebuild b/sci-visualization/paraview/paraview-5.11.0_rc2.ebuild
new file mode 100644
index 000000000000..702e265d4b09
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.11.0_rc2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Python3.11 does not have longintrepr.h causing compile failure
+PYTHON_COMPAT=( python3_{8..10} )
+DOCS_BUILDER="doxygen"
+inherit cmake desktop docs python-single-r1 qmake-utils toolchain-funcs xdg
+
+MAIN_PV=$(ver_cut 0-1)
+MAJOR_PV=$(ver_cut 1-2)
+MY_PN="ParaView"
+MY_PV="${PV//_rc2}-RC2"
+
+DESCRIPTION="Powerful scientific data visualization application"
+HOMEPAGE="https://www.paraview.org"
+SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_PN}-v${MY_PV}.tar.xz"
+S="${WORKDIR}/${MY_PN}-v${MY_PV}"
+
+# TODO: check licenses of plugins (USE=plugins)
+LICENSE="BSD MIT PSF-2 VTK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost cg examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine"
+
+RESTRICT="mirror test"
+
+REQUIRED_USE="
+	python? ( mpi ${PYTHON_REQUIRED_USE} )
+	webengine? ( qt5 )
+	qt5? ( sqlite )
+	?? ( offscreen qt5 )"
+
+# TODO: Verify that these two are not needed any more for the catalyst
+# module:
+#  - dev-python/PyQt5
+#  - dev-qt/qtgui:5[-gles2-only]
+RDEPEND="
+	app-arch/lz4
+	dev-libs/expat
+	dev-libs/jsoncpp:=
+	dev-libs/libxml2:2
+	dev-libs/protobuf:=
+	dev-libs/pugixml
+	media-libs/freetype
+	media-libs/glew:0
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/cgnslib
+	sci-libs/hdf5:=[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/glu
+	media-libs/libjpeg-turbo:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	ffmpeg? ( media-video/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	offscreen? ( >=media-libs/mesa-18.3.6[osmesa] )
+	!offscreen? ( virtual/opengl )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/constantly[${PYTHON_USEDEP}]
+			dev-python/incremental[${PYTHON_USEDEP}]
+			dev-python/matplotlib[${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pygments[${PYTHON_USEDEP}]
+			dev-python/sip:5[${PYTHON_USEDEP}]
+			dev-python/six[${PYTHON_USEDEP}]
+			dev-python/twisted[${PYTHON_USEDEP}]
+			dev-python/zope-interface[${PYTHON_USEDEP}]
+			mpi? ( dev-python/mpi4py )
+			qt5? ( dev-python/PyQt5[opengl,${PYTHON_USEDEP}] )
+		')
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5[-gles2-only]
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qttest:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxmlpatterns:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tk? ( dev-lang/tk:0= )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	boost? (
+		$(python_gen_cond_dep '
+			dev-libs/boost[mpi?,python,${PYTHON_USEDEP}]
+		')
+	)
+"
+
+BDEPEND="
+	openmp? ( virtual/fortran )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.0-allow_custom_build_type.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	use python && python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	# Bug #661812
+	mkdir -p Plugins/StreamLinesRepresentation/doc || die
+
+	cmake_src_prepare
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/lib/python:/$(get_libdir)/python:g" \
+		VTK/ThirdParty/xdmf3/vtkxdmf3/CMakeLists.txt || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		Remoting/Application/vtkInitializationHelper.cxx || die
+}
+
+src_configure() {
+	# Make sure qmlplugindump is in path:
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}"
+		-UBUILD_SHARED_LIBS
+		-DPARAVIEW_BUILD_SHARED_LIBS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+
+		# boost
+		-DVTK_MODULE_ENABLE_VTK_IOInfovis="$(usex boost YES NO)"
+
+		# doc
+		-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION="$(usex doc)"
+
+		# examples
+		-DBUILD_EXAMPLES="$(usex examples)"
+
+		# ffmpeg
+		-DPARAVIEW_ENABLE_FFMPEG="$(usex ffmpeg)"
+
+		# mpi
+		-DPARAVIEW_USE_MPI="$(usex mpi)"
+		-DXDMF_BUILD_MPI="$(usex mpi)"
+		-DVTK_GROUP_ENABLE_MPI="$(usex mpi YES NO)"
+
+		# offscreen
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+		-DVTK_OPENGL_HAS_OSMESA="$(usex offscreen)"
+
+		# plugins
+		-DPARAVIEW_PLUGINS_DEFAULT="$(usex plugins)"
+
+		# python
+		-DModule_pqPython="$(usex python)"
+		-DPARAVIEW_USE_PYTHON="$(usex python)"
+
+		# qt5
+		-DPARAVIEW_USE_QT="$(usex qt5)"
+		-DModule_pqPython="$(usex qt5 "$(usex python)" "off")"
+		-DVTK_USE_NVCONTROL="$(usex nvcontrol)"
+		-DVTK_GROUP_ENABLE_Qt="$(usex qt5 YES NO)"
+		-DCMAKE_INSTALL_QMLDIR="${EPREFIX}/usr/$(get_libdir)/qt5/qml"
+
+		# sqlite
+		-DVTK_MODULE_ENABLE_VTK_sqlite="$(usex sqlite YES NO)"
+
+		# test
+		-DBUILD_TESTING="$(usex test)"
+
+		# tk
+		-DVTK_USE_TK="$(usex tk)"
+		-DVTK_GROUP_ENABLE_Tk="$(usex tk YES NO)"
+
+		# webengine
+		-DPARAVIEW_USE_QTWEBENGINE="$(usex webengine)"
+		-DVTK_GROUP_ENABLE_Web="$(usex webengine YES NO)"
+	)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5; then
+		mycmakeargs+=(
+			-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+			-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+			-DQT_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
+			-Dqt_xmlpatterns_executable="$(qt5_get_bindir)/xmlpatterns"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove wrapper binaries and put the actual executable in place
+	for i in {paraview-config,pvserver,pvdataserver,pvrenderserver,pvbatch,pvpython,paraview}; do
+		if [ -f "${ED}"/usr/lib/"$i" ]; then
+			mv "${ED}"/usr/lib/"$i" "${ED}"/usr/bin/"$i" || die
+		fi
+	done
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN} || die
+	doenvd "${T}"/40${PN}
+
+	newicon "${S}"/Clients/ParaView/pvIcon-96x96.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${ED}/usr/$(get_libdir)/${PN}-${MAJOR_PV}"
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 5ea69351d374..6f53af5eb1f9 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-commons/Manifest b/sec-keys/openpgp-keys-apache-commons/Manifest
new file mode 100644
index 000000000000..819819a878a8
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-commons/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-apache-commons-20221022-KEYS.asc 581814 BLAKE2B d404c80d2723bc7684f014283dfd7d140cf49915723ade75bb07f03418c5590da23240ce0fdb706f81ba8063f016b5baa46813d607e7519eae957b3c234501c5 SHA512 ea804a84f4c4f4a58eb0b58f86c438b86c64c935e78b7d073329cb6ef0a979eb24411db34b0ebc1acb05bf4fe01ca8d6661e45959f5151e453f93a32922d8528
+EBUILD openpgp-keys-apache-commons-20221022.ebuild 541 BLAKE2B 624b808dc0eebc3afd2f6708d2ef467fbdc90550d9f2a03c3e7433d6f9b398f66a3218d4cb93de5117ba26f7a2e503f7000cd912b60aa6fffab1d3cbdc9023dc SHA512 50381468205ef4e1754a64fb6e53636553eea8fb88bb8c78b20dc508bc7cb6196d0dc2e66c057a2c14baaff8a651ae745157281f9d03fec8159a8ae45460817d
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-commons/metadata.xml b/sec-keys/openpgp-keys-apache-commons/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-commons/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-commons/openpgp-keys-apache-commons-20221022.ebuild b/sec-keys/openpgp-keys-apache-commons/openpgp-keys-apache-commons-20221022.ebuild
new file mode 100644
index 000000000000..9f59a5458884
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-commons/openpgp-keys-apache-commons-20221022.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by commons.apache.org"
+HOMEPAGE="https://logging.apache.org/log4j/2.x/download.html"
+SRC_URI="https://downloads.apache.org/commons/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - commons.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b69c35c333a1..2b2cc98c6015 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 623a227e9a7e..274ab6022dcd 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,9 +1,6 @@
-AUX attr-2.5.1-fix-symver.patch 5856 BLAKE2B dbff8d7cd138d962cca02c35f1ad8679f813cedf92784d075f837f0e56989a514d105cfb2c765bb382b1413aaddcd66be4a09a2fafb58172a7b98c0eecc17f63 SHA512 0d576b867e253cb63e712ff6f2cb0491f42be8214e8307bbd71f50247917ebe9236ddafad8610c2e8de2d0f33b1d0f87ad1258c8637b9ba46ad7f2b2fa1f9a24
 AUX attr-2.5.1-r2-fix-symver.patch 6909 BLAKE2B 844f6d9e87ca3cfd9413047cd8fbebc6265545d1aed3653ec2d1d8fc18ee0eb42ebca756a62c9d8a8cc2c4c7f38720a66afcbe0d052525f58e4748ba50d267b3 SHA512 874a4e770a624ce4dd86b6b03e6dd0abef737cafccf2580f5c5e6f75a66425b2e34da6ee520991693387f55000448451fdc96883c2759c9fb4c650d667df63c8
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
-EBUILD attr-2.5.1-r1.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
 EBUILD attr-2.5.1-r2.ebuild 2464 BLAKE2B 716f727ffde58b81969dd0a6645ca67278bc0cddb8b11b5c78b2c3a6630143d3212ddb30c2fafefbbd1ce64590cd24971ab47762aac7f5aec313c6ac855117cc SHA512 9f9b445abf5ae9e702b8ae0fb1a043a29c4702eb97dde834923d429c8d222c9e47d4e669dfc9d7369d657fbaad2bea8249864dd535d584bc595de24c8750077e
-EBUILD attr-2.5.1.ebuild 2495 BLAKE2B 290d82c439e0096b6ac5be07258d87d3c05b56500fa81b4cf610e322505a5cb302c3e5900f59b363c7cfd3ae1bf315f19bfeed7968c95d3c9cc222b8639c5498 SHA512 201868f12414b9662b5edfdc19827c84a9cd967295b6752eeb38e4c52472ea73cc5caf04bba52c08d55b15570d71cb730e283b8f3ebebbfbc159cf0f27c20eb4
-EBUILD attr-9999.ebuild 2632 BLAKE2B 0626b192ef6a6f81dec7186ab4c1a9a4352d9c99b684f0872c2a1f6709d156316bbca932fba7355f9c5596a15b92bd065a56507ef5a041757b1a46daa4c2c96e SHA512 e76b292dcbe879d2d79987e00528c25c9fac831ff391fc9d0adbba51533402a068c5a01449750e22433c858c57bde5b4c2bda11d226f5be625f7df7b16d6f9d4
+EBUILD attr-9999.ebuild 2472 BLAKE2B 430e20284e07660e229d68511dab14c65176f25d76cca30bd1c1b617219a8880b4bc3166d27fdec6e10b2adcbe768f5abe237f9fd09b66e16c9a733030c85623 SHA512 f3076c16dd948b5e4caea3b731e03bb9e35aa36856185635901dcdb00a4bea7b86d6bf727aa4301cd934316d0755aa1012e8bdcfc1558698126647f2bddd36ea
 MISC metadata.xml 337 BLAKE2B c04cc7c99b3d9d39870605354acd4f0a4b03d47e79228f444e915ce17abd2eb075418919dc3272903fdd524f56588ef194d7cdbd43f2b040c4f6a9d5fa2eebee SHA512 e9ba5573c84dd1b2cdce5b74e53b731c1ba4b3e72bca569f3febc77e431b96982cd83a71720e021ba23e8d6fd23f9dbea43a6c8d94b2b6ce1b3d26fda038d6de
diff --git a/sys-apps/attr/attr-2.5.1-r1.ebuild b/sys-apps/attr/attr-2.5.1-r1.ebuild
deleted file mode 100644
index c8051fdd82e4..000000000000
--- a/sys-apps/attr/attr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# autotools inherit only needed for 2.5.1-r1 patch for symvers
-# hopefully in next release
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-	inherit autotools git-r3
-else
-	inherit libtool
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		# bug #580792
-		#elibtoolize
-
-		# Temporarily for 2.5.1-r1 for symver patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# bug #760857
-	append-lfs-flags
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		$(use_enable debug)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. bug #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# We install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	# TODO: figure out when this was added & when we can drop it!
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
deleted file mode 100644
index 0d212005d512..000000000000
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="
-	sys-devel/binutils
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-force-bfd #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index c8051fdd82e4..2046677daddd 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=8
 
-# autotools inherit only needed for 2.5.1-r1 patch for symvers
-# hopefully in next release
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
@@ -27,7 +25,7 @@ IUSE="debug nls static-libs"
 BDEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+	"${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch
 )
 
 src_prepare() {
@@ -39,10 +37,7 @@ src_prepare() {
 		eautoreconf
 	else
 		# bug #580792
-		#elibtoolize
-
-		# Temporarily for 2.5.1-r1 for symver patch
-		eautoreconf
+		elibtoolize
 	fi
 }
 
diff --git a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch b/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
deleted file mode 100644
index 55ef4506f7de..000000000000
--- a/sys-apps/attr/files/attr-2.5.1-fix-symver.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-https://lists.nongnu.org/archive/html/acl-devel/2022-05/msg00000.html
-Bug: https://bugs.gentoo.org/644048
-Bug: https://bugs.gentoo.org/700116
-
-From a9ca51afd2b9f68f57de3a4c3d962d1d763572ca Mon Sep 17 00:00:00 2001
-From: Alexander Miller <alex.miller@gmx.de>
-Date: Thu, 28 Nov 2019 22:17:24 +0100
-Subject: [PATCH] Better supported way to set symbol versions for legacy
- syscalls
-
-Using a linker script to set a symbol versions is an undocumented
-hack and doesn't work reliably in many cases. It works (to some
-degree) with the bfd linker, but fails with gold or lld. And even
-with bfd it can break when using --gc-sections or LTO.
-
-The result may be a library where the code has been discarded and
-the versioned symbols are unusable, e.g.
-    23: 00000000     0 NOTYPE  GLOBAL DEFAULT  ABS getxattr@ATTR_1.0
-instead of
-    23: 000033c0     0 FUNC    GLOBAL DEFAULT   11 getxattr@ATTR_1.0
-
-Remove the linker script entirely and set symbol versions with the
-symver attribute if available (in gcc >= 10, but not in clang),
-otherwise use the traditional global asm solution with a .symver
-directive.
-Those are the documented ways to do it and well supported by (almost)
-all configurations. (The exception is old gcc with LTO; a workaround
-is included, but some versions may still need -flto-partition=none).
-
-Signed-off-by: Alexander Miller <alex.miller@gmx.de>
---- a/libattr/Makemodule.am
-+++ b/libattr/Makemodule.am
-@@ -8,7 +8,7 @@ LT_CURRENT = 2
- LT_AGE = 1
- LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
--libattr_la_DEPENDENCIES = exports libattr/libattr.lds
-+libattr_la_DEPENDENCIES = exports
- libattr_la_SOURCES = \
- 	libattr/attr_copy_action.c \
- 	libattr/attr_copy_check.c \
-@@ -20,7 +20,4 @@ libattr_la_SOURCES = \
- libattr_la_CFLAGS = -include libattr/libattr.h
- libattr_la_LDFLAGS = \
- 	-Wl,--version-script,$(top_srcdir)/exports \
--	-Wl,$(top_srcdir)/libattr/libattr.lds \
- 	-version-info $(LTVERSION)
--
--EXTRA_DIST += libattr/libattr.lds
---- a/libattr/libattr.lds
-+++ /dev/null
-@@ -1,12 +0,0 @@
--"fgetxattr@ATTR_1.0" = libattr_fgetxattr;
--"flistxattr@ATTR_1.0" = libattr_flistxattr;
--"fremovexattr@ATTR_1.0" = libattr_fremovexattr;
--"fsetxattr@ATTR_1.0" = libattr_fsetxattr;
--"getxattr@ATTR_1.0" = libattr_getxattr;
--"lgetxattr@ATTR_1.0" = libattr_lgetxattr;
--"listxattr@ATTR_1.0" = libattr_listxattr;
--"llistxattr@ATTR_1.0" = libattr_llistxattr;
--"lremovexattr@ATTR_1.0" = libattr_lremovexattr;
--"lsetxattr@ATTR_1.0" = libattr_lsetxattr;
--"removexattr@ATTR_1.0" = libattr_removexattr;
--"setxattr@ATTR_1.0" = libattr_setxattr;
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -26,6 +26,27 @@
- #include <sys/syscall.h>
- #include <sys/xattr.h>
- 
-+/*
-+ * Versioning of compat symbols:
-+ * prefer symver attribute if available (since gcc 10),
-+ * fall back to traditional .symver asm directive otherwise.
-+ */
-+#ifdef __has_attribute
-+# if __has_attribute(symver)
-+#  define SYMVER(cn, vn) __typeof(cn) cn __attribute__((symver(vn)))
-+# elif __has_attribute(no_reorder)
-+   /*
-+    * Avoid wrong partitioning with older gcc and LTO. May not work reliably
-+    * with all versions; use -flto-partition=none if you encounter problems.
-+    */
-+#  define SYMVER(cn, vn) __typeof(cn) cn __attribute__((noreorder)); \
-+			 __asm__(".symver " #cn "," vn)
-+# endif
-+#endif
-+#ifndef SYMVER
-+#  define SYMVER(cn, vn) __asm__(".symver " #cn "," vn)
-+#endif
-+
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
- # pragma GCC visibility push(default)
- #endif
-@@ -35,66 +56,78 @@ int libattr_setxattr(const char *path, const char *name,
- {
- 	return syscall(__NR_setxattr, path, name, value, size, flags);
- }
-+SYMVER(libattr_setxattr, "setxattr@ATTR_1.0");
- 
- int libattr_lsetxattr(const char *path, const char *name,
- 		      void *value, size_t size, int flags)
- {
- 	return syscall(__NR_lsetxattr, path, name, value, size, flags);
- }
-+SYMVER(libattr_lsetxattr, "lsetxattr@ATTR_1.0");
- 
- int libattr_fsetxattr(int filedes, const char *name,
- 		      void *value, size_t size, int flags)
- {
- 	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
- }
-+SYMVER(libattr_fsetxattr, "fsetxattr@ATTR_1.0");
- 
- ssize_t libattr_getxattr(const char *path, const char *name,
- 			 void *value, size_t size)
- {
- 	return syscall(__NR_getxattr, path, name, value, size);
- }
-+SYMVER(libattr_getxattr, "getxattr@ATTR_1.0");
- 
- ssize_t libattr_lgetxattr(const char *path, const char *name,
- 			  void *value, size_t size)
- {
- 	return syscall(__NR_lgetxattr, path, name, value, size);
- }
-+SYMVER(libattr_lgetxattr, "lgetxattr@ATTR_1.0");
- 
- ssize_t libattr_fgetxattr(int filedes, const char *name,
- 			  void *value, size_t size)
- {
- 	return syscall(__NR_fgetxattr, filedes, name, value, size);
- }
-+SYMVER(libattr_fgetxattr, "fgetxattr@ATTR_1.0");
- 
- ssize_t libattr_listxattr(const char *path, char *list, size_t size)
- {
- 	return syscall(__NR_listxattr, path, list, size);
- }
-+SYMVER(libattr_listxattr, "listxattr@ATTR_1.0");
- 
- ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
- {
- 	return syscall(__NR_llistxattr, path, list, size);
- }
-+SYMVER(libattr_llistxattr, "llistxattr@ATTR_1.0");
- 
- ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
- {
- 	return syscall(__NR_flistxattr, filedes, list, size);
- }
-+SYMVER(libattr_flistxattr, "flistxattr@ATTR_1.0");
- 
- int libattr_removexattr(const char *path, const char *name)
- {
- 	return syscall(__NR_removexattr, path, name);
- }
-+SYMVER(libattr_removexattr, "removexattr@ATTR_1.0");
- 
- int libattr_lremovexattr(const char *path, const char *name)
- {
- 	return syscall(__NR_lremovexattr, path, name);
- }
-+SYMVER(libattr_lremovexattr, "lremovexattr@ATTR_1.0");
- 
- int libattr_fremovexattr(int filedes, const char *name)
- {
- 	return syscall(__NR_fremovexattr, filedes, name);
- }
-+SYMVER(libattr_fremovexattr, "fremovexattr@ATTR_1.0");
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
- # pragma GCC visibility pop
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index d9bdb1d8bdb0..aca2f0b264f9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,17 +1,11 @@
 AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5
 AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174ad6dd3157be16a28c527b37d1c58b421538a6238e93317689e6cd35b7dc5a0f480a4322c432986697a9e0af60019650eae92c0a SHA512 fd3573cf5a4b4fbba132d0fac5ad6eb4af5aa548a8c0c747653e47acfb97c01e31d7430db543df47d9a2680792d2583de70e1f1d49b2feb75887e9f8638527b7
-AUX coreutils-9.0-fix-chmod-symlink-exit.patch 1133 BLAKE2B 28a3adfb2c8b4e8d557a713d9e83fb61672e74dbc7dc8a8f7adf497825be0e53e1c08bff37122750a6144da70737af558dc018a06816e279879f31daf746a4d1 SHA512 392b94d55c5864e5de637567f7207e5c789a722710c29bead72c41b9f85f535f96f84f4abc64b35ee218c5ec5bc129837a65ec95cbb88113877b302823491991
-AUX coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch 4718 BLAKE2B a4a8ab721a277fd3eaac7d64c8a8cf1918c14c6d494f5ea35646d737299c7d2a84d177667984cf7ed8bb860388571f847a3f0cbb45c661eb114b378596f83259 SHA512 bb425eaae25b1035e9e4899801f3735804404fab2392d2545ff8213201c5f7dffc112cfab63e650e6b86cefccec661c8d991b5fd2310ae4a442abf9be7d27398
 AUX coreutils-9.1-fix-rename-simple-backups.patch 1343 BLAKE2B b284b2b7d33fe7650a4ac8723ca5566e819cd4f4740394cc549562a03fe7ed95d29cfb688a9e5513edcea1f9d5f7b72f1a530f9bf5093ad4dc6534a494e9f91c SHA512 900128c08b096c39302193855fdbb980c54597acf3349b9014ced500e344b7f47438722342e3a7d68f8c4588632769a11165c5c06796993d3b9aca019de8468a
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
-DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30
 DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f
 DIST coreutils-9.1.tar.xz 5712104 BLAKE2B f5654e4935535275615d44a56c071d1c0746af36cf4615fcc0a5a0d387af9c9023adac31f31a52e16b3d1105b9d4c0fb7ebff9b2862498849f867a866049dd6e SHA512 a6ee2c549140b189e8c1b35e119d4289ec27244ec0ed9da0ac55202f365a7e33778b1dc7c4e64d1669599ff81a8297fe4f5adbcc8a3a2f75c919a43cd4b9bdfa
 DIST coreutils-9.1.tar.xz.sig 833 BLAKE2B e9627a066f3c67596feaa8d43d5785076230f440bacea84d8b5736e51a22787c2d5df1f3e2cd8523d01fb7b468933d3c17fce3cb1fbefef322a0e0d820b81842 SHA512 9f0766531afd4faa3e2c337730f61db55605cf06729e9c61f644594883732c2e0b1ddb0005b492be309c53e6f45b8ff875398163a48699d52517ea49e9bdbc91
 EBUILD coreutils-8.32-r1.ebuild 5968 BLAKE2B 37f5e49a8d45706ea17779f841523c5f876f29cd9d9d2c88dea33136b249c89853dcea87417f7e4b8c040e9a4b7d1691704301d11116baa567c0cb2b9fa0e17e SHA512 5e2b09e5e4fdb4c34aa0c75b8fbb6aadba98d93063aaf6eff01854e1a1527b9757c73ce35b8da17fe3eb480e04bff88d445305d95ad248bc9461723a9699e33c
-EBUILD coreutils-9.0-r2.ebuild 6544 BLAKE2B 75fbd687caf46c2bb97e5e6c9e81e8900a6041c4168770b1296df7095fb59e20c5a0b7c81145d14dae7c8dfe105024feb662ebf2fa7820216045cf043b3188e3 SHA512 28f0d629f7b18463217bc2d9efb4cf5d4ea74994de6ed9525a8bd22573c4d8b66cd05f52d049e02471ac0c242560b6d74214fce231841cbc16feef775404e83e
 EBUILD coreutils-9.1-r1.ebuild 7045 BLAKE2B 2511f0f6385dd1e9c4c6073a6a6fe370d4461708feca146603f203a6ec662adf92aca12ecc615dcaa4ce97b645b8f078db2117722305e9dd3a9c8cf276878c66 SHA512 49f93061af61f78fe51a078710ed1cbe745a5fd8adb52ad4a76de3b093c5d446a242acf6d0226451c5b8c655d34601b40571f09aae8c71fcd47eb7e74d6db68d
-EBUILD coreutils-9.1.ebuild 6778 BLAKE2B 0aaf6c5838efd7ecefd3644404972a58a87b26bbe453f3eba0cec31121ca4fcd937992fe7e369a78334c841c6e3e4efada538cfff24c765030f8c66c9f6831c2 SHA512 faeebc82ab7e02c92b489398622f76a86345ef24c7644f3611c0f60732537aaed850ff3c15e1b9bdfdac5df6225cbb77f944f218ee5f2723b477352afb9c1986
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-9.0-r2.ebuild b/sys-apps/coreutils/coreutils-9.0-r2.ebuild
deleted file mode 100644
index f759f70394f0..000000000000
--- a/sys-apps/coreutils/coreutils-9.0-r2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-PATCH="${PN}-8.30-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	!vanilla? (
-		mirror://gentoo/${PATCH}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
-	)
-	verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-		"${FILESDIR}"/${P}-fix-chmod-symlink-exit.patch
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch )
-		PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" \
-	emake -j1 -k check
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/coreutils-9.1.ebuild b/sys-apps/coreutils/coreutils-9.1.ebuild
deleted file mode 100644
index f91b65f9f59f..000000000000
--- a/sys-apps/coreutils/coreutils-9.1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc
-inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig
-
-MY_PATCH="${PN}-9.0_p20220409-patches-01"
-DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
-HOMEPAGE="https://www.gnu.org/software/coreutils/"
-
-if [[ ${PV} == *_p* ]] ; then
-	# Note: could put this in devspace, but if it's gone, we don't want
-	# it in tree anyway. It's just for testing.
-	MY_SNAPSHOT="$(ver_cut 1-2).193-54bec"
-	SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )"
-	S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		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 ~x86-linux"
-fi
-
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
-	caps? ( sys-libs/libcap )
-	gmp? ( dev-libs/gmp:=[static-libs] )
-	xattr? ( sys-apps/attr[static-libs] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
-	selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	test? (
-		dev-lang/perl
-		dev-perl/Expect
-		dev-util/strace
-		${PYTHON_DEPS}
-	)
-	verify-sig? ( sec-keys/openpgp-keys-coreutils )
-"
-RDEPEND+="
-	hostname? ( !sys-apps/net-tools[hostname] )
-	kill? (
-		!sys-apps/util-linux[kill]
-		!sys-process/procps[kill]
-	)
-	!app-misc/realpath
-	!<sys-apps/util-linux-2.13
-	!<sys-apps/sandbox-2.10-r4
-	!sys-apps/stat
-	!net-mail/base64
-	!sys-apps/mktemp
-	!<app-forensics/tct-1.18-r1
-	!<net-fs/netatalk-2.0.3-r4"
-
-pkg_setup() {
-	if use test ; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Upstream patches
-	)
-
-	if ! use vanilla ; then
-		PATCHES+=( "${WORKDIR}"/patch )
-	fi
-
-	default
-
-	# Since we've patched many .c files, the make process will try to
-	# re-build the manpages by running `./bin --help`.  When doing a
-	# cross-compile, we can't do that since 'bin' isn't a native bin.
-	#
-	# Also, it's not like we changed the usage on any of these things,
-	# so let's just update the timestamps and skip the help2man step.
-	set -- man/*.x
-	touch ${@/%x/1} || die
-
-	# Avoid perl dep for compiled in dircolors default (bug #348642)
-	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h || die
-		touch ${@/%x/1} || die
-	fi
-}
-
-src_configure() {
-	local myconf=(
-		--with-packager="Gentoo"
-		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-		# kill/uptime - procps
-		# groups/su   - shadow
-		# hostname    - net-tools
-		--enable-install-program="arch,$(usev hostname),$(usev kill)"
-		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
-		--enable-largefile
-		$(usex caps '' --disable-libcap)
-		$(use_enable nls)
-		$(use_enable acl)
-		$(use_enable multicall single-binary)
-		$(use_enable xattr)
-		$(use_with gmp libgmp)
-	)
-
-	if use gmp ; then
-		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
-	fi
-
-	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		# bug #311569
-		export fu_cv_sys_stat_statfs2_bsize=yes
-		# bug #416629
-		export gl_cv_func_realpath_works=yes
-	fi
-
-	# bug #409919
-	export gl_cv_func_mknod_works=yes
-
-	if use static ; then
-		append-ldflags -static
-		# bug #321821
-		sed -i '/elf_sys=yes/s:yes:no:' configure || die
-	fi
-
-	if ! use selinux ; then
-		# bug #301782
-		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	# Known to fail with FEATURES=usersandbox (bug #439574):
-	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
-	#   -  tests/rm/deep-2.sh (bug #413621)
-	#   -  tests/dd/no-allocate.sh (bug #629660)
-	if has usersandbox ${FEATURES} ; then
-		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
-			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
-	fi
-
-	# Non-root tests will fail if the full path isn't
-	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}" || die
-	chmod a+rx "${WORKDIR}" || die
-
-	# coreutils tests like to do `mount` and such with temp dirs,
-	# so make sure:
-	# - /etc/mtab is writable (bug #265725)
-	# - /dev/loop* can be mounted (bug #269758)
-	mkdir -p "${T}"/mount-wrappers || die
-	mkwrap() {
-		local w ww
-		for w in "${@}" ; do
-			ww="${T}/mount-wrappers/${w}"
-			cat <<-EOF > "${ww}"
-				#!${EPREFIX}/bin/sh
-				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
-			EOF
-			chmod a+rx "${ww}" || die
-		done
-	}
-	mkwrap mount umount
-
-	addwrite /dev/full
-	#export RUN_EXPENSIVE_TESTS="yes"
-	#export FETISH_GROUPS="portage wheel"
-	env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins src/dircolors.hin DIR_COLORS
-
-	if use split-usr ; then
-		cd "${ED}"/usr/bin || die
-		dodir /bin
-
-		# Move critical binaries into /bin (required by FHS)
-		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
-		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
-
-		if use hostname ; then
-			mv hostname ../../bin/ || die
-		fi
-
-		if use kill ; then
-			mv kill ../../bin/ || die
-		fi
-
-		# Move critical binaries into /bin (common scripts)
-		# (Why are these required for booting?)
-		local com="basename chroot cut dir dirname du env expr head mkfifo
-		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "Could not move common bins!"
-
-		# Create a symlink for uname in /usr/bin/ since autotools require it.
-		# (Other than uname, we need to figure out why we are
-		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place...)
-		local x
-		for x in ${com} uname ; do
-			dosym ../../bin/${x} /usr/bin/${x}
-		done
-	fi
-}
-
-pkg_postinst() {
-	ewarn "Make sure you run 'hash -r' in your active shells."
-	ewarn "You should also re-source your shell settings for LS_COLORS"
-	ewarn "  changes, such as: source /etc/profile"
-}
diff --git a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch b/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
deleted file mode 100644
index 25b2b72bcb80..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-fix-chmod-symlink-exit.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=e8b56ebd536e82b15542a00c888109471936bfda
-https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00031.html
-(and https://lists.gnu.org/archive/html/bug-coreutils/2021-09/msg00035.html)
-
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Fri, 24 Sep 2021 20:57:41 +0100
-Subject: chmod: fix exit status when ignoring symlinks
-
-* src/chmod.c: Reorder enum so CH_NOT_APPLIED
-can be treated as a non error.
-* tests/chmod/ignore-symlink.sh: A new test.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention the bug fix.
-Fixes https://bugs.gnu.org/50784
---- a/src/chmod.c
-+++ b/src/chmod.c
-@@ -44,8 +44,8 @@ struct change_status
-   enum
-     {
-       CH_NO_STAT,
--      CH_NOT_APPLIED,
-       CH_FAILED,
-+      CH_NOT_APPLIED,
-       CH_NO_CHANGE_REQUESTED,
-       CH_SUCCEEDED
-     }
-@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent)
-   if ( ! recurse)
-     fts_set (fts, ent, FTS_SKIP);
- 
--  return CH_NO_CHANGE_REQUESTED <= ch.status;
-+  return CH_NOT_APPLIED <= ch.status;
- }
- 
- /* Recursively change the modes of the specified FILES (the last entry
diff --git a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch b/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
deleted file mode 100644
index e77766cbfe3a..000000000000
--- a/sys-apps/coreutils/files/coreutils-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From cbb451b63faee375415691c1abc8a6fd3e1677a9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Sat, 12 Feb 2022 22:54:07 +0100
-Subject: [PATCH] dircolors: consider COLORTERM as well as TERM env vars
-
-COLORTERM is an environment used usually to expose truecolor support in
-terminal emulators.  Therefore support matches on that in addition
-to TERM.  Also set the default COLORTERM match pattern so that
-we apply colors if COLORTERM is any value.
-
-This implicitly supports a terminal like "foot"
-without a need for an explicit TERM entry.
-
-* NEWS: Mention the new feature.
-* src/dircolors.c (main): Match COLORTERM like we do for TERM.
-* src/dircolors.hin: Add default config to match any COLORTERM.
-* tests/misc/dircolors.pl: Add test cases.
----
-Backported from coreutils 75c9fc6740e93dba95f63a1e5e92bd5cf17f1743.
-See also https://lists.gnu.org/archive/html/coreutils/2022-02/msg00019.html
-
- NEWS                    |  3 +++
- src/dircolors.c         | 15 ++++++++++++++-
- src/dircolors.hin       |  7 +++++--
- tests/misc/dircolors.pl | 14 ++++++++++++++
- 4 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f2fbcbb..646c132 100644
---- a/NEWS
-+++ b/NEWS
-@@ -64,6 +64,9 @@ GNU coreutils NEWS                                    -*- outline -*-
-   on (1024*5) buffer boundaries
-   [bug introduced in coreutils-8.31]
- 
-+  dircolors will now also match COLORTERM in addition to TERM environment
-+  variables.  The default config will apply colors with any COLORTERM set.
-+
- ** Changes in behavior
- 
-   cp and install now default to copy-on-write (COW) if available.
-diff --git a/src/dircolors.c b/src/dircolors.c
-index b765ded..64ff665 100644
---- a/src/dircolors.c
-+++ b/src/dircolors.c
-@@ -243,6 +243,7 @@ dc_parse_stream (FILE *fp, char const *filename)
-   size_t input_line_size = 0;
-   char const *line;
-   char const *term;
-+  char const *colorterm;
-   bool ok = true;
- 
-   /* State for the parser.  */
-@@ -253,6 +254,11 @@ dc_parse_stream (FILE *fp, char const *filename)
-   if (term == NULL || *term == '\0')
-     term = "none";
- 
-+  /* Also match $COLORTERM.  */
-+  colorterm = getenv ("COLORTERM");
-+  if (colorterm == NULL)
-+    colorterm = "";  /* Doesn't match default "?*"  */
-+
-   while (true)
-     {
-       char *keywd, *arg;
-@@ -299,10 +305,17 @@ dc_parse_stream (FILE *fp, char const *filename)
-           else if (state != ST_TERMSURE)
-             state = ST_TERMNO;
-         }
-+      else if (c_strcasecmp (keywd, "COLORTERM") == 0)
-+        {
-+          if (fnmatch (arg, colorterm, 0) == 0)
-+            state = ST_TERMSURE;
-+          else if (state != ST_TERMSURE)
-+            state = ST_TERMNO;
-+        }
-       else
-         {
-           if (state == ST_TERMSURE)
--            state = ST_TERMYES; /* Another TERM can cancel */
-+            state = ST_TERMYES;  /* Another {COLOR,}TERM can cancel.  */
- 
-           if (state != ST_TERMNO)
-             {
-diff --git a/src/dircolors.hin b/src/dircolors.hin
-index b5d6452..6d2d3a4 100644
---- a/src/dircolors.hin
-+++ b/src/dircolors.hin
-@@ -8,8 +8,11 @@
- # The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
- # slackware version of dircolors) are recognized but ignored.
- 
--# Below are TERM entries, which can be a glob patterns, to match
--# against the TERM environment variable to determine if it is colorizable.
-+# Global config options can be specified before TERM or COLORTERM entries
-+
-+# Below are TERM or COLORTERM entries, which can be glob patterns, which
-+# restrict following config to systems with matching environment variables.
-+COLORTERM ?*
- TERM Eterm
- TERM ansi
- TERM *color*
-diff --git a/tests/misc/dircolors.pl b/tests/misc/dircolors.pl
-index 2c57104..464acfd 100755
---- a/tests/misc/dircolors.pl
-+++ b/tests/misc/dircolors.pl
-@@ -42,6 +42,20 @@ my @Tests =
-      ['term-4', '-b', {IN => "TERM N*match\nowt 40;33\n"},
-       {OUT => "LS_COLORS='';\nexport LS_COLORS\n"}],
- 
-+     ['print-clash1', '-p', '--print-ls',
-+      {ERR => "dircolors: options --print-database and --print-ls-colors " .
-+              "are mutually exclusive\n" .
-+              "Try 'dircolors --help' for more information.\n"},
-+      {EXIT => 1}],
-+     ['print-clash2', '-b', '--print-database',
-+      {ERR => "dircolors: the options to output non shell syntax,\n" .
-+              "and to select a shell syntax are mutually exclusive\n" .
-+              "Try 'dircolors --help' for more information.\n"},
-+      {EXIT => 1}],
-+
-+     ['print-ls-colors', '--print-ls-colors', {IN => "OWT 40;33\n"},
-+      {OUT => "\x1B[40;33mtw\t40;33\x1B[0m\n"}],
-+
-      # CAREFUL: always specify the -b option, unless explicitly testing
-      # for csh syntax output.
-     );
--- 
-2.34.1
-
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 87bc1c66f534..bd1043a3951e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,13 +1,9 @@
 AUX file-5.39-portage-sandbox.patch 457 BLAKE2B ff4b67570144d5995ef62326da5f7a4ac5fe4befc3db56ff6d6a711c84bb4316da9e1a203326a6bc219066acd8e40634bf17f28f95d583bfa2f3d4698bcd57fc SHA512 20f66d918a605233f733fa6f5c038d9c56ec1175e706b76b16ecb8be81d64d79c3a932824b61092bf1edcd55c29fc2bcfa8bdf506e5717c10e849ec6110bbd3d
 AUX file-5.40-seccomp-fstatat64-musl.patch 578 BLAKE2B c2c074e4dca62253303bae3af88a7ce0bc7d3efd608bd7269d624ad69b0fe4022db38efc5bb63d8f6d1f7bf45c2a1d749c406e76cf1ce42be731e663e2874ad5 SHA512 008c2a2c18b14eaa49f62b87fa14f4bea46bfd56efda17e49541fd51d87201d4d5511d3aae50b53dfcd68cc8e9a38884711ac59458acff9bf3290e267c2891bb
-AUX file-5.42-unicode-fixes.patch 10989 BLAKE2B af85384f3d2461d30deda506e1e624ffb9d72ef3a25c7e902a747f10dbcb6ca7782d24900b1d5cc856763052975d6e3649d880d005d82bd5f64d310b014f82a8 SHA512 824f128b44a51fee1673110e90be6fdf7831a5220cc608dc94ef1367e1550de05170a8e9a4c4e90a1f372e975b9c391a2cb5ea968df1cb263734bd78ce585403
 DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
-DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05
-DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a
 DIST file-5.43.tar.gz 1162786 BLAKE2B aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c SHA512 9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
 DIST file-5.43.tar.gz.asc 195 BLAKE2B d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f SHA512 c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
 EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b
-EBUILD file-5.42-r1.ebuild 3760 BLAKE2B 218d9cdc0b2c4387c6ba06729b56e4d886639ce8fe883a5be1593acdd2204012a88748afa76654f600ad38e88132c6cb6d73853dab5d717cdee8be1cb0a82d66 SHA512 dc21797dd4a187abf91d3f52bdc798e3c1838c6bd4930de4a209d46fdb7331268ad5710f062436b9208f21cc7618dd6c49a71e10e09a60643cfd6a288d939108
 EBUILD file-5.43.ebuild 3712 BLAKE2B 3081dc9e676be42da2cbc8fb34018b2e4f63ffb9c0854346325c574d71942608db81463fd5c80756455e1541c838e3d27f51f7d228a16549316fcc51954acfc0 SHA512 25de2f67fabd5f276a52c271ff1627a3387ffaf1f7d1b12893e5b6c6f56c2a64b54f2011787260bf7283cfe7a3e807631da8c0c2ede3e9237e39cd450cde7cd9
 EBUILD file-9999.ebuild 3870 BLAKE2B ac7f37d005c94d589cf9663a2443d7ea49df93e52da2b66c60d1e755ba787810c1885d47268e424857e19755786d69660415f137baf3f4b2325b40e94dc998a3 SHA512 d44ae484b41b20df592a0b69ce054557a963f8b63b956f9ec70564351d7c23ab26d969bc3f1d914a0440da7dad72b1ae413193c1e6cc1a1263e4052a64028309
 MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19
diff --git a/sys-apps/file/file-5.42-r1.ebuild b/sys-apps/file/file-5.42-r1.ebuild
deleted file mode 100644
index bbde9949d397..000000000000
--- a/sys-apps/file/file-5.42-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
-	inherit verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	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"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-	"${FILESDIR}/${P}-unicode-fixes.patch" #861089
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# don't let python README kill main README, bug ##60043
-	mv python/README.md python/README.python.md || die
-	# bug #662090
-	sed 's@README.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/files/file-5.42-unicode-fixes.patch b/sys-apps/file/files/file-5.42-unicode-fixes.patch
deleted file mode 100644
index cc6ee7196b49..000000000000
--- a/sys-apps/file/files/file-5.42-unicode-fixes.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-https://bugs.gentoo.org/861089
-https://github.com/file/file/commit/19bf47777d0002ee884467e45e6ace702e40a4c1
-https://github.com/file/file/commit/c80065fe6900be5e794941e29b32440e9969b1c3
-https://github.com/file/file/commit/7e59d34206d7c962e093d4239e5367a2cd8b7623
-https://github.com/file/file/commit/f042050f59bfc037677871c4d1037c33273f5213
-https://github.com/file/file/commit/d471022b2772071877895759f209f2c346757a4c
-https://github.com/file/file/commit/441ac2b15508909e82ad467960df4ac0adf9644c
-
-From 19bf47777d0002ee884467e45e6ace702e40a4c1 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 17:00:51 +0000
-Subject: [PATCH] PR/358: Fix width for -f - (jpalus)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn)
- 	size_t llen = 0;
- 	int wid = 0, cwid;
- 	int e = 0;
-+	size_t fi = 0, fimax = 100;
-+	char **flist = malloc(sizeof(*flist) * fimax);
- 
--	if (strcmp("-", fn) == 0) {
-+	if (flist == NULL)
-+out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
-+
-+	if (strcmp("-", fn) == 0)
- 		f = stdin;
--		wid = 1;
--	} else {
-+	else {
- 		if ((f = fopen(fn, "r")) == NULL) {
- 			file_warn("Cannot open `%s'", fn);
- 			return 1;
- 		}
--
--		while ((len = getline(&line, &llen, f)) > 0) {
--			if (line[len - 1] == '\n')
--				line[len - 1] = '\0';
--			cwid = file_mbswidth(ms, line);
--			if (cwid > wid)
--				wid = cwid;
--		}
--
--		rewind(f);
- 	}
- 
- 	while ((len = getline(&line, &llen, f)) > 0) {
- 		if (line[len - 1] == '\n')
- 			line[len - 1] = '\0';
--		e |= process(ms, line, wid);
-+		if (fi >= fimax) {
-+			fimax += 100;
-+			char **nf = realloc(flist, fimax * sizeof(*flist));
-+			if (nf == NULL)
-+				goto out;
-+		}
-+		flist[fi++] = line;
-+		cwid = file_mbswidth(ms, line);
-+		if (cwid > wid)
-+			wid = cwid;
-+		line = NULL;
-+		llen = 0;
-+	}
-+
-+	fimax = fi;
-+	for (fi = 0; fi < fimax; fi++) {
-+		e |= process(ms, flist[fi], wid);
-+		free(flist[fi]);
- 	}
-+	free(flist);
- 
--	free(line);
--	(void)fclose(f);
-+	if (f != stdin)
-+		(void)fclose(f);
- 	return e;
- }
- 
-
-From c80065fe6900be5e794941e29b32440e9969b1c3 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 19:44:35 +0000
-Subject: [PATCH] PR/362: ro-ee: fix wide char printing
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -60,6 +60,12 @@ FILE_RCSID("@(#)$File: file.c,v 1.196 2022/07/04 17:00:51 christos Exp $")
- #ifdef HAVE_WCTYPE_H
- #include <wctype.h>
- #endif
-+#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \
-+   defined(HAVE_WCTYPE_H)
-+#define FILE_WIDE_SUPPORT
-+#else
-+#include <ctype.h>
-+#endif
- 
- #if defined(HAVE_GETOPT_H) && defined(HAVE_STRUCT_OPTION)
- # include <getopt.h>
-@@ -550,6 +556,55 @@ out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
- 	return e;
- }
- 
-+private void
-+file_octal(unsigned char c)
-+{
-+	putc('\\', stdout);
-+	putc(((c >> 6) & 7) + '0', stdout);
-+	putc(((c >> 3) & 7) + '0', stdout);
-+	putc(((c >> 0) & 7) + '0', stdout);
-+}
-+
-+private void
-+fname_print(const char *inname)
-+{
-+	size_t n = strlen(inname);
-+#ifdef FILE_WIDE_SUPPORT
-+	mbstate_t state;
-+	wchar_t nextchar;
-+	size_t bytesconsumed;
-+
-+
-+	(void)mbrlen(NULL, 0, &state);
-+	while (n > 0) {
-+		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
-+		if (bytesconsumed == CAST(size_t, -1) ||
-+		    bytesconsumed == CAST(size_t, -2))  {
-+			nextchar = *inname;
-+			bytesconsumed = 1;
-+		}
-+		inname += bytesconsumed;
-+		n -= bytesconsumed;
-+		if (iswprint(nextchar)) {
-+			putwc(nextchar, stdout);
-+			continue;
-+		}
-+		/* XXX: What if it is > 255? */
-+		file_octal(CAST(unsigned char, nextchar));
-+	}
-+#else
-+	size_t i;
-+	for (i = 0; i < n; i++) {
-+		unsigned char c = CAST(unsigned char, inname[i]);
-+		if (isprint(c)) {
-+			putc(c);
-+			continue;
-+		}
-+		file_octal(c);
-+	}
-+#endif
-+}
-+
- /*
-  * Called for each input file on the command line (or in a list of files)
-  */
-@@ -559,15 +614,13 @@ process(struct magic_set *ms, const char *inname, int wid)
- 	const char *type, c = nulsep > 1 ? '\0' : '\n';
- 	int std_in = strcmp(inname, "-") == 0;
- 	int haderror = 0;
--	size_t plen = 4 * wid + 1;
--	char *pbuf, *pname;
--
--	if ((pbuf = CAST(char *, malloc(plen))) == NULL)
--	    file_err(EXIT_FAILURE, "Can't allocate %zu bytes", plen);
- 
- 	if (wid > 0 && !bflag) {
--		pname = file_printable(ms, pbuf, plen, inname, wid);
--		(void)printf("%s", std_in ? "/dev/stdin" : pname);
-+		const char *pname = std_in ? "/dev/stdin" : inname;
-+		if ((ms->flags & MAGIC_RAW) == 0)
-+			fname_print(pname);
-+		else
-+			(void)printf("%s", pname);
- 		if (nulsep)
- 			(void)putc('\0', stdout);
- 		if (nulsep < 2) {
-@@ -586,7 +639,6 @@ process(struct magic_set *ms, const char *inname, int wid)
- 	}
- 	if (nobuffer)
- 		haderror |= fflush(stdout) != 0;
--	free(pbuf);
- 	return haderror || type == NULL;
- }
- 
-@@ -594,35 +646,33 @@ protected size_t
- file_mbswidth(struct magic_set *ms, const char *s)
- {
- 	size_t width = 0;
--#if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH) && \
--   defined(HAVE_WCTYPE_H)
--	size_t bytesconsumed, old_n, n;
-+#ifdef FILE_WIDE_SUPPORT
-+	size_t bytesconsumed, n;
- 	mbstate_t state;
- 	wchar_t nextchar;
--	(void)memset(&state, 0, sizeof(mbstate_t));
--	old_n = n = strlen(s);
-+
-+	(void)mbrlen(NULL, 0, &state);
-+	n = strlen(s);
- 
- 	while (n > 0) {
- 		bytesconsumed = mbrtowc(&nextchar, s, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2)) {
--			/* Something went wrong, return something reasonable */
--			return old_n;
-+			nextchar = *s;
-+			bytesconsumed = 1;
- 		}
- 		width += ((ms->flags & MAGIC_RAW) != 0
- 		    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 
- 		s += bytesconsumed, n -= bytesconsumed;
- 	}
--	return width;
- #else
- 	while (*s) {
- 		width += (ms->flags & MAGIC_RAW) != 0
- 		    || isprint(CAST(unsigned char, *s)) ? 1 : 4;
- 	}
--
--	return strlen(s);
- #endif
-+	return width;
- }
- 
- private void
---- a/src/file.h
-+++ b/src/file.h
-@@ -575,7 +575,7 @@ protected size_t file_pstring_length_size(struct magic_set *,
-     const struct magic *);
- protected size_t file_pstring_get_length(struct magic_set *,
-     const struct magic *, const char *);
--public char * file_printable(struct magic_set *, char *, size_t,
-+protected char * file_printable(struct magic_set *, char *, size_t,
-     const char *, size_t);
- #ifdef __EMX__
- protected int file_os2_apptype(struct magic_set *, const char *, const void *,
---- a/src/funcs.c
-+++ b/src/funcs.c
-@@ -763,7 +763,7 @@ file_pop_buffer(struct magic_set *ms, file_pushbuf_t *pb)
- /*
-  * convert string to ascii printable format.
-  */
--public char *
-+protected char *
- file_printable(struct magic_set *ms, char *buf, size_t bufsiz,
-     const char *str, size_t slen)
- {
-
-From 7e59d34206d7c962e093d4239e5367a2cd8b7623 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 20:16:29 +0000
-Subject: [PATCH] Handle invalid characters as octal (idea from PR/363 by
- dimich)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -580,8 +580,11 @@ fname_print(const char *inname)
- 		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2))  {
--			nextchar = *inname;
--			bytesconsumed = 1;
-+			nextchar = *inname++;
-+			n--;
-+			(void)mbrlen(NULL, 0, &state);
-+			file_octal(CAST(unsigned char, nextchar));
-+			continue;
- 		}
- 		inname += bytesconsumed;
- 		n -= bytesconsumed;
-@@ -660,9 +663,12 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 		    bytesconsumed == CAST(size_t, -2)) {
- 			nextchar = *s;
- 			bytesconsumed = 1;
-+			(void)mbrlen(NULL, 0, &state);
-+			width += 4;
-+		} else {
-+			width += ((ms->flags & MAGIC_RAW) != 0
-+			    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 		}
--		width += ((ms->flags & MAGIC_RAW) != 0
--		    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
- 
- 		s += bytesconsumed, n -= bytesconsumed;
- 	}
-
-
-From f042050f59bfc037677871c4d1037c33273f5213 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 4 Jul 2022 22:30:51 +0000
-Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to
- initialize the state.
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -575,14 +575,14 @@ fname_print(const char *inname)
- 	size_t bytesconsumed;
- 
- 
--	(void)mbrlen(NULL, 0, &state);
-+	(void)memset(&state, 0, sizeof(state));
- 	while (n > 0) {
- 		bytesconsumed = mbrtowc(&nextchar, inname, n, &state);
- 		if (bytesconsumed == CAST(size_t, -1) ||
- 		    bytesconsumed == CAST(size_t, -2))  {
- 			nextchar = *inname++;
- 			n--;
--			(void)mbrlen(NULL, 0, &state);
-+			(void)memset(&state, 0, sizeof(state));
- 			file_octal(CAST(unsigned char, nextchar));
- 			continue;
- 		}
-@@ -654,7 +654,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 	mbstate_t state;
- 	wchar_t nextchar;
- 
--	(void)mbrlen(NULL, 0, &state);
-+	(void)memset(&state, 0, sizeof(state));
- 	n = strlen(s);
- 
- 	while (n > 0) {
-@@ -663,7 +663,7 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 		    bytesconsumed == CAST(size_t, -2)) {
- 			nextchar = *s;
- 			bytesconsumed = 1;
--			(void)mbrlen(NULL, 0, &state);
-+			(void)memset(&state, 0, sizeof(state));
- 			width += 4;
- 		} else {
- 			width += ((ms->flags & MAGIC_RAW) != 0
-
-
-From d471022b2772071877895759f209f2c346757a4c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 5 Jul 2022 19:53:42 +0000
-Subject: [PATCH] Use printf("%lc") instead of putwc(). Somehow mixing wide and
- narrow stdio does not work on Linux?
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -589,7 +589,7 @@ fname_print(const char *inname)
- 		inname += bytesconsumed;
- 		n -= bytesconsumed;
- 		if (iswprint(nextchar)) {
--			putwc(nextchar, stdout);
-+			printf("%lc", nextchar);
- 			continue;
- 		}
- 		/* XXX: What if it is > 255? */
-
-From 441ac2b15508909e82ad467960df4ac0adf9644c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 5 Jul 2022 20:05:23 +0000
-Subject: [PATCH] wcwidth is not supposed to return -1 if the character is
- printable, but it does for 0xff... Prevent it from decreasing the width.
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -666,8 +666,9 @@ file_mbswidth(struct magic_set *ms, const char *s)
- 			(void)memset(&state, 0, sizeof(state));
- 			width += 4;
- 		} else {
-+			int w = wcwidth(nextchar);
- 			width += ((ms->flags & MAGIC_RAW) != 0
--			    || iswprint(nextchar)) ? wcwidth(nextchar) : 4;
-+			    || iswprint(nextchar)) ? (w > 0 ? w : 1) : 4;
- 		}
- 
- 		s += bytesconsumed, n -= bytesconsumed;
-
-From be1ac8c0aa6d21921012f62582f51a9e546e4972 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 26 Jul 2022 15:10:05 +0000
-Subject: [PATCH] Fix bug with large flist (Florian Weimer)
-
---- a/src/file.c
-+++ b/src/file.c
-@@ -535,6 +535,7 @@ out:		file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
- 			char **nf = realloc(flist, fimax * sizeof(*flist));
- 			if (nf == NULL)
- 				goto out;
-+			flist = nf;
- 		}
- 		flist[fi++] = line;
- 		cwid = file_mbswidth(ms, line);
-
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 58560c8f09e3..a16212a3b3f9 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -1,7 +1,5 @@
 DIST hwdata-0.361.tar.gz 2263204 BLAKE2B 83f613dd75e677bb25e884c00e8c32aa97e1b030ac8642df2c35f895df815bf6b8c3333a150c448fb6a14a8cf6c6cec9ef351896a5762a45ea99c34c39790213 SHA512 942cf6fa17c2f6fa41d7c624aa7fd28d57d6ad7750eb7a01c8ce85a663154140af75108a8ab12d43375bae63574a594ea2117195a743c12e5c4cb2986f198454
-DIST hwdata-0.362.tar.gz 2277092 BLAKE2B fa0fb6055e65867a61ff628655c45442f175daf6c4d29b921356534a6aca686d6790fab6fd930707fb81891dac4325078a335f351af236d4eece8953703b2c27 SHA512 63ea6b56283b248a54b4a9e350da431db4f40b30e4d1e9afb29bfec3f87b11723899397817435e9142b7775690a399591afb9b701101e2cc4d78893fa791e1b7
 DIST hwdata-0.363.tar.gz 2283349 BLAKE2B dd7aa9c7d202882a31a5359cf674c9399b23b07f47d2fa706739201f60227922572619cef42f50835c4a01efab19773e24b0540a87f759b805755389f8d6f7f4 SHA512 b53ffad2bdeea1ac8c78832e693c44655dc86c401a3f6921ccedf45a88731d82b40b2f033bb90bcaa058b1b3e8361a90aa4eeba9779ee4741efc40ae8ff6282a
 EBUILD hwdata-0.361.ebuild 696 BLAKE2B 792e672c8fb3277cf445be60a5966dd3ce1afdc0466235021726b182c70e653eb930d94dfed09bca71fccb514eb0b89b5d6e1eac3cdd9e3be7e30261fe4900fe SHA512 1499d7696d4561943d6521937d2818d1000a7d6ceb939bbf670e56f301a54109b7a6eca28f2f7bdbeb3094b9236dd8bad81cf34f893f401659c3168f1c8d3af2
-EBUILD hwdata-0.362.ebuild 704 BLAKE2B e40a0fc670739174b895ddeb0fc150d0d7112caf9e01b4b7cf8a6a6e832237dd493d1d9b48c1c496ef162eaf452db10e1ffff03a7f2e41d4e189e29eacc8c4bb SHA512 6d81bf29ab974be19d3d3f1abb835373d9babbca9c949293ec5b0b3bd76648354afffbb0d074f6f59e0e62c762ae4da0adbbeb179c4b24dcf822a0725a0ec60c
 EBUILD hwdata-0.363.ebuild 697 BLAKE2B 7b2dfd3b060a7866502b4275650d936cfee8201310e87fd36e5b88a71512a5202f3fc0f7dcbb3beccf6c97ae59d74d4a04de602447d6f092a31acad37af43435 SHA512 3155c833ee8012d8f17fca390099af9a1842aa8157b6cecd5cc606d429bfe9411f39d2d2b343bd88229edaf8b92c09ff260b7b06b065f4e0bf7183ffdd4c73ef
 MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/hwdata-0.362.ebuild b/sys-apps/hwdata/hwdata-0.362.ebuild
deleted file mode 100644
index 719e257fb904..000000000000
--- a/sys-apps/hwdata/hwdata-0.362.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo
-
-DESCRIPTION="Hardware identification and configuration data"
-HOMEPAGE="https://github.com/vcrhonek/hwdata"
-SRC_URI="https://github.com/vcrhonek/hwdata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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"
-
-RESTRICT="test"
-
-src_configure() {
-	# configure is not compatible with econf
-	local conf=(
-		./configure
-		--prefix="${EPREFIX}/usr"
-		--libdir="${EPREFIX}/lib"
-		--datadir="${EPREFIX}/usr/share"
-	)
-
-	edo "${conf[@]}" || die
-}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 48737675851c..1aeafde46fc1 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,8 +1,6 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.6.tar.gz 488750 BLAKE2B fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 SHA512 8672dcf2b781d89ec281c4370b204467f9db219edb7c23adf02b71decf0ecab7b442d6e95e91416af3aecc27948e9442bb3b369e532e40f7ef32635628e110af
 DIST logwatch-7.7.tar.gz 498214 BLAKE2B 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da SHA512 5224013c548e60248ef2de8aeabc760d046374f54035e7e5e00bba0c6e6777eb5e7fcfd05a9f029d3d34e9d3fb8a243ed99b417961b21895cc14b881f1ad3dd4
-EBUILD logwatch-7.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3
 EBUILD logwatch-7.7.ebuild 2405 BLAKE2B 3955dd13d7d123f453e0c426aeaeb7e0a27d982e907f598ae621b31bbf5fa5710a86d995bddb18a8932eb5e6d2f4cfaa69f964903dfef86ee58a322ea51e3b12 SHA512 5b888b1fca220786a73bd524df55997c5c05e798877fb3951287895b393c845b1503924a9ac5fd652bf9c48d6fd7919bbd4d1110a9d89d17e787f904ca61e7df
 EBUILD logwatch-9999.ebuild 2413 BLAKE2B f846a4b0f713e757baaacc811b97ad37456b58b255ab616b8debbaafbc9ed754a214f71fc1f8da0c86aff2df3b70b199e0f28322a359a2514028e4782fd31ee3 SHA512 a59f67d27700d7fc8e6910e846bbb975dacd92098f5f3752ac8c6c7e7968a0fe40dce3267f69c7e853b0e3bcbedf92105f2faf137ec6308c302a261821c4d38e
 MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a
diff --git a/sys-apps/logwatch/logwatch-7.6.ebuild b/sys-apps/logwatch/logwatch-7.6.ebuild
deleted file mode 100644
index 24fb4fa00cfe..000000000000
--- a/sys-apps/logwatch/logwatch-7.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="https://sourceforge.net/projects/logwatch/"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/Date-Manip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-PATCHES=()
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	keepdir /etc/logwatch
-
-	# logwatch.pl requires cache dir (bug #607668)
-	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
-
-	newsbin scripts/logwatch.pl logwatch.pl
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc README HOWTO-Customize-LogWatch
-
-	# Do last due to insopts modification.
-	insinto /usr/share/logwatch/scripts/logfiles
-	insopts -m755
-	doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
-	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-
-	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 434446cef5f8..dda4b957e02b 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,9 +4,7 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
-DIST shadow-4.11.1.tar.xz 1656584 BLAKE2B d459a1e0ffb342b6b455caf65e6af60b32eee72d4a9b1ab126485fb4632503a42061d3f0b960554c8155af6dc0564c585335b27aecca6538b394a0d58d927588 SHA512 12fbe4d6ac929ad3c21525ed0f1026b5b678ccec9762f2ec7e611d9c180934def506325f2835fb750dd30af035b592f827ff151cd6e4c805aaaf8e01425c279f
 DIST shadow-4.12.3.tar.xz 1747620 BLAKE2B 63b10d75a11d419156a996b8acf1bebbfab28999c2ab796e6625c028882073d4021806d8b56224190886c076a1205955e7797cb6f797ef73af3a8a33ac34bf2f SHA512 0529889258f54e7634762dc154aa680d55f8c5f1654afadd1b7431cfbb890a3b1ba27c7ff4b7c45986e4ee2289946db2e420b23ed13e4e5b15800a1fb3a013bc
 DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb000650630daae8b41fb71413daa45b5fe39a98fc640aaafa0f219fbaf9e065afa6b44f051373fb1967358ccc43d SHA512 d3f294d86c0e2174c88809810a801737c01cd01f9cadbe7b1ae382b2745d86e2e30c0718fa6489c2abb65500ed94c8ac1961d05243b5a1800c966384c69281c9
-EBUILD shadow-4.11.1.ebuild 6247 BLAKE2B 1aa58e8496f45bfa85c1d9a9893eeb31629ea6709b81451e68a42369f7bfb293c538bc1b2d458afbd30a7c9511d88c8f977c7ec4283b38553de454f5b1712ef1 SHA512 021974ec33b5cc1d512a6c1626b7e71787b30ecf331aa9aba214b1f37a2ea8ef02f53dcc186ee2ccdd304845af3f5ae8526da5073611f90e26cb45840ed2aed6
 EBUILD shadow-4.12.3.ebuild 6482 BLAKE2B bc7bc19a961369429b2850e04957c3c4b66aa6b57482897f051b4f93e9ca68c0dc1979e75b3323e498ed6da8bed01f0e56605a4fed0edb58f90e3ad8de9c42e7 SHA512 842e434b064fc30675805c360c1ff73830c9d01016d5f9a8f74ba70d0892f48de8e792e963d25b82db2d75380a51fcfd0789fc655f85e720f9c86d5bfc081192
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.11.1.ebuild b/sys-apps/shadow/shadow-4.11.1.ebuild
deleted file mode 100644
index 7a8c042c0b85..000000000000
--- a/sys-apps/shadow/shadow-4.11.1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool pam
-
-DESCRIPTION="Utilities to deal with user accounts"
-HOMEPAGE="https://github.com/shadow-maint/shadow"
-SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="BSD GPL-2"
-# Subslot is for libsubid's SONAME.
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
-# Taken from the man/Makefile.am file.
-LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-
-REQUIRED_USE="?? ( cracklib pam )"
-
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	virtual/libcrypt:=
-	acl? ( sys-apps/acl:0= )
-	audit? ( >=sys-process/audit-2.6:0= )
-	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam:0= )
-	skey? ( sys-auth/skey:0= )
-	selinux? (
-		>=sys-libs/libselinux-1.28:0=
-		sys-libs/libsemanage:0=
-	)
-	xattr? ( sys-apps/attr:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-4.14
-"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-apps/man-pages-5.11-r1
-	!=sys-apps/man-pages-5.12-r0
-	!=sys-apps/man-pages-5.12-r1
-	nls? (
-		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20180315-r1
-		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-	)
-	pam? ( >=sys-auth/pambase-20150213 )
-	su? ( !sys-apps/util-linux[su(-)] )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
-)
-
-src_prepare() {
-	default
-
-	#eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-account-tools-setuid
-		--disable-static
-		--with-btrfs
-		--without-group-name-max-length
-		--without-tcb
-		$(use_enable nls)
-		$(use_with acl)
-		$(use_with audit)
-		$(use_with bcrypt)
-		$(use_with cracklib libcrack)
-		$(use_with elibc_glibc nscd)
-		$(use_with pam libpam)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with su)
-		$(use_with xattr attr)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use nls ; then
-		local l langs="po" # These are the pot files.
-		for l in ${LANGS[*]} ; do
-			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
-		done
-		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
-	fi
-}
-
-set_login_opt() {
-	local comment="" opt=${1} val=${2}
-	if [[ -z ${val} ]]; then
-		comment="#"
-		sed -i \
-			-e "/^${opt}\>/s:^:#:" \
-			"${ED}"/etc/login.defs || die
-	else
-		sed -i -r \
-			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
-			"${ED}"/etc/login.defs
-	fi
-	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
-	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" suidperms=4711 install
-
-	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
-	emake DESTDIR="${D}" -C man install
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	insinto /etc
-	if ! use pam ; then
-		insopts -m0600
-		doins etc/login.access etc/limits
-	fi
-
-	# needed for 'useradd -D'
-	insinto /etc/default
-	insopts -m0600
-	doins "${FILESDIR}"/default/useradd
-
-	if use split-usr ; then
-		# move passwd to / to help recover broke systems #64441
-		# We cannot simply remove this or else net-misc/scponly
-		# and other tools will break because of hardcoded passwd
-		# location
-		dodir /bin
-		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
-		dosym ../../bin/passwd /usr/bin/passwd
-	fi
-
-	cd "${S}" || die
-	insinto /etc
-	insopts -m0644
-	newins etc/login.defs login.defs
-
-	set_login_opt CREATE_HOME yes
-	if ! use pam ; then
-		set_login_opt MAIL_CHECK_ENAB no
-		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
-		set_login_opt LOGIN_RETRIES 3
-		set_login_opt ENCRYPT_METHOD SHA512
-		set_login_opt CONSOLE
-	else
-		dopamd "${FILESDIR}"/pam.d-include/shadow
-
-		for x in chsh shfn ; do
-			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
-		done
-
-		for x in chpasswd newusers ; do
-			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
-		done
-
-		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
-
-		# comment out login.defs options that pam hates
-		local opt sed_args=()
-		for opt in \
-			CHFN_AUTH \
-			CONSOLE \
-			CRACKLIB_DICTPATH \
-			ENV_HZ \
-			ENVIRON_FILE \
-			FAILLOG_ENAB \
-			FTMP_FILE \
-			LASTLOG_ENAB \
-			MAIL_CHECK_ENAB \
-			MOTD_FILE \
-			NOLOGINS_FILE \
-			OBSCURE_CHECKS_ENAB \
-			PASS_ALWAYS_WARN \
-			PASS_CHANGE_TRIES \
-			PASS_MIN_LEN \
-			PORTTIME_CHECKS_ENAB \
-			QUOTAS_ENAB \
-			SU_WHEEL_ONLY
-		do
-			set_login_opt ${opt}
-			sed_args+=( -e "/^#${opt}\>/b pamnote" )
-		done
-		sed -i "${sed_args[@]}" \
-			-e 'b exit' \
-			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
-			-e ': exit' \
-			"${ED}"/etc/login.defs || die
-
-		# remove manpages that pam will install for us
-		# and/or don't apply when using pam
-		find "${ED}"/usr/share/man -type f \
-			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
-			-delete
-
-		# Remove pam.d files provided by pambase.
-		rm "${ED}"/etc/pam.d/{login,passwd} || die
-		if use su ; then
-			rm "${ED}"/etc/pam.d/su || die
-		fi
-	fi
-
-	# Remove manpages that are handled by other packages
-	find "${ED}"/usr/share/man -type f \
-		'(' -name id.1 -o -name getspnam.3 ')' \
-		-delete || die
-
-	if ! use su ; then
-		find "${ED}"/usr/share/man -type f -name su.1 -delete || die
-	fi
-
-	cd "${S}" || die
-	dodoc ChangeLog NEWS TODO
-	newdoc README README.download
-	cd doc || die
-	dodoc HOWTO README* WISHLIST *.txt
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
-		"${EROOT}/etc/login.defs.new"
-}
-
-pkg_postinst() {
-	# Missing entries from /etc/passwd can cause odd system blips.
-	# See bug #829872.
-	if ! pwck -r -q -R "${EROOT:-/}" &>/dev/null ; then
-		ewarn "Running 'pwck' returned errors. Please run it manually to fix any errors."
-	fi
-
-	# Enable shadow groups.
-	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
-		if grpck -r -R "${EROOT:-/}" 2>/dev/null ; then
-			grpconv -R "${EROOT:-/}"
-		else
-			ewarn "Running 'grpck' returned errors. Please run it by hand, and then"
-			ewarn "run 'grpconv' afterwards!"
-		fi
-	fi
-
-	[[ ! -f "${EROOT}"/etc/subgid ]] &&
-		touch "${EROOT}"/etc/subgid
-	[[ ! -f "${EROOT}"/etc/subuid ]] &&
-		touch "${EROOT}"/etc/subuid
-
-	einfo "The 'adduser' symlink to 'useradd' has been dropped."
-}
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index b2c27913988d..27a80f776f5f 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -4,19 +4,8 @@ AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaa
 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
-AUX sysvinit-2.99-shutdown-h.patch 2684 BLAKE2B 57c27b8646a0b47f66eb103450e645fa45220a1bf79da86207ffa1393c311cb4c4a2ad9b8b7bf81cc4ae2ccb2acb19b66fd575935d8a0b0a2a9b3899c0088c9f SHA512 ef33da0d5673180275c8120c6904a4214cf1308827a626d8d6a2aab67d7d25b5407f9efcaf6a7a4a09a8c409899242943f6a95881cc8c8898b780224f991f2f7
 AUX sysvinit-3.05-fix-man-makefile.patch 780 BLAKE2B 0fc0396f41663a554484c06a96079497b4991ea44f077bc89c2249db86c47b5b5630713485fb6ef01a66e380cb5cb49af585e23eb2db762b38dca94d55d0a4d1 SHA512 b7fd436a224b67b41693aa1e0ccce5b94471473345ca72ef618c7a7abb8e5bf1866ffb27d42a1fc0d1326df275ec8f7e920be5d03dc8883c590551e1e87b873e
-DIST sysvinit-2.99.tar.xz 126908 BLAKE2B b82c745d5b695f918d4a163e7b9eaceccc07a46f73c3782c7771cc29a8600be13de4ff30891086df5773d60f37fa3b0f58566ccaf72cd70af68083b51152a38b SHA512 34f328d7d2e6ceddcddfebab49eb9c34e90dc96decf2caeb89dffd2ade54322fa4a3cb9fa1e1a4bc687e07fcb0a13e5aebe6186582a9f5c9153e1513baa87ddd
-DIST sysvinit-3.01.tar.xz 126616 BLAKE2B b991c6d2a09b02003cc587379b148f8ca3817c27fcaf81f184f679cfd5325e0b551484bba47bb554a34c7eeba60538f4943de49b1d59bd4bef73d7d086fefdb2 SHA512 66da3830aa32b70f0beea994213145a550e5b5d58a5b54afb17109243d5efface6aba8c296b76dbfb22ce6f86c9c58f237ff71ee04ec7d5b316ad412bf7acbcf
-DIST sysvinit-3.03.tar.xz 219956 BLAKE2B e2f9d838a67341cabac4b82d90c66b29470727383c4a4d86f2767863a9b9f6d60768069fa79636552aa3bef654bd2f0944cb35eb15a4f053d1fa9aaa4e04473d SHA512 920205d70e1384d11926739ab45d4a04c5a7d7263c50bd06288c806ebc3316d641bd05a5c67497c48951fafe32fc364e88bfb1cb2cc1d6787e9eb6c5e692061b
-DIST sysvinit-3.03.tar.xz.sig 833 BLAKE2B 7d851f4cd12e5745055bb78f531b97b1e9fb9a16260a713fc7ac91000208f04ec8f1109068ebe017838449c73b9e40679f248816050979d9624742dd6023eeef SHA512 a643447ed906b5e3249808eafc85f8b336ebfa6028adf8a8e8df82469b7f08cfe98f44b8e7f6b50168f70925eabf610760a185f10d0529ec1a5ff7337de70dc4
-DIST sysvinit-3.04.tar.xz 220184 BLAKE2B 5caa94fd09e5660fb39982b8c8d68ca5546d83a7f78450f4d7fe8fcd9ac429cd8d9f1ef63e9276221ac878ca2964874c1065d61bfd9ed8b0d1505b44c775b388 SHA512 059092ee857782e88f88e47475846f859589aa1062a6e1294fe8983a11d04a13811e0dd6d277431f45abc2d9d96e5358f6b2d2df1d291402fada66cd009a5fa9
-DIST sysvinit-3.04.tar.xz.sig 833 BLAKE2B 8f04051ea7c03ab447fe309ee61cb4d35a9c02f9a88699423097f9fe4544a26e89536f2625572d0781f792103ce88276db19c2b9ed9489c6ca969d54bc45c117 SHA512 38becfc0d0796570bc75661d4212ad3b1470eea33905694a5264b8b68054d3e47d9250da58f67d52807efcd96334f170a600dff72491f76de94df58077eb4dd0
 DIST sysvinit-3.05.tar.xz 234416 BLAKE2B 56cd57976c34194b07512e05f21782247d2f79e51655de758ee789016fe45ec74d2b036c727e6897f6fd743edf2755715fe22ed4538d8d5f81220b0898c3c62b SHA512 15063d237e247f4eefd9c2e86c986384c1103eb2a84d834d92f00a557106a9c24f5f3530633412997692515a5404c194840fc71b4d3c94eb284ae6c776bb38a3
 DIST sysvinit-3.05.tar.xz.sig 833 BLAKE2B 520be5b28b02a67703eb027515d4c290532bdefdb319d6b74d14dbaa51538410eab9d336637c1b32cd8f27d45353b78f531ba7646157790e2563a38dbf396646 SHA512 ed7816281e81b7c568ee8e3b8a1b2eb3973751d5fc7f626bdfefbe28d0f0d67857862924dd000e12e6c12ed0382c27c1992d2d6326cc1fc3c94559f475402b33
-EBUILD sysvinit-2.99-r1.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
-EBUILD sysvinit-3.01.ebuild 3849 BLAKE2B 144846be10f656a54d362593b1bfda4b5a50b4ae7d871243a703b3fc3cab51ec947c01726e4e72288f21da4159e2690d16da97635f187acede8f2e285a4b8b31 SHA512 4a39ebf78b0b738e88197af58b7c1cdad66361805e022c48c51705e5357ade36f0681821da6e64a43aaf186b00d8df218a2ea40bb6eb517e50a51c2bfc475788
-EBUILD sysvinit-3.03.ebuild 4917 BLAKE2B bc080021aff5e028a6378831154a7a71dc2bdae5cf00536393262a96e9c362120a0f6668293a03e70887162bdf917b0118df6e399e2c507a2b194284c7b2a530 SHA512 5235168913411aeafd9b533a78e27e3f19041eeebe0288f409002f0c9b77ebe51b06cdf8c6b56f85887ac0e123a1b62f877b830a3377f4bb732e33568d790ac0
-EBUILD sysvinit-3.04.ebuild 4917 BLAKE2B bc080021aff5e028a6378831154a7a71dc2bdae5cf00536393262a96e9c362120a0f6668293a03e70887162bdf917b0118df6e399e2c507a2b194284c7b2a530 SHA512 5235168913411aeafd9b533a78e27e3f19041eeebe0288f409002f0c9b77ebe51b06cdf8c6b56f85887ac0e123a1b62f877b830a3377f4bb732e33568d790ac0
 EBUILD sysvinit-3.05.ebuild 5306 BLAKE2B b4e6a3e983add3f0ec16c5ad95454f8a709dc6972008b3ad5de92e3e9b0dc2976b170e4986895dab69fc1ef7014c0810d15ecdc9591c6e333490be485a4696ef SHA512 bce906a7487840595464f866f18d8e1b694e304c2b262e6406ec15b7fc898a90a520bdf4755bdcee0954f7689d7463b595965a19b5a57a11d1d41dedba27b78a
 MISC metadata.xml 449 BLAKE2B e8c38e3a241f77fb4de63d170e24bcc8d1f8a9ada912fb5870d150874412c2a60a5c3a59ef662bc81f929fb4c36db393667c49c8c75346c3212b81b129edd5d5 SHA512 d5ae5c9606c89a9b73982983d68353bf0605a9c98e7272e762c5a62188b75a071675b61bac5894761a33babcb874949acb76292cda6a6b1fb4abdf725e2e847b
diff --git a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
deleted file mode 100644
index a4ceeda69c5f..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-other inits have moved to not requiring the -h flag when used with -H/-P.
-modify sysvinit to be the same since it really doesn't matter.
-
-https://bugs.gentoo.org/449354
-
-patch by Doug Goldstein
-
---- sysvinit-2.99/man/shutdown.8
-+++ sysvinit-2.99/man/shutdown.8
-@@ -66,22 +66,19 @@
- .\"}}}
- .\"{{{  -h
- .IP \fB\-h\fP
--Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP flags,
--depending on whether we want to poweroff or simply stop the operating system.
-+Equivalent to \fI-P\fP, unless \fI-H\fP is specified.
- .\"}}}
- .\"{{{  -P
- .IP \fB\-P\fP
--Modifier to the \fI-h\fP flag. Halt action is to turn off the power. 
--Must be used with the \fI-h\fP flag.
-+Halt action is to turn off the power.
- .\"}}}
- .\"{{{  -H
- .IP \fB\-H\fP
--Modifier to the \fI-h\fP flag.  Halt action is to halt or drop into boot
--monitor on systems that support it.  Must be used with the \fI-h\fP flag.
-+Action is to halt or drop into boot monitor on systems that support it.
- Halting is often used to run through the shutdown process and leave
- output on the screen for debugging purposes. Or when the user wants the OS to
- stop, but leave the power on. To power off at the end of the shutdown sequence
--use the \fI-P\fP modifier instead.
-+use the \fI-P\fP option instead.
- .\"}}}
- .\"{{{  -f
- .IP \fB\-f\fP
---- sysvinit-2.99/src/shutdown.c
-+++ sysvinit-2.99/src/shutdown.c
-@@ -144,9 +144,7 @@
- 	"\t\t  -r:      reboot after shutdown.\n"
- 	"\t\t  -h:      halt after shutdown.\n"
- 	"\t\t  -P:      halt action is to turn off power.\n"
--        "\t\t           can only be used along with -h flag.\n"
- 	"\t\t  -H:      halt action is to just halt.\n"
--        "\t\t           can only be used along with -h flag.\n"
- 	"\t\t  -f:      do a 'fast' reboot (skip fsck).\n"
- 	"\t\t  -F:      Force fsck on reboot.\n"
- 	"\t\t  -n:      do not go through \"init\" but go down real fast.\n"
-@@ -556,9 +554,11 @@
-   		switch(c) {
- 			case 'H':
- 				halttype = "HALT";
-+				down_level[0] = '0';
- 				break;
- 			case 'P':
- 				halttype = "POWEROFF";
-+				down_level[0] = '0';
- 				break;
- 			case 'a': /* Access control. */
- 				useacl = 1;
-@@ -574,6 +574,8 @@
-   				break;
-   			case 'h': /* Halt after shutdown */
- 				down_level[0] = '0';
-+				if (!halttype)
-+					halttype = "POWEROFF";
-   				break;
-   			case 'f': /* Don't perform fsck after next boot */
-   				fastboot = 1;
-@@ -613,12 +615,6 @@
-   		}
- 	}
- 
--	if (NULL != halttype && down_level[0] != '0') {
--		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
--		usage();
--  		exit(1);
--	}
--
- 	/* Do we need to use the shutdown.allow file ? */
- 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
- 
diff --git a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux ibm static"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.99-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	# dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.01.ebuild b/sys-apps/sysvinit/sysvinit-3.01.ebuild
deleted file mode 100644
index 589bb6747c9b..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.01.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux ibm static"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-S="${WORKDIR}/${P/_*}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.99-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	# dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.03.ebuild b/sys-apps/sysvinit/sysvinit-3.03.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.03.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
-	!<app-i18n/man-pages-l10n-4.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/po/${locale}.po || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/sysvinit/sysvinit-3.04.ebuild b/sys-apps/sysvinit/sysvinit-3.04.ebuild
deleted file mode 100644
index 392f8ab24242..000000000000
--- a/sys-apps/sysvinit/sysvinit-3.04.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="de es fr pl"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sysvinit.asc
-inherit toolchain-funcs flag-o-matic plocale verify-sig
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
-SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )"
-S="${WORKDIR}/${P/_*}"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *beta* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-IUSE="selinux ibm nls static"
-
-COMMON_DEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers"
-# Old OpenRC blocker is for bug #587424
-# Keep for longer than usual given it's cheap and avoid user inconvenience
-RDEPEND="${COMMON_DEPEND}
-	!<app-i18n/man-pages-l10n-4.12.1-r2
-	!<sys-apps/openrc-0.13
-	selinux? ( sec-policy/selinux-shutdown )"
-# po4a is for man page translations
-BDEPEND="nls? ( app-text/po4a )
-	verify-sig? ( >=sec-keys/openpgp-keys-sysvinit-20220413 )"
-
-PATCHES=(
-	# bug #80220
-	"${FILESDIR}/${PN}-2.86-kexec.patch"
-	# bug #158615
-	"${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CPPFLAGS =$/d' \
-		-e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \
-		src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# logsave is already in e2fsprogs
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \
-		-e '/^MAN8/s:\<logsave.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.98-r1 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-
-	delete_unused_locale() {
-		local locale=${1}
-
-		einfo "Deleting non-requested man page translations for locale=${locale}"
-		rm "${S}"/man/po/${locale}.po || die
-
-		sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die
-	}
-
-	plocale_for_each_disabled_locale delete_unused_locale
-}
-
-src_compile() {
-	tc-export CC
-
-	append-lfs-flags
-
-	# bug #381311
-	export DISTRO=
-	export VERSION="${PV}"
-
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		cd man/po || die
-		po4a po4a.cfg || die
-	fi
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
-	newconfd "${FILESDIR}"/bootlogd.confd bootlogd
-
-	into /
-	dosbin "${FILESDIR}"/halt.sh
-
-	keepdir /etc/inittab.d
-
-	if use nls && [[ -n "$(plocale_get_locales)" ]] ; then
-		install_locale_man_pages() {
-			doman -i18n=${1} man/po/${1}/*
-		}
-
-		plocale_for_each_locale install_locale_man_pages
-	fi
-
-	# Dead symlink
-	find "${ED}" -xtype l -delete || die
-
-	find "${ED}" -type d -empty -delete || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ -z ${ROOT} ]] ; then
-		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
-			ln -s /dev/initctl /run/initctl \
-				|| ewarn "Failed to set /run/initctl symlink!"
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-
-	# Required for new bootlogd service
-	if [[ ! -e "${EROOT}/var/log/boot" ]] ; then
-		touch "${EROOT}/var/log/boot"
-	fi
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a9669508d9f2..cd166b02003a 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,10 +6,7 @@ AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c756098
 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
-DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c
-DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
 EBUILD util-linux-2.38.1.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
-EBUILD util-linux-2.38.ebuild 10819 BLAKE2B 7317078c9dcb3693626cf7b46c47c001ed5a8a267ccb0e6964f011c2cb2b165c19b5346b21363e786d77691b038dae5086e354a20ce53362725f5e198ecf9b49 SHA512 422801817576d20a373f63286b8ac226c6e9e091ec1bc4c3a5df8aa90aa11274e73a86a488e2e3eaf21e6e054599b8e4a195dafebb06b3baffc8e4423f373924
 EBUILD util-linux-9999.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.38.ebuild b/sys-apps/util-linux/util-linux-2.38.ebuild
deleted file mode 100644
index d125ee135b9c..000000000000
--- a/sys-apps/util-linux/util-linux-2.38.ebuild
+++ /dev/null
@@ -1,394 +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 toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
-	inherit verify-sig
-
-	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	fi
-
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.sign )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	rtas? ( sys-libs/librtas )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Required for man-page generation
-	BDEPEND+=" dev-ruby/asciidoctor"
-else
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-karelzak )"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if use su && ! use suid ; then
-		elog "su will be installed as suid despite USE=-suid (bug #832092)"
-		elog "To use su without suid, see e.g. Portage's suidctl feature."
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-		return
-	fi
-
-	if use verify-sig ; then
-		mkdir "${T}"/verify-sig || die
-		pushd "${T}"/verify-sig &>/dev/null || die
-
-		# Upstream sign the decompressed .tar
-		# Let's do it separately in ${T} then cleanup to avoid external
-		# effects on normal unpack.
-		cp "${DISTDIR}"/${MY_P}.tar.xz . || die
-		xz -d ${MY_P}.tar.xz || die
-		verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign
-
-		popd &>/dev/null || die
-		rm -r "${T}"/verify-sig || die
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	if use test ; then
-		# Prevent uuidd test failure due to socket path limit, bug #593304
-		sed -i \
-			-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-			tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-		# Known-failing tests
-		# TODO: investigate these
-		local known_failing_tests=(
-			# Subtest 'options-maximum-size-8192' fails
-			hardlink/options
-
-			lsfd/mkfds-symlink
-			lsfd/mkfds-rw-character-device
-		)
-
-		local known_failing_test
-		for known_failing_test in "${known_failing_tests[@]}" ; do
-			einfo "Removing known-failing test: ${known_failing_test}"
-			rm tests/ts/${known_failing_test} || die
-		done
-
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS, bug #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-
-	append-lfs-flags
-
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-		--enable-libblkid
-		--enable-libmount
-		--enable-pylibmount
-	)
-
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. bug #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-
-	# bug #485486
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam)
-	# bug #545042
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam)
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config.
-	# bug #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# Avoid automagic dependency on ppc*
-	export ac_cv_lib_rtas_rtas_get_sysparm=$(usex rtas)
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-
-	if multilib_is_native_abi ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-raw
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# Upstream is shipping pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-			--enable-libmount
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call, bug #689190
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		# Need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam ; then
-		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-
-		newpamd "${FILESDIR}/su-l.pamd" su-l
-	fi
-
-	if use su && ! use suid ; then
-		# Always force suid su, even when USE=-suid, as su is useless
-		# for the overwhelming-majority case without suid.
-		# Users who wish to truly have a no-suid su can strip it out
-		# via e.g. Portage's suidctl or some other hook.
-		# See bug #832092
-		fperms u+s /bin/su
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-
-	local ver=$(tools/git-version-gen .tarballversion)
-	local major=$(ver_cut 1 ${ver})
-	local minor=$(ver_cut 2 ${ver})
-	local release=$(ver_cut 3 ${ver})
-	export QA_PKGCONFIG_VERSION="${major}.${minor}.${release:-0}"
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6ec3b9a016e1..68a623b6b609 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 014966dec1c0..7e15bd0fe275 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,8 +1,4 @@
-DIST pambase-20210201.1.tar.gz 3345 BLAKE2B bc12164181de98b3c5b8ed3b72bc6a84b5c6039f389a87da94e5cb9312fa4e221e6317bcd496d5c634c60cd6fbb8c8cd2f4b845687ef942a707fe687f5184afd SHA512 74ab4d7c19a20c088d667ae92e4dcb99b33584ba56df46184173432fd297bd47917494b81cb5ad3f5f49ad5a797c008527399f329e56f2799f5fc376eaa59236
-DIST pambase-20211218.tar.gz 3366 BLAKE2B b07ae0b8f9480e0ad456fcfbd46da008182dedf3542b14c27cbe5d65a68290898751cd3e5a59cb8f040ced6316a70cdbc7afdd54ef2965a20ba537c686f76b36 SHA512 8aaaf15f9f82ce9f717a988676d00435e60bada05927843967b505a972d96a2ab7bab9971bd5476b8a8bda76c7063fa4d452818a89eccd4066f65d3f1b2fb3d7
 DIST pambase-20220214.tar.gz 3372 BLAKE2B fc560005c48598d972cf68bfbd33784be7d7e5a12f5ebcd06e708241a169b1bcf7cb7dcd7109f44c2d9802ae0b294eaeb61782640f0b0cb9767f2ecf8c053c7f SHA512 57d037944cf6d9db69d5eb8ce32b087ac4781fae13c1daba1e248a1818dfcbbf2cb66fce79cad7808f2b0f89d3f3dd05455a1c8f3c976561769b056dc8bf7323
-EBUILD pambase-20210201.1.ebuild 2871 BLAKE2B fde23c001d5eb46a9236951c1804b9510df0f36d69e18353869b04bc45f05e9d32e048aedd57e04d7c391ae640690a08def6ba60eaddaa221c7374ea89e26ffe SHA512 4208c703b8b415c5c8a8f2f2115f173e4c95a0d61ea18c8cd046830b922f21f5205ae05f6168c377f00917802755dd833998263a86de7d839d696ecab3ee9d05
-EBUILD pambase-20211218-r1.ebuild 2991 BLAKE2B dbfa9306240f9d7b08df56c5aa4b0a82a37df6cf0056f9e854db5017b0568f959340501df2ff4af9399bdf17da6968fa26e1e122e6c90b343061698fec39a294 SHA512 8c2b25d8d05b619d69d35aa1b5fb6e8fda7636cc7bd9bc2d29b8bcea7f4494fc2c82c96aa1c3e72ea522cbc4d0994d55f7d14e3fd2fdb5ed71bacc17a00e8554
 EBUILD pambase-20220214.ebuild 2990 BLAKE2B 118105e55be184f2c0c875170b982b9c619d7e179513f5f3e88bec96e884408b140c475a1c3e1957e0c292145bedd4bd9bc2da8082446a16019a5749c91c7b1f SHA512 e3f7bbfe026bbf5973bfb32e1b037d0d24e9752b8915b6e05cec3017f1d6ad4467c5b5335d18df1d6c7b10d0c837c0b57fdd84d185867e3635b783d407c2ff33
 EBUILD pambase-999999999.ebuild 2983 BLAKE2B 8232640b95964edab8773429baa17210f0f35fe202d175650b4e7d9ab0f148f4dd3f88486fca3bdb74ecf48c01aec983c905ee3e12f694e1fd9c415ea54d3729 SHA512 2d37f4947207eb705789b088772e4cb201dd3b2ceaa287fa733a251bb43229a1b0a449cff7ba0b733851558269a284e2ecac4ca796bac85a7ad7dfd93c97b94b
 MISC metadata.xml 4061 BLAKE2B c877f6450ccfc91a3f3ee1bf10301cf21913f66a6d5f32f6698ea852006094243432a2fbc635821532355841ec074aa1ea426a745254f62e2e595d8049b3b75a SHA512 4c46b27df8f3b31c8f9474cf2b01c46014a3374c508f65970deb16476fbcf5710855322eb61d7fa65ac44a1fba60a2a223a26e890da3fed50102964f97306767
diff --git a/sys-auth/pambase/pambase-20210201.1.ebuild b/sys-auth/pambase/pambase-20210201.1.ebuild
deleted file mode 100644
index e0e310c95346..000000000000
--- a/sys-auth/pambase/pambase-20210201.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit pam python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
-else
-	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( passwdqc pwquality )
-	pwhistory? ( || ( passwdqc pwquality ) )
-	homed? ( !pam_krb5 )
-	pam_krb5? ( !homed )
-"
-
-MIN_PAM_REQ=1.4.0
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	elogind? ( sys-auth/elogind[pam] )
-	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		sys-auth/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
-	pwquality? ( dev-libs/libpwquality[pam] )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	homed? ( sys-apps/systemd[homed] )
-	systemd? ( sys-apps/systemd[pam] )
-"
-
-BDEPEND="$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	${EPYTHON} ./${PN}.py \
-		$(usex caps '--caps' '') \
-		$(usex debug '--debug' '') \
-		$(usex elogind '--elogind' '') \
-		$(usex gnome-keyring '--gnome-keyring' '') \
-		$(usex homed '--homed' '') \
-		$(usex minimal '--minimal' '') \
-		$(usex mktemp '--mktemp' '') \
-		$(usex nullok '--nullok' '') \
-		$(usex pam_krb5 '--krb5' '') \
-		$(usex pam_ssh '--pam-ssh' '') \
-		$(usex passwdqc '--passwdqc' '') \
-		$(usex pwhistory '--pwhistory' '') \
-		$(usex pwquality '--pwquality' '') \
-		$(usex securetty '--securetty' '') \
-		$(usex selinux '--selinux' '') \
-		$(usex sha512 '--sha512' '') \
-		$(usex systemd '--systemd' '') \
-	|| die
-}
-
-src_test() { :; }
-
-src_install() {
-	local DOC_CONTENTS
-
-	if use passwdqc; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
-				page and then edit the /etc/security/passwdqc.conf file"
-	fi
-
-	if use pwquality; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
-				page and then edit the /etc/security/pwquality.conf file"
-	fi
-
-	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
-
-	dopamd -r stack/.
-}
-
-pkg_postinst() {
-	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
-}
diff --git a/sys-auth/pambase/pambase-20211218-r1.ebuild b/sys-auth/pambase/pambase-20211218-r1.ebuild
deleted file mode 100644
index ba3e8d54e3bd..000000000000
--- a/sys-auth/pambase/pambase-20211218-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit pam python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="https://github.com/gentoo/pambase"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo/pambase.git"
-else
-	SRC_URI="https://github.com/gentoo/pambase/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	S="${WORKDIR}/${PN}-${P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="caps debug elogind gnome-keyring homed minimal mktemp +nullok pam_krb5 pam_ssh +passwdqc pwhistory pwquality securetty selinux +sha512 systemd yescrypt"
-
-RESTRICT="binchecks"
-
-REQUIRED_USE="
-	?? ( elogind systemd )
-	?? ( passwdqc pwquality )
-	?? ( sha512 yescrypt )
-	pwhistory? ( || ( passwdqc pwquality ) )
-	homed? ( !pam_krb5 )
-	pam_krb5? ( !homed )
-"
-
-MIN_PAM_REQ=1.4.0
-
-RDEPEND="
-	>=sys-libs/pam-${MIN_PAM_REQ}
-	elogind? ( sys-auth/elogind[pam] )
-	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
-	mktemp? ( sys-auth/pam_mktemp )
-	pam_krb5? (
-		>=sys-libs/pam-${MIN_PAM_REQ}
-		sys-auth/pam_krb5
-	)
-	caps? ( sys-libs/libcap[pam] )
-	pam_ssh? ( sys-auth/pam_ssh )
-	passwdqc? ( >=sys-auth/passwdqc-1.4.0-r1 )
-	pwquality? ( dev-libs/libpwquality[pam] )
-	selinux? ( sys-libs/pam[selinux] )
-	sha512? ( >=sys-libs/pam-${MIN_PAM_REQ} )
-	homed? ( sys-apps/systemd[homed] )
-	systemd? ( sys-apps/systemd[pam] )
-	yescrypt? ( sys-libs/libxcrypt[system] )
-"
-
-BDEPEND="$(python_gen_any_dep '
-		dev-python/jinja[${PYTHON_USEDEP}]
-	')"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	${EPYTHON} ./${PN}.py \
-		$(usex caps '--caps' '') \
-		$(usex debug '--debug' '') \
-		$(usex elogind '--elogind' '') \
-		$(usex gnome-keyring '--gnome-keyring' '') \
-		$(usex homed '--homed' '') \
-		$(usex minimal '--minimal' '') \
-		$(usex mktemp '--mktemp' '') \
-		$(usex nullok '--nullok' '') \
-		$(usex pam_krb5 '--krb5' '') \
-		$(usex pam_ssh '--pam-ssh' '') \
-		$(usex passwdqc '--passwdqc' '') \
-		$(usex pwhistory '--pwhistory' '') \
-		$(usex pwquality '--pwquality' '') \
-		$(usex securetty '--securetty' '') \
-		$(usex selinux '--selinux' '') \
-		$(usex sha512 '--sha512' '') \
-		$(usex systemd '--systemd' '') \
-		$(usex yescrypt '--yescrypt' '') \
-	|| die
-}
-
-src_test() { :; }
-
-src_install() {
-	local DOC_CONTENTS
-
-	if use passwdqc; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
-				page and then edit the /etc/security/passwdqc.conf file"
-	fi
-
-	if use pwquality; then
-		DOC_CONTENTS="To amend the existing password policy please see the man 5 pwquality.conf
-				page and then edit the /etc/security/pwquality.conf file"
-	fi
-
-	{ use passwdqc || use pwquality; } && readme.gentoo_create_doc
-
-	dopamd -r stack/.
-}
-
-pkg_postinst() {
-	{ use passwdqc || use pwquality; } && readme.gentoo_print_elog
-}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 0be74294bce4..6a41d44ff696 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 bcccf30510c3..0c7535cd996f 100644
--- a/sys-block/open-iscsi/Manifest
+++ b/sys-block/open-iscsi/Manifest
@@ -3,12 +3,9 @@ AUX iscsid-conf.d 422 BLAKE2B 2871024472d5308b395aeb8c67f7b47aed4618790295d3ef7e
 AUX iscsid-init.d 2094 BLAKE2B e13fc820e74a79e3c1f220b827c3188b6cb3bc149f450e3ee668d851faacd59e1e44b51250ba3f53a321d287eb81b580a332605226564269dbcd3e2762c0c95e SHA512 a5544e35da3433dfde96984d2e5783991d961554b8843f4f96d4317a38d7534864882342633ed0dc15c2f9e49a419e51958593b0de1ce84644938dafabe392fc
 AUX open-iscsi-2.1.1-Makefiles.patch 2185 BLAKE2B ab4dc518f12f0975cf472c94dfa883e98dcce57b2d203c39730ee67c4e6b548ff6554dd4ec8ffd7a624aca99e38c88284ea1bd41cbf89f077e5017e4bc45fd5a SHA512 1b37cfde4889d2f00f91cd173cb323fcb131040ac14351bb66aa4b8250cb527334e869faac4b0fa1ee9160ed7f44ffe2c9cd9a78075d3fec2ca32e0c27c0ba4b
 AUX open-iscsi-2.1.7-fix_bitwise.patch 1480 BLAKE2B c5076f91885866042d99eef8d905fef4375645863bbf840fbec6c1bbc568ee98866b7fc74b2a78eb675a72cf800c82d11fd28438e9653e696f7d6260896b3f1a SHA512 b9474d78f1616bfdcfc2e11f51faa4a0398a30d00af50a7ae885a8ea07fdf1ba06a354e2ffec777ee2d9598c386093a1f89c4bb633a85a85011f6fa42b307a71
-AUX open-iscsi-2.1.7-fix_sed.patch 1518 BLAKE2B 382889e1bcc0af1cb8306343079efe62935c3539759a0b811c03d13e7df02b248da685badf52d3cf750e704ddd30ad2404d4b2ea030ca8c5919af5b089b5af94 SHA512 29e8a3321198c9270eb3b408cd425670e8535a3299c912bd19d883ca57460fc555c2f672c41b658bcabf326c8a676a7380c3a904d00ed0ee17e83418a5232a50
 AUX open-iscsi-2.1.7-no_werror.patch 1025 BLAKE2B 2d96bc5c35708206c68281d3153bbfbbc38a052ca36d7cd3b437ac714201b393296b75896ef1d2216ddb75f0da472922f41ef400c77b0c8662f75fa6d3e0b2e0 SHA512 d59d723db29d570cc0045c32393a28ffa2d96f57adafd9f1bf278fbf2c4027231e4128e64bade460b3c9d7c81f761cd57b19f27f510f0e76fa5a666aefe60477
 DIST open-iscsi-2.1.4.tar.gz 621247 BLAKE2B 043a999b2f397a6c740d61654079d7ab966caee6cf6cfb244ddd70eae4f5201045b371ce5fbe244216a2a210a5379c92e8c3fbe62d33707cf05e7a4a20a13a91 SHA512 ae0663a964d86e6a4c19203598b859173c93ecce550f9bc9855ff735dd51a3c45822f2bc1cc99e6891c56ef1d16c42223803f07a961558fe6e38ead2164faef3
-DIST open-iscsi-2.1.7.tar.gz 627848 BLAKE2B c8b572dc71046b722b9455799b4360c17963f05ce2cac48f122d40fc61bef6f01b98287003fc222bdb0dd4706218add8c41d3eb40464023b9b240a8205069dd3 SHA512 619c57b988c6972da09428b3a84ca375ca46653fbfca9cb61389c70a95871b665f93b75b8e6ff2aa993bdb89e2a078a188c0a7b45c3bf9c15a16b496e9ebc892
 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.7.ebuild 4260 BLAKE2B c739e129ed8b0b1e4060a3cd385ac2c5746b9bf9110d05fb257c62fbe600e03b4def1a66609505761ca323f1e2b69989ee1c6caf7c82d8ab29413e710c84cd39 SHA512 cbb91c0f06affd6f8bfdbbd5f78d1a2f17c12e19f4f401a51eac601e81e208446640eab79960203596a4f56f0e46e8fde30219dba0a0c538d7bbaee07babf654
 EBUILD open-iscsi-2.1.8.ebuild 3353 BLAKE2B c17ee0a0935e58d305be615d98e10ef48104f8e3104d198346046bc1eee07d3de4ad607ffd54d7bfd03d386d6b6202a1aaa672d7a41012dbe8a124eff3056281 SHA512 73757323fb36daa0d138811da9cf660d99de44416f7051197649f9b4656bbd512010889edf5c6473a80f83b3e75921bc8be26bf70316cb6f32ddc5cadd1c62f7
 MISC metadata.xml 532 BLAKE2B 201e4a44b240ad6ba1096927924ef8c84027f092ffed238db0d92cce1fe8f37e4c927dc1f8ae8393578cf66831df2c2590409349b980edb09e5187ac4369aad0 SHA512 67ed8a95407e6cce2fbfc35a6b0df99586eff99ec51f41666de298739f233282cad15c4d9d73fb42d3d2972f85da274fe47699c87f8ba2ccc44a841d563087f4
diff --git a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch b/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
deleted file mode 100644
index ad56b823b557..000000000000
--- a/sys-block/open-iscsi/files/open-iscsi-2.1.7-fix_sed.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 66d76978f2ffbe276e84b03a7fac1041a7c3b4c3 Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@43-1.org>
-Date: Thu, 2 Jun 2022 13:17:10 -0500
-Subject: [PATCH] Do not hardcode the path of sed
-
----
- doc/Makefile             | 2 +-
- etc/Makefile             | 2 +-
- libopeniscsiusr/Makefile | 2 +-
- utils/Makefile           | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 9ed025d..e121270 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -7,7 +7,7 @@ ifeq ($(TOPDIR),)
- 	TOPDIR = ..
- endif
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- 
- DESTDIR ?=
-diff --git a/etc/Makefile b/etc/Makefile
-index d065319..2d98027 100644
---- a/etc/Makefile
-+++ b/etc/Makefile
-@@ -19,7 +19,7 @@ initddir ?= $(etcdir)/init.d
- 
- HOMEDIR ?= $(etcdir)/iscsi
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- 
- SYSTEMD_SOURCE_FILES	= iscsid.socket iscsiuio.socket
-diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile
-index 523518b..90903dd 100644
---- a/libopeniscsiusr/Makefile
-+++ b/libopeniscsiusr/Makefile
-@@ -29,7 +29,7 @@ PKGCONF_DIR ?= $(LIB_DIR)/pkgconfig
- MAN_DIR = $(prefix)/share/man
- 
- PKG_CONFIG ?= /usr/bin/pkg-config
--SED ?= /usr/bin/sed
-+SED ?= sed
- 
- LIBISCSI_USR_DIR=$(TOPDIR)/libopeniscsiusr
- 
-diff --git a/utils/Makefile b/utils/Makefile
-index a7eb352..15539eb 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -7,7 +7,7 @@
- # from the top-level make file.
- #
- 
--SED = /usr/bin/sed
-+SED = sed
- INSTALL = install
- CHMOD = chmod
- 
--- 
-2.35.1
-
diff --git a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild b/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
deleted file mode 100644
index 552d373862e7..000000000000
--- a/sys-block/open-iscsi/open-iscsi-2.1.7.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info flag-o-matic toolchain-funcs systemd udev
-
-DESCRIPTION="A performant, transport independent, multi-platform implementation of RFC3720"
-HOMEPAGE="https://www.open-iscsi.com/"
-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"
-IUSE="debug infiniband +tcp rdma systemd"
-REQUIRED_USE="infiniband? ( rdma ) || ( rdma tcp )"
-
-DEPEND="
-	sys-apps/kmod
-	sys-block/open-isns:=
-	sys-kernel/linux-headers
-	infiniband? ( sys-cluster/rdma-core )
-	dev-libs/openssl:0=
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
-	sys-fs/lsscsi
-	sys-apps/util-linux"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.7-fix_bitwise.patch
-	"${FILESDIR}"/${PN}-2.1.7-fix_sed.patch
-	"${FILESDIR}"/${PN}-2.1.7-no_werror.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is -lt 2 6 16; then
-		die "Sorry, your kernel must be 2.6.16-rc5 or newer!"
-	fi
-
-	# Needs to be done, as iscsid currently only starts, when having the iSCSI
-	# support loaded as module. Kernel builtin options don't work. See this for
-	# more information:
-	# https://groups.google.com/group/open-iscsi/browse_thread/thread/cc10498655b40507/fd6a4ba0c8e91966
-	# If there's a new release, check whether this is still valid!
-	TCP_MODULES="SCSI_ISCSI_ATTRS ISCSI_TCP"
-	RDMA_MODULES="INFINIBAND_ISER"
-	INFINIBAND_MODULES="INFINIBAND_IPOIB INIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	CONFIG_CHECK_MODULES="tcp? ( ${TCP_MODULES} ) rdma? ( ${RDMA_MODULES} ) infiniband? ( ${INFINIBAND_MODULES} )"
-	if linux_config_exists; then
-		if use tcp; then
-			for module in ${TCP_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use infiniband; then
-			for module in ${INFINIBAND_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-		fi
-		if use rdma; then
-			for module in ${RDMA_MODULES}; do
-				linux_chkconfig_module ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"$
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	pushd iscsiuio >/dev/null || die
-	eautoreconf
-	popd >/dev/null || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DDEBUG_TCP -DDEBUG_SCSI
-
-	append-lfs-flags
-}
-
-src_compile() {
-	# Stuffing CPPFLAGS into CFLAGS isn't entirely correct, but the build
-	# is messed up already here, so it's not making it that much worse.
-	KSRC="${KV_DIR}" CFLAGS="" \
-	emake \
-		OPTFLAGS="${CFLAGS} ${CPPFLAGS} $(usex systemd '' -DNO_SYSTEMD)" \
-		AR="$(tc-getAR)" CC="$(tc-getCC)" \
-		$(usex systemd '' NO_SYSTEMD=1) \
-		user
-}
-
-src_install() {
-	# Force serial install to avoid race conditions
-	emake -j1 \
-		DESTDIR="${ED}" \
-		sbindir="/usr/sbin" \
-		SED="${EPREFIX}/bin/sed" \
-		systemddir="$(systemd_get_utildir)" \
-		install install_systemd
-
-	# Upstream make is not deterministic, per bug #601514
-	rm -f "${ED}"/etc/initiatorname.iscsi
-
-	# QA: install udev rule into right place
-	mkdir -p "${ED}"/lib/udev/rules.d
-	mv "${ED}"/etc/udev/rules.d/50-iscsi-firmware-login.rules \
-		"${ED}"/lib/udev/rules.d || die "mv failed"
-
-	# QA: let docompress compress man pages
-	gunzip -r "${ED}"/usr/share/man/man3/ || die "gunzip failed"
-	gunzip -r "${ED}"/usr/share/man/man8/ || die "gunzip failed"
-
-	dodoc README THANKS
-
-	docinto test/
-	dodoc $(find test -maxdepth 1 -type f ! -name ".*")
-
-	insinto /etc/iscsi
-	newins "${FILESDIR}"/initiatorname.iscsi initiatorname.iscsi.example
-
-	newconfd "${FILESDIR}"/iscsid-conf.d iscsid
-	newinitd "${FILESDIR}"/iscsid-init.d iscsid
-
-	keepdir /var/db/iscsi
-	fperms 700 /var/db/iscsi
-	fperms 600 /etc/iscsi/iscsid.conf
-}
-
-pkg_postinst() {
-	in='/etc/iscsi/initiatorname.iscsi'
-	if [[ ! -f "${EROOT}${in}" ]] && [[ -f "${EROOT}${in}.example" ]] ; then
-		{
-		  cat "${EROOT}${in}.example"
-		  echo "# InitiatorName generated by ${CATEGORY}/${PF} at $(date -uR)"
-		  echo "InitiatorName=$(${ROOT}/usr/sbin/iscsi-iname)"
-		} >> "${EROOT}${in}.tmp" && mv -f "${EROOT}${in}.tmp" "${EROOT}${in}"
-	fi
-
-	udev_reload
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 234200b6e9e4..397cfaf8929d 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index 5ae4b17536be..eba3db68d06b 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -38,6 +38,7 @@ AUX ceph-17.2.1-python310.patch 456 BLAKE2B 161527aee7f0c9a11e3823771f5452da98b9
 AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011a96d3d2562b2a5cecf25b1b20c65a0cb8e90c0972e6708088feeecd3f829d3fd614b41289bf7f0d2d6d357fe SHA512 65bbdeed0f835a5444bd468dce5e78bb43284f1cb96c3ecdbc63b267213b251c9ad18291f47cb4f604e6817e0bf4aab025b8b67c5c0877cd58f4981d4f65ccec
 AUX ceph-17.2.3-gcc12.patch 924 BLAKE2B 119fccc4caa45e7b62c73d6cc66b9ba0b23598607c18fc621ce86e2ba11bbfd15e432e4c0e528fb8af2cfeedf3e535bfcc8008a39c5c7e3789b96372f2970e53 SHA512 121d8992dab710b5b1721e7fd04e30cb4e2e6b2cd2f6ed30934c6f65b3d9676bc5a1e8dd52c739cff704f900a651ea8729bb3234db033ef23434acd8fb5436fd
 AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c
+AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517673c98b09c50a86467cd4478d11067a14ea57b10113e67e7772525cbee525e2855261322ff9e8cbd47a3268c5 SHA512 a0c720e624cef883c0360d043a4c3d49a4dfca2f0e4b3f73da9318615a3a5ff506baa133a140403b9a90fc87bddb6fbe58691f629f1cb689a21b732855343b44
 AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -59,10 +60,10 @@ DIST ceph-17.2.5.tar.gz 169004360 BLAKE2B b6d8df5f9b58de5e42fed5d16b1c82d2178297
 DIST ceph-xsimd-17.2.3.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.4.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
 DIST ceph-xsimd-17.2.5.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde92c6d89aaa20e827539e9a4e0010c7549cdd5cf02a7ebed83f953ab2a6f1d9cc9a98cf45c3dc7758ae4938c9c43713 SHA512 ecc58e7909648aaa22aefbf76ee2c5a2bece4b1b88da9c7eda1b69a46247e619ff99c4366afd6015f95debd68c1a6b89292c677b9049462d0fc0255fbc0c2a33
-EBUILD ceph-15.2.17.ebuild 10881 BLAKE2B 8d81f3bb8a1223507b3cced5d0551636f2f61f724692a23062df05e591ca72e3983b712df0b6ddc51d701fb2aaa5650115a0a4d4cbb908a0422c646037848285 SHA512 55095378fab69cea399a853e868a6a66f0e7587f053719af9fc8dade12f940cdb7bd7d997e41ee94778e6bbdf623d2905362bc7ef5d4e0215b4d1d0c476c6aa9
-EBUILD ceph-16.2.10-r2.ebuild 12647 BLAKE2B df854bd9eea569f292f16aa95fc558d11153a7017911994df06a080df3789b94678996b1c43794b6cd15edbe4d1647f67e8ab8d92065c51bc5a959aaa3a8abb8 SHA512 ba586812652ec0f21338772e039333ee5ce84051a794bedfb3810ccc4f39e2fa904f26fe69ecda9c852899c8f97774748d59a1c3c7673cf2d5e70e9d1bc9bebc
-EBUILD ceph-16.2.9-r2.ebuild 12715 BLAKE2B 6661665e1117b7f459acad7d5b0c63733508c113f810e004179bf7bc62c013958220b9b3786e3e78abcde7de94dbf3b04f72db9210ab1ca1f88044783e566604 SHA512 2844a125be41170c89ef51fdb59368d68bdfcd64bd2c0527c80c091b87bcd5dd8af72275538eedb0a97845d5403bcaa19c85393f9f23a16c34e17343893e9df7
-EBUILD ceph-17.2.3-r3.ebuild 12755 BLAKE2B 2ab7c42a333221dc1fd70d059cd0b192225bd2303fb2df49be0998843d35d3b3ea704ff01f4bfd73274ad23a577f24d4f23d082d7bcf22013780ea8901322a05 SHA512 ea764c60f21438a00994a4401e3b9d2533bb5d18229ee09d9bd49ad74f3afa08bcf22f71d04d28445b905f6afddc21bb89e9cef6ba8fd218509e96a11b9200a0
-EBUILD ceph-17.2.4.ebuild 12732 BLAKE2B 779c9aec1e08f427a73ee9466d03bc7d82da16f9ecf881394fa3f72b61411daaca2bb54b19c25ab38874c75f2813910ad68d0af0772f7880ce3ece2e79528fb6 SHA512 5dacd1c7dfcb6b70fb69c209497f0834d5dde1ac5e40c44beccb12d9a675740296302ea5e3efdab78bdbc03656c98694b744d9cd579e225ab4bea61362068d35
-EBUILD ceph-17.2.5.ebuild 12951 BLAKE2B 0f45786f57c4fd9ca446f34d9b6bca55437df36248c1155ef90c7776c642b481872c445992e1570c24e64885f52adace03395e1c948a3fe231d5fa755fec4c28 SHA512 5966adce94acae28aed6ed6bd8fc37dd65d7c667271f29fa26290a264138eab62855de8564eb236d67427209897739c8bbb790d6d8f0d468b5824ed0277541db
+EBUILD ceph-15.2.17-r1.ebuild 10862 BLAKE2B 5ff8479b25132dbe053adf5cb2a735ebb61401d5901fc0139458bbdf5fda39efb21549802f3925f7e266b953e74cec45c10e48fed01924d7d31c66954d51977e SHA512 16bba20dfc2333cc505b0aca7620ab70c90dc4780fead69f65ac4062bbce7f1756f1ffab0d0ef1c87ef429b8550423e883b56dbb5222917dfe4c520e8b30c9bf
+EBUILD ceph-16.2.10-r3.ebuild 12628 BLAKE2B 3718d22fb467559c07f71b6e35ae485c98dde3d1caa434c402571bde27db506be2c6ef35243ff84d6bd7bdaa640df5cdefd6c2b5e5ca0677a93a3fb618c61e3c SHA512 d8510740ec9e4e95e5cf4fbaaafb0543fd6bbf9854147b33d9f806551c519396fdbebd1027051e6d5b692f811cd02037bb997be43af8b2895d6359f35cb9fb77
+EBUILD ceph-16.2.9-r3.ebuild 12696 BLAKE2B ec29984e6fda74e5ed094958c346a0d72c735a549c965223ee8b8222a60819e3413e7d89210b5cfb334295b9dbf69ff5c91b3ee227666b4d583eec1cce96d8f6 SHA512 7f956d3792697f762c0a77f5cff1618a39dd35d155514ecfcb7e17c2a6814c24f6b61270c4047413424afb4b1a93ac760e0d8dcdad777892451590d8c905c05a
+EBUILD ceph-17.2.3-r4.ebuild 12736 BLAKE2B 24481d61d27376019073af32b0faede9a64f0a417db1a1efa2d3f1f9e9294f0231dee04bbc92066fca3bebce1eb8cc95d5e2ffeb6da66bf70ed13bf36ccc2abd SHA512 c0a4938ec02b6cc2d2827ac5d2cb7fc07d811156cef26ed9e3c048510de229e4d1933296f6f4d13b322170235d3b32027fd31e53270803285be1bb66f2e6a454
+EBUILD ceph-17.2.4-r1.ebuild 12713 BLAKE2B 69785ea9eb4429b71f3fb5d70571c3730df1379995f2f89dc10b4d5e71db70f52e9639a642fb1c4dff9dba397f6f762515bcb2a96fe7f380b3822d0259d2d66a SHA512 06e77158e208caa6446f80a133825f9f592104feb35a1ac25f1a766433df9bee85a759bc1387356b35843d3da9b26105ead2520cca61ddb7c9c7eb7f9d80c9a1
+EBUILD ceph-17.2.5-r1.ebuild 12971 BLAKE2B a143bebe1fc4d1ce8bd100e646ea4a8f89becee55e2a4cedbaa50c86c3f206c55e09fc79c34e5d5c25bcb08adb23c0752328b8b68dc1a63d9f2ecd00574af595 SHA512 90aae5dd793d07a6a33e20dcc9017973f0117ad78ad3a75b374f20466806710b8e68146cd7754de5383f8e9ff6853339aa7cd8c05ce5a2a701edeee1f8e63110
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-15.2.17.ebuild b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
index 16c75727aa77..423274a240be 100644
--- a/sys-cluster/ceph/ceph-15.2.17.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild
@@ -134,7 +134,7 @@ RDEPEND="${DEPEND}
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
index 79585b405bcc..2cd8c909eb1b 100644
--- a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild
index a6cfee73bcba..e238384639e1 100644
--- a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild
@@ -141,7 +141,7 @@ RDEPEND="
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.3-r3.ebuild b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild
index b51469653659..b685d55ffe93 100644
--- a/sys-cluster/ceph/ceph-17.2.3-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild
@@ -147,7 +147,7 @@ RDEPEND="
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.4.ebuild b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild
index a704f275f39d..27978404165d 100644
--- a/sys-cluster/ceph/ceph-17.2.4.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild
@@ -149,7 +149,7 @@ RDEPEND="
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
diff --git a/sys-cluster/ceph/ceph-17.2.5.ebuild b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild
index 59cec215e6f8..133f0229b828 100644
--- a/sys-cluster/ceph/ceph-17.2.5.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild
@@ -149,7 +149,7 @@ RDEPEND="
 	sys-block/parted
 	sys-fs/cryptsetup
 	sys-fs/lsscsi
-	sys-fs/lvm2[-device-mapper-only(-)]
+	sys-fs/lvm2[lvm]
 	virtual/awk
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cherrypy[${PYTHON_USEDEP}]
@@ -222,6 +222,7 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.4-cyclic-deps.patch"
 	# https://bugs.gentoo.org/866165
 	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+	"${FILESDIR}/ceph-17.2.5-gcc13.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
new file mode 100644
index 000000000000..c23badcc5e09
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/878531
+https://github.com/ceph/ceph/pull/48661
+
+From 74794f9d6f5c6671438085bdba730b504901a7c0 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 28 Oct 2022 16:47:38 +0100
+Subject: [PATCH] common: fix build with GCC 13 (missing <cstdint> include)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Needed for uint8_t. Only worked by chance before (see
+https://www.gnu.org/software/gcc/gcc-13/porting_to.html).
+
+```
+FAILED: src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o
+/usr/bin/x86_64-pc-linux-gnu-g++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/src/include -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/include -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/xxHash -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/rapidjson/include  -O2 -march=native -pipe -fPIC   -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protector-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -MD -MT src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -MF src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o.d -o src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -c /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc
+In file included from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/log/SubsystemMap.h:12,
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/config.h:23,
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/mdstypes.h:13,
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.h:21,
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc:1:
+/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/subsys_types.h:56:23: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
+```
+
+Bug: https://bugs.gentoo.org/878531
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/common/subsys_types.h
++++ b/src/common/subsys_types.h
+@@ -17,6 +17,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ 
+ enum ceph_subsys_id_t {
+   ceph_subsys_,   // default
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a30a8b4c3381..c38e25750d00 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 93b5e2fc6976..af935fd3acf5 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -1,10 +1,6 @@
 AUX autoconf-archive-2021.02.19-python310.patch 1344 BLAKE2B adf7282ce2f57c957d3542f4fb1af2cce0da4d93556249529d2bfe11e5f7c3f42e725770decf5dce37ee310710d954f43ca61fd6f7685c5a5d2362830520355b SHA512 5541fe628832b071bfba890530bc72f0b1747ec3cfc1e43a79b5a0f992c8c59609d836fd00eb8ee0daf0428c6d3f7b8894bddf2d9485625f683175e45d4f5640
-AUX autoconf-archive-2021.02.19-revert-ax_pthreads.patch 2642 BLAKE2B aef63e95d567e80e54f87b2476a70e8fb9df9fcdb6b1023c52df8a2fef0c2dbeda57488c3813ef1e22af2e4901251f102a76290d6d04e78766994d92cb3445b7 SHA512 1dea34945bed9c1c96970165ffad5f075f0bc85929b9f02c2bb254e35e2e3b9325bc7be8b1cb79b8f7bc6be5e1fffd33e504a82fc262a747dc458bad6bedb87d
-DIST autoconf-archive-2021.02.19.tar.xz 667304 BLAKE2B bc99cfd2b507a0c7fc37a001cc9e090fa037cc3626f5f5201c9a62ef06ee8ca4532ca8f21e1422f9dff9f67f64409ae560117c3161809f2d3bc3a39469910485 SHA512 a968c355c3cf66d74dc5b452141afbdf763e84a6c43b12c25da9a08482910d6d57ba3952aaf270d8cd5fd8b9d2dadf2d7d943ae2e1b067d68b71d2738d881aa0
 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-2021.02.19-r1.ebuild 747 BLAKE2B 103c90fbea8f87de38b4e5b6352d59441afa45df17462c330b2a437601141deb169692bebeb7f2a50618bab4c6680539661feffc98ff37dc288f46bc0f058244 SHA512 b5f1fc22367fa604314b38bde132619e365b1685464da947ea8160d08fc15e925685eeedefb2503b27126ee8885d6960f43758dd559123015bc50504f50cb558
-EBUILD autoconf-archive-2021.02.19.ebuild 639 BLAKE2B 376bcd528e33c40d7494b374599bd21f19d05a5d37502ae89d566b8f94b77fb7d662dcafb239d5f8e2282ad75576f92bc1922ce14096204f52320fb738eedb78 SHA512 0fdb0a254884ad11950aa931798a8fc2da584d77fad51f9f6d87f7c4c8c60e8b23d10ab7c50ec3e70d3571e9f615db6d37258562493409a68ed7b8622effecf7
 EBUILD autoconf-archive-2022.02.11.ebuild 689 BLAKE2B ab66e415a7b8e85a070a8b4782ce29d17d5da942dc6ca3bc88b327a3746c319c481870e49b7082a55858e4ccd10d3d5d4ee4d9d4c7ab9164113c41622b1fd2ae SHA512 a4eb8667227e103100732f7ac84e9ceca73f923c6067ab981d1f300a63391ab088fab76cee0915561c69ef73533ddc1144fe42b58ed933545f8ba4a06c3f9879
 EBUILD autoconf-archive-2022.09.03.ebuild 641 BLAKE2B a4f7ab80034375c5098756944f0c6a8ba86cf2cbd1615f7a112911eda67d9a199137c4f03c01bfee76ddf8b4705e519c3fd4d0f48c7d36ea885449f3315b7968 SHA512 f8b9a1812e00a5f7100dc90331c42410939928c4c1692c609dca3989baa3d1d3b50d6580f058ceab59a89fc3fc4e23081d568d4f5ba882544b09fe344e8dd6fb
 MISC metadata.xml 380 BLAKE2B 49267dfffb9d805ec3628b175ceab3aa82106669690fe263ae9b9a07f2706f481ef976b56b561f1eeabef18b5be871c3d76161601d5654912a94b92716ec2a66 SHA512 de2dac77eea27093848b2233f6be17e2f1caf4a22b58904c6596990ab1bae444c8f21d17bc0e4d3b5aa3de2d5866701f733ec86ec81689d3d0bc3bda3167e04b
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild
deleted file mode 100644
index d9ba9d3bedf3..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 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 ~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
-	"${FILESDIR}"/${PN}-2021.02.19-revert-ax_pthreads.patch
-)
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2021.02.19.ebuild
deleted file mode 100644
index 87b98f88cd12..000000000000
--- a/sys-devel/autoconf-archive/autoconf-archive-2021.02.19.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 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 ~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=""
-
-# File collisions. #540246
-RDEPEND="!=gnome-base/gnome-common-3.14.0-r0
-	!>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]"
-DEPEND=""
diff --git a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch b/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch
deleted file mode 100644
index 3800fd292a6d..000000000000
--- a/sys-devel/autoconf-archive/files/autoconf-archive-2021.02.19-revert-ax_pthreads.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-This is an upstream revert which hasn't yet landed in a release.
-
-https://github.com/autoconf-archive/autoconf-archive/commit/59008cc7f85e1982eb298e1c424c2e6ad5942c4a
-https://github.com/autoconf-archive/autoconf-archive/pull/233
-https://github.com/autoconf-archive/autoconf-archive/commit/2567e0ce0f3a11b535c6b527386197fb49ff172b
-
-From: David Seifert <soap@gentoo.org>
-Date: Sat, 12 Jun 2021 22:29:03 +0200
-Subject: [PATCH] Revert "AX_PTHREAD: target > host"
-
-This reverts commit 2567e0ce0f3a11b535c6b527386197fb49ff172b.
-
-* `AC_CANONICAL_HOST` is the system on which the actual binary will run,
-  `AC_CANONICAL_TARGET` is the system for which code is generated. The
-  Autoconf manual even mentions that
-
-    --target=target-type
-      the type of system for which any compiler tools in the package produce code (**rarely needed**).
---- a/m4/ax_pthread.m4
-+++ b/m4/ax_pthread.m4
-@@ -87,11 +87,11 @@
- #   modified version of the Autoconf Macro, you may extend this special
- #   exception to the GPL to apply to your modified version as well.
- 
--#serial 30
-+#serial 31
- 
- AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
- AC_DEFUN([AX_PTHREAD], [
--AC_REQUIRE([AC_CANONICAL_TARGET])
-+AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_SED])
- AC_LANG_PUSH([C])
-@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
- # --thread-safe: KAI C++
- # pthread-config: use pthread-config program (for GNU Pth library)
- 
--case $target_os in
-+case $host_os in
- 
-         freebsd*)
- 
-@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"],
- # definitions is, on some systems, a strong hint that pthreads support is
- # correctly enabled
- 
--case $target_os in
-+case $host_os in
-         darwin* | hpux* | linux* | osf* | solaris*)
-         ax_pthread_check_macro="_REENTRANT"
-         ;;
-@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
-         AC_CACHE_CHECK([whether more special flags are required for pthreads],
-             [ax_cv_PTHREAD_SPECIAL_FLAGS],
-             [ax_cv_PTHREAD_SPECIAL_FLAGS=no
--             case $target_os in
-+             case $host_os in
-              solaris*)
-              ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-              ;;
-@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
- 
-         # More AIX lossage: compile with *_r variant
-         if test "x$GCC" != "xyes"; then
--            case $target_os in
-+            case $host_os in
-                 aix*)
-                 AS_CASE(["x/$CC"],
-                     [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e2c90329484c..fb0dadf960b4 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ea4f53a6c810..d6f0a15bf1bc 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -2,6 +2,6 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
-EBUILD e2fsprogs-1.46.5-r1.ebuild 4420 BLAKE2B 3f0557a4e835948873392c67f69cc68c90fc81ff046580552e05a1149af67151fefb0d226ac5a527c84ef7bf92b94fd6ecc74652b5673f63a263e23b0513decc SHA512 bd0719065bf1b8e16df444d787e77398c07c77322d7dff087868ee70629288221ad332c22a7a303447fdae619be1483b9db33d8ff29804263b083e23fcda6e45
-EBUILD e2fsprogs-1.46.5-r2.ebuild 4406 BLAKE2B 488856c7e5b0d7d1fc5d0fb0adec5c3033bf9c5784d7741d44dc4fcaa2c20aa7a696aeb5eaf18549a17f60c2d9723444672bae3bbcf2b3fb157e8bb9a1a33de0 SHA512 5611089a6c5b186bbae1347ea312f4325f91cd2e00e597e9d5ae178d5e20625ff483e3267894fe8682d405107d31b9bf5ed1160135a6728d6cf0abc8d4d4ac60
+EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
+EBUILD e2fsprogs-1.46.5-r4.ebuild 4387 BLAKE2B 495e5e1d6638f3af2add5b7b9ae37226e16802c24ea8132abd8b04c2cf25094179d94565c82ae7db5469c90e391753be2bf7d549ce9e36d266ff371f527a96a1 SHA512 33d71a6c7a40b8aabc9c5a546b1f0d717408139fd0a7ae087a475ca826cd5dfc00d388961e8f39452f1c0d202bc022e29ee04e78c9da10dd93f9c1138bb72613
 MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
index 8da61d9a0ff1..09e9ee84888f 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	cron? ( sys-fs/lvm2[lvm] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )
 	tools? ( sys-apps/util-linux )"
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 37e0cf5c7af1..01be94e1f77e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	cron? ( sys-fs/lvm2[lvm] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )
 	tools? ( sys-apps/util-linux )"
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index a435488bb574..e70e3f2faad9 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,6 @@
 DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3
+DIST exfatprogs-1.2.0.tar.xz 272716 BLAKE2B d8b4188ee2fd96b4b0abab52540e894f55279e3031596081f8077a45a2ad5737870298a0658feee177818dbf02ae036e035c350437c3ea4b7ab7100f46fc8772 SHA512 61a78af024e1ff7e12f2d7449c3ee2ff9476c8746269e29c453c77dbc73d3f52af7ca8fc3e1bd85d6a75b6ed8b7712b5f80e5cc1dffc5ff00fb63455a57ca9bf
 EBUILD exfatprogs-1.1.3.ebuild 623 BLAKE2B 0a18440e3d1b53f3b8da000793db3de0cd5792dc225394fd9a522b618d332be16096240b61cada89b3153ba61fa2388d66283a6c988d101d485e133219e3bc7c SHA512 1201ba29fdd440594cccc4330f3764ef3e7263f690311ab39fbd80d1fb8eae415de0c205bdbf0cff2dfd6efb2caffe07ce2b39ef0d60dd9e0049c9f69866ada7
-EBUILD exfatprogs-9999.ebuild 627 BLAKE2B d3b0215501ec60e66b917ad551444ed9ef68bc53393cb5f34918ba33952be687945139f5f6ebd1c40588e4e9b4ca8d5e5b6cdde8ef22281db54686f7cef90691 SHA512 8e912bda0ec2086d1fa40e7969638e61f28323cd848f51abbd3ad1a564e6af3880f5eb02e884bf5cca35a74d2ff9b098efa094d907b15a4a1d2755e397263e03
+EBUILD exfatprogs-1.2.0.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
+EBUILD exfatprogs-9999.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
new file mode 100644
index 000000000000..6d2c947cbb32
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
+HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
index e9fc0d2e9745..6d2c947cbb32 100644
--- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
 HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
-if [[ "${PV}" == *9999 ]] ; then
+
+if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
@@ -15,11 +16,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE=""
-
 RDEPEND="!sys-fs/exfat-utils"
 
 src_prepare() {
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 73b30d3f96d0..da46a1d8daff 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
 DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
-EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
-EBUILD lvm2-2.03.16.ebuild 10055 BLAKE2B 86b12b246425bd349ede5dd62e54bd1251343fffd558ccd3bfb7f5cb246c36f6ec85ca98793ea4c749bdc9c755ee1b54edebf22ddc9dab1ed2a45984ba264828 SHA512 b6bcb929f0d40a87afda4a7e9e60accdf444c32190074bd4942214454d56153d1504dd26a26b37852952574b78f715f0e351a9ac5e217d1c7747d9f5a1230467
-MISC metadata.xml 976 BLAKE2B 62a8892f78c85315386a5d52acbc2eddc957e9dcceba6b762e57a2229f78648a1e5ec3b1adc3eeecda3c0730a23c83ff3e08c4eef374a06cbfef2463fc053115 SHA512 4c058826b51181cd230b813390fd11d30697e2ff352d6af5ba576f30c35703c336c5390663d7aeb6e74203b9d457d45d3079fad88a79d89b21272b07a21f7e39
+EBUILD lvm2-2.03.14-r4.ebuild 9754 BLAKE2B fb0bc82154959383aebdb494229f521c39fdb1fcd9efd44ed43257456610cfe3cc1822878ff929eaacb4b5aea6f2fbb8acdb5c7a388066ec547933cc9d2e4fb0 SHA512 8a266fbee2cf9ee8e48be42a415483f37a4ea3959c7d6e8e7118d13ebc3f7dbb0d6858f3714f292947affa3a1914df08d22d58d637d87bd6b9943d27ff8fe593
+EBUILD lvm2-2.03.16-r1.ebuild 9680 BLAKE2B 5205dad55e1b3c698c5c5df2e3180ccc6efd1f96d06999da9900cbed699287a65fc32140ff21c976acac39a49d347e8f1d10421a3dfbb977119ca3a898e6c7aa SHA512 38189585f7fb88bebfcfae78c098308c39c204db97c96894a1a62170de53229d865c8664b95cfe1dbf89b84aee083072d845fcfff259f6cbfb65d2e8e507809b
+MISC metadata.xml 939 BLAKE2B a3f004d1454fd139e640d70d7e53b472faa4f70f1b7b7b015a85ddd15766746ed89d0691ab8988b826d50d384d9be689dc5c2162358255c86fe24056c06acd55 SHA512 4bbc76d6ab664633ad7306965a430ae7071f3822e5dcc55d102ab19f2a853ead2c33144372892e38c51c264ca3e2ff7bcf4765105a7e7960fb5c835879e81621
diff --git a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild
index b0b0fa745cfe..b8512c8bc5ce 100644
--- a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 TMPFILES_OPTIONAL=1
 inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 
@@ -13,8 +14,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 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="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
+IUSE="readline static static-libs systemd +lvm lvm2create-initrd sanlock selinux +udev +thin"
+REQUIRED_USE="!lvm? ( !lvm2create-initrd !sanlock !thin )
 	static? ( !systemd !udev )
 	static-libs? ( static !udev )
 	systemd? ( udev )"
@@ -34,7 +35,7 @@ RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	>=sys-apps/util-linux-2.16
 	lvm2create-initrd? ( sys-apps/makedev )
-	!device-mapper-only? ( virtual/tmpfiles )
+	lvm? ( virtual/tmpfiles )
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
@@ -133,20 +134,20 @@ src_configure() {
 	# The build options are tristate, and --without is NOT supported
 	# options: 'none', 'internal', 'shared'
 	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		$(usex !lvm --disable-udev-systemd-background-jobs '')
 
 		# This only causes the .static versions to become available
 		$(usex static --enable-static_link '')
 
 		# dmeventd requires mirrors to be internal, and snapshot available
 		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
+		--with-mirrors="$(usex !lvm none internal)"
+		--with-snapshots="$(usex !lvm none internal)"
 
 		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 		$(usex hppa --disable-o_direct '')
@@ -197,7 +198,7 @@ src_compile() {
 	emake V=1
 	popd >/dev/null
 
-	if use device-mapper-only ; then
+	if use !lvm ; then
 		emake V=1 device-mapper
 		# https://bugs.gentoo.org/878131
 		emake -C libdm/dm-tools V=1 device-mapper
@@ -217,13 +218,13 @@ src_install() {
 	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
 	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	use !lvm && INSTALL_TARGETS=( install_device-mapper )
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
 	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
 
-	if use !device-mapper-only ; then
+	if use lvm ; then
 		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
 		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
 		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
@@ -244,7 +245,7 @@ src_install() {
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
+		if use lvm; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
@@ -267,7 +268,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use device-mapper-only; then
+	if use lvm; then
 		tmpfiles_process lvm2.conf
 	fi
 
diff --git a/sys-fs/lvm2/lvm2-2.03.16.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild
index cd7d14565326..70e6c17be7d5 100644
--- a/sys-fs/lvm2/lvm2-2.03.16.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild
@@ -1,54 +1,57 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 TMPFILES_OPTIONAL=1
 inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 
 DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
 HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="https://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	https://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
+S="${WORKDIR}/${PN^^}.${PV}"
 
 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="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
+IUSE="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev"
+REQUIRED_USE="
 	static? ( !systemd !udev )
 	static-libs? ( static !udev )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
-	dev-libs/libaio[static-libs?]
-	static? ( dev-libs/libaio[static-libs] )
-	!static? ( dev-libs/libaio[static-libs?] )
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:= )"
+	udev? ( virtual/libudev:= )
+	lvm? (
+		dev-libs/libaio
+		sys-apps/util-linux
+		readline? ( sys-libs/readline:= )
+		sanlock? ( sys-cluster/sanlock )
+		systemd? ( sys-apps/systemd:= )
+	)"
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available -- thus, pull in recent enough baselayout for /run.
 # This version of LVM is incompatible with cryptsetup <1.1.2.
 RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
-	>=sys-apps/util-linux-2.16
-	lvm2create-initrd? ( sys-apps/makedev )
-	!device-mapper-only? ( virtual/tmpfiles )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+	lvm? (
+		virtual/tmpfiles
+		lvm2create-initrd? ( sys-apps/makedev )
+		thin? ( sys-block/thin-provisioning-tools )
+	)"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
 	static? (
-		readline? ( sys-libs/readline[static-libs] )
+		lvm? (
+			dev-libs/libaio[static-libs]
+			sys-apps/util-linux[static-libs]
+			readline? ( sys-libs/readline[static-libs] )
+		)
 		selinux? ( sys-libs/libselinux[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
 	)"
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+	virtual/pkgconfig"
 
 PATCHES=(
 	# Gentoo specific modification(s):
@@ -72,6 +75,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.16-readelf.patch
 )
 
+QA_CONFIGURE_OPTIONS="--disable-static"
+
 pkg_setup() {
 	local CONFIG_CHECK="~SYSVIPC"
 
@@ -114,7 +119,7 @@ src_prepare() {
 	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
 
 	# Don't install thin man page when not requested
-	if ! use thin ; then
+	if ! use lvm || ! use thin ; then
 		sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
 	fi
 
@@ -133,26 +138,26 @@ src_configure() {
 	# The build options are tristate, and --without is NOT supported
 	# options: 'none', 'internal', 'shared'
 	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		$(usev !lvm --disable-udev-systemd-background-jobs)
 
 		# This only causes the .static versions to become available
-		$(usex static --enable-static_link '')
+		$(usev static --enable-static_link)
 
 		# dmeventd requires mirrors to be internal, and snapshot available
 		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
+		--with-mirrors="$(usex lvm internal none)"
+		--with-snapshots="$(usex lvm internal none)"
 
 		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-		$(usex hppa --disable-o_direct '')
+		$(usev hppa --disable-o_direct)
 	)
 
-	if use thin; then
+	if use lvm && use thin; then
 		myeconfargs+=( --with-thin=internal --with-cache=internal )
 		local texec
 		for texec in check dump repair restore; do
@@ -181,7 +186,8 @@ src_configure() {
 		$(use_enable udev udev_rules)
 		$(use_enable udev udev_sync)
 		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
-		$(use_enable sanlock lvmlockd-sanlock)
+		# USE=sanlock requires USE=lvm
+		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
 		$(use_enable systemd udev-systemd-background-jobs)
 		$(use_enable systemd notify-dbus)
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
@@ -190,22 +196,19 @@ src_configure() {
 	)
 	# Hard-wire this to bash as some shells (dash) don't know
 	# "-o pipefail" #682404
-	CONFIG_SHELL="/bin/bash" \
-	econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	pushd include >/dev/null
-	emake V=1
-	popd >/dev/null
+	emake V=1 -C include
 
-	if use device-mapper-only ; then
+	if use lvm ; then
+		emake V=1
+		emake V=1 CC="$(tc-getCC)" -C scripts
+	else
 		emake V=1 device-mapper
 		# https://bugs.gentoo.org/878131
-		emake -C libdm/dm-tools V=1 device-mapper
-	else
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts #lvm2_activation_generator_systemd_red_hat
+		emake V=1 -C libdm/dm-tools device-mapper
 	fi
 }
 
@@ -215,17 +218,21 @@ src_test() {
 }
 
 src_install() {
-	local inst
-	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	local INSTALL_TARGETS=(
+		# full LVM2
+		$(usev lvm "install install_tmpfiles_configuration")
+		# install systemd related files only when requested, bug #522430
+		$(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
+
+		# install dm unconditionally
+		install_device-mapper
+	)
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
 	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
 
-	if use !device-mapper-only ; then
+	if use lvm ; then
 		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
 		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
 		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
@@ -233,33 +240,33 @@ src_install() {
 			# We keep the variable but remove udev from it.
 			sed -r -i \
 				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
+				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
 		fi
 
 		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
 		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
-	fi
 
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+		if use lvm2create-initrd; then
+			dosbin scripts/lvm2create_initrd/lvm2create_initrd
+			doman scripts/lvm2create_initrd/lvm2create_initrd.8
+			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+		fi
+
+		if use sanlock; then
+			newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+		fi
 	fi
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
+		if use lvm; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
 			dolib.a daemons/dmeventd/libdevmapper-event.a
 		fi
 	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create-initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
 	fi
 
 	insinto /etc
@@ -269,9 +276,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use device-mapper-only; then
-		tmpfiles_process lvm2.conf
-	fi
+	use lvm && tmpfiles_process lvm2.conf
 
 	if use udev; then
 		udev_reload
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 1f13a2e87d3b..58bb7db61599 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -13,7 +13,7 @@
 	<use>
 		<flag name="lvm2create-initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
 		<flag name="thin">Support for thin volumes</flag>
-		<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
+		<flag name="lvm">Build all of LVM2, not just device-mapper</flag>
 		<flag name="sanlock">Enable lvmlockd with support for sanlock</flag>
 	</use>
 	<upstream>
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 4742db2e8429..85fae1660ca2 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index e1142ea67cad..dbd460693362 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -37,33 +37,21 @@ DIST genpatches-4.9-333.extras.tar.xz 3672 BLAKE2B a9ed67b06a3b12f87d8174c79faf0
 DIST genpatches-4.9-334.base.tar.xz 5344640 BLAKE2B ebfa09f025b7fef8966b61ca40130e8df3e9825c9169254a70a34ad157e6d6c213e90fb2c0cfd09397dec22fa36fd1eb038359dae299bf540b57beaa8753068d SHA512 a200c750914f3b65e919c63cc16ff4c4dd78bac3564ac70efd3b0da35d032278044d2f034bc78eacf8f9efbd971a8b9b12433c640ebcee35e400c322fb8f3f88
 DIST genpatches-4.9-334.experimental.tar.xz 106352 BLAKE2B b5b4c3ea51ee6e9a4db7c0b765648d61127dca9a9685ccb260a222e91fe37db4219abce81b76e66df948e53fb2edeaa5a7d4c5d092e2e134b32beadd70ee0171 SHA512 d9908cce30c16d1e54f7b82816b0f2df753c422686bf492c5de8e0ced3d5dd1ae1ff63d6383835d9b2dff00d036ae7f5b226b03c8fc2eddeb260bd32e513b5cf
 DIST genpatches-4.9-334.extras.tar.xz 3676 BLAKE2B 8871ca3d4edf00f37ba2f52da71fc33986571bf5ece6e792cccc4f02be843e9fb811ea33465befbacd37fa4eae52dee5c7d0d383d76f463a06b47ea86e68bbd4 SHA512 157b056a2a0803bede7e9538e3186088d52c8e4c4bb531e62b141c73a0c2255de07da7c83a5b62772e5fada6040a85779abbc6a6b350f09fbbdb828d769a4a38
-DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
-DIST genpatches-5.10-158.experimental.tar.xz 16872 BLAKE2B 5a1ce33f79ea8db3729b8afee36e145302ce7d45bc0548b7524fdee52049f27687c8638aab11302615697169777049a5fdb7b337e63c9c8a5e99afd5272dee15 SHA512 9b09ad4092e9a24b0794b872584388bf5424b1dfe4695a71cda370c4e07d8dc9918f98cd40db16a4988e79232aa1d05a7e3081b120c7a7ccda3fca175be994cd
-DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
 DIST genpatches-5.10-159.base.tar.xz 4292244 BLAKE2B f2afd1af247c7c7833787f4fcba41f36793233de4f3c14602afb18b6ebd7ac918ab49f8be4c1f8481cd9f6249992a7cdd7b532df029e436ff7f05780c8671578 SHA512 f8cdf11ffa78229db60eb33134b7648c75b2ea08e9f521126497abd19dcd6aa7b50b638a9ebc61871c249bd2e8f117b2faad96b3d6afed0235f56f25ec073976
 DIST genpatches-5.10-159.experimental.tar.xz 16872 BLAKE2B b80656a9633b29f2f10bf1a95cccb9392a3336c5feaf782286c92c0f13c2f5bd7a0e04b4d3a640d689c7afd2d5991cb935e09a54bbd0cc69a38ea5d9b2c7bb7e SHA512 34b8fa832d77e4398e2f859d4dccd18576a528d28a8c50b87fca8d9c911e65b34b02e38fcf93df5f86412ab3b413260c9d5a63e92a561e81be7b1ad5d33cf527
 DIST genpatches-5.10-159.extras.tar.xz 3868 BLAKE2B 2cd0fc67c5b6f89303e3dcf5492b944eb048623c3ee865521933793af8cc2837d841e5f740035b1ad46a5b2f805f6fa8f1004f824ee3967c545c417e7c3b2513 SHA512 3b5b76c7220c1068ee2d29c48635655af4a227f542a870c3c140f7eea256f3d3e2c3df160c6bf193e595f150c2b51f66818c646af1ba679f94ec0c4086fe8b27
 DIST genpatches-5.10-160.base.tar.xz 4292896 BLAKE2B 23f6fc8d45f13b190f6fcf4532c266550dd186d48b67d8d48b839f683d453394b29c8898abbe730699c52385e28815d9353fec8c2efd8fdccb25d4102f5c2f3d SHA512 0f5ad6a3fad45ffc8ec01d43f02caf872d819e7f5e744207b2f6bebab3ec356e83e5208ac08ef23065ace4a67295621d2a5aa74b1c720f1643311b2819ecce08
 DIST genpatches-5.10-160.experimental.tar.xz 16864 BLAKE2B e095bea1d0b4e65afb1b14ce448ef9b360c86ae11e57afbcc00df59f094b355decf2be6db8cfc00c9954610945b5bdda706ecf5f6b5bdc1d5885e0aadb0d8e94 SHA512 66313f86e42ce5f413b6e0509acba1de6e784265f6ba11e78747a769bd229e81e9de83196502ad6d622729b03b72999c3ac8cc4e0caffcf3d22495cef86b37b7
 DIST genpatches-5.10-160.extras.tar.xz 3872 BLAKE2B 4168fd4f59232f91d3f50faff5bdff7da05e6b0decbfe5fa8b0cf7ac21a083eaec162d0be6422667a2e895b0005ea526ff134a4a353f035b442687716033178c SHA512 2876f3dcaee91cd20d5f41f77e0f375c3548b9d0a988ded464c9a39ca53f3b0ab7eb1f9cbe75b6397106fc48a869131724814cd7d01261d5f511dc3e6c00a3e5
-DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
-DIST genpatches-5.15-78.experimental.tar.xz 5420 BLAKE2B bf4aea35df32ae2a9b936804af40e994b65a91bd8f6d89e86e43c573bfaad5110c42ef30cc78c798d3d61b0e210851105a1fb6265c54361aa4b7f9110caf730c SHA512 5d583b5fa677f69b38a7d7e919fa2633c10faf30b7d6478b06f647fbcacc6a2cd1961a07c59983446fd27e2bf0863107720a714e0ab928a731c450240cd8ee53
-DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
 DIST genpatches-5.15-79.base.tar.xz 3195612 BLAKE2B bf8edc209ecc99da4f4c05b575b095992e64ca421e9848a75ef1ff7bca84377eec93ac3bc7d23bfd4c91d529cbf1693e231b606b27ba2ead46e9c3037db10c21 SHA512 c8cdadb66f904f2083f713a58bce743e56e27440f01fe98b3ddf82aaa43401c2fabad029060e7c01590dc294edcdfa8ec6c784f24ca87a1b9fa8703ed626e4f3
 DIST genpatches-5.15-79.experimental.tar.xz 5424 BLAKE2B 38d08aeb92b44140b52f1d04c311f4b07a35a578bd0da8212422ce1f14c2ebcc8fd89d2b8adeee2bfe60cb0c06ba999a0077b91299a8cf4e527d54c86a0e9617 SHA512 d5e9534b7a57b1a3d1cc5a77ffb95128ab474db51c2d3d4bbbd5b60494e323844e81a847cbb23af626a0c171d5629b3480f21fa35fb5fe1ea9917aac4d41252a
 DIST genpatches-5.15-79.extras.tar.xz 3932 BLAKE2B df50c7ce655f1f81d46ab6f077963afb0997ed2f6c0b70aa49c34a445d3f8938cce7201b75221705fe27c0a6f699dc553f932eeee7960a21dd89e3c55dde9306 SHA512 31e8c8aeb98e01dd1e0b25c51cfe48d5b6bc98617833229b283d35da6d7572b95dd8141592a2350ff01554bf80d918d2137ef2eb248c483ab22fc3db20a11fe3
 DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
 DIST genpatches-5.19-19.experimental.tar.xz 73244 BLAKE2B 6d89efa7fd2c6af8145e08e0502dacea8b3bfc28a30e70a1ea82e36e2c4cf953fec159fbed97169a52d47046e23938a58bf3d8a331cdd816ed1dae6465adeff7 SHA512 9cb5bd9cd9accba3033a6b66e75879bda8d7e5a92752a878d256260c74e87ae71d79260819ec61f3b9ddd1eea9d733efbce8b8566e085ce3e081a5e830fb3470
 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
-DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
-DIST genpatches-5.4-224.experimental.tar.xz 16900 BLAKE2B 4f49641399af48b9cfa88e6379a50716cef3c99d7571beda8d675a3d6b48e6a7761638e65685ca0ad8c69f2376442ebfc5ad2601d3d1a7d462caf8d5c91cac00 SHA512 ec203ba70fa1ac631e8a9b3923ad4f47de2ed91a57eb1f9eb18516881ab950be837b4391a5570e7105706cefbc9458730dcbb0db6cd2274e2946530599cd5dd1
-DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
 DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc4645e5c809bda93c0de480aea22b2f1feac231c7eddaf031daae9939126297a197bb3cbcd48a696da76eda0fe8591cac817103b SHA512 da6a1febb01a772d8ba454de51fe902830461bcbd87e76f8f459bf9adbb8bbe2493914c5ebd4f291ea59bcfedea34d3aa96baf98409e84220240d70c17ab66a1
 DIST genpatches-5.4-225.experimental.tar.xz 16900 BLAKE2B 9d4f708d5b0bf8775c38ab802a5841b2e92b3ed6edae9bb589c5c570f2fdc113ef15849b91285b3555a497185ee7c52cba06f450163dccc3d35132d1f831ab6e SHA512 b469e8c92f97cd545fcc872134f23e833898775ecd16eb677f11c8ca22a06bd38d796623ec743e72452d47930196984ac904e548d025cb3dfbbf164c5431f681
 DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
-DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
-DIST genpatches-6.0-4.experimental.tar.xz 5404 BLAKE2B 103b72e840e612d03dba399397bc6570b630968b4d29ab3d0b17a546adbc22d1ef37f7b0bebd92142085948085b006e22d0647a27faa448018857d8ba8647aff SHA512 5489e40b0c8f2402f4998e19dbb1e864f03c088e603c83d66da86917df694827b1a6092cbc2233b03432f31efb6cd1439e1c6b78c22de37e96eebe9ebdc472ff
-DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
 DIST genpatches-6.0-5.experimental.tar.xz 5404 BLAKE2B 29f7bdcdb8cd838064412e823f99b78738a359e4cd7717361e1781e57d966f1d74daf34a6e78e6c770df5585229882e6b4600ea8c3f31ba159f83bc54338912d SHA512 9334a0c8fbb3478be8ddce93a6441136490e3163bf7dec9034248acaae276de8c0e17a1265330cd7e0edfbb7e8b6b8ff7aceb6e34ac190dd02b2e15dee4ff329
 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
@@ -88,14 +76,10 @@ EBUILD gentoo-sources-4.9.321.ebuild 667 BLAKE2B 444003c6649801be27c4571babb82c7
 EBUILD gentoo-sources-4.9.329.ebuild 735 BLAKE2B d8bdafd9ae65b5160e244cce0781e1e91beec4f923c116fa978cf230162ec21babf8e970bb6d2e62853c0b189cc7f3fe355923a2e97d711f1246efc8110d8ee1 SHA512 6a1df6636f09fa5ab4aa121b3303e2a346d24e6d626310cda7005d848150d216ae124b4728baf2790824320e954daf2acd825c07b88bb9d4f8dc348ccc8bcb21
 EBUILD gentoo-sources-4.9.330.ebuild 742 BLAKE2B f08b8f1e4d1402a75d8cbfefe9c0b92b135f51a936dd5d43523200fe2247908d5818f1e081fb3e1a94edb8aa0f7b84f0491671e5c39dc54d8477b0211a495541 SHA512 a8c90a1b2be46603442b17bab686c9d4b5c355502b443261c3a0ab3f7381ac75c2838931c7bd7df982f0d8c806566d7d250a969b91ed25cdc2931d3d62c379da
 EBUILD gentoo-sources-4.9.331.ebuild 742 BLAKE2B d6ed761901e2a757a14532208608c54721fa7f39333f7bb3d08a6e9a479d43d2978cfc40867ea3b711266b6cdee0ecd7124c1453b2868e0282d0935c6427865d SHA512 7afa1e07ec2c39d7b880fb35070af650041653f713f1d8ed56d7484114558a9d73bb05fe537ff1a8c6cdaac68b4623defb566f7a41d011a33e23a81dbf6a41e4
-EBUILD gentoo-sources-5.10.149.ebuild 741 BLAKE2B baab5ce976169f3307165030922df507b491967ce5620006e8d32cade5197ef9f0304bbdd0042e52fe6cfde2fd4666f7288651aead223444301e12dda4e66bbc SHA512 054e5c9a4b30fc8c1a39810b8f31ea7fe126b2ccd62204b2d78c3251fd78d1de3e012c31fb6a826353e33590b3532bcc18ff3d9a5bf4f512bc3e857c5fb94fee
 EBUILD gentoo-sources-5.10.150.ebuild 741 BLAKE2B 065a9625b63aff715ceb2a04b62a203086046981d57fc5f8ceaeba58320104d9489fee5d3e5f6b2ddcd4f19c97aa0e72dfa20a9fdee7cef00a6b317147e3c752 SHA512 ca2aa36ba127991f4feb587eeb33b4729c9ce161fe5660a0f601d91a479446bd64fbd8f56b26037abe319c04dfa955f1a8b430e2503aaf4687d7a7eac0fdce7d
 EBUILD gentoo-sources-5.10.151.ebuild 749 BLAKE2B fd82593d1e9d5fac3dd7a95be52dd7beb3b13aa3abbb2b27f367c1ddde5e64a9b502f8bf972c8993f37ccc01ed1615967334d437b8e7543f891b3cff6196906e SHA512 4e3dbc04a0760401ea105b838174d1a23a4ccf1f481e6f60fc81c6238857e7e6323721b2414fae5216d23394b9b0466cc3ab9055579f76c708a5b360b7f37a34
-EBUILD gentoo-sources-5.15.74.ebuild 740 BLAKE2B fb89c3c7a6e33ab5c8fdb37e9ddf9f9c7cfc3c15baf505c5036b14f12d876b497edaba51723ce85283d9734b53ebb84b5ae089e65eacbef748253f7ee7bd78cb SHA512 517c90929232ffa17c783ca4243d7f955a6a19d5da244770d6739596df4929a7ee0462c5cca76565e5287fb35f950c6f1f5a85a905a0acb21787aaa9038cb923
 EBUILD gentoo-sources-5.15.75.ebuild 740 BLAKE2B c86e533cf8dbdded46665e03dc0a4d369a992257f42da69aeb42112bddbf0abc396452149a0ffbfda885e5a3302211d5db6a91f5ee86d21ee0616ec4da184fca SHA512 d8f5e3ca35aeaf2a4a4ef962ec753dd55868f69ab445fcef6095889cc6cccc2df731bbde917fc56cf54106ff0e9a3be5068b4503649c99b08227e6790743a626
 EBUILD gentoo-sources-5.19.17.ebuild 757 BLAKE2B 6e24c356b5467f2d9e34b9b11587f0220b39114945ad8c8523e877ff37527789383a8d88f464ce5aab945d7e43e740d967df9c1c87584972ba85ec29cc49a11f SHA512 14961c8e6525c0fd38e3346ddca99c85782e68ba75aa919e866524a264db853ed2c997741a86a1aa6b7e59eff4e5fa15015f9b9ad933aaf6456e2f2db672dc96
-EBUILD gentoo-sources-5.4.219.ebuild 734 BLAKE2B c19c0cd5d15ea9f6ebed81a797d6994a434dfbafe3be4634fb059fa4bd11a54160d7f334c4845dae40461b6c24ac5c40ec2741c9b5cd2466c81ad38c347921fa SHA512 978fe7cb95044c363b8609ba3ddd76cd185ca87c1a763d814f3941099629737a083a532f58c138a1fb9b9a46d20ca512ca677980622a41de7520b0a200aa4d61
 EBUILD gentoo-sources-5.4.220.ebuild 734 BLAKE2B 922e1bd7f9ca6b07a17a58d8b592fed1c438eb160ead222a4ff515c4cd9f67e559caa37e321c5f2c526c0765abd119a4d94aa04b0c522d08c3a0935843ebfba1 SHA512 a79134afe8a8e35f3a3df35cf8086339f8e7a1e36e90844f47128d0946aeb8a60be1870eca0007fcd74e568c1c12e28d24d5a78615a77c0ee99b37a5df179442
-EBUILD gentoo-sources-6.0.3.ebuild 741 BLAKE2B 5ea1c1e649245e1c156ec44d9d454fded0e208ab1b0306f971808112994d7597760ad9bb0e5e518226098e812b9855272b2326bddedc21356d2a0e6756c16dca SHA512 b4c10e3ea61260f2df9ba92c7f6ec5a3b34ef12772fe4b3631a3c43948037f0709d6069b5bdfe7ef3855d19ca0fb1e6f491d8285769ad94a167b259e6fd00575
 EBUILD gentoo-sources-6.0.5.ebuild 741 BLAKE2B 1a7d328ea3676f0ac0a9e6bff442e83aa76725ea7898a9b4eb6d2521a2d18dee30b283791dc75c433d15fdb1685b7bb00d535e1a4926b678021699e95c8b9bf2 SHA512 d187671f1cea171181e15f8c5d80124861a780566f57ad5fd051fae05c2ef330570fd02326630995062d9c7e1a1e4395ca80c73012e9fc3b2acc362f17e94f33
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
deleted file mode 100644
index 05e6263e4036..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.149.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="158"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.74.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.74.ebuild
deleted file mode 100644
index f2eb96321149..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.74.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="78"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
deleted file mode 100644
index f729fdfe2950..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.219.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="224"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.0.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.0.3.ebuild
deleted file mode 100644
index 02c0443368ef..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-6.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="4"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 90c336b0af9e..139a8f03a5d3 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -17,6 +17,7 @@ EBUILD linux-firmware-20220610.ebuild 9800 BLAKE2B ddd7ff41cf1e2e86da288de91078f
 EBUILD linux-firmware-20220708.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e3d102f28b9531281f0d4cbfe5229ec051384ed383eb977922a0e31b8783daace3b5176a22c4f00df4d70bc9799d8dbbe6ea SHA512 22ddcc5a34c7cc6789adbed9b6556ec67218a19cd8c9ed1f806d5013e609e956cc4f8162beb2e8ffd01021da99889be4920c5fc9a4b0b9a82dd5a040988ca726
 EBUILD linux-firmware-20220815.ebuild 9735 BLAKE2B 6d233c4e2ceb85955d039a7b4323e3d102f28b9531281f0d4cbfe5229ec051384ed383eb977922a0e31b8783daace3b5176a22c4f00df4d70bc9799d8dbbe6ea SHA512 22ddcc5a34c7cc6789adbed9b6556ec67218a19cd8c9ed1f806d5013e609e956cc4f8162beb2e8ffd01021da99889be4920c5fc9a4b0b9a82dd5a040988ca726
 EBUILD linux-firmware-20220913-r2.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
+EBUILD linux-firmware-20221012-r1.ebuild 10389 BLAKE2B 974245aee6d4eef5d0753c769fbe883852f733882753da262679bd8bc938ed321d1dc5e882992238cb0a22b955a59eea5a02bfe6ac9947c5ca3ecb08036f3926 SHA512 51655006247935eaf92ef0bbe33f93cf59c80869ebb9625d6dd36687d1c6ef522ca900bd545abb929d2275e9960f69e1e285552a0adf64bba84caebcabcf36ce
 EBUILD linux-firmware-20221012.ebuild 9901 BLAKE2B 7c1def3ff8d49722abab2c298fafbd637df5b6f21cd5171b8a169149f752aca8415d8535b3068cd5433e8449d0465b5680fdd73a9796af5d1bb285b84ebefead SHA512 d99dcb62bd50a36895f64396fddb517483a6892c7930ae81af7aab273605402eb1006a649f8fa2419de6fe5e08d26aaf28cf50ae20d40b04128b4efc6f80be9f
-EBUILD linux-firmware-99999999.ebuild 9691 BLAKE2B c9076729135f91fd4491b6df406da45837f071e3ab7f2ee475a2770d87e7929adefb87927c5133934b20b7ac8abf5675531180dc99a5d30f44ea71697e0e837e SHA512 8c04303e8b8add3c798cbac06ebff4a0048c1d75ae1e81b341c158d363755dfd036c39c8fbeab3e18e167a544be7826a175c70997b183b9970bc921db4b13664
-MISC metadata.xml 970 BLAKE2B b775ae0bf7cecb73829acb649595bb15c0cf95dd696b02223023ed97d42b57fa2ecc3523d678ff1dbafd27b3d71d1f27f5661adc0dfe07a416563b523682c776 SHA512 649289c0e622b28d31598524ecb48470d274a6835f6c2de00de95b114038e2d5d0f42354aaf1948da55e51060a9b3a87c8bb30f5a7b2124e373818de4e945860
+EBUILD linux-firmware-99999999.ebuild 10389 BLAKE2B 974245aee6d4eef5d0753c769fbe883852f733882753da262679bd8bc938ed321d1dc5e882992238cb0a22b955a59eea5a02bfe6ac9947c5ca3ecb08036f3926 SHA512 51655006247935eaf92ef0bbe33f93cf59c80869ebb9625d6dd36687d1c6ef522ca900bd545abb929d2275e9960f69e1e285552a0adf64bba84caebcabcf36ce
+MISC metadata.xml 1078 BLAKE2B aa7843ce53c1cea1068a0dccef91a9c0e27887b3d2b3d1e440045808e9347b473b1cc3421f6237d934bf98168da4edf773ca0ed553e758f72cc102ac3ec754d2 SHA512 547ec53a88d603254b162e38ea6f9ab1c0179a12427417141d4cf1d62aaf9ad07823ce12a78fc49bca3a933f29f1b75cb9c0f056637ce3c533061935ce87deed
diff --git a/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild
new file mode 100644
index 000000000000..83806f04167f
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20221012-r1.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info mount-boot savedconfig multiprocessing
+
+# In case this is a real snapshot, fill in commit below.
+# For normal, tagged releases, leave blank
+MY_COMMIT=""
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
+else
+	if [[ -n "${MY_COMMIT}" ]]; then
+		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
+	else
+		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
+	fi
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
+	redistributable? (
+		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
+	unknown-license? ( all-rights-reserved )"
+SLOT="0"
+IUSE="compress initramfs +redistributable savedconfig unknown-license"
+REQUIRED_USE="initramfs? ( redistributable )"
+
+RESTRICT="binchecks strip test
+	unknown-license? ( bindist )"
+
+BDEPEND="initramfs? ( app-arch/cpio )"
+
+#add anything else that collides to this
+RDEPEND="!savedconfig? (
+		redistributable? (
+			!sys-firmware/alsa-firmware[alsa_cards_ca0132]
+			!sys-block/qla-fc-firmware
+			!sys-firmware/iwl1000-ucode
+			!sys-firmware/iwl6005-ucode
+			!sys-firmware/iwl6030-ucode
+			!sys-firmware/iwl3160-ucode
+			!sys-firmware/iwl7260-ucode
+			!sys-firmware/iwl3160-7260-bt-ucode
+			!sys-firmware/raspberrypi-wifi-ucode
+		)
+		unknown-license? (
+			!sys-firmware/alsa-firmware[alsa_cards_korg1212]
+			!sys-firmware/alsa-firmware[alsa_cards_maestro3]
+			!sys-firmware/alsa-firmware[alsa_cards_sb16]
+			!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
+		)
+	)"
+
+QA_PREBUILT="*"
+
+pkg_setup() {
+	if ! use compress ; then
+		return
+	fi
+
+	local CONFIG_CHECK="~FW_LOADER_COMPRESS"
+	linux-info_pkg_setup
+}
+
+pkg_pretend() {
+	use initramfs && mount-boot_pkg_pretend
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		# rename directory from git snapshot tarball
+		if [[ ${#GIT_COMMIT} -gt 8 ]]; then
+			mv ${PN}-*/ ${P} || die
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	find . -type f -not -perm 0644 -print0 \
+		| xargs --null --no-run-if-empty chmod 0644 \
+		|| die
+
+	chmod +x copy-firmware.sh || die
+
+	if use initramfs; then
+		if [[ -d "${S}/amd-ucode" ]]; then
+			local UCODETMP="${T}/ucode_tmp"
+			local UCODEDIR="${UCODETMP}/kernel/x86/microcode"
+			mkdir -p "${UCODEDIR}" || die
+			echo 1 > "${UCODETMP}/early_cpio"
+
+			local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
+			cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
+
+			if [[ ! -s "${amd_ucode_file}" ]]; then
+				die "Sanity check failed: '${amd_ucode_file}' is empty!"
+			fi
+
+			pushd "${UCODETMP}" &>/dev/null || die
+			find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
+			popd &>/dev/null || die
+			if [[ ! -s "${S}/amd-uc.img" ]]; then
+				die "Failed to create '${S}/amd-uc.img'!"
+			fi
+		else
+			# If this will ever happen something has changed which
+			# must be reviewed
+			die "'${S}/amd-ucode' not found!"
+		fi
+	fi
+
+	# whitelist of misc files
+	local misc_files=(
+		copy-firmware.sh
+		WHENCE
+		README
+	)
+
+	# whitelist of images with a free software license
+	local free_software=(
+		# keyspan_pda (GPL-2+)
+		keyspan_pda/keyspan_pda.fw
+		keyspan_pda/xircom_pgs.fw
+		# dsp56k (GPL-2+)
+		dsp56k/bootstrap.bin
+		# ath9k_htc (BSD GPL-2+ MIT)
+		ath9k_htc/htc_7010-1.4.0.fw
+		ath9k_htc/htc_9271-1.4.0.fw
+		# pcnet_cs, 3c589_cs, 3c574_cs, serial_cs (dual GPL-2/MPL-1.1)
+		cis/LA-PCM.cis
+		cis/PCMLM28.cis
+		cis/DP83903.cis
+		cis/NE2K.cis
+		cis/tamarack.cis
+		cis/PE-200.cis
+		cis/PE520.cis
+		cis/3CXEM556.cis
+		cis/3CCFEM556.cis
+		cis/MT5634ZLX.cis
+		cis/RS-COM-2P.cis
+		cis/COMpad2.cis
+		cis/COMpad4.cis
+		# serial_cs (GPL-3)
+		cis/SW_555_SER.cis
+		cis/SW_7xx_SER.cis
+		cis/SW_8xx_SER.cis
+		# dvb-ttpci (GPL-2+)
+		av7110/bootcode.bin
+		# usbdux, usbduxfast, usbduxsigma (GPL-2+)
+		usbdux_firmware.bin
+		usbduxfast_firmware.bin
+		usbduxsigma_firmware.bin
+		# brcmfmac (GPL-2+)
+		brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+		brcm/brcmfmac43340-sdio.meegopad-t08.txt
+		brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
+		brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+		brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+		"brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt"
+		brcm/brcmfmac43430-sdio.AP6212.txt
+		brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+		brcm/brcmfmac43430-sdio.MUR1DX.txt
+		brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+		brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+		brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+		# isci (GPL-2)
+		isci/isci_firmware.bin
+		# carl9170 (GPL-2+)
+		carl9170-1.fw
+		# atusb (GPL-2+)
+		atusb/atusb-0.2.dfu
+		atusb/atusb-0.3.dfu
+		atusb/rzusb-0.3.bin
+		# mlxsw_spectrum (dual BSD/GPL-2)
+		mellanox/mlxsw_spectrum-13.1420.122.mfa2
+		mellanox/mlxsw_spectrum-13.1530.152.mfa2
+		mellanox/mlxsw_spectrum-13.1620.192.mfa2
+		mellanox/mlxsw_spectrum-13.1702.6.mfa2
+		mellanox/mlxsw_spectrum-13.1703.4.mfa2
+		mellanox/mlxsw_spectrum-13.1910.622.mfa2
+		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
+	)
+
+	# blacklist of images with unknown license
+	local unknown_license=(
+		korg/k1212.dsp
+		ess/maestro3_assp_kernel.fw
+		ess/maestro3_assp_minisrc.fw
+		yamaha/ds1_ctrl.fw
+		yamaha/ds1_dsp.fw
+		yamaha/ds1e_ctrl.fw
+		ttusb-budget/dspbootcode.bin
+		emi62/bitstream.fw
+		emi62/loader.fw
+		emi62/midi.fw
+		emi62/spdif.fw
+		ti_3410.fw
+		ti_5052.fw
+		mts_mt9234mu.fw
+		mts_mt9234zba.fw
+		whiteheat.fw
+		whiteheat_loader.fw
+		cpia2/stv0672_vp4.bin
+		vicam/firmware.fw
+		edgeport/boot.fw
+		edgeport/boot2.fw
+		edgeport/down.fw
+		edgeport/down2.fw
+		edgeport/down3.bin
+		sb16/mulaw_main.csp
+		sb16/alaw_main.csp
+		sb16/ima_adpcm_init.csp
+		sb16/ima_adpcm_playback.csp
+		sb16/ima_adpcm_capture.csp
+		sun/cassini.bin
+		acenic/tg1.bin
+		acenic/tg2.bin
+		adaptec/starfire_rx.bin
+		adaptec/starfire_tx.bin
+		yam/1200.bin
+		yam/9600.bin
+		ositech/Xilinx7OD.bin
+		qlogic/isp1000.bin
+		myricom/lanai.bin
+		yamaha/yss225_registers.bin
+		lgs8g75.fw
+	)
+
+	if use !unknown-license; then
+		einfo "Removing files with unknown license ..."
+		rm -v "${unknown_license[@]}" || die
+	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+	./copy-firmware.sh -v "${ED}/lib/firmware" || die
+
+	pushd "${ED}/lib/firmware" &>/dev/null || die
+
+	# especially use !redistributable will cause some broken symlinks
+	einfo "Removing broken symlinks ..."
+	find * -xtype l -print -delete || die
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			local files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+
+			einfo "Applying USE=savedconfig; Removing all files not listed in config ..."
+			find ! -type d -printf "%P\n" \
+				| grep -Fvx -f "${files_to_keep}" \
+				| xargs -d '\n' --no-run-if-empty rm -v
+
+			if [[ ${PIPESTATUS[0]} -ne 0 ]]; then
+				die "Find failed to print installed files"
+			elif [[ ${PIPESTATUS[1]} -eq 2 ]]; then
+				# grep returns exit status 1 if no lines were selected
+				# which is the case when we want to keep all files
+				die "Grep failed to select files to keep"
+			elif [[ ${PIPESTATUS[2]} -ne 0 ]]; then
+				die "Failed to remove files not listed in config"
+			fi
+		fi
+	fi
+
+	# remove empty directories, bug #396073
+	find -type d -empty -delete || die
+
+	# sanity check
+	if ! ( shopt -s failglob; : * ) 2>/dev/null; then
+		eerror "No files to install. Check your USE flag settings"
+		eerror "and the list of files in your saved configuration."
+		die "Refusing to install an empty package"
+	fi
+
+	# create config file
+	echo "# Remove files that shall not be installed from this list." > "${S}"/${PN}.conf || die
+	find * ! -type d >> "${S}"/${PN}.conf || die
+	save_config "${S}"/${PN}.conf
+
+	if use compress ; then
+		while IFS= read -r -d '' f; do
+			target=$(readlink "${f}")
+			ln -sf "${target}".xz "${f}" || die
+			mv "${f}" "${f}".xz || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' xz -T1 -C crc32 '{}' || die
+	fi
+
+	popd &>/dev/null || die
+
+	if use initramfs ; then
+		insinto /boot
+		doins "${S}"/amd-uc.img
+	fi
+}
+
+pkg_preinst() {
+	if use savedconfig; then
+		ewarn "USE=savedconfig is active. You must handle file collisions manually."
+	fi
+
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
+	# Make sure /boot is available if needed.
+	use initramfs && mount-boot_pkg_preinst
+}
+
+pkg_postinst() {
+	elog "If you are only interested in particular firmware files, edit the saved"
+	elog "configfile and remove those that you do not want."
+
+	local ver
+	for ver in ${REPLACING_VERSIONS}; do
+		if ver_test ${ver} -lt 20190514; then
+			elog
+			elog 'Starting with version 20190514, installation of many firmware'
+			elog 'files is controlled by USE flags. Please review your USE flag'
+			elog 'and package.license settings if you are missing some files.'
+			break
+		fi
+	done
+
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postinst
+}
+
+pkg_prerm() {
+	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
+	use initramfs && mount-boot_pkg_prerm
+}
+
+pkg_postrm() {
+	# Don't forget to umount /boot if it was previously mounted by us.
+	use initramfs && mount-boot_pkg_postrm
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 838ce9db7b42..83806f04167f 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit mount-boot savedconfig
+inherit linux-info mount-boot savedconfig multiprocessing
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
-MY_COMMIT=
+MY_COMMIT=""
 
 if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
@@ -14,11 +14,12 @@ if [[ ${PV} == 99999999* ]]; then
 else
 	if [[ -n "${MY_COMMIT}" ]]; then
 		SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${MY_COMMIT}"
 	else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -29,7 +30,7 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
 		linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
 	unknown-license? ( all-rights-reserved )"
 SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
+IUSE="compress initramfs +redistributable savedconfig unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )"
 
 RESTRICT="binchecks strip test
@@ -60,6 +61,15 @@ RDEPEND="!savedconfig? (
 
 QA_PREBUILT="*"
 
+pkg_setup() {
+	if ! use compress ; then
+		return
+	fi
+
+	local CONFIG_CHECK="~FW_LOADER_COMPRESS"
+	linux-info_pkg_setup
+}
+
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend
 }
@@ -301,6 +311,17 @@ src_install() {
 	find * ! -type d >> "${S}"/${PN}.conf || die
 	save_config "${S}"/${PN}.conf
 
+	if use compress ; then
+		while IFS= read -r -d '' f; do
+			target=$(readlink "${f}")
+			ln -sf "${target}".xz "${f}" || die
+			mv "${f}" "${f}".xz || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' xz -T1 -C crc32 '{}' || die
+	fi
+
 	popd &>/dev/null || die
 
 	if use initramfs ; then
@@ -314,6 +335,11 @@ pkg_preinst() {
 		ewarn "USE=savedconfig is active. You must handle file collisions manually."
 	fi
 
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
 	# Make sure /boot is available if needed.
 	use initramfs && mount-boot_pkg_preinst
 }
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index d62bc079c3ee..dcaea9b2c06e 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -18,6 +18,7 @@
 	<name>Gentoo Kernel Project</name>
 </maintainer>
 <use>
+	<flag name="compress">Compress firmware using xz (<pkg>app-arch/xz-utils</pkg>) before installation</flag>
 	<flag name="initramfs">Create and install initramfs for early microcode loading in /boot (only AMD for now)</flag>
 	<flag name="redistributable">Install also non-free (but redistributable) firmware files</flag>
 	<flag name="savedconfig">Allows individual selection of firmware files</flag>
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index d4e36b365cf9..54726dae7c62 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 48b50cf0618e..6068d9e41eeb 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -11,6 +11,5 @@ AUX gpm.service 218 BLAKE2B 728726976390bb394d479e424d5c1fafb9bc17d00e23a9021899
 AUX gpm.service-r1 196 BLAKE2B a1ec9c4d5bbd111ffe5e95cfb3fbd3a6c2d6181e794e1eb07938c1581ee72ffcec6ba80f28438371c474728a69e4d19183f8385e006db4bc44becd210b5a1bfc SHA512 2bb5a2faadaee9691b95191b67aef70f6dc7ef923db853abec8987d86e3d8239737ba2baf8ada4ae705a42f5cf59f34fdf1ce2accd642d8a0ff6718a89e81434
 DIST gpm-1.20.7-docs.patch.xz 41668 BLAKE2B cab4649d0eda83c37474b68ac141fab84cbfaac4e18f0f42ad7c0a90d14bc39697b17c450e8a8dc8b1c960f6d9e7ff344ec15791df240f61a27ccfcd7d0a9171 SHA512 6cdcad70d0a77a56cb507330ff8409155de11255b5e61fb92ee439c1e117932c346df475f4187abb0e348ee4c28fa235a9693883b1c36913e91404662df272f4
 DIST gpm-1.20.7.tar.lzma 789691 BLAKE2B 5dbceedaa330d5f1ead8b2267fb5844cfd284627e085edd784a72365830a700f9a6a97f96afb4aa00a44ddbae735ef23be7eafc97a65f6250d72e15b359486c7 SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9
-EBUILD gpm-1.20.7-r4.ebuild 2535 BLAKE2B 715b67881ea497c893c955217768a6398e22a8b91230a624a599d630e112ff98658018b8db8871d964fc7838e24d786c774ad20e8f757f039aefa02c0377f77e SHA512 aa0009fe65ab1eebc3c5332eb1714466d011bdd5f95dc4ca296aeeaa3b2353a5cbee2ea89b6b3f7efc750987b275c73f55f055ec3d9bc9549f65b8b3dee4de60
 EBUILD gpm-1.20.7-r5.ebuild 2602 BLAKE2B 3fffce9e9cf5ed5467fc402c2f48a77a614133c64eb4b7dfdbdff6174d6b7b96882443e7699a7c0ca0168a7d63e0ce5ef64c2159e048254f6a6fa516bfd03370 SHA512 e59f7c8a7e562596c94ef1e7e5a95d2998cfa7009c3bb207b522665f13b2af0949f68e6ecaa1257e11317d3e72e0991e9e925f50d8b53d6f544bcca061687e69
 MISC metadata.xml 334 BLAKE2B e2fe9030bcb3a1e85b0cd4aaae85bf3952ddad42585fd10e1edaa7fa2f47f4337b012e13e5f8773b16bfb19409b5230118e42f7c545aa6cd7cf22db81dc80a2f SHA512 8256b2488b6142311c077f15d5dc1c9061e182e969c2edbbc4cc8984fc493ec46b30a4d93a058d64087fb64c39959957151a046bbdfeac90bdd5b287343f4dfd
diff --git a/sys-libs/gpm/gpm-1.20.7-r4.ebuild b/sys-libs/gpm/gpm-1.20.7-r4.ebuild
deleted file mode 100644
index 9ecf544e9cf2..000000000000
--- a/sys-libs/gpm/gpm-1.20.7-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# emacs support disabled due to #99533 #335900
-
-EAPI=7
-
-inherit autotools linux-info systemd usr-ldscript multilib-minimal
-
-DESCRIPTION="Console-based mouse driver"
-HOMEPAGE="https://www.nico.schottelius.org/software/gpm/"
-SRC_URI="
-	https://www.nico.schottelius.org/software/${PN}/archives/${P}.tar.lzma
-	mirror://gentoo/${P}-docs.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="selinux"
-
-RDEPEND="
-	sys-libs/ncurses:=[${MULTILIB_USEDEP}]
-	selinux? ( sec-policy/selinux-gpm )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	sys-apps/texinfo
-	virtual/yacc"
-
-CONFIG_CHECK="~INPUT_MOUSEDEV"
-ERROR_INPUT_MOUSEDEV="CONFIG_INPUT_MOUSEDEV:\tis not set (required to expose mice for GPM)"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-sysmacros.patch
-
-	# Hack up the docs until we get this sorted upstream.
-	# https://github.com/telmich/gpm/issues/8
-	eapply "${WORKDIR}"/${P}-docs.patch
-	touch -r . doc/* || die
-
-	# bug #629774
-	eapply "${FILESDIR}"/${P}-glibc-2.26.patch
-	# bug #705878
-	eapply "${FILESDIR}"/${P}-gcc-10.patch
-	# bug #829581
-	eapply "${FILESDIR}"/${P}-musl.patch
-	#
-	eapply "${FILESDIR}"/${P}-gcc-include.patch
-	eapply "${FILESDIR}"/${P}-signedness.patch
-
-	eapply_user
-
-	# fix ABI values
-	sed -i \
-		-e '/^abi_lev=/s:=.*:=1:' \
-		-e '/^abi_age=/s:=.*:=20:' \
-		configure.ac.footer || die
-	# Rebuild autotools since release doesn't include them.
-	# Should be fixed with the next release though.
-	# https://github.com/telmich/gpm/pull/15
-	sed -i -e '/ACLOCAL/,$d' autogen.sh || die
-	./autogen.sh
-	eautoreconf
-
-	# Out-of-tree builds are broken.
-	# https://github.com/telmich/gpm/issues/16
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/gpm \
-		emacs="${BROOT}"/bin/false
-}
-
-_emake() {
-	emake \
-		EMACS=: ELISP="" \
-		$(multilib_is_native_abi || echo "PROG= ") \
-		"$@"
-}
-
-multilib_src_compile() {
-	_emake
-}
-
-multilib_src_test() {
-	_emake check
-}
-
-multilib_src_install() {
-	_emake DESTDIR="${D}" install
-
-	dosym libgpm.so.1 /usr/$(get_libdir)/libgpm.so
-	gen_usr_ldscript -a gpm
-}
-
-multilib_src_install_all() {
-	insinto /etc/gpm
-	doins conf/gpm-*.conf
-
-	dodoc README TODO doc/Announce doc/FAQ doc/README*
-
-	newinitd "${FILESDIR}"/gpm.rc6-2 gpm
-	newconfd "${FILESDIR}"/gpm.conf.d gpm
-	systemd_dounit "${FILESDIR}"/gpm.service
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 07b932cff06d..88a81bdc69ff 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 002308ea0cb8..75d93f234997 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -3,7 +3,6 @@ AUX lsof-4.95.0-clang-15-configure.patch 4940 BLAKE2B 60ae5f75e430621328da88f767
 AUX lsof-4.95.0-test-typo.patch 935 BLAKE2B 508728789172985e16ba60a1a28cda07ae186499ed4db8c3085329b823f71861c4a4f402c3657a1730dbb14071c211c35659fbb065b0cea7527f53e36bcc5976 SHA512 c648e5ecee68e5fe9959df50509a43d19af24874604d361bf248ea6c42beb10ca9fcd60831638010a9a38e784cad56b8ff8c29557392e6888646abb358a4e5c6
 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-r1.ebuild 3535 BLAKE2B fcc6cb09db26c3d974d94e596ad3aa37eb8d79b5b0428990500faf50bca26a833173a0ef302517ccf8f267bd393a14340a6425cb8b21fbdc64c2c18d7de5f489 SHA512 e732ea3fe2e4cd65a74fff42aa3607f1a4e412384ad51d87c89463653ee611ae3717c67152870d86460af20a7a5b26ce3b940770aedd82d4a57764a84e6a0732
 EBUILD lsof-4.95.0.ebuild 3474 BLAKE2B b5073fd31fee0137da8a587436eb551ce44d06e9aa81295c13d4b82520fc0b4da698c503ebaaa8eb51191e0bfda7b600ad58200846cf7b2426064ae184b629d3 SHA512 cdcdc6706007771ed126f153fa7bfb22c4c7e1c856988c679123f3e95d685c03f1e445492c04a2a0c40d74f85829c65d4433f7ee29068183087899931c49c7a5
 EBUILD lsof-4.96.3.ebuild 3449 BLAKE2B f73acab9c1cefb70b5bb51c2722fbade61581e56b3311c1c7676b0c28d932790aa36aae5183d881cb96801eb91728bd29a3700989a34abc3ea6eb9d1fb81864e SHA512 5b4b397223b3082a4b1bd397a15bea4f8ba1ab3c68768ad7fdea4b56649c5882d798afdcd87e3a1df1366fd284255a128d25bf6aacf75a4d84017d18c083388a
 MISC metadata.xml 474 BLAKE2B d3c6368abc4d7656f3e2b136ffb651465fe7a65d65cb355b675b055ee6aa118d13d08ef224bd31fd17017d2ac3669b35a12dbd85f5375268bd48c099557c6eb1 SHA512 b7f98a413e6eb9fd787725e27c966586fea085ecbde22c84fd01e4fe5582e2e0d2ca18d1cce786d8e979d08e0fbdfed338c22d122d84544c1fc848b61573adfc
diff --git a/sys-process/lsof/lsof-4.95.0-r1.ebuild b/sys-process/lsof/lsof-4.95.0-r1.ebuild
deleted file mode 100644
index b5cabe286fcd..000000000000
--- a/sys-process/lsof/lsof-4.95.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="https://github.com/lsof-org/lsof"
-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"
-IUSE="examples ipv6 rpc selinux"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/groff
-	rpc? ( virtual/pkgconfig )"
-
-# Needs fixing first
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.85-cross.patch # bug #432120
-	"${FILESDIR}"/${P}-test-typo.patch
-	"${FILESDIR}"/${PN}-4.95.0-clang-15-configure.patch
-)
-
-src_prepare() {
-	default
-	# fix POSIX compliance with `echo`
-	sed -i \
-		-e 's:echo -n:printf:' \
-		AFSConfig Configure Customize Inventory tests/CkTestDB || die
-	# Convert `test -r header.h` into a compile test.
-	# Make sure we convert `test ... -a ...` into two `test` commands
-	# so we can then convert both over into a compile test. #601432
-	sed -i -E \
-		-e '/if test .* -a /s: -a : \&\& test :g' \
-		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-
-	# "create" man-page (bug #689462)
-	# inspired by shipped "makeman" ksh script
-	soelim < Lsof.8 > lsof.8 || die
-}
-
-target() {
-	case ${CHOST} in
-	*-darwin*)  echo darwin  ;;
-	*-freebsd*) echo freebsd ;;
-	*-solaris*) echo solaris ;;
-	*-aix*)     echo aixgcc  ;;
-	*)          echo linux   ;;
-	esac
-}
-
-src_configure() {
-	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# make sys/proc_info.h available in ${T} because of LSOF_INCLUDE
-		# dummy location -- Darwin needs this for a Configure check to
-		# succeed
-		if [[ -e /usr/include/sys/proc_info.h ]] ; then
-			mkdir -p "${T}"/sys || die
-			( cd "${T}"/sys && ln -s /usr/include/sys/proc_info.h ) || die
-		fi
-	fi
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all
-}
-
-src_install() {
-	dobin lsof
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/*
-	fi
-
-	doman lsof.8
-	dodoc 00*
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "Note: to use lsof on Solaris you need read permissions on"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
-	elif [[ ${CHOST} == *-aix* ]] ; then
-		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
-	fi
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 1c97eb05c04d..b8f20987fa5a 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index ad4e150cef63..471c56223bfc 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,5 +1,5 @@
 EBUILD httpd-php-7.4.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.0.ebuild 425 BLAKE2B 259e7a664b5cf5d23bf3e7f640b3e7fa8a3bac58cbb3b05d728281ecfdd0f896e2afd717046e17bc10b6650786aec1ae169a5f991c10d0de586190d7f882649c SHA512 f0f5ddd9a5897fba9d8d75c4d7c14dc3070e3e79824e58824827d8ef3380a39800b7622cd6449b6d20cfdf05fc65e755568772060135aecf78c02da92a099ea6
 EBUILD httpd-php-8.1.ebuild 432 BLAKE2B cf4530b831758342f5ff8c5e4470bbf966b0f9e93e754f83112808f2825142a47f621b1f6013d4c3a856ae81de6b05dd23fd81f62966ebe62a9a9251aa12b459 SHA512 2814e9125f2106f28d556d75bd30b37fa07990bafb888fbc5a4c10d58c337e2ce563c8984cd869c41a89d1042170a75a2626f0938ce17290bee1ed46288dc80b
-EBUILD httpd-php-8.2.ebuild 432 BLAKE2B 137d0f637225a741d8096e1b4cc253767b8d027e566caa9a8ae882764114e545559e5c4b91aebc541eb2b4874493e6321e70174bf5678b15a910e905e0196b3b SHA512 1806d6f2d402ae273b6971437341acd7c8506569598b528118a9e33d7744b21320e50be6d94a5b5463f3a31d2a82aaa9521b3f9636a3ca037558b510e59eb48f
+EBUILD httpd-php-8.2.ebuild 439 BLAKE2B 73a8e9caf4732d8a76138d550cb788a80a73f43440df6fb01e8576910d4ca3164b57f58e3e69b5ecc5f31d734fe3ddfdb71833e7218b396d471ae6c15f10f397 SHA512 c3f0ae70fd988bb32ffa2ce8e79c43659342e42af276d20e9f9b49cd116d19468589bd81708111484aff0c7b97f3227909761a4d7c5275bfd9f9e660c8ca58f9
 MISC metadata.xml 264 BLAKE2B 48808ef17a373b4dfb3c169ae63e61416ccbecfea1eba9c3bee7e5be7393f8bec7986123526a3af092841134ecbdeff1a0a52422f24f28bd9ce9e84ef7b7983b SHA512 7ac8d7b84e7690138da0717d15bb650fd97fe251ec3733304bc33672db24668d9247447257ab96110867ce4a048b0523d0ef6c849bdee54c98061c8faa00d3e9
diff --git a/virtual/httpd-php/httpd-php-8.2.ebuild b/virtual/httpd-php/httpd-php-8.2.ebuild
index dab8a6159b46..679236a80223 100644
--- a/virtual/httpd-php/httpd-php-8.2.ebuild
+++ b/virtual/httpd-php/httpd-php-8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 2517df506570..7c25ab5b567a 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a686b641d95a..932ed94ec435 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
 DIST QScintilla_src-2.13.3.tar.gz 3060031 BLAKE2B e93dd884f630ef5f02fbf558ea8d9f94cfde1af03b811c8df9c3197ce9cadc430bf9727aec114ba118588effa5bc76166e3bda48800b6112edc8e8c598d72952 SHA512 be102fd6123fad0bc7f8de39080886369398889de48a4ec8873a0751890d7be1f238ae5194b71d31aac492e2881b6bf7885d9c06a2a47e36328780b47694f5b5
 EBUILD qscintilla-2.13.1.ebuild 1898 BLAKE2B 3f12cbb046479c41e627790dcdd07725f9d6a70ed75edf123b844702ed6ed7603b83fb35d93e4a2d078d409fdb0be39b17d61a849460f4523e3be3610d6a855a SHA512 600176bf4a329e0b4e076fd752630ab4edfed325145ae2e488a0fdc2f194cce50a802a6923198363d30234a95f047a311bb1a2a3bbfa1404c4138fb25d539461
-EBUILD qscintilla-2.13.3.ebuild 1909 BLAKE2B cb94e338b1b23038aca0f300898242e57d038c81f54b1347521ab3dd441a14999b880be8d408c37c78371ea22243c2047054ff281f244fb560716760126be22c SHA512 260feb5d4d9455fb9530e38dd0ebe636c4556c94b518eaf16ecd385d94a133a22f28d83f3c6394fc634ef42aa331f4d2b78a6fdd8aab8c0bb0565692ee73b257
+EBUILD qscintilla-2.13.3.ebuild 1904 BLAKE2B 4efdf5c406362d834ee9e357cb5770cc41ebf3a398c15edbdc548783a70b3139cd731b20bb5b98fb10dc76e51905fffa1a7ac3960b0b6c193b2900d1ab04507c SHA512 5103d72ac50506fad4eb7f8c2b82c506e9b366d86cb04f978eb2eba53ef70fe35ff3468d81e9ad4da10eb6bc2f9a5e2c8c2df2ef7a2adfa7c80826190147365f
 MISC metadata.xml 605 BLAKE2B 926d6dffbaf1d0243678e72a7e09d537d58571413142bef96b5963ea21cf1edadb6404992a6c57c1698cc58f9154ef9eb80926f1472b0570f6f3c299e856304c SHA512 99a337e3019d6ea8f8887bd92130d3fbc8d042eeb4d0c42afd6ea943751b901dbe0bc94f3244ae55371e2e2b9cfc0e2c4709f2bcbd07b70e42c16c454ae83007
diff --git a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
index ca1f4183654b..84cd701d95c2 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.3.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="designer doc"
 
 RDEPEND="