gentoo auto-resync : 11:12:2022 - 09:22:24

author: V3n3RiX <venerix@koprulu.sector> 2022-12-11 09:22:24 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-11 09:22:24 +0000
commit: 583acea08c150460a36d3ee1a4800c33b9b19103 (patch)
tree: 9152116a16df0b23202b077b54a014f7d2c28373
parent: ecd86b32a8f0b6be58bbb4b294ce38f1fbd7d3dc (diff)
183 files changed, 1937 insertions, 1847 deletions
diff --git a/Manifest b/Manifest
index 704b9c5114f1..cbab589eeaa1 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29770 BLAKE2B 44f1b419c48b76dd89561cb05beb9e84c1c8f964d6161dc2b79831f182495afa647c9adde60f1ff40b03fee8003b4389331dd9251cfbe81e10de0411b5322b1c SHA512 853dedde270422cc40cfa1dcd91ea2d29470826ca9033109eabadabc2739ffb8a9dd5732d39cba4dcb4b34e3242dcc0af4bb87c70cf8fbe5232a46e85645b258
-TIMESTAMP 2022-12-11T02:40:04Z
+MANIFEST Manifest.files.gz 29775 BLAKE2B f5d83d9973fe987dd781571aa00f9741b0f382d059162bfa7656779919e68fa38ef0965c05407ea3beec6abb4ba7bf039dac5e33a96d762c4b38451c59f2e81a SHA512 93fd8bfe7c424fe95121ba0fb75b19dd53fd1d83cd24666051a12d39afbfea8e6dacf2739c0c60b3f060e8f2972d5bbe7d71f48b58901bd98eec9e6ff08a0767
+TIMESTAMP 2022-12-11T08:40:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVQwRfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVl2VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAj0w/7BQweNY/aOw8s9lOyhfw9AWon0UgRxStXPq+GFBrrkg4VwhzZWyYWgo3a
-UOUuOF87gelQ+8AJ5gmFJpm/sxBnFZPcTvt63OyVBrfcspvykUSVWRhTv84CcKv0
-GTPlxRzSALlLMSS4Q6j+xoYDdPOAtRA608UzObcp6NB0r8S97KmgQy+RALOR1HJb
-NZkU/92tj0iondhjfTZYYKKLmjOrpX6euoaQhxx0zqtwZDcP5AzqLgQ8hoRNIJaH
-AXGuK8zRuCJ3SrAl+uUnEtjbyBYC+J/HVLxBg1D0xAVTQIXtGUIPY6itSBvxvq5q
-+m8OWgn1rNI8G3bs+XlrM763F6dpC+pQN95UUVo98X3jEmOFWk77JwyMHZ3tQYVI
-UOrngEnQVnSjr8F+XZZkDoksItnHuhVdkRVvA7FXGmdzEixf+o2WWKIwgsFxLjL8
-UaXssXQowrtF2GTGt5HlQVhWvC+W8qQ8AR9gzvXuATLcWUdvLhRG76+92nvwtbrf
-XP7/q9tEtYpNFNl4yy/5Iqe493gZ6EICBJRoFn3y30tCH7LjEGEe/V/Vct/4FPOc
-AmT0w/UQKzWwUDWY4kYhuAh+jpthNjhF1yRG7wOjmRfidARcbPF/jJmWnbBBfnpV
-Ebw3iiIRVdw+CUSi57KlNxhNg4rK4K+v/RDDHj6gqQrIvATMc2M=
-=3HaQ
+klAtPxAAp1Z3BWyOygPrsl+mLF5naU/sBxculj9D2ZC1fVGmFBwvhRhnLhLNBpxP
+eoqAbV4lsSvXcIDpP4tjFojehwEpjGH08fAAH45ZPUvrMlnu3vYILNMFtnfJybng
+5830sL8SmtJzwrN74bIdF/ch6pRUJUc2HNmtA/Q3L66u9YVuoRBYELXNHywhehFr
+2SAiMtF7OVYTHydq0Ev0jb4QBP7f2+ixfktN/5DtREH8/kEtnrqawPEqvsVscg0P
+cf/CrLQ1JFY6BigwwTxTRY1pEW9LBNPV+7wWrjl7MUU/6Tk/Gtl5NUC6ywJn9waU
+jFh+8rXjiUDFF3801dRNMn9tuQNgb+8JQABFx0dvZNtK5wfpTkluI1cNgjm+5Gl5
+j4zLIp3oRikCD+RtWomqwU1rPFwbCKvEXXeVbHu/mLGWHXvebhvbG5bcPMlwLS86
+MrlSWrfYPmgYzL1WkQ+yY97nYzHzOT1hMaKjv0dfnpyruAvvrWwVzv2OzmOLERCl
+j1vnPUksFoNJ1tVLHnRptQx9xo3aiIJMlZT85Vlps6ige4qLRQOGfsSHaQaAR5e3
+qm5yZNtg9n3Q4MBWkGyPEBA/yUAxvD4v+OLw2tHWWtBbOc/zRiQMk9oZJQR0rwu4
+fkPQJ/iCTfs/ws2jZsIxJaiAOlvEyn1BlQ8PFJUN5w5mUf+3BjQ=
+=KvOA
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4fa111754c1b..3246f04b3904 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1a4b4a325667..2eff5b0fc358 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 06a77a28785f..856f9ac64c24 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -3,7 +3,7 @@ AUX ansible-lint-6.8.6_test-module-check.patch 1882 BLAKE2B e42bae381ba29c224768
 DIST ansible-lint-6.8.2.gh.tar.gz 288616 BLAKE2B 4ae9c344d834a3d69a05689df296c7915e6eb7cb2a85b773f3adcc4efd898c3e1c9f32d8b1efda31afb7a5466d1966aa754cd5529c7dcfd6c1f45517d39e1750 SHA512 101be050772f6df827a697faa5ff9650c98959d9bd6e7a025a19c0ac94faa6b06e114b9122ae8f09f650be565b226189f4706ef8dd0f27548774664adccf3d18
 DIST ansible-lint-6.8.6.gh.tar.gz 293630 BLAKE2B aa43acb9cca21d3cdafebddb18d82781ab708d5696edc51567a8c56cc3eacb3bd96d08f97436eab54e69866f55fa6fc6537eb62e44e4d26eb3ee46ee13e7322d SHA512 0beb16ecff432444a25d3efa70f67eb55437faed593dfbb4bcaf080b06558403e711218f5a021268a2450ceeab1127d8dc8de027d1e4889350f20ca3d9ed9dca
 DIST ansible-lint-6.9.1.gh.tar.gz 388343 BLAKE2B 73035bdbd6c1bdee5566d5dee5a8461953d99bbaf896d7a9764c32419e74c3d23883ac1a7548de3e21372195f99c325c371cead7397bf64d6d033d9a2f81ed01 SHA512 eaf255c53fb8355b06e7013f6676a09e2d7e67aa332306448f530c345925c80ff5ea54c580f7f6720a25ebed9e8deb4c0a8e4e22af4183e8a8ef7b6999be6099
-EBUILD ansible-lint-6.8.2.ebuild 2916 BLAKE2B e13bcc29f518fb7de8fa2cf6790bc3bd5cbb19a05c1dfbc2c4299dabc58d32e84d83816162b1775f4fd513d75b466817ab4e63594ac07ecace22078951c36402 SHA512 c25506cf73dd7392c4fcfda3459e140d5b4a5e61aa4a2f650723971921e56add3c1e64ca7acd7728afc304232e31010ee5d09e68d32b69bc920a7a9fdcfda223
-EBUILD ansible-lint-6.8.6.ebuild 2931 BLAKE2B 822a3d70efff7b1c372fcf75301f4de59226c19a8b79053503fe917f3a87144df07a583d2bab1b6074b99af5e7ec2ae877fbf200a3f133dbbb6e062b81de43a9 SHA512 c26071c2b7c9105e927d66f1fc5f06b365cfe281e16f65daef259bcc4b0859e656cf9fe56190debdd5416174576d554db8d6981d7a4cce7fe458ce3407f6d0e0
+EBUILD ansible-lint-6.8.2.ebuild 2916 BLAKE2B 485b4f5266feb356fdd115e1d3d4a705a18fbb699b66c8e581938501562813ab7956de81e222788c46eeba46d430b21230887661d8afbf9f2abd64bd5393467b SHA512 7939a0506d1982e15f8ea71373101b0388e8ab86fe7f334e1a6aacd4d922e124916038b5cacd829fb757dca664950b180e49f623cbe2eddf8be43cca49962603
+EBUILD ansible-lint-6.8.6.ebuild 2931 BLAKE2B 765790ea4fd0c6af58165f33c7ab2614aa75f19ab0e770203dd8f2108283cc9273c53b3a280c63621e8263b5f4a653bb059a39d2328e80229172d0cc33e3c80c SHA512 eae5405a3cf63410def47601caf9cc3c95329af25fb0107f43fee4f88be581f6e5c3fbcfb7126a7181a7c205a3ff5d30f78d38369097d9cf5873bab8f963e7b2
 EBUILD ansible-lint-6.9.1.ebuild 2881 BLAKE2B 42423539627b347970bcdc12d2b4fe8fbd475d42ca6bae75a6d1847b21c62f9c3529edd2b43240b39aa4b712ed40fd4b976e2e1be846e99a73e3c39641adf693 SHA512 7c0885f1caffa7f3d59f9c93ed4cc10d2982cdf36af1b9c1b1ae3687f416b692a6eb48ab5670935fb887d46414fce0125f6f6406c619807b2732dbcd03e891b0
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
index fb27321a99b1..2e40f9cbc06a 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
index df6b0f93eebd..dcb2f57e85ed 100644
--- a/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index 09d146b38c02..95c45e0c1acd 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 2793 BLAKE2B 0caaf174605c0935aed3ba25dc5316efff2e2818910ab84cb83bb1293f4578037285415c00d372479ecd8eb7ab90bb18934eb00dca0f1512662c9817fb90ac36 SHA512 5507d4f25f5987f0bd4b97cc54309863dc615a76076adacef07345151a919d1e088c2e02317ae76b853e55c2038bfb5e4880d6b18698b716c704010054200200
+EBUILD ansible-molecule-4.0.1.ebuild 2793 BLAKE2B e5593a6e67bd847e78d87062b987ddf8789e7edfe349b772c3e6bb98c5b8cb40bfceccfb9a49e391a825c01a64cc2b593ba93ba29696281e2de9284c12f2ee5e SHA512 62e5344a0373478ff3cb2b45808331acd1fc2f021a978335bcc997ba90995a2a42fd550e8e93388b2e65d809f2ab4e01230b277ad364c8c942257b31c0b50163
 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 0da494a9e37b..c7f2bb183135 100644
--- a/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
+++ b/app-admin/ansible-molecule/ansible-molecule-4.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 2432880ef1a1..9394f71f4239 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/async/Manifest b/app-emacs/async/Manifest
index 4191dd890f88..f59e57bdff40 100644
--- a/app-emacs/async/Manifest
+++ b/app-emacs/async/Manifest
@@ -4,5 +4,5 @@ DIST emacs-async-1.9.4.tar.gz 15375 BLAKE2B 763c716672722e8d8ba2b1d351513ab54582
 DIST emacs-async-1.9.7.tar.gz 28411 BLAKE2B a033b0d84a61f133c0a871b6355626a67250b61c6ae4640331c8d14b3abda0d9d7405bb9fb09128874053cc310b3532772f8a515afb63b6d740492e10c9af5a9 SHA512 ca2c118594cc1478b1f68b3fce7e2b9c10cc3a90146b33a2631286cdef60c39932aa0036837ea9546f963105de7fae8fbe3ab8b6f36daff95323ca89a0fea645
 EBUILD async-1.9.3.ebuild 543 BLAKE2B 310360dd9accc1275f0f705c134fccb81088885519bb215586ce8c857f4c3020021127dc67a63e22a574c54787eb998e94a242f6a02f5fddc64bd74a1ef3679a SHA512 dcc87c78e978471647b6fe3ce595351949a9e62b0c854999cf77fd940329dbc3cd0f1add687092262743c5f9080eb61e59fdc3758f9b817460144124b04ccf7d
 EBUILD async-1.9.4.ebuild 543 BLAKE2B 8a2da7696bdad28511738c6a8f3e57f6c4bc7e3ebb3de1ba14e764921b019c737c0c06a74913c599621c384d3ca73184394c9a4ddc8581004e5cabc9e180bdcb SHA512 89bf8c176151cdfa1ae61374276a0dfbf39b017a8c09ecabcf3094fc089d9051886015ee401b9d270b6e75da4e43e7a5354cbe4dc6fb07a732c32f90644bda6f
-EBUILD async-1.9.7.ebuild 545 BLAKE2B 0def5398b1dd79df1541350cc9e1c6e45ca4ebd1d7ab20bda87615f231ff5a76596c7e8a989ddd19fd8b900eb6ab8e3a8921368a287fb5e8b677ce61dfe816d8 SHA512 b6061bc546b4b625c066e77b045676ae0c25a51b21fa655c012bcf8b24f5eae25462b6659e5bbc751076ec91080513bfd0bff2c4a88b556d658973965aa7244f
+EBUILD async-1.9.7.ebuild 543 BLAKE2B 8a2da7696bdad28511738c6a8f3e57f6c4bc7e3ebb3de1ba14e764921b019c737c0c06a74913c599621c384d3ca73184394c9a4ddc8581004e5cabc9e180bdcb SHA512 89bf8c176151cdfa1ae61374276a0dfbf39b017a8c09ecabcf3094fc089d9051886015ee401b9d270b6e75da4e43e7a5354cbe4dc6fb07a732c32f90644bda6f
 MISC metadata.xml 366 BLAKE2B 773ef114fba2a72f9223282cd40b3e46966a015caa04e91610ef5106a6df8b253d37bba5f575260a138e1811b9b57384a035eb3e517b28233e604450ed4f3d1b SHA512 c64120f7a70e14723680475519d82bfa6a4fd2a651b3ada184033fa6894521bd2fdecc058f9f43ec910bad8c2b72efb33add458e5e4269427d092a0300f4c910
diff --git a/app-emacs/async/async-1.9.7.ebuild b/app-emacs/async/async-1.9.7.ebuild
index 45b0c0da522d..208631a78af0 100644
--- a/app-emacs/async/async-1.9.7.ebuild
+++ b/app-emacs/async/async-1.9.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
diff --git a/app-emacs/autoconf-mode/Manifest b/app-emacs/autoconf-mode/Manifest
index 43403829c6be..16010d0200a2 100644
--- a/app-emacs/autoconf-mode/Manifest
+++ b/app-emacs/autoconf-mode/Manifest
@@ -2,5 +2,5 @@ AUX 50autoconf-mode-gentoo.el 366 BLAKE2B 9394476da3892a5b857fe35ff9a6ecbacec761
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416 SHA512 73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
 EBUILD autoconf-mode-2.69-r1.ebuild 528 BLAKE2B 9a34ee1d0a7667625084f9e75e35d35d93f57eef8b6ca1bad3113a75a8091ed9798fdf5e75b6d9477c9ed58e0e317208aa980606bce191f212f490a98824dd95 SHA512 74858225657f921ac836bcc5e2642efd6e7d7ed9456898fb7085b578c078e791fadcc1ee1f49d6e6b4bbb3392f138ee8ff2d8ad578ba78a03ced573ca1b0602f
-EBUILD autoconf-mode-2.71.ebuild 535 BLAKE2B ee2c8d09424a34416280d35e76b22eb3ab3c3fd8bfc2de42eea9ca02ea17827d5fe612e84b7082cab43d77d0465a265caab0660941920221d518176020cb1f8c SHA512 13e98122a1b330cbcf4325ce06a5db3363518a8f59c4860f88c3366b78f11f1372ea47fda7e59894c7be45dd3398e07bb9f593540fe153ead7e3795b5cd13727
+EBUILD autoconf-mode-2.71.ebuild 528 BLAKE2B 95b777aa4359fe602923ba1c4f7ef2d9d9e36c4a0b2a67cda87a706ed04434966d7fa54cfe7fa8ffe4d2946ab744f294a7afb4149b37f4c7a99aa0c8dbc2b998 SHA512 333f608c78b2961dc5838c19d16714934117f3475bff49e47420c459db6df17a058ea3d32ebcbe91347b8bb5c1451c340528970c1b408bc39c32356583c144e1
 MISC metadata.xml 372 BLAKE2B dcbbcfcad0337cdd2edf7fe0fedc1de5d3286f2a92e8cd8ec2c216edb7f32062559377a7d43cfd9fc68b3d5938066751545d5c644474e93d691260b259066c28 SHA512 b261211b6a4d21e8c85b657668ee64ec95b21caa523aee6b26520cb0f6499f8b220c9650af996c289459b8dc19002ddf8629ac5f50c9e903da9bdfbadc5e566a
diff --git a/app-emacs/autoconf-mode/autoconf-mode-2.71.ebuild b/app-emacs/autoconf-mode/autoconf-mode-2.71.ebuild
index acff34458e98..afdf57c2607f 100644
--- a/app-emacs/autoconf-mode/autoconf-mode-2.71.ebuild
+++ b/app-emacs/autoconf-mode/autoconf-mode-2.71.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/autoconf/autoconf-${PV}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 S="${WORKDIR}"/autoconf-${PV}/lib/emacs
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/buttercup/Manifest b/app-emacs/buttercup/Manifest
index ec337fef8438..a580fe39dde6 100644
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@@ -5,6 +5,6 @@ DIST buttercup-1.28.tar.gz 87689 BLAKE2B 510741e02c5973c80f3b6d9374d179b132ead8a
 DIST buttercup-1.29.tar.gz 87693 BLAKE2B f42b98303a058dc3435b00dc5b50eb7217cfd70b48f982cb8823401b4d603ba2292a3235077d1263ddeba69284f6d7a37e407869dd3d4357102f1e765b14bf4e SHA512 3d400dfe5020fffefa5e8b32b9d5b8191a4882d790a9c5d48267cb021ffd0d6e9256116dca0d6118e920a2a0a2902bba7a2f73504c165cad71a4fc7f9867542f
 EBUILD buttercup-1.26.ebuild 664 BLAKE2B 077b0052dc38e92fc20ae97d938cc8c4a4d60a258b02b97324d4d0c9667659fa6ce808aac28d3089c870de086e81c6998ad7917b2703408c2a077dda7f456d0e SHA512 14e30df54ed3ae39a27c793b5c8f02fdda1f2d3020d4bc2440b188fc060934d87364d5af0e35f0a9f372ad962452c603d079faf6037305b82b064a7a7a917f66
 EBUILD buttercup-1.27.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
-EBUILD buttercup-1.28.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
+EBUILD buttercup-1.28.ebuild 664 BLAKE2B 077b0052dc38e92fc20ae97d938cc8c4a4d60a258b02b97324d4d0c9667659fa6ce808aac28d3089c870de086e81c6998ad7917b2703408c2a077dda7f456d0e SHA512 14e30df54ed3ae39a27c793b5c8f02fdda1f2d3020d4bc2440b188fc060934d87364d5af0e35f0a9f372ad962452c603d079faf6037305b82b064a7a7a917f66
 EBUILD buttercup-1.29.ebuild 668 BLAKE2B 58d00b943b8634db5dfcd694b3d5d3dcb12f2b99e18434d1c31b9f50acb9aec669d6aac0d3fbd38eca545ceb5cdb926dcb274e6a91a0e7e184bc0a084d37129e SHA512 8b0ab6cd74f243390c88004c5b75e58a9461723b3830bf29a20741d13f2f284989d5da06405864a238be40a37f8cff2cc6c4c506c968fa3be1d0cfcf9b643f47
 MISC metadata.xml 392 BLAKE2B 365eddee8c36962902e64b476ca9f21b34bf1faf9dd5ff2ad28d799a8079ea81cfea23adfc81e0a40edee9d4a6551affabaec91c9b931cfb161cf8a5bfbb024f SHA512 899c734fc6bae680c7d44dd0750d0a55a74ef2a5408be0e3a33a920ed283535c1136fc6b04bca86e85304ee1a3972413f18cc047be1e1565ce6c2a7940e087f5
diff --git a/app-emacs/buttercup/buttercup-1.28.ebuild b/app-emacs/buttercup/buttercup-1.28.ebuild
index cfebece4d7cc..afd8e4303721 100644
--- a/app-emacs/buttercup/buttercup-1.28.ebuild
+++ b/app-emacs/buttercup/buttercup-1.28.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/emacs-${P}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 DOCS=( docs/{running,writing}-tests.md  )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 841afd967837..6e23552b30c4 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -6,5 +6,5 @@ DIST editorconfig-emacs-0.9.1.tar.gz 39950 BLAKE2B 3914fb730937e5ab44e4fcdb4278b
 EBUILD editorconfig-emacs-0.7.8-r3.ebuild 643 BLAKE2B 208c992003325e6032e9e0e4fb8d5a809525fb47df3ce9230ca06e0ded7a1f3d2f784665d523d2f04e9bf68af17c3832c23b99d3e4bf20f243922881a7d623c2 SHA512 a723535a6344b20ade6cc9642c96075abcd6e596f1683231f5b5b436fe3cb611e1dc3ba5c132c4acc70a28c4303ed54c05db48709cd76138113f4e5c955aa10b
 EBUILD editorconfig-emacs-0.8.2-r2.ebuild 643 BLAKE2B cd8b1c3edf7fb93e11d195423f0e8a88ed62973d9233fa202f79737a41f2c8b57490d38d05b44f60abcc87f8b1d6a760356ff5be0921707e034e794f5b085b02 SHA512 9147e98b5153d9965a66b67107f1891c9de1994673607dae4b1bb430715ff6db927b2a29ad487223beef5873e59a5478dc990ebc3db17ebf6069821beb1de437
 EBUILD editorconfig-emacs-0.9.0.ebuild 659 BLAKE2B 2642e922451e0c4f77b0acac44ba75b40a1d9a7d8894282e36c5054e48a94fa8117132c545de26ef9c15e1e2dc1e7cd6ff6e9e8785625f4a1177badc1b12dc49 SHA512 4d43fab43f633fb5c36d7fe881dd78ad727ca1c6a3f025650ed9f55e9f3fe1543bca292db41f8af8475fb85f7c99470a0cc684fd916690e96271dbe804e140e6
-EBUILD editorconfig-emacs-0.9.1.ebuild 659 BLAKE2B 2642e922451e0c4f77b0acac44ba75b40a1d9a7d8894282e36c5054e48a94fa8117132c545de26ef9c15e1e2dc1e7cd6ff6e9e8785625f4a1177badc1b12dc49 SHA512 4d43fab43f633fb5c36d7fe881dd78ad727ca1c6a3f025650ed9f55e9f3fe1543bca292db41f8af8475fb85f7c99470a0cc684fd916690e96271dbe804e140e6
+EBUILD editorconfig-emacs-0.9.1.ebuild 657 BLAKE2B 13752a9c3478dd2b7771e8bd90cccda8cfd9fb7ee688d8251d563dd32d602e4e1b20ec638a0d0d994f16c37c2164d4dd715653941d70179f72992929aa8a61c5 SHA512 a4be58955b0fb4171cacfeff3a182ff809d543f39c28458d54a6d74938a0f5feaeaa6d935a40cd07f54b52b5ac4cfcf7db7444a34894192e6d5f15bcb58ca524
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.1.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.1.ebuild
index d58236571e60..4dde1d1e89d9 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.1.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"	# make test requires a git repo
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/helm/Manifest b/app-emacs/helm/Manifest
index fe393fa70309..e3973dd599a1 100644
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@@ -9,6 +9,6 @@ DIST helm-3.9.0.tar.gz 2366592 BLAKE2B 8aeaecf444127dc9758c1116c2f2b6d6a11515b7a
 EBUILD helm-3.8.5.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 EBUILD helm-3.8.6.ebuild 659 BLAKE2B e3cad45c98c77c77b7b4db89070d84fcc5709fa315e7b8a5e0f6df7054665cd4d380d3a2e2d45a8376d02b368efe9477026fefca855365b425366571083aa1d8 SHA512 414fbc4a5080f8ac17607bf41bc2d84d0fffec6b3c8b3b25462133ab55245ed424995e89f3d1c574280bc6e56386162fba7c2ce7de4ca5243ee8302f4786d841
 EBUILD helm-3.8.7.ebuild 663 BLAKE2B 82c07fd093da57f0646b344c3611bc4cf5685eb16608a5b3c37abdd3c0fc57d506872399d1fad844fac9e4d8eee570a3fdc537ce5a09835501f9214e19494b0b SHA512 8ca81540d374fc09a2d5804779ac0fae248669d8960042113871578560da3f29a07b0231a21945358964333c522b0efef31d8a705559799cef336cb8b4afdb07
-EBUILD helm-3.8.8.ebuild 719 BLAKE2B 07f927291083758443650942b14f84106fd02907e436dea648cfe7c2cfd70a6bf24ecdfc9e1940044b67fde2590d6369e7b2584f00726c0f07c2e60b0cdfe384 SHA512 3dc932a7e136c9f888dd780380bf65a45434018491a45b551c01611b237032bb9cd83196c93e4d2b820706b352360f15ee96ad0960c83dbcb4c5eba7563ad579
+EBUILD helm-3.8.8.ebuild 717 BLAKE2B 88673316473a486ed6a5f5efd5e1d78d5027e7fb980aab7503c2acb425d57d56fb2269b5dbc4aa4a971555443fc2f7451902ae5127f3a817f30a30573f9e87dc SHA512 8f2cdbf3dbeeb4172a6c55ad8ca6d54ebc7109b506572a87e4d8c58534e88d52df6f12e5f8297fde903b4e4cef4e160f97a8d13d4a4c6b8e758d31fd9e2ecfa7
 EBUILD helm-3.9.0.ebuild 726 BLAKE2B 0e55fbf08d88a05fa30277e5af78d6507e37887f7f7c103695a2c49cf0512022267610fc54cf538095e96dfe9eea2d90718b430f8b40b2d242b6bb00ad1377b3 SHA512 af3cdbef618ebc7789a9c01e7ff8efb2a408ae1079b9f63bc45add32095881f0c8e5772f3688f88fa6cb3b07852b09396a4f696006fca354f2e3fc461345ee8e
 MISC metadata.xml 822 BLAKE2B 5de057ddb881d67550d3e8cd0be43d3328b8e7a38b98338ffccec147095cd5d8f8bc68695c797a872e2ed7e455859fc1d6170f414231016edab5a8d742ad2a40 SHA512 08367530e4e47577e1812d229b97094b9c012c4c91eb7e69f5724e98d8790327fe35fb9b480cf33eedd105f1fd85133c39397eda0426461d80bdee704a51c55a
diff --git a/app-emacs/helm/helm-3.8.8.ebuild b/app-emacs/helm/helm-3.8.8.ebuild
index a99c12c1de3c..4c8a13f1e690 100644
--- a/app-emacs/helm/helm-3.8.8.ebuild
+++ b/app-emacs/helm/helm-3.8.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-emacs/async
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index f9cd056c824d..1b4a7e0d2eea 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -7,7 +7,7 @@ DIST org-mode-release_9.6.tar.gz 2203782 BLAKE2B 2355202c3f570c7b9dfd2613d2cc040
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
 EBUILD org-mode-9.5.4.ebuild 1400 BLAKE2B 8dae635a451ccad2b84b274afe2782adf13a200a2cfb4b7f0ad72849d7c37dd51384645894596db8f0adc7a4bc0b6e0b52a4e346ad8bff238169cd3fedc6d5e8 SHA512 7ff47b6781456aed31ac6b5f11a176db98d5f76db66af3288ca970f02e06be41882d3bebb758e421fbb77425082fd2150e258070467184c3d040d957a4fe47aa
-EBUILD org-mode-9.5.5.ebuild 1406 BLAKE2B a080f0c74ce2d3120fb1e6c28e895a424acd5e45e9863c7957c380a11451b6e6d53efef5679e6440e1508e5bb5d87495fc26ef794f08eeb725d90861fd96730b SHA512 1244e80869a648c9b8e1293b7c1017f07a6151deb16c8dc9cb77cf18ea922a653f0249e5c57e1dff3d08f8a4af44133d3167ecf64a1fd7760dbd81ca5f10d20e
+EBUILD org-mode-9.5.5.ebuild 1403 BLAKE2B a63cdcf1e1efda30f0a90466ae11d38e3d952fe8292bf8ea21d483322f9558c9223593a0887c1117a61c13f60116ff390c497fa1c862db110773fd1f47c784de SHA512 21441fe19106edf83c3f29f8be8caada903f35fbd196e7e86d4b606a4db8f8be82cd955fd7319f56abaec308324c8a0f3732e7950e63c0afbc44424f433fbae1
 EBUILD org-mode-9.6.ebuild 1422 BLAKE2B df6f47926ce062612f24d8dd306a8fe06416cc1bb979622812c13a617295884b344a4f9677fb0d3e56330543823c2add19812c938f024026ac1f9333cc87b89d SHA512 250259ff8afd7551cd3d6c006976699dc6aad16a297b959ef1dfc5701d8623ce51f8c24caee946f50e000f98a365974cc6657e917e14acd69c690708f4ee272b
 EBUILD org-mode-9999.ebuild 1548 BLAKE2B bf1ed3bb0ae6a50d6032f1166362806289cffc5f7846517ad77b9c8355a12d657c3d084639809be5db9c5c8f33d5084c21550fdb9cdb2928bfd28e80d792a7fc SHA512 584c1f87a553501a0fedbec2a784bf7615588505fedc486fc8c9e7bda51af5dd83dddd420837998f322b649f8c230d26a304f7cb08a17e965a8b494c6ce56c27
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.5.5.ebuild b/app-emacs/org-mode/org-mode-9.5.5.ebuild
index 8e095e0da8e8..ce1d9c2d3df5 100644
--- a/app-emacs/org-mode/org-mode-9.5.5.ebuild
+++ b/app-emacs/org-mode/org-mode-9.5.5.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index 481fe02283f0..c4eb71789f1a 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -2,5 +2,5 @@ AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b5695179
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
 DIST s-1.13.0.tar.gz 60783 BLAKE2B 87f15341053924bf82e5b84f53a9f0ffb4713946974fb338f114ff25cb0c54ee6a4cdd6c2283eb089eb6ee85d268717dc2534a2de2bad0c7584f7e3ed941e42b SHA512 537e270256e7187ef470c03a3824f133bd0f3951b8470685cd865b4894710c6659efbdacbe347dcaac8de73d4e3a638cdb0cebdad8da6bf7f9a2f5d106bff1c6
 EBUILD s-1.12.0-r1.ebuild 499 BLAKE2B a7add64afde8acf76ff7ac5cf7bdd3193b1555f18135b3a14f2500f6411e5fb634136009e027239e5f6b6ba2237ebe19293d44aff4cfaf9fff1bd59d33adfe07 SHA512 3826bfc67bf5b3992aded1c23297dc6fbdbecfead3a21fa5c22f7d1f2111189b1fb5c885c82916f7a3cb09b731b83c3e386e9577965c90bf0623dcb8dfe33030
-EBUILD s-1.13.0.ebuild 509 BLAKE2B 3f0be5a920b30b76463d12247466c5c0059d02269c038c416b4cfc9c33d33e28e77a22c702629cd6726ddfde8892ab0fabea5992b1bd6e7996efececa4a25972 SHA512 f71e105ed02beb3ea35168a2153b6116a9a91726ca768c4f32202f93665044152fd80cd9aad41e9d9d59bb234bfaf137fc28a6d84eb224d652b09d26ffdb0a83
+EBUILD s-1.13.0.ebuild 506 BLAKE2B 434f085cc853b1de1da072ce552c1a0224df04a32d6eccd21ee53b26eec9eeecf323ca41f8948b8eb23922d0e9941e70bd014bae89c123c62211f5f1e97e03fd SHA512 b49e8251b6b27cf16ec9acc61aa5822728331bc8ad93e016c9974d8ea1611fad123971d246ee6a54c8788e701d74eb6cddf61308ba145c693254214c8d2ec76d
 MISC metadata.xml 358 BLAKE2B c966645ca03d9831e511a7b54ab031c9c9764ee8295d5b0a90dc1f80d93a68c95076329af5d8951dc025d86ab0f15580109b2c521178ff68694cfdce5fe0f9bf SHA512 268ef26faa4a736d2301efa6c3f745f90cc41fbc6fbaeb63931a6206a2cd78e66546d30f16dc956c7918a644522a637311047e71dc4318bdc588957085fca914
diff --git a/app-emacs/s/s-1.13.0.ebuild b/app-emacs/s/s-1.13.0.ebuild
index 2c0ab56e5eb1..969f742164bc 100644
--- a/app-emacs/s/s-1.13.0.ebuild
+++ b/app-emacs/s/s-1.13.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/s.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2dd48b9897e5..f93c4ec249b2 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index 66830d232b89..e3d314a432ca 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,3 @@
-DIST javassist-3.29.1.tar.gz 1291658 BLAKE2B 4064401ad01c1e1c9aa4a219a81f0fc2e67b1d4cb85cb98b4a996dd2bf789ee1feb790e5bb332205ef2fafe1c7ac0ea82e5e25afff4d9960c54dfe2cb895d0fd SHA512 5788a4a50b803b2a4520340ceae9fd47466d2004cce4138fd861b57fd760109c61c375a28bd907bb9dfeb56bd44734f003ddd1b550571f101a7d1bc04096b5f8
 DIST javassist-3.29.2.tar.gz 1293705 BLAKE2B 23101970a3fe9e4428b9e2e55ec2973663b537b2e205db55952bce116eb0cdd327e156f9bebf16a3c4322d8e5002d612067b14e8d234e87524361b5f08c9ecde SHA512 651f48d9138b54d4816611c077614bbb15f8189d755c2c2c7e5c2dfb35ad8f48cd9d2e0532edbd565456a923b3166eaecdde8702d65c70a32eb21c2d42f67bfc
-EBUILD javassist-3.29.1.ebuild 2072 BLAKE2B 61ba2d0d93672979234c09fe36e610fd0c58015516458367d7995bbe0a985068d4216effdc01d8363105716513bf448e56f0432435f26cdd8a3b185390dbeda5 SHA512 fd4911cafbbe4e528a2610e72bf438cfc592a9d0f0f164d1547c80863522b624d54991ffe5cd2077dca6c71dda66a2c9f3f4f74ddb7288d7e430785514022de1
 EBUILD javassist-3.29.2.ebuild 2497 BLAKE2B ba0551443870a130e4bd4de2f37684961b569f3f1e529f5494a277021143329fe6a781035db9bd3ce627e106fdeff154871f7b04c09113f753ee5e238a4d2a3c SHA512 ea82bd70b282cab0a694fd420feda0d79eb366d705242a9e1c84a6d9f338b03b6c06ec6add9ee2cd80706f81c9bf37b9d69fee81d831df08f101666feaa05ea0
 MISC metadata.xml 551 BLAKE2B c2f226813733db484e082189bb9420fa19eea8d5f95f751cf42305f110dc6b8a6e07370d9e3bca4be9dfac71333c86e95fb5e3f48543ca0041c2e2a4d96808b0 SHA512 b6b193720397459d3133bed6d0e93973084375684f1df77f93703f9cadf06e0a23e2798a13edf70c67642a656d5e5ef24aef2c032c71b65bc215622dbe42c1e2
diff --git a/dev-java/javassist/javassist-3.29.1.ebuild b/dev-java/javassist/javassist-3.29.1.ebuild
deleted file mode 100644
index 30332016b6d5..000000000000
--- a/dev-java/javassist/javassist-3.29.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 https://github.com/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz --slot 3 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild javassist-3.29.1.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.javassist:javassist:3.29.1-GA"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A class library for editing bytecodes in Java."
-HOMEPAGE="https://www.javassist.org"
-SRC_URI="https://github.com/jboss-javassist/javassist/archive/rel_${PV//./_}_ga.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 LGPL-2.1 MPL-1.1"
-SLOT="3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-# Tests run: 431,  Failures: 6
-# Cannot solve those test failures. Using "mvn test" they all pass.
-# https://bugs.gentoo.org/856364
-RESTRICT="test"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:[4.13.1,) -> >=dev-java/junit-4.13.2:4
-# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
-
-DEPEND=">=virtual/jdk-11:*
-	test? ( dev-java/hamcrest-library:1.3 )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( Changes.md README.md )
-HTML_DOCS=( tutorial/{brown.css,tutorial.html,tutorial2.html,tutorial3.html} )
-
-S="${WORKDIR}/${PN}-rel_${PV//./_}_ga"
-
-JAVA_AUTOMATIC_MODULE_NAME="org.javassist"
-JAVA_MAIN_CLASS="javassist.CtClass"
-JAVA_NEEDS_TOOLS=1
-JAVA_SRC_DIR="src/main"
-
-JAVA_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3,junit-4"
-JAVA_TEST_SRC_DIR="src/test"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-# https://github.com/jboss-javassist/javassist/blob/rel_3_29_0_ga/pom.xml#L166-L168
-# <include>javassist/JvstTest.java</include>
-JAVA_TEST_RUN_ONLY="javassist.JvstTest"
-
-src_prepare() {
-	default
-	java-pkg_clean javassist.jar
-	sed -e 's:\.\./\.\./::' -i src/test/javassist/JvstTest{4,Root}.java || die
-}
-
-src_test() {
-	default
-	einfo "Testing"
-	JAVA_PKG_WANT_SOURCE=11
-	JAVA_PKG_WANT_TARGET=11
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index c05502fb59b6..947a39719dd7 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
+DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
@@ -13,6 +15,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
 EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
 EBUILD tomcat-el-api-10.1.2.ebuild 1378 BLAKE2B 8a81c24f9ef4ad38ccb2bbd79e0ac11c08c913a50f48c2e0d81a37e6bb894f3527b02606f4bd43ec63ecf3dfd865ba77e48b4ff4e49da1934959caf98e401bdd SHA512 da1ff8e697ee12f3a7325ad51c9cccd04f739d9c2af8627e8b6d0e15799b486f16f9aad58dbfddd6c0f0fcf1f9d33bd6ddb2a4de8cd236bf1284c1acadce5450
+EBUILD tomcat-el-api-10.1.4.ebuild 1378 BLAKE2B 3eceda8178c020a0b56f12d084a877a6ef576876c34ef7bf04ee33a261b6fdc59c43c656cdc49abe059d71889dc3698dd20ce1856c9c74af101e949eb61d3287 SHA512 b4f83e63e448a4f16003b589b105694847a20e4b02a4b34f220d08af00f86ed2cf3bf41f6970cdfb068a599325e22efb545ab74ceb09512d10b37b1fa4edf59f
 EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f37825077154ff548e36a02817752826d603c35e1b47b58d099253d5f8b23e5c194c2157947970faa52459809c0136fdbb00a3193d SHA512 bb5dfb679a825e5d7cc69d37871ef541dab45d3c234d39baf373745528c5dbeaf5388b3c63407d606cda053a07ae867f25347f88dda7acaf6f49467020fcb61a
 EBUILD tomcat-el-api-8.5.84.ebuild 1374 BLAKE2B 49636903311ea08eecc21383ba28668f85a0b81e9a2e7769ab851e512886a4365a7870d6c7e54a12bf18ad0b2f36130cf601c776aa7ff4963c23486752a71ca2 SHA512 ae9e51bab4ef27768e8a5a4b04a53ea9c8b000db7020bc939c19a363b638c905df7385c8d4f5dfaeb7c53b8592d022c80f5047e6fea5d2d9b6dbefdfd28302bb
 EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
new file mode 100644
index 000000000000..fc428cd76e48
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 15f0daff9978..09f95230151f 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -2,6 +2,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
+DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
@@ -13,6 +15,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
 EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
 EBUILD tomcat-jsp-api-10.1.2.ebuild 1421 BLAKE2B 386285f7b823c7babcf7626af895d4d403dd2a31c6b6a220188251da2227ec180d657a01f5f37ddd32806b5672c66f64e02809d0d0308d00695cb9aefbafd348 SHA512 995e9e4293fbb5e9c6503c0bb2b8e85ebfeaa0bb4155c04df91e49f8d61cb2c58fc0f43b6b05aa26e63e08a38ec1f4d484145cd28c582d1b45899c0b1d2b4777
+EBUILD tomcat-jsp-api-10.1.4.ebuild 1421 BLAKE2B 5772c460b91398713fc37a32cf88b0d13b179090ea5fc76b5aea12b9b21e3f9e222eaffbe9feccac6d02c23dbecbcf682d4bde5f377544d4f9cb41f73d928ef2 SHA512 6d35f8506e603445a7a90b284d34ee5faede6a27f49ac9a3528f327b0a42ba594ddc522a0debecd4c1440ca20a45ea95410f85ec12aa969340abe91a5fa6fdbb
 EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a41ab87a375a9aa72b1a73bead1335a730c3a9c5d3b60526e4b87d7e46f0d25f70b251002b1ecccfe3df40cf9bb96e0dd0d7b SHA512 abadc559103fb67928be0f0a62cdff998248f5843284011556a08c3aaa5f06ba5764cb2e6448a8de05c3dfeff5d276d201c900fa434a145ba6914106839fda5f
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1417 BLAKE2B ba676748e8426dab6b0cecfeaf857c59d5b2e8c40882ec72028b8c67a39e377f82256254e5109805068a9eb0521c9183bb867d3d4c43376ef0d98044bde24839 SHA512 3e9b09aa9c3ff00ac6f52d7087c87fd745727ad595ce3083977aa7df6207bd068e5e51a7235f7ce230f5e45abf3b7d2d296bba70b4f3e37bc8fa5ff6b7223ef1
 EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
new file mode 100644
index 000000000000..4e8a67f38a9a
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index b97f36ad7087..48b4f3a8e6e7 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,6 +5,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
+DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -20,6 +22,7 @@ DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b
 EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
 EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
 EBUILD tomcat-servlet-api-10.1.2.ebuild 1468 BLAKE2B 67d55f97786e2e4f191b8d9b76ec902b1d362e43f178f2f9b5afd49d70dfd0fa06ecbe519e0fa48cf7592438ddef6119f4917de642bd2380bc9af64b152276a0 SHA512 f654acecda8b6bef951d896355762bb95b2c59a37ea1fece08d0ae611b7bca43c6f363fce7405a87c6cc3df8df3dba3ba9a4d8408e274bf40b035e4d0ec4ff4c
+EBUILD tomcat-servlet-api-10.1.4.ebuild 1468 BLAKE2B 1c120380e8ab778805d7c63fee68e8fbef0b9102a5b24cd0262357f19572c1644251d8e552bc5e2d8d41b710a4c73bd8f35057083f82208f02ba123b9183e1c9 SHA512 bc2887d2850edd8eaa3db5ad533dc3d87f9f3043f4b1aebea050dc2c91f164b533000e962352a75c9ed9adad86664054846e527e7bec35abca22dd4f59ae2386
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
new file mode 100644
index 000000000000..ad529b04d70d
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.4"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="6.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index a68bfb7cd538..6bbd5f490951 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 65eb90f3795b..ec60265c10d2 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,3 @@
-DIST PyQt5-5.15.6.tar.gz 3239505 BLAKE2B e98d6af85ae4586dbb1b7db1d4cb17ccdac917a36a304a7486d553a681be9a920e8750173e49e58e02d0129890a8a713702977e64efbb386ce831b8aaef2b0fd SHA512 65fd663cb70e8701e49bd4b39dc9384546cf2edd1b3bab259ca64b50908f48bdc02ca143f36cd6b429075f5616dcc7b291607dcb63afa176e828cded3b82f5c7
 DIST PyQt5-5.15.7.tar.gz 3238978 BLAKE2B 8e810444d9e4fe0c5af702161bc834848eefb6fdf04b282bbf42a9057d564aa778a01a5d40c249c10eecafb0dce8d160f032668f0d1fc87714fd874f002ec88a SHA512 815065f88454f767525fdd2caf97b0192eaf6095133c9c708ee4efa3d222742720a169856be65c84400a6e8d42d69ae65697d7f9dd17b9b4a347d75db93c5129
-EBUILD PyQt5-5.15.6.ebuild 5251 BLAKE2B 00a45b75b52a19b22f3ac675783fd8b60275ce94358de52ec261d35b6527d93992b72c6f2441dc8fd09bfd6ed97a499f23719b054180a6e367d4d2636361392d SHA512 0d9cb47f9ddab94989371824030ef9fab99fc3daf86aba8ce27a3a4ef89991b6cb2c4d4e3477ebe857c814c3c97f364dbf271538c54c454229ccbcd2d432d96e
 EBUILD PyQt5-5.15.7.ebuild 5261 BLAKE2B f941fc12e1955424e1e3e902592cb45fb40b0dcfe17931303bccbead95a808584082936f433fde0451de5dadd236dfa5d6c1d3c5dde3f541de5bce8f0b97cb09 SHA512 d06c9b75704fbd94a71fa50bb5069ec16757bab237f8abd63864490155acbfad0cb3b55c59548ddf56e6401bf3a1090da5289bb367142a079f63b9b378206d52
 MISC metadata.xml 2287 BLAKE2B b4090aa2c55d05554a152bc3adfa76c68dc78175d26bb4ea6d25858ce2db922c168cc4ded6c7fa9114cf651417e0a6e435baebe460c8efbbd94be17adafd6f43 SHA512 12e3559ff04c32ebce2a382bf3b01730b0b69829c77cdf75f0061143cc19000e126daebbf9014beeae8bd1fba2675ef2ecfe7943296a8dc66000439c104c1351
diff --git a/dev-python/PyQt5/PyQt5-5.15.6.ebuild b/dev-python/PyQt5/PyQt5-5.15.6.ebuild
deleted file mode 100644
index f0138e797269..000000000000
--- a/dev-python/PyQt5/PyQt5-5.15.6.ebuild
+++ /dev/null
@@ -1,183 +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 python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/"
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-fi
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-# TODO: QtNfc, QtQuick3D, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
-	multimedia network opengl positioning printsupport sensors serialport speech
-	sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns"
-
-# The requirements below were extracted from the qmake_QT declarations
-# in project.py and from the output of 'grep -r "%Import " ${S}/sip'
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	bluetooth? ( gui )
-	declarative? ( gui network )
-	designer? ( widgets )
-	help? ( gui widgets )
-	location? ( positioning )
-	multimedia? ( gui network )
-	opengl? ( gui widgets )
-	positioning? ( gui )
-	printsupport? ( gui widgets )
-	sensors? ( gui )
-	serialport? ( gui )
-	sql? ( widgets )
-	svg? ( gui widgets )
-	testlib? ( widgets )
-	webchannel? ( network )
-	websockets? ( network )
-	widgets? ( gui )
-	xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.15:5"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		>=dev-qt/qtdbus-${QT_PV}
-	)
-	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
-	help? ( >=dev-qt/qthelp-${QT_PV} )
-	location? ( >=dev-qt/qtlocation-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
-	network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
-	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
-	positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
-	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
-	sensors? ( >=dev-qt/qtsensors-${QT_PV} )
-	serialport? ( >=dev-qt/qtserialport-${QT_PV} )
-	speech? ( >=dev-qt/qtspeech-${QT_PV} )
-	sql? ( >=dev-qt/qtsql-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	testlib? ( >=dev-qt/qttest-${QT_PV} )
-	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
-	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
-	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
-	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
-"
-RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-sip-12.9:=[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}]
-	>=dev-python/sip-6.4[${PYTHON_USEDEP}]
-	>=dev-qt/qtcore-${QT_PV}
-	dbus? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	pyqt_use_enable() {
-		use "$1" || return
-
-		if [[ $# -eq 1 ]]; then
-			echo --enable=Qt${1^}
-		else
-			shift
-			echo ${@/#/--enable=}
-		fi
-	}
-
-	configuration() {
-		local myconf=(
-			sip-build
-			--verbose
-			--confirm-license
-			--build-dir="${BUILD_DIR}"
-			--scripts-dir="$(python_get_scriptdir)"
-			--qmake="$(qt5_get_bindir)"/qmake
-			--no-make
-			$(usev debug '--debug --qml-debug --tracing')
-			$(usev !dbus --no-dbus-python)
-			$(usev !declarative --no-qml-plugin)
-			$(usev !designer --no-designer-plugin)
-			$(usev gles2-only --disabled-feature=PyQt_Desktop_OpenGL)
-			$(usev !ssl --disabled-feature=PyQt_SSL)
-			--enable=pylupdate
-			--enable=pyrcc
-			--enable=Qt
-			$(pyqt_use_enable bluetooth)
-			--enable=QtCore
-			$(pyqt_use_enable dbus QtDBus)
-			$(pyqt_use_enable declarative QtQml QtQuick $(usev widgets QtQuickWidgets))
-			$(pyqt_use_enable designer)
-			$(pyqt_use_enable gui)
-			$(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
-			$(pyqt_use_enable help)
-			$(pyqt_use_enable location)
-			$(pyqt_use_enable multimedia QtMultimedia $(usev widgets QtMultimediaWidgets))
-			$(pyqt_use_enable network)
-			$(pyqt_use_enable opengl QtOpenGL)
-			$(pyqt_use_enable positioning)
-			$(pyqt_use_enable printsupport QtPrintSupport)
-			$(pyqt_use_enable sensors)
-			$(pyqt_use_enable serialport QtSerialPort)
-			$(pyqt_use_enable speech QtTextToSpeech)
-			$(pyqt_use_enable sql)
-			$(pyqt_use_enable svg)
-			$(pyqt_use_enable testlib QtTest)
-			$(pyqt_use_enable webchannel QtWebChannel)
-			$(pyqt_use_enable websockets QtWebSockets)
-			$(pyqt_use_enable widgets)
-			$(pyqt_use_enable x11extras QtX11Extras)
-			--enable=QtXml
-			$(pyqt_use_enable xmlpatterns QtXmlPatterns)
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-
-		# Run eqmake to respect toolchain and build flags
-		run_in_build_dir eqmake5 -recursive ${PN}.pro
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake INSTALL_ROOT="${D}" install
-		python_optimize
-
-		local exe
-		for exe in "${D}$(python_get_scriptdir)"/*; do
-			python_doexe "${exe}"
-		done
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-
-	if use examples; then
-		dodoc -r examples
-	fi
-}
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index f3a64b6423c6..62405f8490e0 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,12 +1,6 @@
-DIST ansible-compat-2.2.1.tar.gz 39126 BLAKE2B c4d0512606c99ba8f07e0287620c94af6b46d7bf0077f12dcbfd9689fc7106f164a87db25de1625249ac2930858bfa655bd93d83aba0d85ed4f8bdd42cd345dc SHA512 3e941eb2c5303f83b7e7c057d08801f192889b636d9c6e56a2ac21cf75144a52ba2916eaedeba7bf848dd268387bf4d3261541d75145b213cc3f6baca6a06e5e
-DIST ansible-compat-2.2.3.tar.gz 39603 BLAKE2B 16b88a1c669a74d858e4d47539811b33db77561f7e72088d5eece67ee1594e65a9328277bc65b96dce726180c29118b2b240b45541b6548b34584d643f836894 SHA512 4944ff97524734c445438c052aeedd0d526b58e91a56e0bcc32123fb3a9464c82f7718ea1897a09ef0dd33dfa36abdc6e0a0157e9a4eb8d341cbd712b2f538d1
-DIST ansible-compat-2.2.4.tar.gz 39772 BLAKE2B a4874675086956e11de4df4068e3b17b65b4f9f7610bb88bfba308d880fe478e39a4450a362bb06a555a36a41731f336c51756893ebe65715fc022421c51a293 SHA512 ec30329b2aa07ea7685a8cd91438f0d0e9003644fb3d15a842277abc7f5f1eeed61bb606ca594d6496e1980be0109dd5e4021bc4aeb66d909a312bf02649a1b9
 DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
 DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
 DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
-EBUILD ansible-compat-2.2.1.ebuild 1840 BLAKE2B f937d79b50bd20504a4d89ab09b669b011b685be6dc1a032f00998a4eeec2db837366e41e8b2f10175f39d2c1e1543ff4cb7e59831c881a148939a3ea4e911be SHA512 dbcadfd90dc993542d29333e23ed03d30ef2fa690f6739f1467e88c387017b61d89d12b40847e0cc7d855a2acc526907ebc8a918423a70145a0ad5a761b9c021
-EBUILD ansible-compat-2.2.3.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
-EBUILD ansible-compat-2.2.4.ebuild 1739 BLAKE2B 0f604539a52e2a55a6bf17c2ddf8fb2216e0c0e56a2587a6aa230615cf93ef04ef4627f5f26ae20284ee964a87452cffa77f1a32acc3f666a97cf4defb983a45 SHA512 b3da667a719439973776c6fbe89dad891b018c435af21dd5463f7d78a94449853c977235811235aa8f4d6ecac327974f9db4203eefed2df456288b1f506a33ef
 EBUILD ansible-compat-2.2.5.ebuild 1675 BLAKE2B df204a67712387cf02c8a23c2f0e2384d2f5d22eadbdcb4078657927a38ee10954e42f3ac5f75d2a9ae4d2106d0820762ab93f33a79677a1e5bf97b541c4ec11 SHA512 39d90bca553988b31038446b9c0e2e6a4374a2979bf2daecf9c022342054678befcb25c7fcfb7340630ecd120b7146d81e01e2b8558dbb1af551225ed9ef217e
 EBUILD ansible-compat-2.2.6.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
 EBUILD ansible-compat-2.2.7.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.1.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.1.ebuild
deleted file mode 100644
index 30d54cc49842..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.1.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.3.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.3.ebuild
deleted file mode 100644
index 0a8b7add6886..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.3.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-markdown[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -p pytest_markdown.plugin
-}
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.4.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.4.ebuild
deleted file mode 100644
index 12d9c5e19884..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.4.ebuild
+++ /dev/null
@@ -1,57 +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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-6.3.1[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst_parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index d3d36c71d2ed..a4f9b570c138 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -1,17 +1,5 @@
-DIST cfn-lint-0.69.1.gh.tar.gz 9871037 BLAKE2B a6c4d1b3b892eee01231771dfbe7831737f8f6f89cf096a4ea0c1b945aa47574a51938d4b8ecdd7e3c2cd18df87ba343c07f3e379b49b78b07d7ec676f12e0d1 SHA512 1823485a0d2273a6a1c6632944a095bc4f9b7999f4e0dc81a47cb8673a3d02f822865b08ca3dfcf518b38a9c68a0f0bc5c3235904aca5ce94919ec627b9c3ddc
-DIST cfn-lint-0.70.0.gh.tar.gz 9891445 BLAKE2B 6cdacffb2c3649203046339d088d3e41a4280197a5b23ef5b7cb837d93de62760dbe78a2b92800f11606f3e723f6c9c93d7d08e1379541a1bbbdfc302ae76633 SHA512 456acc59b30b4e4546d07426a7218b7ef2716412c82b12a9f419550d4916121fd0874dfca1725436305309165bb05875c27410a5bdf82ba462157022dc3feed1
-DIST cfn-lint-0.70.1.gh.tar.gz 9891593 BLAKE2B 2ee4ba8d688c3888e11e1df52ab26f554f7d13a2f46bc56b5f0d3de7912e8cd99432e7dc174f0072966fd6a586718abe5e9ab11797c5a24480ee508f8819a7df SHA512 c2566ffadf5935b8dfd38eb690f406466aef4d1e0793691547479673bc2519acd8bd5b42ecfb666736c81e9cf3254601542b0a7d4b5257ca626e6e3b194c64da
-DIST cfn-lint-0.71.0.gh.tar.gz 2970400 BLAKE2B f57f8605a05004dfe6207a313126c74d163f4e461b4065d8ba439534b38cf9beb4d7fc11ed7736ae3c635ba3f7ab3d658f5d8278d4859bf24c987545d9105e97 SHA512 814e9029e221fc5a6fb9d5c687760549fe6a239ca3c9f0248a4bd307429da46ba394af49a7af1d3f52f4fdbc88ded86aa5cc42e3e46608bacb909d23e334c053
 DIST cfn-lint-0.71.1.gh.tar.gz 2984397 BLAKE2B faa2164ee0f469f8e9118b82d5c86dee05e5404feb5ae28abd9e4218122677dba09308d5a573c4eaabb8f321932b8de621a39bc20f1c86724dc24fedac7e7a93 SHA512 dee916eaa43eabcc4cf2db7fb08db8875f68292a56aa97d29d0d291da51a828a78b681162b71759ec0dc3d246570dbce8fe33a41ce61c22e6fbf2a4ff15f49ff
-DIST cfn-lint-0.72.0.gh.tar.gz 3027416 BLAKE2B 710c403838d90de46525ce6991aa05bb973fc010b6909d329c8a59159779578f51248f823554faf1c9c9f2fd019235770f1f9ca124426ff1c79d203d7599c5c2 SHA512 c420ab110039c4bc761551ca8665d2c58390ffb0590adf2f8ae3beb3cc2587fae1c96e06faa5baecb6014ce68f580e8f0d285c2ad287718c15d6d6e49ca5d50b
-DIST cfn-lint-0.72.1.gh.tar.gz 3061196 BLAKE2B 58bca78db0d2bdc6ce4ee146c47c6f8d1eab272bf9074c7ce73c6caa6fa2dfed2bd05efec7b66c8ac341d9a072012354e4c056c24d1edb16933175db87043f87 SHA512 a58fe5a1c0aae095cdc1dc1e3ed6d5dc080e9a54fb565f68b2a80756e49ab8f1de24043dabe6ff8b9d88732a675074a8c5818a1d0802e91c67275fc19ab23905
 DIST cfn-lint-0.72.2.gh.tar.gz 3114298 BLAKE2B 5a426a046d1a0ffb773f9b34c544ccf9f55467de156f3bc0c3324c9877a1f101da69130c39a0d0144d57557c75e9bbcecc41bb1823fe41c00f14874c516c0033 SHA512 2248e2854410ba889180dd20df1f8c1ec70150b8433a7b4d564c6d9a9c7ceaedc81bf051eeaf1906878e57dc395c5e4c08623574cb9f4dced9ea0a8fbe73325d
-EBUILD cfn-lint-0.69.1.ebuild 1638 BLAKE2B e8d994dfa0765e96d9d8ac3b26bf68e9bc3fc79f4177aae0c6b2fe0a3c074a3dc016b8f030d0f2ed9ef44622958386adc185822b56bacc79e757ad99f645f192 SHA512 6cc04df1ea03ae64eb1d3bc74cd5d689ddd73e4f75c1e7a799c6d6fe81c267c975656606821991ae3e3a02d2b6eafac6f8cd4bde4f2ce624be834339a28e374e
-EBUILD cfn-lint-0.70.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
-EBUILD cfn-lint-0.70.1.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
-EBUILD cfn-lint-0.71.0.ebuild 1640 BLAKE2B ec6a9bdbdbb86461f0f2acb66fd1734ea65367182fef0d7b0baf080350972f8c701fa18d7b52bc4b243f5565c5b1ef0f98232bc8e9fcab71d19ffef9d413f016 SHA512 2bf2da99cc45b67e70c61127f855007d89bf82af5e39af3d48099da70794b83e1b2e959c1d89cf832fef080beee3d80a8f758cdb0a2b30a8f41c55d323cd97b7
 EBUILD cfn-lint-0.71.1.ebuild 1638 BLAKE2B d6f1eb649359ad720f936be2dcefbd7c0f0106624e1189dd7af84a690255aba1faf6cfe40e441a51560b66b4b49e1d91e02e3a6cf293dfa5b9bd6132f7349922 SHA512 aec08fc4886ee20dfab104e0c9829bd7a19c85d84dec6262a909a138a56b7eb441177c40fed1cdfc0c7f5cba89edabce9a2328135bccf3d1fde0dae3fc7e6a28
-EBUILD cfn-lint-0.72.0.ebuild 1640 BLAKE2B ae06a57b64652dff129a2532863f0ac274cd1f97cc65d78a0cdeea6aab3b134fe2e8965eee02f2f220cd8893091539b02d519958b3c28fed305cf727371456aa SHA512 3a98281593316fa61399e97469a52bc3da0ec74211098b39c82a07f0d3c5df2ddcf7b8ecadb10b8bfb37d632e1221209bf9aaea44bb36a204f96148b6b111ae9
-EBUILD cfn-lint-0.72.1.ebuild 1640 BLAKE2B ae06a57b64652dff129a2532863f0ac274cd1f97cc65d78a0cdeea6aab3b134fe2e8965eee02f2f220cd8893091539b02d519958b3c28fed305cf727371456aa SHA512 3a98281593316fa61399e97469a52bc3da0ec74211098b39c82a07f0d3c5df2ddcf7b8ecadb10b8bfb37d632e1221209bf9aaea44bb36a204f96148b6b111ae9
 EBUILD cfn-lint-0.72.2.ebuild 1640 BLAKE2B 0e316501d527a704dcbd50724505468c906e84e00c9861ae701b176db497b6c67072283627bc1200759429896d58ac6a0007ef4dfd7dd1bc8ee9b4e417eed64d SHA512 2faaaa66c9015dc80c36392a03747515fc42985129d8f9aa02a2a9d14235c60eb803996c923ffb01f2c776b1f20b8ca3e2a931a5aa5f2f1fbf93eb5361eb69ed
 MISC metadata.xml 583 BLAKE2B 9f73e2b92e5cfa2ad59f5c8e5d91bdd3aa9eba3fa722b93b388cffea42020db7e7441bab5749432812934a4514d3e9104e6d897e1d115afa5ed237757bd48c03 SHA512 1866a349855ae4e248498b7aabd6ce4c4e10ea58731df4bfa13500f61dc041da6dbd7420e7d6a78fad46d5cf00bd7ef2d0c4c7d6819a21b3a5031b0d49588a19
diff --git a/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.69.1.ebuild
deleted file mode 100644
index 46166788b6e7..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.69.1.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.70.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.70.0.ebuild
deleted file mode 100644
index 0916420e1790..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.70.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.70.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.70.1.ebuild
deleted file mode 100644
index 0916420e1790..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.70.1.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.71.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.71.0.ebuild
deleted file mode 100644
index 0916420e1790..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.71.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.53.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.0.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.0.ebuild
deleted file mode 100644
index 335ae90faf41..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.54.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-lint/cfn-lint-0.72.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.72.1.ebuild
deleted file mode 100644
index 335ae90faf41..000000000000
--- a/dev-python/cfn-lint/cfn-lint-0.72.1.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..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="CloudFormation Linter"
-HOMEPAGE="
-	https://github.com/aws-cloudformation/cfn-lint/
-	https://pypi.org/project/cfn-lint/
-"
-SRC_URI="
-	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-sam-translator-1.54.0[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	>=dev-python/jschema_to_python-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-	dev-python/junit-xml[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	>dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
-	>=dev-python/sarif_om-1.0.4[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	test/unit/module/test_template.py::TestTemplate::test_build_graph
-	# requires git repo
-	test/unit/module/maintenance/test_update_documentation.py::TestUpdateDocumentation::test_update_docs
-	# Internet
-	test/unit/module/formatters/test_formatters.py::TestFormatters::test_sarif_formatter
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_2
-	test/unit/module/maintenance/test_update_resource_specs.py::TestUpdateResourceSpecs::test_update_resource_specs_python_3
-)
-
-src_prepare() {
-	# unpin the deps
-	sed -e 's:~=[0-9.]*::' -i setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 306624fe2736..8ec4b3d45e20 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,19 +1,5 @@
-DIST ipykernel-6.16.2.tar.gz 136606 BLAKE2B 596cae97c6e4d170c51a2f2f481c306a93833cf62959837bde129ed080f70e730cb083ff0a608b7539f633898b7f79f8c5ee3495580fe2821382f0be10417ccc SHA512 3a3bae6cc8ace33b7b8c9d335c7da73c1983824b74b29b77c14cbe24239d556c9c967a759a37a60745823cb6ab698a21262457082464cf33ec1b02ebbe2240d9
-DIST ipykernel-6.17.0.tar.gz 136711 BLAKE2B 2d037334e3fbff0cdd3e2a99cb0987c2c647bf04e3eaa85ff56a202d2b2c88383ffd81f8ba74565fee9ade19ab9d6bcfcb862bd92fdea00892f0195f1c97a752 SHA512 52ff2cbf2aa8f1d02c0d25866e91e2eccddca55b70a226145b99165b3514ab1b87e797abac4423bfb7090152e7eafbc47aacde8c3373f5b2bdf0ff642c07d0ba
-DIST ipykernel-6.17.1.tar.gz 137131 BLAKE2B 0805f04b685fdfd8e43b733962e096035f900a4f8a525cf6f52980bffeedb88d5f33eb75a311dda26fe482ee2625c9f3ade15d1b449165f8050c5e83b20e0b39 SHA512 f1293ac6c4744fe3c79e0886d55a15f6c19ac73c07f5bd4a09f4f0c26c8ed0935b5c0924c55efc2097257737d6a59caba1cf9fba004b5f368a62840a269908f7
-DIST ipykernel-6.18.0.tar.gz 137928 BLAKE2B dd296b1fcf7d9fcf81a3315e22d6c488086d44f91807242a8fdfaed99836a0f97af6274ec967a1a4052b03c72b5706381e15511b5fb8d3fa3e169e08e7e68049 SHA512 918f11d7eef2d6e11ba5fb835ffb7511039142609bab04d68fd0c187085aa2c5b9634438484c9ae5a9bdb8822098e3073d6ffacae1f19f82eb0efda53eca366d
-DIST ipykernel-6.18.1.tar.gz 141559 BLAKE2B 4c12ff56d2e9c34a278e68e141032768ede70f86119193bab22e2ea58faec6e723dbc4d4411565f8c7974e67d55e053b6821e88f5c105cd9f2e2ae7049d137f2 SHA512 ff9fe59c646487483e979b757ea34d884b0bf9749430daf5ae6dd0cf7381c67e51712624938800d49c53f9ca70cb63fc8c38f10851084d4a5b68f3b1e2762b0a
-DIST ipykernel-6.18.2.tar.gz 141693 BLAKE2B 6990354a26dcf9572e52e8d12b3df4f2b34cfff79afd05905f23a3957d3d79c0f28fa27d4bdb8978616fff272d626fb60e1ad8094c05020b2307b8aa5d3e68c6 SHA512 c8c2a1132e8cefec0e5b66cd3cfec14ce18d62d48119e644e1f8849d1472baf3b95b158feb6887cb1788229ac4a0bdff95d0d71141b32930e4e4962688ae5bfd
 DIST ipykernel-6.18.3.tar.gz 141999 BLAKE2B da5b0b2a36a58f2c91fdeab95a7e4bb33e09f9663eccb6d394f69a5a25e7e55e3f18315d017aaf435607efa73acca955665f7720b75ac4aa3256aa034698082d SHA512 0687ac146bac38bbdd6abad11df31572cb105bd41b79de98b40c18b60cdcb550b7ea10d68acf99f26d70c00ed4ef371d6dc2b6a4ce27eccae3f736955754ca1a
-DIST ipykernel-6.19.1.tar.gz 143329 BLAKE2B 324744ab8633338d15d9d72e931fe1c708909ab50c41f2c82192c2c7dd1ad6ffd04b6564265b9d4d09919767b496793aa639bec60fdad8f3e9b2de49f3a6333b SHA512 8c0a3a4cdef050d5fc059bd416a139a89bdacac6d68e31af8c800a7a0cfebf069c2df968b256ac8af1528fdd1d499a020428529ead10c0d96f2205b28906f690
 DIST ipykernel-6.19.2.tar.gz 143367 BLAKE2B f6f38f5eed3a11951d303f49c58131d9473040b34032c133cf0f788bb648fc7c8529e3879dce315dcd3eda4eb1be45eb4891d10d4a2d006bb7947f2b342a47a7 SHA512 67ccbffb2d9eba27e9b87c7bd9dc471955c0109ea30caf77412f74c803dc25ab526de90d8351c9459b5d7b2009c746f73ac4a08ae8c277d2e2de8344aef71834
-EBUILD ipykernel-6.16.2.ebuild 2099 BLAKE2B e65f36bb85b061fb9ac801e706a1621eefcd6357998ddc7dbc5c9c8a5ca7f7cb9fcef8b7086957df6d754cc0feb301eaf2d6481f30634990f5f3eba511bc9f61 SHA512 c6f458c6483e27ea814c94b116769a125bff1d9d4531c7861cde0c5bb164d3f9ed6d076777db75cd05d91bf1623d27b6b82367c415dfc0df8b7eabcf6fbdb838
-EBUILD ipykernel-6.17.0.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f6741807f087644f5ad3586df50ff0ecaa7b16253e2329cfc7d7c3fc100e162100f19923986fe7344344dca8c48d9880 SHA512 f1bd0e18ea2dbeb437aee47e51ecb42b3360c90a1fda367fded53405613578caad801c452e616b6aa1522c2cacca28fd43303d0687deb2829d0ed505753d199b
-EBUILD ipykernel-6.17.1.ebuild 2107 BLAKE2B 7be212425f9b84d7b5f04f5314411e54f6741807f087644f5ad3586df50ff0ecaa7b16253e2329cfc7d7c3fc100e162100f19923986fe7344344dca8c48d9880 SHA512 f1bd0e18ea2dbeb437aee47e51ecb42b3360c90a1fda367fded53405613578caad801c452e616b6aa1522c2cacca28fd43303d0687deb2829d0ed505753d199b
-EBUILD ipykernel-6.18.0.ebuild 2137 BLAKE2B 686df5f65d91a5b6faf0bbc5fb66233361df010242bbedeba00da2edc2a2814f6fe3832b46e66b23b1fde1d00c2bd36b2db905c2d7292f9e210c163c1a904b4f SHA512 ec3ab8d9aca1a75e7b578747db127272071d93dda8cb31c5f224c99cbcf157844f6fcec07c5c9ac47b439827f9eb527d3b4c313d4ef5f85b71ebf6ea3919417f
-EBUILD ipykernel-6.18.1.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
-EBUILD ipykernel-6.18.2.ebuild 2058 BLAKE2B 5cfd9b1c38959c002c48360afef9f9f69c4b606034b5c056df7d62c69b96cd35f4913bc92baee1da48952f274b6778dd6235dca4db1b6d2cfaf5fc860b572df4 SHA512 7935fa4383db9cb7e364850caf30ef90abf4787e771b64cb49e6391c7b63dee99f663b71a79651743518c93c616b70d7cc63b0156c572f23cb88e8ffd86aa9b0
 EBUILD ipykernel-6.18.3.ebuild 2062 BLAKE2B 4c231d0e9288f4d9b7d40db29ad495b78be4ed84deeb55932acc3b4e222be7e642d9da7bb44f6734cef32fd19fca79aa651173f2b2544637cafe92509e533c35 SHA512 5b6a0145fbe7ba37a92179e3ab475c30aa5c3ac46252328df086719ebbe94aa2645f7702712dfe1ab89d0cdf94335d73430913681ee9022a5bd643233059805e
-EBUILD ipykernel-6.19.1.ebuild 2078 BLAKE2B 2538c93fab041125eb9a3550c40769396f10214d3677fdeaee81501804d839ea337652eede98e96127196c27ecb43e10cb2bc46896420b3936c1f6a736ce1ae7 SHA512 e0ca85d89bf6c7e143b65900bab208278add9595c493132a5570940744a4dda03b4807685c18e831339d01cb1910bf6007e9d488dc41054ea40b4b72a9d30110
 EBUILD ipykernel-6.19.2.ebuild 2078 BLAKE2B 2538c93fab041125eb9a3550c40769396f10214d3677fdeaee81501804d839ea337652eede98e96127196c27ecb43e10cb2bc46896420b3936c1f6a736ce1ae7 SHA512 e0ca85d89bf6c7e143b65900bab208278add9595c493132a5570940744a4dda03b4807685c18e831339d01cb1910bf6007e9d488dc41054ea40b4b72a9d30110
 MISC metadata.xml 527 BLAKE2B 4a24cb9d5b801bf94c71c47d0c90b04bc249fb41a794c7b688a5762f08545d1fcfe9e4976aa4f583ecb456458b5f6dfc394349633959444584c0abad0da4be42 SHA512 ed9f0ef12ec5de67a646783243555f1737604a84c78c57b9f7c65137cec8cbc396991411501927f92bd393daad2238c27363ecc9c115031450231c2a4fb2cbb9
diff --git a/dev-python/ipykernel/ipykernel-6.16.2.ebuild b/dev-python/ipykernel/ipykernel-6.16.2.ebuild
deleted file mode 100644
index 17b9ec61a3c2..000000000000
--- a/dev-python/ipykernel/ipykernel-6.16.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.17.0.ebuild b/dev-python/ipykernel/ipykernel-6.17.0.ebuild
deleted file mode 100644
index 5f03300e2ce5..000000000000
--- a/dev-python/ipykernel/ipykernel-6.17.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.17.1.ebuild b/dev-python/ipykernel/ipykernel-6.17.1.ebuild
deleted file mode 100644
index 5f03300e2ce5..000000000000
--- a/dev-python/ipykernel/ipykernel-6.17.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.18.0.ebuild b/dev-python/ipykernel/ipykernel-6.18.0.ebuild
deleted file mode 100644
index 66afc3161910..000000000000
--- a/dev-python/ipykernel/ipykernel-6.18.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	dev-python/comm[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.18.1.ebuild b/dev-python/ipykernel/ipykernel-6.18.1.ebuild
deleted file mode 100644
index 34e2bb08177b..000000000000
--- a/dev-python/ipykernel/ipykernel-6.18.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	dev-python/comm[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.18.2.ebuild b/dev-python/ipykernel/ipykernel-6.18.2.ebuild
deleted file mode 100644
index 34e2bb08177b..000000000000
--- a/dev-python/ipykernel/ipykernel-6.18.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	dev-python/comm[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-python/ipykernel/ipykernel-6.19.1.ebuild b/dev-python/ipykernel/ipykernel-6.19.1.ebuild
deleted file mode 100644
index 52fc858aaae0..000000000000
--- a/dev-python/ipykernel/ipykernel-6.19.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="IPython Kernel for Jupyter"
-HOMEPAGE="
-	https://github.com/ipython/ipykernel/
-	https://pypi.org/project/ipykernel/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
-	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
-	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
-	dev-python/nest_asyncio[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/tornado-6.1[${PYTHON_USEDEP}]
-	>=dev-python/traitlets-5.4.0[${PYTHON_USEDEP}]
-"
-# RDEPEND seems specifically needed in BDEPEND, at least jupyter
-# bug #816486
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/ipyparallel[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# TODO
-	ipykernel/tests/test_debugger.py::test_attach_debug
-	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
-	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
-	ipykernel/tests/test_debugger.py::test_set_breakpoints
-	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
-)
-
-src_prepare() {
-	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Use python3 in kernel.json configuration, bug #784764
-	sed -i -e '/python3.[0-9]\+/s//python3/' \
-		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fc21a350e747..db5ee1c94d96 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/csv/Manifest b/dev-ruby/csv/Manifest
index 9866f1220b2b..28274f71092b 100644
--- a/dev-ruby/csv/Manifest
+++ b/dev-ruby/csv/Manifest
@@ -1,7 +1,9 @@
 DIST csv-3.2.3.tar.gz 88749 BLAKE2B ec927ae8eaaf4f050e34218cd5a6bef2cd912828e065a03b772070e0ad9f18617b55a771a1fe2a4467106cabf2d54efe84313fdecfb758104545b9874056eec9 SHA512 104b27991f43c9d18a7a0f9db38b32bf638b7b73e25376f1a404b76910a348bf8bf7850a9a671658b928bacfbe288176cfa14dce2ae1524c64dfbeb52138a482
 DIST csv-3.2.4.tar.gz 89474 BLAKE2B a4a4b890f4c978ab933d4f7fde05d90d30f44f4f954db39ca00f867a90b2d584e52625127ee33b81dab82445bf9a6a94340e090c35cd5c6ab9e14b22320d5d57 SHA512 b024132fda678347fae4b237dfbf9f261ca3bf46c22c627db4ad8c6f17a690ab97a8ad4ffe693f6ed3c5a71620408f15ccee9d27c36196c7b51ca9abc09029a5
 DIST csv-3.2.5.tar.gz 89665 BLAKE2B d464e1d36568b30328a3b2b14a363e19f3364f9a18afc16caba3cdff86c9d5bb2565706eef4f5dc573eacb918330477892aab6d544136fe8d1eed4ed558a3860 SHA512 2f41b7a51754843dd90213931e0bd2a29e7d1c03046a526d884c5677263fcb07110f507d7b91f2976693588799df1d261ce3d7f50d473206ce218def4a461250
+DIST csv-3.2.6.tar.gz 90054 BLAKE2B 106e3ef5d5e1ad3d95e80e96711db61bf00822711259188b26738b44de52c35d8e12c8042a7dbfeda5108c0b98cc73b8beb69c4f6957b2eb2f34297c220e5736 SHA512 b89044581d1c6cac5270573e424747c42a20cc6d51dde03971bbfc01b5ced3dd5ad713290a0e9c821cf67302153e9b17750e01b7f41182dcb794e0a4f10d88a2
 EBUILD csv-3.2.3.ebuild 1011 BLAKE2B 6f0a72c7018a33b730b626ce0badb39049dc349a66584c322b9e098b4afc35594e5b26e5f2f62c0a31065182487dff6a9591ccda184164f3d9b2729c6e25cbe8 SHA512 9436a672fa9016ca8b5d525e49f77094638e6a3b54500c90f908cf4dfd7ef083fbc1ae799ac7d3c5d3990c07a838ed0ed0c29e70d89dec739d072d2abd74454a
 EBUILD csv-3.2.4.ebuild 1004 BLAKE2B ec90585b458e50168253e400567a8c19d74f669059051767db15a4d81261afbfaee23127e668b1d89ba554baa9defbdbdedb392b7ac5512a0c36195cb17655f0 SHA512 afd25487c87359f247b0c34db0693b1cfe246bbbc6b60949626e9741af59aa93ab3f20c29e0f0522264eebaa6b9cfe7e77224f2fece1342f40b9891192943c16
 EBUILD csv-3.2.5.ebuild 1004 BLAKE2B ec90585b458e50168253e400567a8c19d74f669059051767db15a4d81261afbfaee23127e668b1d89ba554baa9defbdbdedb392b7ac5512a0c36195cb17655f0 SHA512 afd25487c87359f247b0c34db0693b1cfe246bbbc6b60949626e9741af59aa93ab3f20c29e0f0522264eebaa6b9cfe7e77224f2fece1342f40b9891192943c16
+EBUILD csv-3.2.6.ebuild 1004 BLAKE2B ec90585b458e50168253e400567a8c19d74f669059051767db15a4d81261afbfaee23127e668b1d89ba554baa9defbdbdedb392b7ac5512a0c36195cb17655f0 SHA512 afd25487c87359f247b0c34db0693b1cfe246bbbc6b60949626e9741af59aa93ab3f20c29e0f0522264eebaa6b9cfe7e77224f2fece1342f40b9891192943c16
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/csv/csv-3.2.6.ebuild b/dev-ruby/csv/csv-3.2.6.ebuild
new file mode 100644
index 000000000000..b0a5c099d961
--- /dev/null
+++ b/dev-ruby/csv/csv-3.2.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The CSV library provides a complete interface to CSV files and data"
+HOMEPAGE="https://github.com/ruby/csv"
+SRC_URI="https://github.com/ruby/csv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} run-test.rb || die
+}
diff --git a/dev-ruby/date/Manifest b/dev-ruby/date/Manifest
index 0e081caab623..a28703fa78f0 100644
--- a/dev-ruby/date/Manifest
+++ b/dev-ruby/date/Manifest
@@ -1,5 +1,7 @@
 DIST date-3.2.2.tar.gz 108973 BLAKE2B aedb4d5d43b1d7ac277bc6fd36651f36828be7a04f4eb75c45ea02bc56b3a403af9e8a26b23a9839c904ae455e6a02476fe83115d8c816f06168db6e0a788347 SHA512 5a640b550c9ea0c1fa24aa5d114ae9108fd568c8c38b20434168a92c886d66487065e0c6aedc7e55cbe59cc3338fd262ca601267ed0b55377c382fe0502e9604
 DIST date-3.3.0.tar.gz 108249 BLAKE2B 7d85337c1b39b09d15a73a47b5e09788a700a0e044fc74a4138be490d7212174e3cc03c40c7b4814bc69523399826832c48c07a38e0cfb6f28554f584cf81fe0 SHA512 1e20c5a29b0aabc3354b6c39e0dcc4cbeafc6b74afddd5b4446b7a7b608832f072c86b98267893267d0372ba7ab0bfd71862369cd8d35b162cba8bdd81563a57
+DIST date-3.3.1.tar.gz 108337 BLAKE2B 90241a005755c330dab010aa2d1a0c6192b7de3e33f0b3fe8089385d2aed0a834ea96b71e276f2cf5bbddc187c915a5d93e38cfcddeaf267d803113895b9fd3f SHA512 8eb701542619320fc4400440b8c8a03626a389e0c94bf1e17f4bf952d616e5cbbce0f3714d824db255734386fb5b5522e220f619533f4c901746bb7d630e8275
 EBUILD date-3.2.2.ebuild 1034 BLAKE2B a43e6fc4d8d169070178ed3ff967cb6775bfb40b1842a1579864340b18468f90bdd60815c214483abf317c07867eba1ef8e473553dce9a801a1f0451989387c5 SHA512 a7a3be82be4c51ecc2d3635a79933981ec4e0071b8019edb079a0bca20061dacfc420bae4e1f2c6340334eb5e1437e687e647db49b43d626ff52a07e2eb6bb89
 EBUILD date-3.3.0.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
+EBUILD date-3.3.1.ebuild 1058 BLAKE2B 40186664921b3dde314d469654c7294eed9fb4f0023bcf04f4d5205faf65cd243a0abdee0599d9a85931b9a2461ef26299f232d2b7b1cbcf4f66335bf4da56f2 SHA512 26575bb1fb144170f2d86359fe688c2f28b994982cf1f4a7e7888a44168ba473fbe77eee4d13c02fbca51c85b522f80b2b5b1f41a830e43a47285156e5f83e4a
 MISC metadata.xml 336 BLAKE2B ebecdf17ef8daa50c1327043a3c8744971b20f9e58758716a4d39968312ed3426e3902d2be1fc6d1ccc6ff84460fa1c2bd98d5cdf0ccd417167603209c14b66d SHA512 5abad9d2498b1ca553c2500c9ea24b04b3c8f617ee799a45efe48814a8cb926380fdd6c5b963ac6b3f43f8c92ab445e59458a80b569ac5a433b7c89c3d9171dd
diff --git a/dev-ruby/date/date-3.3.1.ebuild b/dev-ruby/date/date-3.3.1.ebuild
new file mode 100644
index 000000000000..303b2f58e831
--- /dev/null
+++ b/dev-ruby/date/date-3.3.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/date/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="date.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A subclass of Object includes Comparable module for handling dates"
+HOMEPAGE="https://github.com/ruby/date"
+SRC_URI="https://github.com/ruby/date/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 09813d90cc5a..cb9263364a35 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,7 +1,9 @@
 DIST hiera-3.10.0.gem 40960 BLAKE2B e8a5716c11ccb99ec9b10e42197ad3492b99680be1de84cbd0d671a090c918c84c95485c2609cbb231d7a94e2a1f52d467ce5208a68ec627a44e8b9abb150950 SHA512 01e33f573f99d8bf023e7b956db226e6d16f8f28f7f1a445b61808a62bae8884f6fb367e0b088987e844bcd53f9f05d68baf123115ff83c0f939cc1b1e61a5df
+DIST hiera-3.11.0.gem 40960 BLAKE2B e1c2ef1d5a6a92727540b1f579add0c63566ec9df6d5544553486b3dc812df3b5ae5dc7746bda591569f4979c8c53ae79a950238d03b205a7e06ac7697fb68b1 SHA512 51e82f0ec9cd84685dcd2ae904ee1640e0c8c7072a494793c9798aef53cbacfd368c1591c7ceeb15ae9af0d0134bd5c352fd116c42896980b7a6456342fc1354
 DIST hiera-3.8.0.gem 40960 BLAKE2B b368ef92bca06081c99ec7e1a1e04b69f3c1cae285fcb17f9d1b89683fd679b037d2ef26af6912a776d73d3a553a8323c6820482383065927245898c9e78daa1 SHA512 0aa8d306cce33760eee9ca702f6d1f8a0137c551321c7553a25644a4097b8539945d5432e94ff83ed9c3392603dc962b33ab1e1702ed1ab5699d3ef179de9379
 DIST hiera-3.9.0.gem 40960 BLAKE2B 863fe37ecfda2153b5e94afde6d53893a0b5baaa10aa3bc3a939cc7df54168bbcb709f85bb50ffad11376d7434337ae3c79bc5d9fac99433da31e7dd77213004 SHA512 6ce3598e7c7a628198638a4b75a65efcc529089c7c80d7f3dfc072c26e8a65054d8bc5c71f40ce2833465ccfaa333c5490ecdfe58578532eb3455be46a69ad0e
 EBUILD hiera-3.10.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957b7f3bfcdf5816ee7f688b3a36d16cf090eed87f60656f0af99a3131cede33e8671c8283393f18f1a30bbd8b SHA512 b5a4c3c60e20a6dfaea3bf44c64ad17a914b66dbd734fc5cb583208340257551a229ef8975904aa209ae11a96e0e84f85c19a968c96840282535db24fd23ce59
+EBUILD hiera-3.11.0.ebuild 526 BLAKE2B 3bc71b2da6c48f2b2b332cd86aeab10a314b4b957b7f3bfcdf5816ee7f688b3a36d16cf090eed87f60656f0af99a3131cede33e8671c8283393f18f1a30bbd8b SHA512 b5a4c3c60e20a6dfaea3bf44c64ad17a914b66dbd734fc5cb583208340257551a229ef8975904aa209ae11a96e0e84f85c19a968c96840282535db24fd23ce59
 EBUILD hiera-3.8.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
 EBUILD hiera-3.9.0.ebuild 523 BLAKE2B 1b7a4f94b843d62acb9c728aa02a90bc61eef8f171e0a63de00900a69024f8e12b97d50576a0ab08f3e56fd1196e0e9785c6502cbb6fa61476a39e00d8c0bf05 SHA512 09ebd67149a83f9bcd406a5945bf3f0ad52d9a795dd5a8e8ce56f2e0975a0e089697c3b8c1e01defb18b864fe58690eb5c2b3e6fbb1616227a5724f5408d8550
 MISC metadata.xml 442 BLAKE2B 108e882fb6805ccf19e6fa6754abfe678659b6d6f7572b57ea33a96515535b61637229d9338b67631c02648565435200d09605d13c2c61febada77ea75e4941d SHA512 6fddf1ff56b57c26963b6a42f4e0552c77090dbf7a97a6076cbedec86b38c0204455c390c335b4ff1749235f1cdedbe49379bae5e65eb94340cf3103ca9e320e
diff --git a/dev-ruby/hiera/hiera-3.11.0.ebuild b/dev-ruby/hiera/hiera-3.11.0.ebuild
new file mode 100644
index 000000000000..c22010b56757
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.11.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/io-event/Manifest b/dev-ruby/io-event/Manifest
index 3dc66ba5805b..3a3ac0baf1bc 100644
--- a/dev-ruby/io-event/Manifest
+++ b/dev-ruby/io-event/Manifest
@@ -1,5 +1,7 @@
 DIST io-event-1.1.2.tar.gz 34305 BLAKE2B 8e7814ada38c4a766f413373e0ef5b0c94a1b94342667a25c59bf8925fed791c3dc527bf63f02a9e40297abcdde730047a3a80104ac9d9f12ea648e5842ea851 SHA512 68a9c01f8075117767cdcacb095f9587118f86cc536d94a990b55e63e7f5213c350556486c45e2687db2ac810d48dc1d9aa28e994ef6ae0229f7b258d0b92aa2
 DIST io-event-1.1.3.tar.gz 34336 BLAKE2B bf0143c73e8d3f2929d3d86a740bb4c846558e3e605414087a5bb16b6e8d1c0b35494b9c761de8d57004b4b540b72d16916ec602a04f204f32fa5ba074a465a3 SHA512 9da7405e6d0d0b7aed30718bd52c15bd05061f73c4a1ed481bbfa037a11d75a034876e7470ad29523e8e16c5a3b69eaf8716d81b8e840fb01c6248ecab633495
+DIST io-event-1.1.4.tar.gz 34425 BLAKE2B 80af7c6234e44197c79c2b893aae02a05399c28a02daca900526e25bf3d0703d085b94dc231cf485028e8ce529b54a5a85b5adb6a720be87222be8d84302354a SHA512 8c8ae307879511099cbd5ceec775d408a5de28887e466a1fc62f4c1551c8e757875fcc7f12646c8d73f0fd9018a28cb8d6d0da1e4e6f0a0238812fe2674d1520
 EBUILD io-event-1.1.2.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
 EBUILD io-event-1.1.3.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
+EBUILD io-event-1.1.4.ebuild 812 BLAKE2B 29277f25b5ee930d609136697016f714bce53c4d1b687f0e43f5ea7ae62d05a704b5694e73a205f6f558de5470d909de715ac8224ca76d369766f2dc4de30cae SHA512 c7df0b2b298c04cd5978e7365a9e23452d6b0dc5ebfd9c999b8bd643144380f43cc1bdd3e2773414fa39cb0286f128c795b377c53d4903662f88e36be4a82978
 MISC metadata.xml 344 BLAKE2B bb572a3bebb66073283f2eea535cb9ac95d3adba0e060350609028bb47b7a03b6ddb3294293e95a6c505fe5d9c7127a37f1d1afa9abf66312bf4b4a688b4ddf9 SHA512 9c114303bb3edf528224eac75e7095403230f94baf373649442c123cceee029258616fa2ea68823814dd1ecdfe0f9c4ef73491ca449f569f12aa159b78811ef5
diff --git a/dev-ruby/io-event/io-event-1.1.4.ebuild b/dev-ruby/io-event/io-event-1.1.4.ebuild
new file mode 100644
index 000000000000..107271412ff8
--- /dev/null
+++ b/dev-ruby/io-event/io-event-1.1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An event loop"
+HOMEPAGE="https://github.com/socketry/io-event"
+SRC_URI="https://github.com/socketry/io-event/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~sparc"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/sus-0.6:0 )"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# Avoid dependency on unpackaged covered package
+	rm -f config/sus.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S sus-parallel || die
+}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 7a5c847b4888..0593b711600e 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,7 +1,9 @@
 DIST json-2.5.1.tar.gz 131183 BLAKE2B 2ccdf5921ef476b66cb1dbf72cc01763636c82b0eb5d0a5cfc029e14177c7c6766464e7852b11c2424db401f5b931cb64c01d3952929236c9979378a7928ea59 SHA512 4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087
 DIST json-2.6.1.tar.gz 132705 BLAKE2B 5a8e83b8d11e360402324427de5d2520f39ee1567e2fbf3c92c738546792bb5dec4a9a3c36f3286a3de63161bb5d9f9e7b059c2560f7a3fa50271ce2aa3dc0fc SHA512 e9d0ef77d77ae54a0300b490e3e5c445d0b5aefbce1b160454916bd4f4f8f943131223047e6a7416347cc40d9e7fb1870101c3cbf3a2663a9053f07bdfbd13cf
 DIST json-2.6.2.tar.gz 133073 BLAKE2B f81202ee284d3a6afe5c6f3ddccde76655e170b64883e37bc38c47bd63d731f8dca4e8a57da15e275ad64af5e1e967def69590d1105c0069b92f322919782a84 SHA512 9c1c16ef462e7736c0306781573f32b96a0a53368ed24b4d1ae97953df62956b6cd72dcd20ed07708b0e1e3dd71baa61551bde452c87d7efac41267c0ee60b33
+DIST json-2.6.3.tar.gz 133077 BLAKE2B f6101f533159fb689b6bf22975137d34a77bd0926c164a9c14f2d5eab982778538ec40551709e8a6470f05e78584a3e5680be740314bb7829b48feb32fb258ae SHA512 1bf9125266d8cdc565deb9e2fe3c884a1fc8d2f3b31caae67a154d0c47e30305074c1c08b49d180dd785c766762b46d3b3ef85919d53388797fcc2f37675317c
 EBUILD json-2.5.1-r1.ebuild 1955 BLAKE2B 6737796ab30d7e97f6be361a86d111e17a430c2b64b946d8e9e5fd6519396be7d4e66805f6d2ee4827708fd5451db1671ad12ec22614baa8185316e91550b862 SHA512 8eae36fb5c6664f77eb2e3801b7596e59e6b0bce1733b6749dd27cfabf1455dce1f3f8cc1f8b5077f042cab5c67827630bc1af0652ad9c9861da4bcad783ca23
 EBUILD json-2.6.1.ebuild 1970 BLAKE2B 1d7018e40d4a987ed94b5c3894bbbaa3e96089459a8287d155ccde8c8eea96813b464da311c4e3e811d182ad3aaec57a5d260949ec2e239a89921df97ace36b0 SHA512 ee6419dab91dbac2ca11f9abe0c89cb745e4d5365cd620a4329978bfaaa24601eeef52f434d609724e0750e19310a0c6fcc75618344954a6ae0d06c25f42eab6
 EBUILD json-2.6.2.ebuild 1590 BLAKE2B aaf12a53f31d94660bddc588ba6960d5ffdf03dc8385b43ed59b492f55d9a33578464613b4a168616047949406cef2a431c40f7472eaa72026e63cd08d8964c0 SHA512 33b3c95994613245cdaa369c1005ebe18ccbe11152be41f38cc8da217516032522341bab427032af0b603943ff4808d82ae399acf99bb4b3b65453302ae7588c
+EBUILD json-2.6.3.ebuild 1583 BLAKE2B cdee2e02ce10aabce91ef185b78d19124c55982008bc4f4e3b1a54f51917cd4fa0dc443e9c2beb2222bbdb1bbee57d7a3396f7b69ae82eb8b6de8a241e315f48 SHA512 24cc6b1c6287daf12f3c9008308033021b781d4da1b731f9b45fb5088a0e7656b929f6751dbe15a040a7b59a49d63b7ebd3087c4b01e4ce0e175c49fde314f32
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.6.3.ebuild b/dev-ruby/json/json-2.6.3.ebuild
new file mode 100644
index 000000000000..6fdae306ab6c
--- /dev/null
+++ b/dev-ruby/json/json-2.6.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/json/ext/parser/extconf.rb ext/json/ext/generator/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension"
+HOMEPAGE="https://github.com/flori/json"
+SRC_URI="https://github.com/flori/json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( BSD-2 Ruby )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e '/task :test/ s|:compile,||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	# Remove hardcoded and broken -O setting.
+	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
+		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
+
+	# Avoid setting gem since it will not be available yet when installing
+	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 65adee255ea8..30a3e163fd2a 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,5 @@
 DIST mini_magick-4.11.0.tar.gz 1193122 BLAKE2B b736bb1b147ec2b1f926ebf5a3b908e659d6dfcaca0e7199932086e09cfd6be21046dff3c4e0edb7877c40c5bbda73aa0f521b305c15abb6fab931242b4561c9 SHA512 7201a94345aa95bb9466369c78fbc48108b245df77435e839a3f0df7694f4da4eeff3a7b3da4aaabedefd93859abde1145baef6f0f01580f66255653be88f5d2
+DIST mini_magick-4.12.0.tar.gz 1331356 BLAKE2B 84d222424c354e83a041f2c6352f92d11889ed51126f90dd55ccbdbfa31974b79977bf3cf10d30c5f350d17a7dd2d20bf538c2eb78f65c58a29a81f71290acf8 SHA512 8801b4fe9cfed47eeae91cffd5364ca828f8b21d7040217d72d0f5ca9070e02f191b8f87b933c067c0d914332806f14e1b87621dbca06df047c43db8a72cd559
 EBUILD mini_magick-4.11.0-r1.ebuild 2277 BLAKE2B 088e85056002872d165938c0eca1020652e7d63f15a6607cf328dc5aa7fe2161237a3d862267e2de631054514a915ead394284607200f1f18ff38a8ee5d89657 SHA512 7ef95304925d82b9f297fa1a93cba9bcb64bda5441c384085231ee68e1408ee88bef4168cf1b5829963fa37641ea093e8ba42f7558a96f7fc69e2a8b67858140
+EBUILD mini_magick-4.12.0.ebuild 2270 BLAKE2B 14527ca7040265962444190545cc00f54dcadf601ec830efd3d90683972c77701ce8f2cd9b596903c84dfbaa9203887b7c148b49ba739fd11cefd1069940e9e1 SHA512 984038b0c909c15932c15885707faef152fb505c49ba31ca359d1f3fd34266ae70f83d6fad45c3c87a0af12d80a8fc1119346892e3e98cbe60c1a886c6411ef4
 MISC metadata.xml 348 BLAKE2B 616115e2d9f177ca273537d5c1de529eba522e330b14d1a9538272f3e6d17a72a1675ebd01abd7d1c3c0777120748d0917d59baf4fd8dd90f8791cca4e0434d9 SHA512 80ecc79ca8441d5e50df43f215f61c97bfe9b2dc7dfbb63c89096e356aea206956426f1f50c689129865ad2c13a9dbc9b5b1a968fe1a33e545c204755d91877e
diff --git a/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild
new file mode 100644
index 000000000000..375b1127f9ce
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid spec broken by recent imagemagick updates
+	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
+	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid posix-spawn tests because is not the default, does not work with ruby30 and appears to be unmaintained.
+	sed	-e '/SHELL_APIS.*posix-spawn/ s:^:#:' \
+		-e 's/"posix-spawn"//' \
+		-i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 2641b5a11fd3..2b72e2d48775 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -4,10 +4,12 @@ DIST mocha-1.14.0.tar.gz 246015 BLAKE2B 836b678ca0bcbc1860cb185ee6cd5a71bbdeff46
 DIST mocha-1.15.0.tar.gz 245879 BLAKE2B 982c0b1a59f47fa7ee990ba20e8acd55d581a508f281f83a9ada1cc7e6e6a214351c69f4d9bad127c0b900ea1d2107a7e47d7da0aa8b185e58a9027cdc0b1ab3 SHA512 c4218098e4f7a4099e2c9c8046fddabc41ab099b60aa635f9da1f5e4e37c7170dd3afa66ea5959e1bdb020e44b0bf5063721df3f8bdd312c53c36227b2e23f6d
 DIST mocha-1.16.0.tar.gz 246370 BLAKE2B c2891021c33e4038ff965a470eda3be7eac2765f7c038fef33f38cd07b8501fdb88a1dcd8d291eabb124fb0fff50c40651bf29ac4a28012b57c7a02d2ff46b63 SHA512 b7d8825771f84245e7383e4081dcb42734b9716e7bef3c1b5d49ac28850590b4beabf8d0370992e100b6340ff3cfb3113610e303de74bc33c059bd9b9910cb8e
 DIST mocha-2.0.1.tar.gz 244331 BLAKE2B 7ed47d0b740cd6b22e2bada9c9674c225457fae08d1be091292b5261f29f92c32a2a4f434727a4be530be56a861c9b71507484df274b797161e7c86d54bb9da9 SHA512 d86250b23e578fee987c68c5de5ca0ad9c114304993c315dde7aad0e5a415360a552b7366ef890321a4adb71a90668afb0e51fa2430c584b9b38818bc67fa53d
+DIST mocha-2.0.2.tar.gz 245650 BLAKE2B 3bf56cacc99b5eeb17977cd1052c635df74aec10f20a76d843d703e68520ef434bc9111b739591dfa15b21ecdbdfb5b55037e9509683624349be83613528787f SHA512 93579390f4feaf034cd6e8905654fe8cc5c8a1f28f3d27488deeb84250114a5e04c4e7aa544f18f33b2c3887668d5fddb3a3f9bda5548d577be1522da2e09760
 EBUILD mocha-0.14.0-r1.ebuild 874 BLAKE2B 9cffaa02080f973e929c0f4ec7d5fd85b919fa05e48d3ff5f924c66a4b96f901bec9b05c257c09232a459eaa374722d4e34f3412039d287544de23af587c53d2 SHA512 a2232d40f2f118ce99f8c44f46c0ab7e11abbbffbf7f1451ae9734c7b96c6740a7b92a08427c20e9c4ff0e97f82924a9a7bbfc8e0c129c4618f26cc4fb2b243a
 EBUILD mocha-1.13.0.ebuild 998 BLAKE2B 7e906fff5e3dd23b3090303f019a36061f08637ef0c4a5df0b327d11d927823b620af65110a9ca381724a1a32477eface4eb7f7fa44fd6130066bc3bd3555066 SHA512 cfc3fabf625b776878bf6b13c1b4367898f4f8431321aa0b3e9e82a93a4056b80ef1bfb29f4058d14ddcc4efd3033ef4379df829e02278e12601682b0a4d9b21
 EBUILD mocha-1.14.0.ebuild 1012 BLAKE2B f5acf87177fcf4e87b305410f3556957495f8d8ce580f64f9d6c626261bb1772c813bf8d9f892a0660770b98d801079329f90011e4f3860bd58713bc9bfbd79e SHA512 3e13341f1ba652ee376e4adfb16c7687494712079cd96c14439e901226f7c23c38c0ce20097606aaadd3659d364ae85229bdde6a548a8bcce6601db49bcf0714
 EBUILD mocha-1.15.0.ebuild 1005 BLAKE2B d4112df979ff51e79493ef253c47813962efe78afc8d996deca16ada4222f19e81b917e61e1454f94d7bdc7755efcfb8b665a2636c4dd9ad933ab3552ce71654 SHA512 5de42fae1d29880d5073e1d55e4d714b9de4a60c3b9d3fe84c4ceec2a9c039bd1bef082e82548141f47312b5f38a1345dfe8c26eaa95edb7e63d1336180c2f41
 EBUILD mocha-1.16.0.ebuild 1005 BLAKE2B d4112df979ff51e79493ef253c47813962efe78afc8d996deca16ada4222f19e81b917e61e1454f94d7bdc7755efcfb8b665a2636c4dd9ad933ab3552ce71654 SHA512 5de42fae1d29880d5073e1d55e4d714b9de4a60c3b9d3fe84c4ceec2a9c039bd1bef082e82548141f47312b5f38a1345dfe8c26eaa95edb7e63d1336180c2f41
 EBUILD mocha-2.0.1.ebuild 1022 BLAKE2B 7d07b42341376f838f6c635f9bdb6f1406030bb94d3c42c434f456a88fe55d537e189b9a93452b11c9d12fc8467fabdecf2c7aa10253252929dc468171835f85 SHA512 d9ba69447cc4c039c77379757ee2f3809d56cf0b3e68db55299feb71fb81c6518f704fe7a78f516c5856f2c936c7592150859155f3d01c9da8c017ae3a2e4dea
+EBUILD mocha-2.0.2.ebuild 1022 BLAKE2B 7d07b42341376f838f6c635f9bdb6f1406030bb94d3c42c434f456a88fe55d537e189b9a93452b11c9d12fc8467fabdecf2c7aa10253252929dc468171835f85 SHA512 d9ba69447cc4c039c77379757ee2f3809d56cf0b3e68db55299feb71fb81c6518f704fe7a78f516c5856f2c936c7592150859155f3d01c9da8c017ae3a2e4dea
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/mocha/mocha-2.0.2.ebuild b/dev-ruby/mocha/mocha-2.0.2.ebuild
new file mode 100644
index 000000000000..8b9904e74ec0
--- /dev/null
+++ b/dev-ruby/mocha/mocha-2.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
+
+RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
+
+RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
+HOMEPAGE="https://mocha.jamesmead.org/"
+SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby2_keywords-0.0.5"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	export MOCHA_NO_DOCS=true
+	each_fakegem_test
+}
diff --git a/dev-ruby/net-protocol/Manifest b/dev-ruby/net-protocol/Manifest
index e043bb72f742..9ee6439b89d8 100644
--- a/dev-ruby/net-protocol/Manifest
+++ b/dev-ruby/net-protocol/Manifest
@@ -1,7 +1,9 @@
 DIST net-protocol-0.1.2.tar.gz 17603 BLAKE2B 2d5dd2437d2d10e82c20e17884b80259b7cb5b5ef626f4dc054515adaff46143b46754fc375f66e5754aa81a72372784b389864bbed249c6df59d64331c47672 SHA512 959b426ab3fb388d42ccd5b21e60878b58e606ec21d651d232d706c40908c6b53c14ce16362ca3c32cb40da1238baf79127d870788adc8b23884204f4426f9d7
 DIST net-protocol-0.1.3.tar.gz 17522 BLAKE2B 6789bcf2f1908e91b6e01cdb225feb975457b9c274b6632d67e39c2fed1a6a0efe20c8f8f10d8f287618546c116fd0a5947b994c6d749d8312b243bdb7d624e1 SHA512 958f7a52fd7db661e60fa6f4f401ee0097de0782d984b4394dec5ced34b4935d6f30b65a198f5b9cc17247b6ff06ff266e2ca1f1081369cc18597bfd30285774
 DIST net-protocol-0.2.0.tar.gz 17760 BLAKE2B c5606b0f206abee666e53480d1a08f2b673330f8ca0a0b5761e7013dca7273d2d49640b270f7a5f096746bb101ec26382c5a3718d62592f1ed82c32d34409f6a SHA512 9769bfb17e8316f20daba9336af8392d38d4d8056590a4d8b019ca7dc404e2e287a82b0373852b2fea40b249b15602bb2b16596d0e62f4d53cc8f67d977d4e26
+DIST net-protocol-0.2.1.tar.gz 17713 BLAKE2B dc5abe229e6900a41af786f6e617c27a8fec2fc720afaf95ae72a1614017c43617eb207a57a6460dd6b589c392ec6cb65ff4a3b6e3f09e04f765295f5d41a3ff SHA512 e3990b64826c681efac2bcb5cbe4f120e730ddac8e1a62690e575de5037c7a9ddb80bf6cc051c98319c37013fef7f4f331adbcd51e96f32ecf4c3804fcd1f7c5
 EBUILD net-protocol-0.1.2.ebuild 924 BLAKE2B f8478073769c39c413a449de321b90fee171c906045daf559d320299c8d1adbfd3f2a1676acf85cb8efda16015a69b904dc57bc3a2bcdfa7f389dc86df0a5050 SHA512 f682b9b168fefe5bc9a9630cb06bcd8225be64f8a5eb817aa267d473b60ef58be1f4a64e64defea44551923ee3fe0b12cf50f9ef640c846fc9bc2c4d7481789a
 EBUILD net-protocol-0.1.3.ebuild 906 BLAKE2B a24a6993b511a288bdfde3be4246c612d0aae60b35de39ca1f33517d81debbb509c6b0f4509950688c05a8702576785d67065adbd9f9ecc124332e0fb458b7d5 SHA512 fe1dfef3c61e7aaa9e7e48bbc2f83037083415fe568fb744055d79b97a18434d9b9c274a0d3df427c455f36f6db52a66e894c5263ca82e3583c5157083da376e
 EBUILD net-protocol-0.2.0.ebuild 899 BLAKE2B 00406fb22825d5a8d664ce8ef401bf2e781e62102c1b181f18100e7f2835ddb230e052f9ecf371816f031f471ee9e1ee9201ff976e3e01ced19d30a22e42e5a3 SHA512 300cd73f60992ebf3b3272d050a42656d4c58bd95bce5a99db0471228d774a90a2b12918e1b5f7ef9e319c6e698eaca54298626378c83c17c5abe215e43dddda
+EBUILD net-protocol-0.2.1.ebuild 899 BLAKE2B 00406fb22825d5a8d664ce8ef401bf2e781e62102c1b181f18100e7f2835ddb230e052f9ecf371816f031f471ee9e1ee9201ff976e3e01ced19d30a22e42e5a3 SHA512 300cd73f60992ebf3b3272d050a42656d4c58bd95bce5a99db0471228d774a90a2b12918e1b5f7ef9e319c6e698eaca54298626378c83c17c5abe215e43dddda
 MISC metadata.xml 344 BLAKE2B 81d283914804c68a59c8f6ed77389c5f8f9ccd2c8f22e488569478b9df967b8e7e1bf18bb6e8949eccdc0a3731f273ecbed48bc5bd501a75339bd5121e153e82 SHA512 e137752f286f493b7903d114bb18830999f4991fa78d5838fa48aac8f4e88915db08352e73a8b7b3d19c98888ae4cc94d57e2a772fe11f98f99268544b558b94
diff --git a/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
new file mode 100644
index 000000000000..2f0df4b1cbb2
--- /dev/null
+++ b/dev-ruby/net-protocol/net-protocol-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-protocol.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The abstruct interface for net-* client"
+HOMEPAGE="https://github.com/ruby/net-protocol"
+SRC_URI="https://github.com/ruby/net-protocol/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/timeout
+"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index 63fd0af54260..a7a0e254732b 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -2,8 +2,10 @@ DIST psych-4.0.3.gem 93184 BLAKE2B dd3dbd561a4abd97dfc5396d17966dca20205b8f5e7a1
 DIST psych-4.0.4.gem 93696 BLAKE2B a70998ff33cf6590d6f9743b1b0b60907ce104f349aa8bdc011560d9d131c6e0563fc204128a39ebeb63c7d3e6336dc024ef2613c274453dfeb3b37960a2782b SHA512 976f2686b00339c98da125a19ca4128a3c3098a1ae5980a3a8b0adf521c8bda4610dd0df0180f9ca0b902b98f0dac93e081d8270ea2f0799e20addb0bf8275a2
 DIST psych-4.0.5.gem 93696 BLAKE2B 4a084a24251aa0c009c56f7091494f37a41dc2340be67cc5c55ba48c6af227e1473e5d8dd17fa5091fc703e0b1323a9178492e230a1b203b54f9142927c8a19a SHA512 2e24a044e8735c67c052704f2df565aefc653769a991f9c47fecb8df8d303357e2a8627b5111e404d6a0cef0e85eee1de0e943067c22051a5e350a71fbbbb3ac
 DIST psych-4.0.6.gem 93696 BLAKE2B f5bea8262b401c0c291514dbd5ddc4aff389aeadb0b6483901b70a9562d267460260ddc5991e1540e51fb371a79d3a4a831bfdb8cb0b5dd9bd53cac939287545 SHA512 31f0ff5cd48e80ae81977f9519aa7952685b2da4a88b202aeb7214a364932cb1ca256f0934bed158d44a7d4d6e8cbb34928d33e731d0a8ba1a9885733ed32cd1
+DIST psych-5.0.1.gem 39936 BLAKE2B 281beff933541db82b02bb20ae50ed4015cce5916654351b71b6f8d3a537830456277ece122eeede3f1323b3a1704821ee1135673175726c4062253d4b0bde05 SHA512 dca1e881124bea09995367d952d519d5dc74eb5578a4305234cf97f1b0e3e03065b427a7190b5c033e4d4c424b558e3cdf44ef35effbe1d808f8379c93fd6bb2
 EBUILD psych-4.0.3.ebuild 735 BLAKE2B 3a27a307ce238d0d196da3cbd950457501934aff0290dbb9579bef7c728f19163b641218cae359d908a30bdea982c114dcffdb169f1831744564affc3bc22280 SHA512 e1c126a378842896796c9c420d23e5946bfcda3b4b869294d67d13a9b7a4c797033c585fa882503fd81028b4beb32afda5b91e80c949c0f4ba259b20ea57cd1c
 EBUILD psych-4.0.4.ebuild 810 BLAKE2B ef7f0fa4929f3b6d529f24e6028a63cbf9ab07742f6bfbe444ab16051372e0915fa823f4b9566cf34b653eb87336814b34d09dc6ab23bd44ceda6f4811ef7cc8 SHA512 6ed709310f36d61193e1aec54ad991d081ccc349ed885d6d14ce2655c116b8bc4bb2062c775ccdd38495f0a9e07a6acc8d8b269e3604ba03c9fb767ccc817a85
 EBUILD psych-4.0.5.ebuild 803 BLAKE2B 880a5892cc1a5f4bca48ccbbc4b9685ac3b5dcd00398b829c6f4a3609b45a759af1d8130b12460f162817439dabd962ff8296e298583512f592135cf585e8870 SHA512 9a9a42c6ce1fe6f40da4825046174109cd522f5b5eb2c7c178cf7406aec8f2dacaab070f2943466de8b4e6d5e81926fe21e52178e1cccd4a03c41c75d5ec832d
 EBUILD psych-4.0.6.ebuild 803 BLAKE2B 880a5892cc1a5f4bca48ccbbc4b9685ac3b5dcd00398b829c6f4a3609b45a759af1d8130b12460f162817439dabd962ff8296e298583512f592135cf585e8870 SHA512 9a9a42c6ce1fe6f40da4825046174109cd522f5b5eb2c7c178cf7406aec8f2dacaab070f2943466de8b4e6d5e81926fe21e52178e1cccd4a03c41c75d5ec832d
+EBUILD psych-5.0.1.ebuild 814 BLAKE2B bd4ad5cb6fb9dde3dee62646e274ff1cb5c2f18f708dd07fe71d011b432b6ae16784d18eb5c65b50a245b57bb5552dc1be917ad176250a9e484d670349def3a1 SHA512 1ca862ddcf6fe3482c98d3a44b50e8e1406387c7f9bc7205e3659c9ac296e6e4423a294de3cc7e5c229ab6f4679f951a977bb71c8e0eee74b831f4bc2b513381
 MISC metadata.xml 337 BLAKE2B 904a94cd470a394eac3dbb4f9688a33a4066ee90a51277179ce1ee981e273a6f9d68788ca3324fd6c04e3cee60a26f61a8279133c191aa99f5d3305afaada408 SHA512 04118cba0268824529dbf1343a09a01c953fdb924a5411bf92a757ade74ded5f3938129a444364eb10309286b255d956dd37b7c06b56bd5767ccd51441f8a36b
diff --git a/dev-ruby/psych/psych-5.0.1.ebuild b/dev-ruby/psych/psych-5.0.1.ebuild
new file mode 100644
index 000000000000..c79a5288fd87
--- /dev/null
+++ b/dev-ruby/psych/psych-5.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 65d5867eabdf..fc2326a67592 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -2,8 +2,10 @@ DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715ed
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
 DIST public_suffix-5.0.0.gem 114176 BLAKE2B dc7a7dcf3d84130420d6243aa0a9391c141061fbe0fa70d85ce120938f3e31d617cf022a853dc9839cf49b997c1eb85f49a8759f357820ca32f88a26730fa473 SHA512 89dc076e6c55790b1459ceb0b0587d20b80d8a681bab6db2dd213e06f9bf9e55200e86cf891c92b310e691e7b0e1bb5ae95e28e3a3307541c2f020e5f69abeb5
+DIST public_suffix-5.0.1.gem 114688 BLAKE2B 7d1f2bf8b05c4de548b281f01a50eba8911ca9d56f42301139e0e3242eb9960db7b6fe312f4b65996b9b796fcc84748c53968771417b45773a453dc99b2fa33b SHA512 9498d53af79ffa7ccf5f94eb4e54c2281ff3e025d963c9024aeac06efa919dcf766a51f901ab6168125737b6f53831f8835d5777739fc45ddb66c99c2e573746
 EBUILD public_suffix-3.1.1.ebuild 874 BLAKE2B fd5a479bd94cf040749c6933a6bd012763dcbc11fc200897544c85e1a7ac83839c3f37a3f75dbb34ca4a3e050b6c1c68716ee18cc137e84c0955b67ba731997f SHA512 4a019c94279f7befa531d27969399080e2b6873c24468c4d7eee36c5acba71f0110c53e2fe7505f24e28b153a6a72516d4cac40e0c9e61a4c2f156c8b1078fa3
 EBUILD public_suffix-4.0.6.ebuild 814 BLAKE2B 03948fd4c736861e92035ef694c0ad24e1b31e62f98cd1a777d62d2c802260722713c3db6d1eb480f691c98ce6fa577c6afc2584bc08f5e581c342c4ff7bdc38 SHA512 0d7ec35b03cd96d3ea1a451ba02812ebbe37f998bfdb978a0297e2125731860be401d085999a87d2a33fb5d5c836ff8d03d4ff44edc62d884666d59a2afd8a6e
 EBUILD public_suffix-4.0.7.ebuild 831 BLAKE2B 97e6de0503f2db469240e3b6e968911dd57acbbd4cbb5a2f24e949b9fe614dde6d3074460051142150c3d4234f9a94328c0d25437a9b2e29cd1c9ef4e001a258 SHA512 9d5f1c764445c8a2cc8b821adeba402b1c8607aa9ebe4584c0e8f7753f69fdb98b4bb185c46a3796dc3ef2e351065cad1ddf2f816e81a4d72d95750e1637e627
 EBUILD public_suffix-5.0.0.ebuild 824 BLAKE2B 37c71816b1a0c0e32a4a71165d25c7afe29cf8bcb334b1b19fe851be61b551fe71c90d841804d09faff0fa8e7c1d843dbadefa0e3a289051336331959650f3ab SHA512 85521eda75932f4e2bc77f412ed3ab2eac11ca02226ca044723d9d5f0b204a0338424a5857dd0d9f45f8c6f32723cb94134423d7c4aaef3a7dfeb3d8be08fa25
+EBUILD public_suffix-5.0.1.ebuild 824 BLAKE2B 37c71816b1a0c0e32a4a71165d25c7afe29cf8bcb334b1b19fe851be61b551fe71c90d841804d09faff0fa8e7c1d843dbadefa0e3a289051336331959650f3ab SHA512 85521eda75932f4e2bc77f412ed3ab2eac11ca02226ca044723d9d5f0b204a0338424a5857dd0d9f45f8c6f32723cb94134423d7c4aaef3a7dfeb3d8be08fa25
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
new file mode 100644
index 000000000000..0e54e7908148
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yard/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index 21ad8c92492d..e482eaface0e 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1,3 +1,3 @@
 DIST puppet_forge-3.2.0.gem 771072 BLAKE2B dd304297aa65dc0f36f837e27abf255a0474fc2216fa72ac3203febeb4085024f4d155e93a91646d1e7828fe67a5a421b2c75bb638deb846c5d337dfe11eafc9 SHA512 dfa82d96f44fb8247f39155c942bf20aec6a4a2833959c877ec98b150553076dd72112b6d1230fa7ae1acef7f648017a8446c3e952680f8d4a6411d2fc8055dc
-EBUILD puppet_forge-3.2.0.ebuild 842 BLAKE2B c68dccc9159fa998953f40878bb7fee127ed2e3d41df0ce0d1d1aa3ae8f45a215b164145380710262c38cbf176a19f8fd2899805b4c184b2468ca6a9054940c8 SHA512 f7c0a2a9a07b0caf7e12c66763d16b4171a5daf9c04a5c09225cd72f624377e074dab6ec172c9bea63e6f03cb32c9623e234c15e8e13c88a48c5464f311f5412
+EBUILD puppet_forge-3.2.0.ebuild 905 BLAKE2B 92e4b3bd626ba4e9d98a7b9722c0bcb87268b789c1c2ba10aec7ef007b79d111f88bde0a3d6b22018f1e3e513a7991c669e45b54608cb316e51d3e4ce497619d SHA512 6b808a04e25e46eba45b3340c9c2b33505de5151bd917b91c5213f8d22eff10b269886a7aded1e94c71c604c9547b8c1ac2c0eca75ecdbe77558def4d2b49b12
 MISC metadata.xml 570 BLAKE2B 34720e4ded1a16b1d177684f1241999043eb3c15bac2c5463be03ba38dfd0d61b769251f598a80a707947d325fc4a8f86227e6a60d2b40c83ffae8a70b0ca276 SHA512 f28a1e45ea6a5acdf6180d18c732717e348d1077fa43752721778a7b203c071592c91bbddfc5f4d867ce3d4c81f6384e844fc6ae31d46fec9786d5c091481f5a
diff --git a/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild b/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild
index 49cf95ef979f..04b7fa2918fd 100644
--- a/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-3.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -32,4 +32,6 @@ all_ruby_prepare() {
 	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
 
 	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1igem "faraday", "<2"' spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 541769994636..4eb50a734ea9 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,7 +1,9 @@
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
 DIST racc-1.5.2.tar.gz 434903 BLAKE2B cfbaa09c1b2e233e82228075cf979c54688e51e702cade072d42b2952100b74a53e536d904cbbf15cb04ffc74018b48e5b27a5773adf6240614c815250d47119 SHA512 73c68dd75fa35727fd93a76886dd77afbb7032271e535c6e885a4ede6822052a93a610dec8a1f84daf24903c749b30a185831ec96d651588db2a2524f3dcd477
 DIST racc-1.6.0.tar.gz 470565 BLAKE2B 482b17723630dfb1d6e010c3eeb7da5a9f7b97f544d1a5020195134cd5446d28eff9a75b6c392a75970ddf024f560d2c7135abc4a2de76b581aa835c0901b524 SHA512 c19b7444bfafa0dfe3448600d10a1a09319702c37632e19569aeb947e7c035cc4067da040d45ede0dab35eaa197a55eac394715aae520fba41ed6e0c01c95e3d
+DIST racc-1.6.1.tar.gz 470769 BLAKE2B 285959593b60a5883c6f6ed119832c027a28fe43238721eb2365c1871635d781be73ea5a8d53593e288745906f068a8a5e9f568181b210374cc943cc35da5b7b SHA512 bbd592eee9c015ece87c555d4546a36d2a60bd6b9559ae1f3ca4d1cff887738bee46dbb32010d87d71fe4dbe0a13d00fb392db540f6c4b64688f9a8387ca20c7
 EBUILD racc-1.4.16-r1.ebuild 1921 BLAKE2B d94500a6f0676626661bddf4c4057ee0f2b3bccb0f2673b04ec6fa1891242cab213feca9e547e4d1bbcfdf9a4ca961a4bc06aef0d3d7245395e4abeb6acad1cf SHA512 c29be6f4315ad7d761984b2284a06eb767edbc0353d30c1720847da9966ea84d15f87d8304d8fc04013378b455804fcdaf28f730e89569e1e67bfac1db588e30
 EBUILD racc-1.5.2-r2.ebuild 1742 BLAKE2B 730934ec0ca983208511289ec94ecadb4e556d535660b88f2b2f305aa5ce8a7816e05b034e9985e86c2e1d7f330672e8f425924c783334398b223448610405ac SHA512 27b87aa5228cbe86c314bc8ee1e187e8b3aa296205c1a7f540d1ae9819a61b22e637451a164297d4da5e4539a74205760aeb3087dc45d26cd075d6101a692ab9
 EBUILD racc-1.6.0.ebuild 1535 BLAKE2B e86f3b226c7389dfdc580f8a13b4fe2c0b6b879ed926b151eecdf609228ed5d8468d6367b4e2bbae19fa0bfe0918a475e8148d530f5dc50a6a6795033574ae18 SHA512 016e453fadc2f25d002df88833064ba6393c19c92bcbc04ebcd0cb95dda5ab44ca4aca846de97019491127c7509173cb75d22f9d6acb027b68694908cc61f37e
+EBUILD racc-1.6.1.ebuild 1535 BLAKE2B 20ab31cbf5632d8c8c005b29d311dab8f872749eb42b5b97c1a5dfb87fc01ad42be1d9da99b088540d2a782afc6b4e9b48bbe0dce02ae4be3277724f0922ace8 SHA512 8d2370a3e20ca5f7489f6cc6f1e09661f9cd7365bf051ca5e0424beddbe89b0073b46c85b71a2a6d3071f60834b21550a02a58a99c76af099f4a8a22351e1e3b
 MISC metadata.xml 332 BLAKE2B a8a4b14418894206acc7f1e27c92162ef02d0554395b9e5b2727b231f435b2c31fa0ad7aa746a8e095eebeb3b0a53352709880609fd4e3427ba90c6528df9343 SHA512 88ab246151ead3016e6c9480043db93b9ecfe6c282ea0663e4882185af124e3c531b8186a96e105cc90867ac05c0cffcfcf043e0f67303bbca4f8c7cd0c56043
diff --git a/dev-ruby/racc/racc-1.6.1.ebuild b/dev-ruby/racc/racc-1.6.1.ebuild
new file mode 100644
index 000000000000..597b346fd30d
--- /dev/null
+++ b/dev-ruby/racc/racc-1.6.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc README.ja.rdoc TODO ChangeLog"
+
+RUBY_FAKEGEM_GEMSPEC="racc.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/racc/cparse/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/racc/cparse"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A LALR(1) parser generator for Ruby"
+HOMEPAGE="https://github.com/tenderlove/racc"
+SRC_URI="https://github.com/tenderlove/racc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/, :isolate//' Rakefile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/rdoc/,/^end/ s:^:#:' Rakefile || die
+
+	# Avoid depending on rake-compiler since we don't use it to compile
+	# the extension.
+	sed -i -e '/rake-compiler/ s:^:#:' -e '/extensiontask/ s:^:#:' Rakefile
+	sed -i -e '/ExtensionTask/,/^  end/ s:^:#:' Rakefile
+	# Which means we need to generate the parser file here
+	rake lib/racc/parser-text.rb || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r doc
+
+	docinto examples
+	dodoc -r sample
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index c56f48fbf628..36d32a7d05bb 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,5 +1,3 @@
-DIST rack-attack-6.6.0.gem 26624 BLAKE2B 0e24985666d5af4dc693137e41b6eb6b7f97d7e85eadfdf5ccf814007315567f52a9047795a419c8f717f77cd720e3bb2161152f019f5af1aaa318ebb64b8752 SHA512 286034be8770654c7ef9f1c632932968749b406e01ce4d93ff72d28359cafe7ec22906ed973409507bcf06b42ebe685437fee84be1f6e63212dbb706835bc860
 DIST rack-attack-6.6.1.gem 26624 BLAKE2B 3182da7b9fef4506fbbcf6fe8bcf175701b6999728c3b0ef2491cad426047540bc0e9a992db6f18f4f3947d2659e6db2e692a2a015e107c44106696086ffbb2d SHA512 65973550e1639527c4b00fb2743008b7ad9438faf5b70b490585966cf02f9733b215cff1826663ad6d770bac35dbe665cf901a5c4778de8e7f02e29ae1fb2772
-EBUILD rack-attack-6.6.0.ebuild 1070 BLAKE2B 9d8e5f5ca0d42370231996dece45ae5d1fdec20ee0057a9913d75df977542e72e024c823fa46cc96971451c1e5611504b004e345f7a57217c6a59881ef06b3f0 SHA512 81d20153adbd8bd6514c82cbcae39bdd4df228ebdf254eb4ce17fbc37c6832be8a21f1e01525a0a53ad173eca8525d03673f8e468d856080cb3f1c7cc59ff106
-EBUILD rack-attack-6.6.1.ebuild 1077 BLAKE2B 5ad9c3671f5af5291c0e240b23a065ee543f47dcefa8794c7728854c007f93c347f1ac9148c20ae2fe4fd78cd65db203308359e2cb7e759269e372738248abef SHA512 4820b5db02daae81939b4739a27c55ad610d9474df4e40de0933879bbc4c31a1fcd1bb02bfb7e342b4404e4c41771ed50b552c92b67e7083e29ea07339aa4dc6
+EBUILD rack-attack-6.6.1.ebuild 1077 BLAKE2B 4102af54b7418a39b333a6ddab3fbf1cb5ff748ae5bc81ca4b07f0ee974d9e1158ebbeca9c3bac3922226e3c9227b84d92d4fc99f3dddb2535a49e3955951bc9 SHA512 9ee6af1cd0d2d98fba4978d573c35011c85cfa44ead16e15a093673608d2eb60e42c8a9b77ebf47531196ddcf3ebeb7f20c56e5f9caaa7b303efa317c2d24726
 MISC metadata.xml 350 BLAKE2B a309a900898e661312733fd90060523e22078b3f0b912166f073c5b97b15f0e798ba0ebde241e8fba3191d801f2c528e1d995e9cda340fde843be400e60e16df SHA512 f4eab0f9337bfc0572fe79d57d9456f5c2e9f0ee14f2ca05a7fe17a5808e7a1d76677907388cd79db62f147d8909fb4fa6bdc2a22ea55a597866bdb9331801a8
diff --git a/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild
deleted file mode 100644
index 795479b2f348..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/railties
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-
-	# Avoid specs requiring a live redis service
-	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
index 0c3241cf6d1a..452151406ef0 100644
--- a/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # Skip integration tests since they require additional unpackaged
 # dependencies and running daemons.
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 278e735f1eaf..21c1d80182eb 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,3 +1,3 @@
 DIST serverengine-2.3.0.gem 42496 BLAKE2B 944e0e6b6bd31b6609e21fac0ea688b9a4acac3b02c4c1f06a34fe29a51c67db79e9a55c43243ce601d42a30b31ca1da605caeab05bdd9587536c4fb540bb5ce SHA512 0887ac556f9f4faa7d8e25743b2f79694153c0e7e39666c8ea02d0313c17835e0e5697da498ad1b23612ec938d8d9f430cfb9699711479ae088011c5a7fee4c4
-EBUILD serverengine-2.3.0.ebuild 798 BLAKE2B 0c2c570f19494b844f5c8c2a77e9a31c40a50285bc9a0c8851b5bee3d8d5fddd2b8c2a8ede688021a2c218466f231c677f49a0b5d656421c4b7767380be41fca SHA512 f9a6ca7693459c702c612ec489c7740a89c00e61cef448bba68f76bee04984e1b40b795bbc7e3fa0d70e417373ba87e493f79d22610dc984e340d8ef1c5a8ad0
+EBUILD serverengine-2.3.0.ebuild 984 BLAKE2B fb443f4138326e7ce9b6b2ba609ab646094b24ab105485d3cce3b21ebbf24a5d5b9ce0b52bf1fdd38e604a21d78d80b70c8f562bf34281b31709f503ad2e8bbd SHA512 fee7d7eb4d271da3887267812bc78863955f9a1a3c2399e462ededdfe5ca91835319ee131bafe329d3303c17d94f3b250d63e2d2f6fb8bcb8d1280acd485635c
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/serverengine/serverengine-2.3.0.ebuild b/dev-ruby/serverengine/serverengine-2.3.0.ebuild
index a93443157f38..5ca4aae1ebae 100644
--- a/dev-ruby/serverengine/serverengine-2.3.0.ebuild
+++ b/dev-ruby/serverengine/serverengine-2.3.0.ebuild
@@ -24,11 +24,15 @@ ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/timecop )"
 
 all_ruby_prepare() {
 	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rspec/ s/2.13.0/3.0/' \
 		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+
+	sed -i -e '/color_enabled/ s:^:#:' -e '1irequire "fileutils"' spec/spec_helper.rb || die
+
+	sed -i -e '/raises SystemExit/askip "Exits rspec 3"' spec/multi_process_server_spec.rb || die
 }
 
 each_ruby_test() {
 	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
+	${RUBY} -S bundle exec rspec-3 spec || die
 }
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 325bbebd016f..33bd1c33c67b 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 975f9c0e0395..49c091eb879c 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -12,15 +12,19 @@ AUX git-daemon.xinetd 260 BLAKE2B 594a046b5b2b580b7cfed1b620e014160965046c5e5a42
 AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d6979006fc24721db8b389395ac98a98444f032eaf7c66d6c02ab394a764e16a9cd3b5446b6be9061b9bdd89cf964 SHA512 073d8752dc224ff1130a5290e0f965a04b19f2a8dbd5d50172101099386ad3af0fd5e1abf57030960b750a2adf36a7ae69d18ddc990bab4e694486e65424cfa9
 DIST git-2.37.4.tar.xz 6990080 BLAKE2B 731ae7ff4247fd9d300b2b2b27074cce2d62b6333051bbdb161cdf644b4b40247963a978e1ed25a4f8fc9b544b52aa94ef97abf16db46ffcb688efab380efaec SHA512 f13a25548f6463ee0c3e662819a4af13dfafa8d18108534aeaebafd9a36c84dbea913402d781f7bc1436560c9937d76fd78b39cafa5864f576a1278ed96a9a80
 DIST git-2.38.1.tar.xz 7088208 BLAKE2B 50e4e9ef04d9eef7c10aba1f0d53d5d15f50ea9a8c344733e7a7865e2f2a833edb4f4b5882f47dd39389dfdedf22a813cfe3d35ab950d6543d21e0294ce17f2d SHA512 e62ca6f54f01d2e4ccffb5f94e8e5cd2f3e098b766d909c694a8daf4d00d5cdeb9cc5ff8e9bc55d888406f292ba99433d334d4da9689c0ce5d7299a3c67c90e0
+DIST git-2.38.2.tar.xz 7090572 BLAKE2B 80c72541c6cd7362ab5c8e92a2b81fbe80f5fcb3fac26680309ab30250a35f3bf3f1d613cc58bd570e52c81739a212969e28af4b7611ec8e08b8f15f5c9c4b8a SHA512 797c1cee61ff07b6f8502b1819d9797282aa82e33d023dffb4d395376b7a621d518017eaf38d05c6e5aba1372f2731985c53fcb46d43168b67b5bc8febedc6bc
 DIST git-2.39.0.rc2.tar.xz 7146628 BLAKE2B a33e1bf569fc946a68071506e53b74dc9006c468df43b4cdfd776329b476034c8504cdf295d9c696a447cb3ed7f0aabb195bc24bd5397f3b708e98f9152f01cd SHA512 31b6fda1fcbed027f20140066f77283bae1179da015fd01b3bee61ab4b313603b229b13b84680030ca65c4b9435133f209b9cc832caf9cff30824da816c3f687
 DIST git-htmldocs-2.37.4.tar.xz 1448376 BLAKE2B 2414b2f18e3c75c377400623f9e804b6fd5623724834ce52d2680cc10839466d52a8407cac9ed0c8c5928d65058963fe62e9ae2e31f1b695ea3a6fc18ea1938a SHA512 638feee014498af63ea083540b065778d3e3b7fdec9bb7f6e915bbc524e1525e0c4056f8af7d859376b60fcc936cb0ac1e6f83ff940e09f822dfa11570465db4
 DIST git-htmldocs-2.38.1.tar.xz 1479360 BLAKE2B 72d33a04c94ccb250def2136a2967fd333f3704f8e525f065b508cee890058546fec4e5b1349285b83768a7bd1513c0fac8d9ca287e5e964e6f1ec0d055ef7de SHA512 740da4546bdc0e9c4131e9dd0775662525aeb30a468fc4be63bb09c728da2903d479da5b7ef25d5ee029690ff5c9640de0271c7defcba1fadfa4a21f96d0aa8b
+DIST git-htmldocs-2.38.2.tar.xz 1479720 BLAKE2B 270454b0692e9ef678ec5ba5a8bbf5b119230981a29928dd256c5851beb5db0db1c12084f091e57bf7cfe011a7c166f5e341be03d98fade7d848cd069fcf6f0e SHA512 9e505f38658384381c22ff7b0502313b2ac842f89d2f8c27d3a03cb0a51fe23f06541fbdd0e5729a056baafc06689fa9faa40f74d8a456d00d5c5c7ef9b39dd0
 DIST git-htmldocs-2.39.0.rc2.tar.xz 1503264 BLAKE2B cc6e70fc6c7bf620c76da7f4651165cb2e06ae3c4c9dae9da6696a9bacb460d08629f837e9b62fa7be54ea1d7342894dc33bb12c5fff305627581130261f2c1f SHA512 92bb44dc85ed878c1a11fffafae0b8889d03f48c1a7a7f2fd70797f0af1dd9ed33f14c1969247cc18e4671af90a57cf5d8786ef1e60a818c6e8b333fc33368fa
 DIST git-manpages-2.37.4.tar.xz 510016 BLAKE2B 03cba56a27039547429eca6a3dfda600d2b1332a6b0da321a1abc8bb311b03e46c389fdbbd7aafc8b5863730e9417ebbd3195ce04408e3f229e646d134a2ac13 SHA512 8cf5ae54ae3e86929f375ea2d229ecda7d8b5c8a7f7fbe790334fcd38069285b58636320b1886030402ac9d46ed324c1d26784fff14077f661c43ef98b5f5ec7
 DIST git-manpages-2.38.1.tar.xz 553484 BLAKE2B 991e7f3916106e346921f6ae281df803b663b7fb4584f98f48f61a121030db8e5a1a97ecb147bf1559408893d3c9692c58b2890ff5a5a00bd451d8f20b73efdb SHA512 d2c75efc497ec62733be0ae0092a256dedb2a24b765e516218c9d96466aef34a0f2a118f68618ea457bf0fb39f5986c52022870116de974b21f541e0994c7d67
+DIST git-manpages-2.38.2.tar.xz 553556 BLAKE2B 781b50a011d1c329fcdf3c01a94fecf5a388a03ca39e71aac07908e02982ed472d27a581184d894acbad441c945457c32dcb359ee0bcf70671af893e10c8bde4 SHA512 3214887045a6b3ff734794d67f17914324de401badae86ca40e16935f81cca183b3d762519922fa03a260dae218acc407896335ae96a17f433a3115e71512fbf
 DIST git-manpages-2.39.0.rc2.tar.xz 557304 BLAKE2B 0db29a436c709b7cdb45abd5e10d26aba2136b5fa7a501b4313083780ece66d846cc4012b14061ed1f31f368c8407fde021cc092693a64763067fab852f2a7f4 SHA512 d30b27251de23053afe2c34ba7b18c8ab7beaf33278d3dcb90aec76147f289b3844eaa1da2dd08950f2398b8541f1538025ecd502b9efc37deadb9b3e8ddea17
 EBUILD git-2.37.4.ebuild 17492 BLAKE2B 4da60e502eaaff4070d692d9c4a7616ddca329e9c707843f4577eed16da2c8510f7e66f3dade2bdd23c49642b3bf074ecd2598dd2cf76c74d50426d45f07a5fc SHA512 5b8cf697bd440fca3f15bb4e95863dbe83e70c342e82ad91200a3a916cdf38ffa9b54d8467c3f9548043e33dcc88a30c8dba4ab49949b2461b68047bbcc4a146
 EBUILD git-2.38.1.ebuild 16799 BLAKE2B 390830530caa02749474a5057033419b97fc336de27940f1c6c2c29c0c0f433e83f219b42e84e40c33520ad79dc46db797349ae372fe9113d8795d06b105b06b SHA512 89bf153932e8302fde0d0f2700ac323a5d901e812c8150df73188b5bf2e3390b71b2c25a75b5659e9ec53f2d783ec8d8f2c5ed56509d749a7a8dfd2581b484e2
+EBUILD git-2.38.2.ebuild 16799 BLAKE2B 390830530caa02749474a5057033419b97fc336de27940f1c6c2c29c0c0f433e83f219b42e84e40c33520ad79dc46db797349ae372fe9113d8795d06b105b06b SHA512 89bf153932e8302fde0d0f2700ac323a5d901e812c8150df73188b5bf2e3390b71b2c25a75b5659e9ec53f2d783ec8d8f2c5ed56509d749a7a8dfd2581b484e2
 EBUILD git-2.39.0_rc2.ebuild 16799 BLAKE2B 18fc9187e7a83eead80b4a222ed3364d60a371d144e19771ce0dd50ff188772c260f28d7f1b2f4aa8c613cf9e2dcf6ae25ea5a2d7c54b106f7c0fb58338085b5 SHA512 667e9b2161170cae4798a173eb40970880c03a253c84b86062a63b5fcecf98e91ae3371728c2dfba3e73681d7751e80808c6f4d523e7cc1fbb10efeae2dc2cad
 EBUILD git-9999-r1.ebuild 16799 BLAKE2B 390830530caa02749474a5057033419b97fc336de27940f1c6c2c29c0c0f433e83f219b42e84e40c33520ad79dc46db797349ae372fe9113d8795d06b105b06b SHA512 89bf153932e8302fde0d0f2700ac323a5d901e812c8150df73188b5bf2e3390b71b2c25a75b5659e9ec53f2d783ec8d8f2c5ed56509d749a7a8dfd2581b484e2
 EBUILD git-9999-r2.ebuild 16799 BLAKE2B 390830530caa02749474a5057033419b97fc336de27940f1c6c2c29c0c0f433e83f219b42e84e40c33520ad79dc46db797349ae372fe9113d8795d06b105b06b SHA512 89bf153932e8302fde0d0f2700ac323a5d901e812c8150df73188b5bf2e3390b71b2c25a75b5659e9ec53f2d783ec8d8f2c5ed56509d749a7a8dfd2581b484e2
diff --git a/dev-vcs/git/git-2.38.2.ebuild b/dev-vcs/git/git-2.38.2.ebuild
new file mode 100644
index 000000000000..f68fb68b1f50
--- /dev/null
+++ b/dev-vcs/git/git-2.38.2.ebuild
@@ -0,0 +1,657 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/git/git.git"
+
+	inherit git-r3
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: seen
+	case ${PVR} in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=seen ;;
+	esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="Stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+
+	[[ ${PV/rc} != ${PV} ]] && SRC_URI_KORG+='/testing'
+
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}"
+	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
+
+	if [[ ${PV} != *_rc* ]] ; 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
+fi
+
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+	dev-libs/openssl:=
+	sys-libs/zlib
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	iconv? ( virtual/libiconv )
+	pcre? ( dev-libs/libpcre2:= )
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:= )
+"
+RDEPEND="
+	${DEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? (
+		dev-perl/Error
+		dev-perl/MailTools
+		dev-perl/Authen-SASL
+		>=virtual/perl-libnet-3.110.0-r4[ssl]
+		cgi? (
+			dev-perl/CGI
+			highlight? ( app-text/highlight )
+		)
+		cvs? (
+			>=dev-vcs/cvsps-2.1:0
+			dev-perl/DBI
+			dev-perl/DBD-SQLite
+		)
+		mediawiki? (
+			dev-perl/DateTime-Format-ISO8601
+			dev-perl/HTML-Tree
+			dev-perl/MediaWiki-API
+		)
+		subversion? (
+			dev-vcs/subversion[-dso(-),perl]
+			dev-perl/libwww-perl
+			dev-perl/TermReadKey
+		)
+	)
+	perforce? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-git )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		app-text/xmlto
+		sys-apps/texinfo
+	)
+	gnome-keyring? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	BDEPEND+=" app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	perforce? ( ${PYTHON_REQUIRED_USE} )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Avoid automagic CVS, bug #350330
+	"${FILESDIR}"/git-2.37.0_rc1-optional-cvs.patch
+
+	# Make submodule output quiet
+	"${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned!"
+	fi
+
+	if use perforce ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local extlibs myopts
+
+	myopts=(
+		ASCIIDOC_NO_ROFF=YesPlease
+
+		$(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+
+		$(usev elibc_musl NO_REGEX=YesPlease)
+		$(usev !cvs NO_CVS=YesPlease)
+		$(usev !iconv NO_ICONV=YesPlease)
+		$(usev !nls NO_GETTEXT=YesPlease)
+		$(usev !perforce NO_PYTHON=YesPlease)
+		$(usev !subversion NO_SVN_TESTS=YesPlease)
+		$(usev !tk NO_TCLTK=YesPlease)
+	)
+
+	if use blksha1 ; then
+		myopts+=( BLK_SHA1=YesPlease )
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=( NO_EXPAT=YesPlease )
+	else
+		myopts+=( NO_CURL=YesPlease )
+	fi
+
+	# Broken assumptions because of static build system
+	myopts+=(
+		NO_FINK=YesPlease
+		NO_DARWIN_PORTS=YesPlease
+		INSTALL=install
+		TAR=tar
+		SHELL_PATH="${EPREFIX}/bin/sh"
+		SANE_TOOL_PATH=
+		OLD_ICONV=
+		NO_EXTERNAL_GREP=
+	)
+
+	# Can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+	if use pcre; then
+		myopts+=( USE_LIBPCRE2=YesPlease )
+		extlibs+=( -lpcre2-8 )
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=(
+			NEEDS_LIBICONV=YesPlease
+			HAVE_CLOCK_MONOTONIC=1
+		)
+
+		if grep -Fq getdelim "${ESYSROOT}"/usr/include/stdio.h ; then
+			myopts+=( HAVE_GETDELIM=1 )
+		fi
+	fi
+
+	myopts+=( ASCIIDOC8=YesPlease )
+
+	export MY_MAKEOPTS="${myopts[@]}"
+	export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]] ; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+
+		cd "${S}" || die
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+
+		if use doc ; then
+			pushd "${S}"/Documentation &>/dev/null || die
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			popd &>/dev/null || die
+		fi
+	else
+		git-r3_src_unpack
+		#cp "${FILESDIR}"/GIT-VERSION-GEN . || die
+	fi
+
+}
+
+src_prepare() {
+	# Add experimental patches to improve mediawiki support,
+	# see patches for origin.
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	if ! use safe-directory ; then
+		# This patch neuters the "safe directory" detection.
+		# bugs #838271, #838223
+		PATCHES+=(
+			"${FILESDIR}"/git-2.37.2-unsafe-directory.patch
+		)
+	fi
+
+	default
+
+	if use prefix ; then
+		# bug #757309
+		eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch
+	fi
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	local PYTHON_PATH=""
+	use perforce && PYTHON_PATH="${PYTHON}"
+
+	local mymakeargs=(
+		${MY_MAKEOPTS}
+
+		prefix="${EPREFIX}"/usr
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		perllibdir="$(use perl && perl_get_raw_vendorlib)"
+		sysconfdir="${EPREFIX}"/etc
+
+		CC="$(tc-getCC)"
+		CFLAGS="${CFLAGS}"
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+		# TODO: --verbose?
+		GIT_TEST_OPTS="--no-color"
+
+		OPTAR="$(tc-getAR)"
+		OPTCC="$(tc-getCC)"
+		OPTCFLAGS="${CFLAGS}"
+		OPTLDFLAGS="${LDFLAGS}"
+
+		PERL_PATH="${EPREFIX}/usr/bin/perl"
+		PERL_MM_OPT=""
+
+		PYTHON_PATH="${PYTHON_PATH}"
+
+		V=1
+		"$@"
+	)
+
+	emake "${mymakeargs[@]}"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake
+
+	if use perl && use cgi ; then
+		git_emake gitweb
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		git_emake -C contrib/credential/osxkeychain
+	fi
+
+	pushd Documentation &>/dev/null || die
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man
+		if use doc ; then
+			git_emake info html
+		fi
+	else
+		if use doc ; then
+			git_emake info
+		fi
+	fi
+	popd &>/dev/null || die
+
+	if use gnome-keyring ; then
+		git_emake -C contrib/credential/libsecret
+	fi
+
+	pushd contrib/subtree &>/dev/null || die
+	git_emake git-subtree
+	# git-subtree.1 requires the full USE=doc dependency stack
+	use doc && git_emake git-subtree.html git-subtree.1
+	popd &>/dev/null || die
+
+	git_emake -C contrib/diff-highlight
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git
+	fi
+}
+
+src_test() {
+	local disabled=(
+		# We make safe-directory optional
+		t0033-safe-directory.sh
+	)
+
+	local tests_cvs=(
+		t9200-git-cvsexportcommit.sh
+		t9400-git-cvsserver-server.sh
+		t9401-git-cvsserver-crlf.sh
+		t9402-git-cvsserver-refs.sh
+		t9600-cvsimport.sh
+		t9601-cvsimport-vendor-branch.sh
+		t9602-cvsimport-branches-tags.sh
+		t9603-cvsimport-patchsets.sh
+		t9604-cvsimport-timestamps.sh
+	)
+
+	local tests_perl=(
+		t3701-add-interactive.sh
+		t5502-quickfetch.sh
+		t5512-ls-remote.sh
+		t5520-pull.sh
+		t7106-reset-unborn-branch.sh
+		t7501-commit.sh
+	)
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot=(
+		t0001-init.sh
+		t0004-unwritable.sh
+		t0070-fundamental.sh
+		t1004-read-tree-m-u-wf.sh
+		t3700-add.sh
+		t7300-clean.sh
+	)
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn=( t9100-git-svn-basic.sh )
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled+=( t5000-tar-tree.sh )
+	fi
+
+	local cvs=0
+	use cvs && let cvs=${cvs}+1
+	if [[ ${EUID} -eq 0 ]] ; then
+		if [[ ${cvs} -eq 1 ]] ; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled+=( ${tests_nonroot[@]} )
+	else
+		if [[ ${cvs} -gt 0 ]] && has_version dev-vcs/cvs ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -gt 1 ]] && has_version "dev-vcs/cvs[server]" ; then
+			let cvs=${cvs}+1
+		fi
+
+		if [[ ${cvs} -lt 3 ]] ; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled+=( ${tests_cvs[@]} )
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled+=( ${tests_perl[@]} )
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled+=( ${test_svn[@]} )
+
+	# Reset all previously disabled tests
+	pushd t &>/dev/null || die
+	local i
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled[@]} ; do
+		if [[ -f "${i}" ]] ; then
+			mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+		fi
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' -i Makefile || die
+
+	# Clean old results first, must always run
+	nonfatal git_emake clean
+	popd &>/dev/null || die
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	local rc
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	pushd t &>/dev/null || die
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!"
+}
+
+src_install() {
+	git_emake DESTDIR="${D}" install
+
+	if [[ ${CHOST} == *-darwin* ]] && tc-is-clang ; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	local d
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	pushd contrib/subtree &>/dev/null || die
+	git_emake DESTDIR="${D}" install
+	if use doc ; then
+		# Do not move git subtree install-man outside USE=doc!
+		git_emake DESTDIR="${D}" install-man install-html
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	popd &>/dev/null || die
+
+	if use mediawiki ; then
+		git_emake -C contrib/mw-to-git DESTDIR="${D}" install
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		pushd contrib/credential/libsecret &>/dev/null || die
+		dobin git-credential-libsecret
+		popd &>/dev/null || die
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - removed upstream
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	local i
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf "${S}"/contrib/${i} "${ED}"/usr/share/${PN}/contrib || die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym ../gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+			if [[ -d "${d}" ]] ; then
+				find "${d}" -name .packlist -delete || die
+			fi
+		done
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if ! use prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r2.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]] ; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	plocale_for_each_disabled_locale rm_loc
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+		elog "completion."
+		elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+		elog "Note that the prompt bash code is now in that separate script"
+	fi
+
+	optfeature_header "Some scripts require additional dependencies:"
+	optfeature git-quiltimport dev-util/quilt
+	optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx
+
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 55c5f6add40f..b828ff46625e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index 18298a9f1084..8ea7d52c37bb 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -2,5 +2,5 @@ AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4f
 AUX libsixel-musl.patch 1304 BLAKE2B 09e7a75a94edd944cca9997c74b235f9f27aeff550b2a9a02225c93d60f1faf598b9c5c304c9e8f1f207da37d7712d40115410f65cae17995c3bdaed6cfc99d7 SHA512 39b7227040e523881a9405e7f6b98362a0c4fb7f717bf50a724eabfd5cfe9779f820243f7ae0a83b61b4dd124ec4ff0070d391ea43476388095e1d4160f13cbd
 AUX libsixel-static-libs.patch 240 BLAKE2B ba9091c4991c6e69f83ca7eaa35aa7ceaf81e8542b1edffd1ce64ba1bedf518ad82603cdc610f256b1a0dc4954151b7407202a27c101ef6de59ff0724021faa3 SHA512 d3c6c060e8eba47c98180e5e4e127dfcb6f77f89b11dbaa8595cfd9786eee94a884476d210deb9ca6eaa2f548c6407a9bff714cfc3f18d4fa36b60d2c1fc165e
 DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
-EBUILD libsixel-1.10.3.ebuild 1941 BLAKE2B 626e04851badd3e12f1093bb221c7061f7540aa6921b5dc902e3c4545a982377500d18679948383327efe899d6bfd08dcad200c5a755024a698bbb6c0d3c4957 SHA512 530f3b059eb768727f4d58a3f9cfaca029f2f1e3dc9beae13e388dbfa09e3e32f73a5602e36e14fade00efcf8d54710ddb6407331e478a8ae78d16661d3122bb
+EBUILD libsixel-1.10.3.ebuild 1953 BLAKE2B 10cb29d84d4db4b501be30c96241a60d19c1eb3c169f83cf114dfc4b08aeb32ad269ef3eff7ec177aa7680f3dde2e11efa828a525e2e551bcb5f98181b25dab0 SHA512 bc219de058c8d98e21269b01708e17203e79f2aa93d82688bf525b261978ff615c3950df7682fc9eab2899c6170f5dd84add4f6231a6bdf7d8a794d47ddef301
 MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 4367bbc3e5ca..706346f54b19 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~loong x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong x86"
 IUSE="curl gd gtk jpeg png python test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4cca1a3d4d4a..b2d4f42618fe 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 64ee928adcfb..bcf8518a9628 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,7 +2,7 @@ DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa19
 DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 7c2c0935efc35f23a5389f4f9e367e3e0e0dc862b27b27c816edcaf0623c5dc9879ccef5e3519fc35b9be1ae87b3ba80f5e60dd430bbb43df581245e92b3be80 SHA512 64f06b5d6e16d943d4bf614117304839c09cb34cba4ce561b5e68c826e83672a0e9218a486de68fd506ce9c7b2a50e92b0627c66c3ebe048175c214dabd09aba
-EBUILD mpv-0.35.0-r1.ebuild 7171 BLAKE2B bdd55d979e8cae4f718580c356df57a3c3445d6f585d6f4cebe18e98ff9b089336345b9ac6b5541b0e3d6818b366e73a05e7329512cc8a0036f5953eed9fac9d SHA512 7a093cc2acd50e98a5dcda7bd12b911c0465164186dad470d54859ebb1da3133e17049db5513f5a45c09800d9af4d83d40f0626fb391d38b823e41b4911c4703
+EBUILD mpv-0.35.0-r1.ebuild 7183 BLAKE2B 3b8b4340c5400f619a366371a6748617de023311536e6c037be134409d6a29f49ea19f7b09ac47355498bfa3b07b5768db8a528bc689766325d572f303308a8f SHA512 5f0038f9c7348121dbf56580a39290e6d6d65e8c40658ff82aa17b5dc0436ba41478ac6fb40c906fcc1a5c7b2cfca0cce46ede0732a033bea817d1fef7f6f9dd
 EBUILD mpv-0.35.0.ebuild 7204 BLAKE2B 68dbaabd159876757942797a4fec60524e97203236be7ecd1fd7ae0f6699984b35d3a83976209dd635f05a2b2ffc7f41f757f75cb2335895b2b8f056496a3222 SHA512 0e6eac2c91e7b5785c52881810dc93c80fcccc0afdd55464dba9725261c9479333e3f3d4e57c62d3e87762331a06305d7b17569c986f407e1f58918a428bd330
 EBUILD mpv-9999.ebuild 7221 BLAKE2B 4285bafc71d6009ab2a88f8c3f773050a8e8232896b088de0b10069f73f00a91d5a115b38b311ecc361dc2e0e1d63d15ebe52e35f2a3f8b2ef3640ffdd85980a SHA512 8ed27f3f0033cc9c202403a62ab7f930eb1734259cbb1764e9798d7b2bc145ad1ea3e214fcf070b224d3f3d0f2e2f8a32ce1dbf27145137d951077319f75177a
 MISC metadata.xml 2645 BLAKE2B 3b20ff6e14ca27d98aca25e3fe6589705d6830fe56097e5d5f842e7b498133e6311c44cb5bf52476aea5a7223e6dac5bf0d3c51226db7d1efd2fa2b8e6190b98 SHA512 f72d25cc03d476da861b8209d13093f5351e7598dc482f517d5cb89fbf3987be4280bfe25902b172f4da74c36528c2581c8f848d746e64183a29a5bbf1baff5f
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 70fc31844c15..114139e4b2c9 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
 else
 	SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86 ~amd64-linux"
 fi
 
 DESCRIPTION="Media player for the command line"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 74cc96afff27..ddfb08c5e592 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 19682752c67f..cf5367dc1f5e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Dec 2022 02:40:00 +0000
+Sun, 11 Dec 2022 08:39:59 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 095f60e949cf..50c19e821106 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-11T02:40:03Z
+TIMESTAMP 2022-12-11T08:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVQwNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVl2RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCOkw/+KeT8w09mK2I1a++wFY7ZeOyTxi/SRmdDOOQQPlH1A0ju6+3mW7Gve6L2
-L9QeR+T5IKxYCb89t83eyECy3VlVwctw9zzvvgwwPUJrrA898XZ+1x92UCTCDmhM
-HTS3ZNIyu/aCYB9rplyuAxJTcnyera3zjaw/Vtr4SreNFsUF2jAeFRJcG4QE1Mx5
-QuO5R01GPKtbksyTtt3uReF6zOiYBvmKyaOg/qGdncGnWw6DR2+WQB2rW0jFsC0f
-FJd6M888Ji7acwGzaiDtyRLOqO56iRLAC6Tp4IiMkxi4lYER4F36+nUjS+xOblQA
-KLxML6IJEVbKq02sL7cIJCrn7o1tbSIZynwUWDue/cX0lNdR+GyD3ZjaEICFyHSC
-OP/Ljs07yLMf+AhsABpWW+Sxitr8Ynb4ghA4i5kV8BI93r+XggKvJ3bwzmsGN7jt
-uDxq8vwIQBTeaIDKTyTRPuivYcB9FcM3jgXszXJccJf5lYoyBU94LJ/2kyp8zjKe
-ig4r874PIzxX2c+7CYy1omVqlD7nXqLHZ5dupDb1FlxhrYPCz/FTu9kGe09tFYHc
-VKavMmz+IJ6y7ZFvN2Qhp0ZRxJkRj6ux+gwWYdF8WkRxOQVLmqcJkZ4tkIovgUIu
-S3hJ4Ibn7P37+j5fFsxTB+NTCd8YsPERnuhQX4MRI1bZgEQdhoA=
-=uaxk
+klCOxQ/8DfWuoS7UMjyKi3PM6pezsJOiauATdbato4vI3zUgA4JfgXZb9QkIHy5n
+rp8nmjOvMzIUvrXNE7RUh5uW9m2pPoqp7FMT+V0mmLlTWQve3yTk1p4rvFiCUQ2a
+kQOXAL60h5N6/pebT4RLdhXeuUmS5L1EkwhOtJxR+vK1LxmWXUfkDmkTkM7U2hf8
+PjTNiJBCEmbaCCN00IUJB6sLdoJLSRaKJcfSSwFSLBJl3Ff+RkaVTBVMhocoPmKN
+qPTVZjI+CQpGzqoFF/4oVZpyHURRYkpJrwaDqJEE5ecaHBwz7IXdz3xFSgcNhDgy
+VIMXziFNZc2DHsXuBf+jG4ykb5EEJIi0gU1gLItTmea0h90um2wDHwNsiIswfsS3
+LpV7TCekPoxCrQdGERdKfaj49XzVVSfN2i+JN30lgkjRHDp5PEEHjqDSQ41oASU2
+Ncy81xgMiRGvJ4girCZwINSyuiafnHu15pD3HCAsnYsJeUJ3CtMvARSFWmPptm25
+8YdUyGkjnhPRZpf/XNFDA+KOVTpjcAh2mSe8PV4UulyWZMfbgoZu6BE364A9RM11
+LhC3T5uCsYk2MQYw5UsaVJAdX0fIQU+jnsqZdPWdhVI+T52AAMgo06Ctq4Rx4Gsu
+D2j5dhTD5WjdL3FKERI1yhLGnComKee1jlXwFXfa4poczQn/F6c=
+=vNZc
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 19682752c67f..cf5367dc1f5e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Dec 2022 02:40:00 +0000
+Sun, 11 Dec 2022 08:39:59 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 88305d3c771a..1b10b44dc714 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index dd7278e3463a..6f73e11d4956 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-lint-6.8.2 b/metadata/md5-cache/app-admin/ansible-lint-6.8.2
index da6433e0b150..038a734698fb 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.8.2
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.8.2
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[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/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=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.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
 HOMEPAGE=https://github.com/ansible/ansible-lint
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[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/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.2.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.8.2.tar.gz -> ansible-lint-6.8.2.gh.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b09a9939182af01b4fb737e8e29a895e
+_md5_=c0de1e67862f9fcc42314e8e88aafd99
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.8.6 b/metadata/md5-cache/app-admin/ansible-lint-6.8.6
index 8a0ccd1e8e14..39804b14dd47 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.8.6
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.8.6
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-9.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
 HOMEPAGE=https://github.com/ansible/ansible-lint
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ansible-compat-2.2.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/black-22.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/filelock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/rich-9.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.8.6.tar.gz -> ansible-lint-6.8.6.gh.tar.gz
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f22d4131bce24470ca33e05b1fee1b8d
+_md5_=b6d94d541011ea75d56edc1f96a83582
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 3e72d5c8c874..560cb4d9b789 100644
--- a/metadata/md5-cache/app-admin/ansible-molecule-4.0.1
+++ b/metadata/md5-cache/app-admin/ansible-molecule-4.0.1
@@ -1,16 +1,16 @@
-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-5.3.0[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-5.3.0[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-5.3.0[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.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] )
+BDEPEND=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_9? ( >=dev-python/sphinx-5.3.0[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-5.3.0[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_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_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_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[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
 HOMEPAGE=https://pypi.org/project/molecule/ https://github.com/ansible-community/molecule/
 INHERIT=distutils-r1 optfeature
-IUSE=selinux doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=selinux doc test python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~riscv
 LICENSE=MIT
-RDEPEND=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-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND=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_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 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	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b83d5fb482d47f38e3a901c030e69b8a
+_md5_=1a8be6b7c4943812a1e43fdefba032fb
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e62ce0f5c988..b11f127b6c03 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/async-1.9.7 b/metadata/md5-cache/app-emacs/async-1.9.7
index c2d43bf71357..3f87fa3f6b77 100644
--- a/metadata/md5-cache/app-emacs/async-1.9.7
+++ b/metadata/md5-cache/app-emacs/async-1.9.7
@@ -4,10 +4,10 @@ DESCRIPTION=Simple library for asynchronous processing in Emacs
 EAPI=8
 HOMEPAGE=https://github.com/jwiegley/emacs-async
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=88246cff68ab48e1af2e33bccd4afc6a
+_md5_=4dc8d2033e65790a9711fc583975db36
diff --git a/metadata/md5-cache/app-emacs/autoconf-mode-2.71 b/metadata/md5-cache/app-emacs/autoconf-mode-2.71
index bdc8cf3489e8..b1c2532d9ada 100644
--- a/metadata/md5-cache/app-emacs/autoconf-mode-2.71
+++ b/metadata/md5-cache/app-emacs/autoconf-mode-2.71
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs major modes for editing autoconf and autotest input
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 INHERIT=elisp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=2e578e81f6961e7da5117a8bcf31741e
+_md5_=53b045dba4bd324cd04824917c24dec9
diff --git a/metadata/md5-cache/app-emacs/buttercup-1.28 b/metadata/md5-cache/app-emacs/buttercup-1.28
index a0022cc18eeb..86a2d799f0bd 100644
--- a/metadata/md5-cache/app-emacs/buttercup-1.28
+++ b/metadata/md5-cache/app-emacs/buttercup-1.28
@@ -4,10 +4,10 @@ DESCRIPTION=Behaviour-driven Elisp testing
 EAPI=8
 HOMEPAGE=https://github.com/jorgenschaefer/emacs-buttercup
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://github.com/jorgenschaefer/emacs-buttercup/archive/v1.28.tar.gz -> buttercup-1.28.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=c5da25ef5f8b295d465b18e5f9ef2764
+_md5_=a30a086687d49d8c7829e58b07c30dfd
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.1 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.1
index f91397e82cbc..be729e1bfd10 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.1
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=EditorConfig plugin for emacs
 EAPI=8
 HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
 INHERIT=elisp readme.gentoo-r1
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.9.1.tar.gz -> editorconfig-emacs-0.9.1.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=d50134f7705d4eb1346ecbaafe621639
+_md5_=ecf5ec0523a01fd58f41410298397aa6
diff --git a/metadata/md5-cache/app-emacs/helm-3.8.8 b/metadata/md5-cache/app-emacs/helm-3.8.8
index 96debad954dc..38de998e2798 100644
--- a/metadata/md5-cache/app-emacs/helm-3.8.8
+++ b/metadata/md5-cache/app-emacs/helm-3.8.8
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs incremental completion and selection narrowing framework
 EAPI=8
 HOMEPAGE=https://emacs-helm.github.io/helm/ https://github.com/emacs-helm/helm/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 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	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=49f4cc5e960c86b737864f6e1d5d5f2e
+_md5_=6106090f9dc001a13731bab8b05a7240
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 27d362a166fe..82776a2ceb3b 100644
--- a/metadata/md5-cache/app-emacs/org-mode-9.5.5
+++ b/metadata/md5-cache/app-emacs/org-mode-9.5.5
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.orgmode.org/
 INHERIT=elisp readme.gentoo-r1
 IUSE=doc odt-schema
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )
 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	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=4681dc7a1cd799589196aef57d5dd2c3
+_md5_=1d9a15cfbd2e82552cb9ad59e2f6dc8e
diff --git a/metadata/md5-cache/app-emacs/s-1.13.0 b/metadata/md5-cache/app-emacs/s-1.13.0
index 11300043095b..41851381ef49 100644
--- a/metadata/md5-cache/app-emacs/s-1.13.0
+++ b/metadata/md5-cache/app-emacs/s-1.13.0
@@ -4,10 +4,10 @@ DESCRIPTION=The long lost Emacs string manipulation library
 EAPI=8
 HOMEPAGE=https://github.com/magnars/s.el
 INHERIT=elisp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ppc64 ~riscv x86
 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	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=d79e846f788516e22ecf3911c97a31a9
+_md5_=4317cee8f860238bf3ed90b6c8edb6d9
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index c1d5ac11d06e..f2157104abd4 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/javassist-3.29.1 b/metadata/md5-cache/dev-java/javassist-3.29.1
deleted file mode 100644
index 7ab3147e7eb4..000000000000
--- a/metadata/md5-cache/dev-java/javassist-3.29.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-11:* test? ( dev-java/hamcrest-library:1.3 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=A class library for editing bytecodes in Java.
-EAPI=8
-HOMEPAGE=https://www.javassist.org
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0 LGPL-2.1 MPL-1.1
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/jboss-javassist/javassist/archive/rel_3_29_1_ga.tar.gz -> javassist-3.29.1.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=54ffedfa8f37a106251f265a1bd382dd
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.4 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.4
new file mode 100644
index 000000000000..069f49a1819b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.4
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.4:10.1.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 5.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=ba112c66fb7c181348b299c2375517bd
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.4 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.4
new file mode 100644
index 000000000000..14d210fc0c03
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.4
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.4:10.1.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.4:5.0 ~dev-java/tomcat-servlet-api-10.1.4:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.4:5.0 ~dev-java/tomcat-servlet-api-10.1.4:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=4ab1feaf359acead38120db0784ab250
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.4
new file mode 100644
index 000000000000..70647040a22b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.4
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.4:10.1.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.4:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.4:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=29b391247aea456ca55bc7abf39e12d2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8276c1b8ed51..7e561a361f83 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/PyQt5-5.15.6 b/metadata/md5-cache/dev-python/PyQt5-5.15.6
deleted file mode 100644
index 4859d57c3b94..000000000000
--- a/metadata/md5-cache/dev-python/PyQt5-5.15.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sip-6.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtcore-5.15:5 dbus? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=8
-HOMEPAGE=https://www.riverbankcomputing.com/software/pyqt/ https://pypi.org/project/PyQt5/
-INHERIT=python-r1 qmake-utils
-IUSE=bluetooth dbus debug declarative designer examples gles2-only gui help location multimedia network opengl positioning printsupport sensors serialport speech sql +ssl svg testlib webchannel websockets widgets x11extras xmlpatterns python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-qt/qtcore-5.15:5 >=dev-qt/qtxml-5.15:5 bluetooth? ( >=dev-qt/qtbluetooth-5.15:5 ) dbus? ( dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-qt/qtdbus-5.15:5 ) declarative? ( >=dev-qt/qtdeclarative-5.15:5[widgets?] ) designer? ( >=dev-qt/designer-5.15:5 ) gui? ( >=dev-qt/qtgui-5.15:5[gles2-only=] ) help? ( >=dev-qt/qthelp-5.15:5 ) location? ( >=dev-qt/qtlocation-5.15:5 ) multimedia? ( >=dev-qt/qtmultimedia-5.15:5[widgets?] ) network? ( >=dev-qt/qtnetwork-5.15:5[ssl=] ) opengl? ( >=dev-qt/qtopengl-5.15:5 ) positioning? ( >=dev-qt/qtpositioning-5.15:5 ) printsupport? ( >=dev-qt/qtprintsupport-5.15:5 ) sensors? ( >=dev-qt/qtsensors-5.15:5 ) serialport? ( >=dev-qt/qtserialport-5.15:5 ) speech? ( >=dev-qt/qtspeech-5.15:5 ) sql? ( >=dev-qt/qtsql-5.15:5 ) svg? ( >=dev-qt/qtsvg-5.15:5 ) testlib? ( >=dev-qt/qttest-5.15:5 ) webchannel? ( >=dev-qt/qtwebchannel-5.15:5 ) websockets? ( >=dev-qt/qtwebsockets-5.15:5 ) widgets? ( >=dev-qt/qtwidgets-5.15:5 ) x11extras? ( >=dev-qt/qtx11extras-5.15:5 ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-5.15:5 ) >=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 ) bluetooth? ( gui ) declarative? ( gui network ) designer? ( widgets ) help? ( gui widgets ) location? ( positioning ) multimedia? ( gui network ) opengl? ( gui widgets ) positioning? ( gui ) printsupport? ( gui widgets ) sensors? ( gui ) serialport? ( gui ) sql? ( widgets ) svg? ( gui widgets ) testlib? ( widgets ) webchannel? ( network ) websockets? ( network ) widgets? ( gui ) xmlpatterns? ( network )
-SLOT=0
-SRC_URI=mirror://pypi/P/PyQt5/PyQt5-5.15.6.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=3ee613d9300788272235f264dfe63434
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.1 b/metadata/md5-cache/dev-python/ansible-compat-2.2.1
deleted file mode 100644
index 409fae10eba0..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=4f6464d020949923065f357050a063a5
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.3 b/metadata/md5-cache/dev-python/ansible-compat-2.2.3
deleted file mode 100644
index 8467ec29e583..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.3.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=512ee35eb10ce12f886bfea10eef100b
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.4 b/metadata/md5-cache/dev-python/ansible-compat-2.2.4
deleted file mode 100644
index 0ac819648378..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst_parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst_parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/ansible-pygments[python_targets_python3_8(-)] dev-python/myst_parser[python_targets_python3_8(-)] dev-python/sphinx_ansible_theme[python_targets_python3_8(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.4.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=104a48632fff03b09af9a8b4579e3648
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.69.1 b/metadata/md5-cache/dev-python/cfn-lint-0.69.1
deleted file mode 100644
index cd3c45edda2c..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.69.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.69.1.tar.gz -> cfn-lint-0.69.1.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8bd2050976d8898a3df19a5a7993ee3a
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.70.0 b/metadata/md5-cache/dev-python/cfn-lint-0.70.0
deleted file mode 100644
index 133d4196a941..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.70.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.70.0.tar.gz -> cfn-lint-0.70.0.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.70.1 b/metadata/md5-cache/dev-python/cfn-lint-0.70.1
deleted file mode 100644
index 7bbd0ae5daad..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.70.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.70.1.tar.gz -> cfn-lint-0.70.1.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.71.0 b/metadata/md5-cache/dev-python/cfn-lint-0.71.0
deleted file mode 100644
index cc32c659d828..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.71.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.53.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.71.0.tar.gz -> cfn-lint-0.71.0.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f12595e66517ca4b94e1ba776190f17b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.0 b/metadata/md5-cache/dev-python/cfn-lint-0.72.0
deleted file mode 100644
index 18c33daae022..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.54.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.54.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.0.tar.gz -> cfn-lint-0.72.0.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b41a8ae1d01508af334dda990a2f74b7
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.72.1 b/metadata/md5-cache/dev-python/cfn-lint-0.72.1
deleted file mode 100644
index 947f621ef57b..000000000000
--- a/metadata/md5-cache/dev-python/cfn-lint-0.72.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/aws-sam-translator-1.54.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=CloudFormation Linter
-EAPI=8
-HOMEPAGE=https://github.com/aws-cloudformation/cfn-lint/ https://pypi.org/project/cfn-lint/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/aws-sam-translator-1.54.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.72.1.tar.gz -> cfn-lint-0.72.1.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b41a8ae1d01508af334dda990a2f74b7
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.16.2 b/metadata/md5-cache/dev-python/ipykernel-6.16.2
deleted file mode 100644
index ff5b6913f49e..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.16.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.16.2.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=fc1d9398e6bd6eef888b285da5ad798b
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.17.0 b/metadata/md5-cache/dev-python/ipykernel-6.17.0
deleted file mode 100644
index e8c13e3f0a90..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.17.0.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=1f32db91c69faece165c7eccd57ea834
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.17.1 b/metadata/md5-cache/dev-python/ipykernel-6.17.1
deleted file mode 100644
index 946506676fe4..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.17.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.17.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=1f32db91c69faece165c7eccd57ea834
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.18.0 b/metadata/md5-cache/dev-python/ipykernel-6.18.0
deleted file mode 100644
index 640baff0ba69..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
-LICENSE=BSD
-RDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.18.0.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d9804385bf850b2e4cc20dea0aa2ef9a
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.18.1 b/metadata/md5-cache/dev-python/ipykernel-6.18.1
deleted file mode 100644
index 54086f214107..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.18.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
-LICENSE=BSD
-RDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.18.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c829c1dd720112de35f8c844cb7bc9e1
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.18.2 b/metadata/md5-cache/dev-python/ipykernel-6.18.2
deleted file mode 100644
index 0dec175e2361..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.18.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
-LICENSE=BSD
-RDEPEND=dev-python/comm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.18.2.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c829c1dd720112de35f8c844cb7bc9e1
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.19.1 b/metadata/md5-cache/dev-python/ipykernel-6.19.1
deleted file mode 100644
index 2bad04404992..000000000000
--- a/metadata/md5-cache/dev-python/ipykernel-6.19.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/comm-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=IPython Kernel for Jupyter
-EAPI=8
-HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.19.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ba2f19c31ebe14b711f7536da526d6a2
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 5074dd87e774..c6aa8bb989cd 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/csv-3.2.6 b/metadata/md5-cache/dev-ruby/csv-3.2.6
new file mode 100644
index 000000000000..a07c165c40e1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/csv-3.2.6
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-3.4.8[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=The CSV library provides a complete interface to CSV files and data
+EAPI=8
+HOMEPAGE=https://github.com/ruby/csv
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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-2
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=3
+SRC_URI=https://github.com/ruby/csv/archive/v3.2.6.tar.gz -> csv-3.2.6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=98302b90d99c7f5274625d02fe5c0a96
diff --git a/metadata/md5-cache/dev-ruby/date-3.3.1 b/metadata/md5-cache/dev-ruby/date-3.3.1
new file mode 100644
index 000000000000..740d1ff70da2
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/date-3.3.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A subclass of Object includes Comparable module for handling dates
+EAPI=8
+HOMEPAGE=https://github.com/ruby/date
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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-2
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/date/archive/v3.3.1.tar.gz -> date-3.3.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1ba2d799f1f854f1e578dc5881215f81
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.11.0 b/metadata/md5-cache/dev-ruby/hiera-3.11.0
new file mode 100644
index 000000000000..a77aeee9d3cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hiera-3.11.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/deep_merge[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A simple pluggable Hierarchical Database
+EAPI=8
+HOMEPAGE=https://docs.puppet.com/hiera/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/deep_merge[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/deep_merge[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hiera-3.11.0.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=fd834f868124830c178d07e4fb4892ee
diff --git a/metadata/md5-cache/dev-ruby/io-event-1.1.4 b/metadata/md5-cache/dev-ruby/io-event-1.1.4
new file mode 100644
index 000000000000..af9b330e50a3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/io-event-1.1.4
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby30? ( test? ( >=dev-ruby/sus-0.6:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/sus-0.6:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=An event loop
+EAPI=8
+HOMEPAGE=https://github.com/socketry/io-event
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~sparc
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1.1
+SRC_URI=https://github.com/socketry/io-event/archive/v1.1.4.tar.gz -> io-event-1.1.4.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a21b6149d4ca3654ab4379ae93da97ad
diff --git a/metadata/md5-cache/dev-ruby/json-2.6.3 b/metadata/md5-cache/dev-ruby/json-2.6.3
new file mode 100644
index 000000000000..3c77cdc62ccb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/json-2.6.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) test? ( dev-ruby/test-unit:2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-util/ragel ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A JSON implementation as a Ruby extension
+EAPI=8
+HOMEPAGE=https://github.com/flori/json
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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-2 Ruby )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/flori/json/archive/v2.6.3.tar.gz -> json-2.6.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=ee657bf312a9123b307e342a485ed359
diff --git a/metadata/md5-cache/dev-ruby/mini_magick-4.12.0 b/metadata/md5-cache/dev-ruby/mini_magick-4.12.0
new file mode 100644
index 000000000000..d6f3514d5b04
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mini_magick-4.12.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/webmock[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( virtual/imagemagick-tools[jpeg,png,tiff] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Manipulate images with minimal use of memory
+EAPI=8
+HOMEPAGE=https://github.com/minimagick/minimagick
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=media-gfx/imagemagick ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/minimagick/minimagick/archive/v4.12.0.tar.gz -> mini_magick-4.12.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=328be1260a2521c68f1feac7c9120861
diff --git a/metadata/md5-cache/dev-ruby/mocha-2.0.2 b/metadata/md5-cache/dev-ruby/mocha-2.0.2
new file mode 100644
index 000000000000..66731c885055
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mocha-2.0.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] dev-ruby/introspection[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] dev-ruby/introspection[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] dev-ruby/introspection[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Mocking and stubbing using a syntax like that of JMock and SchMock
+EAPI=8
+HOMEPAGE=https://mocha.jamesmead.org/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/ruby2_keywords-0.0.5[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/freerange/mocha/archive/v2.0.2.tar.gz -> mocha-2.0.2.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a63b2cfa9e955f3d417e742a668ca5a7
diff --git a/metadata/md5-cache/dev-ruby/net-protocol-0.2.1 b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
new file mode 100644
index 000000000000..2d115a1ffbef
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/net-protocol-0.2.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/timeout[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/timeout[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/timeout[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=The abstruct interface for net-* client
+EAPI=8
+HOMEPAGE=https://github.com/ruby/net-protocol
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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-2
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/timeout[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/timeout[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/timeout[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/net-protocol/archive/v0.2.1.tar.gz -> net-protocol-0.2.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=0d0a2028387021f8945db9585c58e8c0
diff --git a/metadata/md5-cache/dev-ruby/psych-5.0.1 b/metadata/md5-cache/dev-ruby/psych-5.0.1
new file mode 100644
index 000000000000..0b95838afadb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/psych-5.0.1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/libyaml-0.2.5 test? ( ruby_targets_ruby27? ( dev-ruby/stringio[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/stringio[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/stringio[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A YAML parser and emitter
+EAPI=8
+HOMEPAGE=https://github.com/ruby/psych
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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-2
+RDEPEND=>=dev-libs/libyaml-0.2.5 ruby_targets_ruby27? ( dev-ruby/stringio[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/stringio[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/stringio[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/psych-5.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=5295558a7d1a145ff20618a532896572
diff --git a/metadata/md5-cache/dev-ruby/public_suffix-5.0.1 b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
new file mode 100644
index 000000000000..5a5a4651ea04
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/public_suffix-5.0.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/mocha:1.0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Parse and decompose a domain name into top level domain, domain and subdomains
+EAPI=8
+HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=5
+SRC_URI=https://rubygems.org/gems/public_suffix-5.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=d43553dbfa9a7907c4b8526cbe097145
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0 b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
index fbfcc354dca9..d1d5ea440103 100644
--- a/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-3.2.0
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby30(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby30(-)] dev-ruby/minitar[ruby_targets_ruby30(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Tools to access Forge API information on Modules, Users, and Releases
 EAPI=8
 HOMEPAGE=https://github.com/puppetlabs/forge-ruby
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby27(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby27(-)] dev-ruby/minitar[ruby_targets_ruby27(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/faraday-1.3:1[ruby_targets_ruby30(-)] dev-ruby/faraday_middleware:1[ruby_targets_ruby30(-)] dev-ruby/minitar[ruby_targets_ruby30(-)] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://rubygems.org/gems/puppet_forge-3.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=83b3f246e97142a48126391f99ea9b12
+_md5_=ef3a0645cbb14400d2ad37062a14c055
diff --git a/metadata/md5-cache/dev-ruby/racc-1.6.1 b/metadata/md5-cache/dev-ruby/racc-1.6.1
new file mode 100644
index 000000000000..49d94dd77b7a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/racc-1.6.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=A LALR(1) parser generator for Ruby
+EAPI=8
+HOMEPAGE=https://github.com/tenderlove/racc
+INHERIT=ruby-fakegem
+IUSE=doc test test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~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=LGPL-2.1
+RDEPEND=ruby_targets_ruby27? ( virtual/ruby-ssl[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/ruby-ssl[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/ruby-ssl[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tenderlove/racc/archive/v1.6.1.tar.gz -> racc-1.6.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a4d034199363ef2de7a31d3a78db582b
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.6.0 b/metadata/md5-cache/dev-ruby/rack-attack-6.6.0
deleted file mode 100644
index e56634446e47..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.6.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/actionpack[ruby_targets_ruby27(-)] dev-ruby/activesupport[ruby_targets_ruby27(-)] dev-ruby/railties[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=A DSL for blocking & throttling abusive clients
-EAPI=8
-HOMEPAGE=https://github.com/kickstarter/rack-attack
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://rubygems.org/gems/rack-attack-6.6.0.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8c46c189f581fb09c4ca11b9b357397f
diff --git a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1 b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
index 97d5ef5b7418..a65a753f056b 100644
--- a/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
+++ b/metadata/md5-cache/dev-ruby/rack-attack-6.6.1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/actionpack[ruby_targets_ruby27(-)] dev-ruby/activesupport[ruby_targets_ruby27(-)] dev-ruby/railties[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/actionpack[ruby_targets_ruby30(-)] dev-ruby/activesupport[ruby_targets_ruby30(-)] dev-ruby/railties[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/actionpack[ruby_targets_ruby27(-)] dev-ruby/activesupport[ruby_targets_ruby27(-)] dev-ruby/railties[ruby_targets_ruby27(-)] dev-ruby/rack-test[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/actionpack[ruby_targets_ruby30(-)] dev-ruby/activesupport[ruby_targets_ruby30(-)] dev-ruby/railties[ruby_targets_ruby30(-)] dev-ruby/rack-test[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/actionpack[ruby_targets_ruby31(-)] dev-ruby/activesupport[ruby_targets_ruby31(-)] dev-ruby/railties[ruby_targets_ruby31(-)] dev-ruby/rack-test[ruby_targets_ruby31(-)] dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A DSL for blocking & throttling abusive clients
 EAPI=8
 HOMEPAGE=https://github.com/kickstarter/rack-attack
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/rack:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rack:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rack:*[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=6
 SRC_URI=https://rubygems.org/gems/rack-attack-6.6.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ae746cd1ee96cf3f545f5aaf8a492770
+_md5_=71e2ed8530f8377b21c09edcc4ea76cb
diff --git a/metadata/md5-cache/dev-ruby/serverengine-2.3.0 b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
index cc4b7c0d8203..fcd4522cc51e 100644
--- a/metadata/md5-cache/dev-ruby/serverengine-2.3.0
+++ b/metadata/md5-cache/dev-ruby/serverengine-2.3.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/serverengine-2.3.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=468549ff206903cd17fda2ac00a68c8f
+_md5_=437e71e9c23da6fece6441c84af7cbed
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 51d14a603619..78d1208e844d 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.38.2 b/metadata/md5-cache/dev-vcs/git-2.38.2
new file mode 100644
index 000000000000..395c44d24d3c
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.38.2
@@ -0,0 +1,17 @@
+BDEPEND=doc? ( app-text/asciidoc app-text/docbook2X app-text/xmlto sys-apps/texinfo ) gnome-keyring? ( virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=dev-libs/openssl:= sys-libs/zlib curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) iconv? ( virtual/libiconv ) pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= )
+DESCRIPTION=Stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=8
+HOMEPAGE=https://www.git-scm.com/
+INHERIT=toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd
+IUSE=+blksha1 +curl cgi doc gnome-keyring +gpg highlight +iconv mediawiki mediawiki-experimental +nls +pcre perforce +perl +safe-directory selinux subversion tk +webdav xinetd cvs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+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
+RDEPEND=dev-libs/openssl:= sys-libs/zlib curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) gnome-keyring? ( app-crypt/libsecret dev-libs/glib:2 ) iconv? ( virtual/libiconv ) pcre? ( dev-libs/libpcre2:= ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:= ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Authen-SASL >=virtual/perl-libnet-3.110.0-r4[ssl] cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso(-),perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) perforce? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) selinux? ( sec-policy/selinux-git )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) perforce? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) subversion? ( perl ) webdav? ( curl )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/software/scm/git/git-2.38.2.tar.xz https://www.kernel.org/pub/software/scm/git/git-manpages-2.38.2.tar.xz doc? ( https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.38.2.tar.xz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=aacb8933462c803d39d8a03bb5b8d3a2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fbb9c9304c17..b54bef2eebd0 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/libsixel-1.10.3 b/metadata/md5-cache/media-libs/libsixel-1.10.3
index 6682ab3f8b61..f0a800ae3437 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.10.3
+++ b/metadata/md5-cache/media-libs/libsixel-1.10.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/libsixel/libsixel
 INHERIT=bash-completion-r1 distutils-r1 meson
 IUSE=curl gd gtk jpeg png python test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~ia64 ~loong x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong x86
 LICENSE=MIT public-domain
 RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/libsixel/libsixel/archive/v1.10.3.tar.gz -> libsixel-1.10.3.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	meson	1994a5aef5d4f5798b92f64d6f9a6003	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=8f2e236e78df99ba69cb55e42874a0cc
+_md5_=0a8be1e4a5109060e5838ce2480f90f9
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index d10fe33d70fd..c65e924644e3 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/mpv-0.35.0-r1 b/metadata/md5-cache/media-video/mpv-0.35.0-r1
index b023c0619208..e54fc666896d 100644
--- a/metadata/md5-cache/media-video/mpv-0.35.0-r1
+++ b/metadata/md5-cache/media-video/mpv-0.35.0-r1
@@ -7,7 +7,7 @@ HOMEPAGE=https://mpv.io/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=edo flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
 IUSE=+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet vaapi vdpau vulkan wayland +xv zimg zlib lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~loong ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~x86 ~amd64-linux
 LICENSE=LGPL-2.1+ GPL-2+ BSD ISC MIT
 RDEPEND=media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv ) ) alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= ) drm? ( media-libs/mesa[gbm(+)] x11-libs/libdrm ) dvd? ( media-libs/libdvdnav media-libs/libdvdread:= ) egl? ( media-libs/libglvnd ) gamepad? ( media-libs/libsdl2[joystick] ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) ) jack? ( virtual/jack ) javascript? ( dev-lang/mujs:= ) jpeg? ( media-libs/libjpeg-turbo:= ) lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) libplacebo? ( >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] egl? ( media-libs/libplacebo[opengl] ) ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) openal? ( media-libs/openal ) opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) raspberry-pi? ( media-libs/raspberrypi-userland ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) sndio? ( media-sound/sndio:= ) vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( media-libs/shaderc media-libs/vulkan-loader[X?,wayland?] ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) zlib? ( sys-libs/zlib:= ) selinux? ( sec-policy/selinux-mplayer ) tools? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( cli libmpv ) egl? ( || ( X drm wayland ) ) libplacebo? ( || ( egl opengl vulkan ) ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) nvenc? ( || ( egl opengl vulkan ) ) opengl? ( || ( X aqua ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) vaapi? ( || ( X egl libplacebo wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/mpv-player/mpv/archive/v0.35.0.tar.gz -> mpv-0.35.0.tar.gz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b6cbcbf054675f581d4a26e7eff05f0b
+_md5_=53743cd52c9be2c9c23458a0e94ca4df
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index bdf303352172..95374bca6025 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/nagstamon-3.10.1 b/metadata/md5-cache/net-analyzer/nagstamon-3.10.1
new file mode 100644
index 000000000000..1b71e4225022
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagstamon-3.10.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pylint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
+DESCRIPTION=systray monitor for displaying realtime status of several monitoring systems
+EAPI=8
+HOMEPAGE=https://nagstamon.de
+INHERIT=python-r1 distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HenriWahl/Nagstamon/archive/v3.10.1.tar.gz -> nagstamon-3.10.1.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=5aa92a395bacbe17fed6eefffcc3193d
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1 b/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
deleted file mode 100644
index 8a52721400e9..000000000000
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.4.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=systray monitor for displaying realtime status of several monitoring systems
-EAPI=7
-HOMEPAGE=https://nagstamon.ifw-dresden.de
-INHERIT=python-r1 distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-3.4.1.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=1fad6fe0f8258b648036c0c697b48862
diff --git a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0 b/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
deleted file mode 100644
index 8129c1570550..000000000000
--- a/metadata/md5-cache/net-analyzer/nagstamon-3.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=systray monitor for displaying realtime status of several monitoring systems
-EAPI=7
-HOMEPAGE=https://nagstamon.de
-INHERIT=python-r1 distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PyQt5[gui,multimedia,svg,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/dbus-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/keyring[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/secretstorage[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-xlib-0.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests-kerberos[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/HenriWahl/Nagstamon/archive/v3.6.0.tar.gz -> nagstamon-3.6.0.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d64f67420410328bc4fe09e9f6fc1a17
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 16d756a5d326..dc530c1216ea 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-tomcat-10.1.4 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.4
new file mode 100644
index 000000000000..7f4978f997bd
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=10.1.4
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.4/KEYS -> openpgp-keys-apache-tomcat-10.1.4-KEYS.asc
+_md5_=2a0dd85294d3a36dbaa4f7672373bf44
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 1f1e8404894c..314077d39fb6 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.4 b/metadata/md5-cache/www-servers/tomcat-10.1.4
new file mode 100644
index 000000000000..ef1c73b304d4
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.4
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.4:10.1.4 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.25 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.4:5.0 ~dev-java/tomcat-jsp-api-10.1.4:3.1 ~dev-java/tomcat-servlet-api-10.1.4:6.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.25 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.4:5.0 ~dev-java/tomcat-jsp-api-10.1.4:3.1 ~dev-java/tomcat-servlet-api-10.1.4:6.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.4/src/apache-tomcat-10.1.4-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=b39d92133857112800c53f1596d9b5bd
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 5f3dd4210203..b753c981ac02 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14601 BLAKE2B b2b03f784771869c2af8238b7eb177f68542d9936c68fb72d5570f7586fc5bfa6ebef91d68006df82de3cb72959aeb4bab278be90309ec4475d99a0a7c116698 SHA512 63ddd1056929f887c0a4815b7d7a2bf2cee40e7678885b8dae9d5f1bfc4b69ae36456367dc791d7e3ada9047919456bd6d6dbfc92df0cef91b9e64733254a40c
-TIMESTAMP 2022-12-11T02:40:03Z
+TIMESTAMP 2022-12-11T08:40:04Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVQwNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOVl2RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAJqxAApS6fruoc+ONUycnYtz2ionuP2pulz4yXe9xUm24l4kobYPe1/s/mIw14
-bXUpP8H6Xq+PJ6iCCuh3YS0RI7Pppmmnpb7JFPWCwRXWfvSI9BmbRJ+c/cWFkThD
-52ASJvijKuCX+c0on7ZbXxjrlwU53Z/8Q8YzQnQy1L4UBFG8b3nVDWiTB6qwgbXV
-Ka/QapsNZcmTxN96WHFRGS9CV8/oFLDERQrIjYBZ2Hs4jmlV29Jh9Ht51dLvzcdh
-wB8+HcStg2Iy2gGwT9I7WSw0wQQWx98bfFhujr80jOIEfTslX8CLChy/OGxhtTKr
-5oC92+GveFfVzAxjfZyWse/KU0VYQMGeJE34LR7kxZBblosL2sOAAmjvBIGQF29z
-Nbep4VuX0W3gZHFVsEoVcYMHPcuQG8MZlSs1XIXBLWUFA3EjTZs2wJ3fc3nNqKgR
-RF5rxp0EZaYO+3AzP5owUqe9QWOvW7dyFsaq1JsfyxkpcdOxb6J6uC99nWFLrGTH
-DKtWx2PrMYshLtwmkZA4JRXbDxrgibbyX8bZq3uNqXpo1wy0UJlOLL9/IafihQMe
-186VyPaqHQbDbo9MGLqHZZ+2r2EHDKKW5zIGb0OKaff9ep0OTM6+s+8Ndztr+jNq
-e68DN5fQgycS4093hSXF8N9VDU/QktXQa6N4EbcWF9a1gWKAvds=
-=I34h
+klCSVA/+KNGb62l8pkSYl+SAVl9R6g3Td5/Ut6OgEahZ2/dc3laPI9o/2ZEvltiW
+tgwSK2fgwjj5Ty07F2k28Z+D6KqyLXy544k/jJb8Q+beaI+eixbKNxt+R+zIOlo7
+qkIVVCZG9vQU/oW5LrcgvWRbQwYWU+5CWPcXKURULTTyL6BkUIDsmPqmcxqW9sH5
+TMObN5jkNhnL3LgANEFASgqbKylEto/5GwX6dXjGv6snN27zI9didVyYOIJiRk+q
+x0mC3pbPl0w2kI8S+bEx7LBu19lgLQqE2Dl3HS+GOBnSSpy6Fs3AajJK3yjKaAdk
+hnvyAffx6Ck0zTsUfchAWyD2rXIAisg9MedcC1RN4iLsHWy7ZsnXBv0/F07S89VQ
+4I5HZmhJFNLTaQqZruSQj5uENyIfJZNvgORtBjt4Vxs7hPJdGuNmLrxS/7veQu9M
+4CcW4oPcGTSZ5ngWVJhRsdBYqB8x+lfLQJGQXkcgrBL17imp1bdxbA47kOA6siCv
+2qVGmoZ6jfKqy5CVJoZ1oV3lLPdyf1K8qGZnUSTA6wK+wNsgI/JIM6N88DO4Bel+
+gzwPAjL9xxBZPI5WWExYx+3BtWa3UjFpkE0WXrDFuTRzbC0j1aR1IP8++DBHxqtf
+FglMsi39Cqi0N+egkgPEJLoJlmfJHCOkqXzSP3TH8GEJveHUOcc=
+=nKhS
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 19682752c67f..cf5367dc1f5e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Dec 2022 02:40:00 +0000
+Sun, 11 Dec 2022 08:39:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 351fd0c0db28..1b20de048901 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Dec 11 02:40:00 AM UTC 2022
+Sun Dec 11 08:39:59 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 154559e6fe64..d2bc6cdaea97 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Dec 2022 02:45:01 +0000
+Sun, 11 Dec 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index abb2bba2f2de..975d4719571d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d6d138eff50017e84c60b8f712b2886d29a40365 1670725110 2022-12-11T02:18:30+00:00
+1cca31407dae98c23cf25ffd21c8593e9013d6d1 1670746551 2022-12-11T08:15:51+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ce2384d1f32e..d0e0e78e80be 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1670726401 Sun 11 Dec 2022 02:40:01 AM UTC
+1670748002 Sun 11 Dec 2022 08:40:02 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 19682752c67f..cf5367dc1f5e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 11 Dec 2022 02:40:00 +0000
+Sun, 11 Dec 2022 08:39:59 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 28f2fa16c96b..74d99da76a7d 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest
index f59a90a1f047..e111abab5f0f 100644
--- a/net-analyzer/nagstamon/Manifest
+++ b/net-analyzer/nagstamon/Manifest
@@ -1,10 +1,9 @@
 AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882554f3d4d9e0932cbf0c8761496cccac57b068b7a7c161bcde11223db2ed4a0c5563a15267f13d3553147044ca0f SHA512 7ec4f621e1dc91cb941811aaacb6322fee8024d39dfa65e39b3a19631a3ef7c78d4fcd4d8df5630b76904e3c415290b35ac777c4d0e863ce83e15832d061ea4d
+AUX nagstamon-3.10.1-setup.patch 974 BLAKE2B f74093c6e66129843ba7702602fda6f0b4004c02253405c1e48df0391aca898cafe9a3858c1d5bb4fb739bc80ec227fc05aaff5ee62f56dc104c99f7761b05ba SHA512 e5a65c40c5cda55fb3a118bc39cf8a35efa684cffc657838292c0fdad31bf965395965b6ff5e3b536bad52c28646b6a6f6274bb1e7551bc58c323f4215cc4b1e
 AUX nagstamon-3.4.1-unknown-version-id.patch 745 BLAKE2B 9e9f4619f98cfdea4a0f90fbf5d0b3c34c9e940449752110018a9b72a5817e0445f79cc30a9f720a390d40f09e0a28d491f692c6cd7515eb42f4035af54d483d SHA512 d4100c8f334309fd8711e2113c8e00d00fde124328e0ecd3c50762ff2be1b53b3832995922924170f7c695cdcfb48ba0100fda93a046ea802c56a4a917f77d43
 AUX nagstamon-3.8-setup.patch 1190 BLAKE2B 39eec86dc7fcd69d0e6ef5c3b986e1e1c3096bed7e9e60eb1b7986bd83b9542805cd78a46813ba8af566243d4890565c5670c4fa41fc209f3e261a61bc5108aa SHA512 172a11999da5aaba979c800278a2524c9f3de269f7c3b2dd994ea0f658d48ab6891723ba1e03296cbdd4f979b2ca84b391a763bf19279f22588b570be677a3c5
-DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd
-DIST nagstamon-3.6.0.tar.gz 573998 BLAKE2B 6cc1e7918d8a7a53255fbd1661b8a41c0f3f414341da64724e566ceb95378590ed325fea757fffcdccf33533c8e34ca235036b47323f89bfcb3d06007a0cf43e SHA512 4da9b20c518129857ff86fa4aa4aa7507fce6c5b43fc917a4b8681d36e69f267045ab35c2f6922bde55536bf55e753f61b4fc184165e2f6d9eb6cb9b00703c69
+DIST nagstamon-3.10.1.tar.gz 574520 BLAKE2B 104d082a610c26af47d61b911094c51e3981947e19ed026bc725e479382bcec2b3d36c36400c379c738c970e1cb36183859e1dd132e1fe78c30be3f20688287f SHA512 83da92cc0d5ceaf7abbf2f2e289a2e83cbcb3bb4239d12f594da7543942a3945cfae68cfa9ecc33aa619967d1d35e1b88d4bb76398364c2f9754174fdd62649c
 DIST nagstamon-3.8.0.tar.gz 585689 BLAKE2B 8ab52762bac4797ded3834a94a382174855504b8e39224938f8f720a4aaaf4b3885fb487504ed09d973210b90f612852964bdcc87a6b2dc7c6b07bebfdeacffe SHA512 d34d1c52ddadbafcd583a5e61f7f305ffc8f722d8c007bbefeee6501475f01612e810154bc5815abe27e9c43e4e695a8ec189dcc5b2b487840d79f92eb3edc43
-EBUILD nagstamon-3.4.1-r1.ebuild 1511 BLAKE2B 96d5d67c73d8398fd72f1d9261cbe46d04005262ab43b7627900444520360e4c148f475908067fe26fca3cda577828ff2988db09cd42bad810e7a27b6b90255a SHA512 8079a99e4094a34723d2513a41e5ace06811e367693b31c5474cef3c38ddcfd0ab396f29cc409582c8ea10132f4f9b17106d08a140fa39fb7d8a6a270c076bd0
-EBUILD nagstamon-3.6.0.ebuild 1548 BLAKE2B 4f0922dba9329ce92b126e786b1f8ccc7d9f229b297f9e3d29049fed93c73469d6fc1ee5d69f2badecb0c11434d46a75f8153c20a043ec69504c5a0806af4ea9 SHA512 a8af930643b7dcdd166e8ee14983b05f3f9583ae62478ee9fd045056cb7dc3e8c7a3234387734d3b6ebbe84ea0a9ac8820ca4e9b136de3235ddfa1fbcf85c27c
+EBUILD nagstamon-3.10.1.ebuild 1637 BLAKE2B 61e655948465083e2976f27812c1fb0aa1457c02f2eab06e350e51c0641eb62e86ea123b4e31715b3accfddd09f2d1dc9d49e66d123c3130814d36cbed0c84b2 SHA512 f29af85c0ebf2ce37dc0b61e83d892ee65430fbc926fdb85bd2a51a062d9e1ff63a13cd78d6a44d2935fb1ef823b04cd8e9e158849c1612f107298c536f5dbbc
 EBUILD nagstamon-3.8.0.ebuild 1547 BLAKE2B 010c505e57844be3fc1ac01c7a16e42f1f67833b4af176fd66ea83069c6329c2912515cd7809e84f66badb867560c72d9355ef71da04cb455e5475239f70ffa6 SHA512 cde2ed5b48d0be5a1182eb99abe7dab3681ad04b5eeb97fa07cd8715407bc5b374a28d556565f052f6a5d2239c28ff3bd159c03bf5bcbbc5befb845a4d9e9353
 MISC metadata.xml 524 BLAKE2B 4c3356f78441905ea0100c68e3dc806032b4bfa3173b908b9f66c8ac196db9d3928dfac4dd68b1e0a25d7718bdc1209a7196a5d0adced5631f6f5c9734554866 SHA512 9ad5a7226bca2718b698c6af71d98ee34c0f7f422112d7ebb21c55c4f68bc021229d48a0aaa514304d84968cce1ca659f91632857faa35af18e465a989490981
diff --git a/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
new file mode 100644
index 000000000000..62f6cdbc2a47
--- /dev/null
+++ b/net-analyzer/nagstamon/files/nagstamon-3.10.1-setup.patch
@@ -0,0 +1,25 @@
+--- a/setup.py	2022-12-11 07:36:25.144000930 +0100
++++ b/setup.py	2022-12-11 07:37:00.856204252 +0100
+@@ -47,7 +47,7 @@
+     NAME = NAME.lower()
+ VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION
+ 
+-NAGSTAMON_SCRIPT = 'nagstamon.py'
++NAGSTAMON_SCRIPT = 'nagstamon'
+ 
+ from setuptools import setup
+ 
+@@ -120,12 +120,7 @@
+                 'Nagstamon.Servers',
+                 'Nagstamon.Servers.Alertmanager',
+                 'Nagstamon.Servers.Centreon',
+-                'Nagstamon.thirdparty',
+-                'Nagstamon.thirdparty.Xlib',
+-                'Nagstamon.thirdparty.Xlib.ext',
+-                'Nagstamon.thirdparty.Xlib.protocol',
+-                'Nagstamon.thirdparty.Xlib.support',
+-                'Nagstamon.thirdparty.Xlib.xobject'],
++                'Nagstamon.thirdparty'],
+       package_dir={'Nagstamon': 'Nagstamon'},
+       package_data={'Nagstamon': ['resources/*.*',
+                                   'resources/qui/*',
diff --git a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
index adf94467dd0c..ec3c7f25e642 100644
--- a/net-analyzer/nagstamon/nagstamon-3.6.0.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-3.10.1.ebuild
@@ -1,12 +1,14 @@
-# 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
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 
 inherit python-r1 distutils-r1
 
+distutils_enable_tests pytest
+
 MY_PN="Nagstamon"
 MY_P="${MY_PN}-${PV/_p/-}"
 
@@ -18,7 +20,7 @@ SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -36,11 +38,12 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
 	dev-python/requests-kerberos[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pylint[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" )
+PATCHES=( "${FILESDIR}/${PN}-3.10.1-setup.patch" )
 
 src_prepare() {
 	default_src_prepare
diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
deleted file mode 100644
index 1ab07d830d90..000000000000
--- a/net-analyzer/nagstamon/nagstamon-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit python-r1 distutils-r1
-
-MY_PN="Nagstamon"
-MY_P="${MY_PN}-${PV/_p/-}"
-
-DESCRIPTION="status monitor for the desktop"
-DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems"
-HOMEPAGE="https://nagstamon.ifw-dresden.de"
-SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}]
-	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	>=dev-python/python-xlib-0.19[${PYTHON_USEDEP}]
-	dev-python/requests-kerberos[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0-setup.patch" "${FILESDIR}/${PN}-3.4.1-unknown-version-id.patch" )
-
-src_prepare() {
-	default_src_prepare
-
-	# pre-compressed already
-	rm Nagstamon/resources/nagstamon.1.gz || die
-	sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die
-
-	mv ${PN}.py ${PN} || die
-
-	rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a0d7afd64338..d0820e8c0149 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 9be5ab60969f..0287d947f268 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2022-12-11)
+# ruby27-only package. No reverse dependencies.
+# Removal in 30 days.
+dev-ruby/posix-spawn
+
 # Jonas Stein <jstein@gentoo.org> (2022-12-11)
 # Unfetchable and mirror-restricted.
 # Upstream discontinued
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 8973dde25cd3..e055387c5c71 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index 8b8dc4e529d4..08396749426f 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,8 +1,10 @@
 DIST openpgp-keys-apache-tomcat-10.1.2-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
+DIST openpgp-keys-apache-tomcat-10.1.4-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
 DIST openpgp-keys-apache-tomcat-8.5.84-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.69-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 DIST openpgp-keys-apache-tomcat-9.0.70-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.2.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
+EBUILD openpgp-keys-apache-tomcat-10.1.4.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
 EBUILD openpgp-keys-apache-tomcat-8.5.84.ebuild 566 BLAKE2B 05520c673ab0d06119f610501dfa55aa74c13a13bc7400c03e92e645f3470bf3034ecafd693e332b3d6e0f129f76f74c4f49e0446fa4e5bfbe84107ab9d5a31a SHA512 8b7ce48b7020f5aca73e9bfe7decea27d9a60fb6e9eb63b41c80acc49ee1befc6f635cdb1d50f26739f9fc11dda298d43606947e234f1058e4274ddb75942509
 EBUILD openpgp-keys-apache-tomcat-9.0.69.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
 EBUILD openpgp-keys-apache-tomcat-9.0.70.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.4.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.4.ebuild
new file mode 100644
index 000000000000..14300fd78599
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.4.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 tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index aaea281cda9f..b45ca4b20c2d 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 5a3344ff3534..303fa2369d0e 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,6 +12,8 @@ DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
 DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
 DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
+DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
+DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
@@ -25,6 +27,7 @@ DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672e
 EBUILD tomcat-10.0.27.ebuild 6470 BLAKE2B 14ca531ac0064810e68fe873a176d0a2fd64e411c2ff06f5c7195d8b6b80a61698fbf4c2bfd1bb5ff1f92784f2ddd89eb55f88eb40dbd33b2dd188e71c518c31 SHA512 08f574e72d42b649335dbf06d392d98e0070cc32776cbb5bd92c4449c0d62dc8db0d9f57fd485aa994a1ceacaf10fb5e136c4e9ff06e753a19ce93ac2a0b0213
 EBUILD tomcat-10.1.1.ebuild 6137 BLAKE2B 64b61e8f50da6825231660c690abe13117445ad0203d2487732f51b8a01dbd3d67709f81b0dfc36d067b4082f2c70b463daf7932793e5f34fea1a0e52764c646 SHA512 85bf9f1f084fb57fc0a276412f25fdec428c7fe41923c5261cb57abfd50ae79a489b01fd5565fa1b851f398b3b50f779c163bc6c548bf3a9df2cf4ac30ad3c50
 EBUILD tomcat-10.1.2.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca
+EBUILD tomcat-10.1.4.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca
 EBUILD tomcat-8.5.83.ebuild 5137 BLAKE2B c0bb842eb6e512c6c9d80bc9d923ebeceaeec1050e303bda3fccb2bec95ea91d161cc6acc8c56eac021b37afdaded605957c95c4c8fd69f1c1a004107ae9a722 SHA512 ec301c95e37dc392366f6fd709b6ebc20d13989a38c9347945045527a25ae45a76f7f041a9045b9be1f4febc7f3b90829f1d9ad54fe9efa759a5149d58985f0e
 EBUILD tomcat-8.5.84.ebuild 5434 BLAKE2B 95a1bd6917983a7b165c5eb5cdebd8c33a7cddbaa67e4d572a346f865ff9c23f283d4c2499a72a460224df44215215b42265b31e41008b6d8e43860bb9fa1389 SHA512 464d8ad88c8eae91ed99e636106c3f30fb01e30120dd24f25f2e31e43f540420b9bd0e5bb4220a41bfff0f35ae2c21b1789636e338eab4a364d1a25435a8d5d3
 EBUILD tomcat-9.0.68.ebuild 6034 BLAKE2B 0be969bd2004cfff3eef0b9b93e9d05a75e18af5458c9c3a13c88b16924b37580ed0450f491733096412262907d9b85d6a9751b1fed5278a06f32c76d98dadd0 SHA512 ed582425adb690fd5eb4c5df39b29c58cbf4219ff688c3154df368889218b8799efc145c871ebb3b1bf61199a67db24918b38ea86d2b63386ef230e2fa9437c1
diff --git a/www-servers/tomcat/tomcat-10.1.4.ebuild b/www-servers/tomcat/tomcat-10.1.4.ebuild
new file mode 100644
index 000000000000..9be9150ea919
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.4.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.25"
+SERVLET_API_SLOT="6.0"
+JSP_API_SLOT="3.1"
+EL_API_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-12-11 09:22:24 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-11 09:22:24 +0000
commit	583acea08c150460a36d3ee1a4800c33b9b19103 (patch)
tree	9152116a16df0b23202b077b54a014f7d2c28373
parent	ecd86b32a8f0b6be58bbb4b294ce38f1fbd7d3dc (diff)