gentoo auto-resync : 15:11:2023 - 16:36:08

author: V3n3RiX <venerix@koprulu.sector> 2023-11-15 16:36:08 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-11-15 16:36:08 +0000
commit: db3d7a26fc91ea36f0780dcc3bcc59efdab02d41 (patch)
tree: f1e4dcd66841437a53a8fad6c9efadbd060f692a
parent: 55cd3ff92ff96fafc75066838cfc2af06df3a296 (diff)
106 files changed, 2328 insertions, 333 deletions
diff --git a/Manifest b/Manifest
index f005b025324f..80f50cf63c74 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29293 BLAKE2B aba8e9208765c2f058bd45f902d4f2de1c426a06ca60c58c4044c08149ddc67ebc294efc7e4a829df92d33ee332acf54b349f48784a505925556b49dd9875ee4 SHA512 23cb9e022e2ccb3d641a11d0f73eddc7c70e8cf4ea6e10d2180d51f9234dae9722ff0ab6640f5c6ec870924b4905fcfe116409ee6593aeff9ab5000bc813a543
-TIMESTAMP 2023-11-15T10:09:53Z
+MANIFEST Manifest.files.gz 29292 BLAKE2B 9d00835ef979110eef4fa1502773b5b15cca9923d4f94ebba05570a9521d202e39715df40514f1e6f8e685bc520474e37ce7d98a638c7d5f90459813c84a6b44 SHA512 b13aba39ffd4a058722d60e6178ae8e44e178b0b43f9953fd83d691624a36c633e3f9212024895e5c092cb676a34bc0ee9a09255c3db5a00669c547bfc006fab
+TIMESTAMP 2023-11-15T16:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVUmPFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVU7VJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC1Jw//Q5mjwcQ4POcbNw7E4AgXZBDsRJ41d1W6CJT7UStHtO7vGf6SDd8Sn9AA
-7ZpYs2AUJG0LcGbNHuvhuGWMHvzLtnxEwLDmPVaXUTJUTaG1iIQHObfHNQTUC4Jd
-UJMdeUnmAloEgbZcYZVIOmDoxsCM8S4cvZQT1EH/lvbLdbgj0GssFVAO8/FLTSsM
-17dzoDIQfaZb2oW69amHppO4lx9sZzWaZO2c9Bt7g12QYsdF/v9d1nldoL7sMxLt
-iNPJbGSh2vG/rKEirdQyUxKek0Dk5lSCWEEbIVl61Ui1zzbBmtC3BhvyqGoa2Bf0
-rICLONbAcIyWymIQaoREv42DtT2hTaP8Q5c9Uio8YXR8IPK7D8+U1d0F4CKguTs2
-LOz6QIlR7vJPIs36ac+SdivNxDyuWzZta3eVSPoNhpJS1nlGcE4OwzNG7r/GpHjl
-5/C35+3DL8uG2hcI4Ql2TPknyEYKU0DZATB/d4aM1CeBJlHa9c1h+HvqOMRHXzw9
-3M3gm/l8FmwAcp4xta5i4Y+6LseN3RKNXCCpnoSBnuUR2zA24lD7RDMsiGq8/dNl
-/bzeya1vabjojhRyxXPCE1PDcTj/CfjIfhlvRyDEjI+jikX5xiw35j/zYS+Bh0Be
-oRQyGAu46A47fohX8+XIZTuG+FnN9+4P7b0VdUqg4imQHGSYlog=
-=CTam
+klBFgQ//ckdDaXTPQDZTjoWiqH4H/RqskRtYOtIgaF599ct+IZrs9gcl5Sbv/9xT
+0+Or7/70z+3zT7nLA+ZtFqsmrNAu6SL5fd3IN8LwX+fmW81XAJvP0BSSYJ6qYAaP
+XWxVcI1A4DGeRklYsbZQdh3olTzRXHo56yD3h3BcmG95Aww5NVnfPi5XjzsE7zXq
+klVzSieIrvvNz4I0rg4qIwd0yP+fPbqz1o0OcuTmJYVy/bqz8NJoXSRajScndXIb
+ykU/vtC27rBFdI6EzFtePYHF2lYVVM8ZLQxR/2crA8Fx+Vv/I6eHgswBa6Dx7pYV
+pP5Le4MP+5DW27dV30RS2PEs0ahXd8qO0HqRcY9y71s6yLXXDvA1KNn874yx/0yZ
+IAIUITYaQYtA91BVV6OVg4vtpX+nHzkdOC4S64d2Q+8ZBHg0Ze8oJa6IcqsQt+FY
+dtFcqntcDLlxys5BB5OwMTky75BsQDOByF32K2iqqJJC9mSdZhq8x3Q7F2988BC0
+vy3IgnXoh4YJBwMQ23mIeC/4z1cTeZKqAq0KsuP34C2kK67h+0Lz0WZyZC4B4dxX
+es9K50WAYakgbe/7aFQVkXWBOtKToJWzzcCm2qBrDG+WHsQDOhPdkRvrdPD2c+UA
+XA5pgi0K3O2PTQJElCX2f1LHMVvdd9kRbaCS+QsOu7GpAUm2HRc=
+=yIXK
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5b5d2476a544..7227f0c389fe 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7cc1a8d76637..3642213b8038 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e7d8a07858e6..922df42d6678 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,5 +3,5 @@ DIST conky-1.19.4.tar.gz 1724291 BLAKE2B 478c9f1c3c9ced8d1f9384a5d1d9b918245049e
 DIST conky-1.19.6.tar.gz 1727487 BLAKE2B 2ef2b0acd354559679b9d7d442de7a709e932418e27459b02bdf2f8b6dbdcf7911964932ab9851bab213e7f68d9a82034acab96892752544ab1a26d68c174c09 SHA512 9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde
 EBUILD conky-1.19.2-r1.ebuild 5444 BLAKE2B 742797b5ce98325914c24294911ada0b9f96adf17a24fb86c0af6894aacd0eb110572f64178cb2c584cb3c2c8f8fe92287a8f22c37423c4614bd35b7a3e781fd SHA512 2e2fcde3e935aad1cf27b0c085d9a078cc02bced6cec5af0674526ab44ae2af7db710961f749ca9ba663d2ecc67b1d086ba1db9ed7dc98b42015e5defa8aa8be
 EBUILD conky-1.19.4.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
-EBUILD conky-1.19.6.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
+EBUILD conky-1.19.6-r1.ebuild 5467 BLAKE2B 78c1ad9da78914b44ae11b5e3be4504eba942f60235ad0ea8ddb4d3eb5e3dc3604e69a93682d3661f2f712d40c179b69c296685a0be9d957e926329c13eace3d SHA512 0354b92185c4558b42b0b878cedbc1a7d65f2980166483823c18f6ffe73dfcede80cc5e5d35460b8606f5d617167c7f36be85dfbc8bfd23813249fbc334060f5
 MISC metadata.xml 2406 BLAKE2B d535320fc855c3ee9e321a7181153f0928b43820fdb72a4e3c4e68239070e4ec8a1a5ced292e559d5f19337622a369647f4bf21a2fc3c0c3c573cb24110cb36e SHA512 36e5a0fc2c570577b64e1ccdd7378d9f0ffac100ce6d322d4d9f09b0e1e287dd97347ef82db8507c5b8e8c615b02917fe45113a7091ef1a2faec2456304a9326
diff --git a/app-admin/conky/conky-1.19.6.ebuild b/app-admin/conky/conky-1.19.6-r1.ebuild
index 41a5bd379f95..41a5bd379f95 100644
--- a/app-admin/conky/conky-1.19.6.ebuild
+++ b/app-admin/conky/conky-1.19.6-r1.ebuild
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index d70f14712d2f..cdee195bcef0 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -8,6 +8,6 @@ DIST rasdaemon-0.7.0.tar.bz2 433555 BLAKE2B cf73f59558d8a6f3138fea20e7096a1b1214
 DIST rasdaemon-0.8.0.tar.bz2 394983 BLAKE2B 24209f468fea2bc4e85dcac51e363e44a8a44b224b448ec1330bcd15a5b2b4b3cceeec78dbc86b4a88f5a378ecacba62cdba8e9c3e2b1b3a70be85a18af166ab SHA512 f6262f098fd2a08d35fef2c25e2452a202151d4cc93a1829e821abd564acf7dcf80b08f819cbd7f04244dcc9f1dec5d9138aa013bb43c8fcf19d340233275614
 EBUILD rasdaemon-0.6.8-r2.ebuild 1472 BLAKE2B dbc2f9640d87137e5a7c714c077415baf2c513c5ce2e10f3ee2cff59f12cc8f096ffc625c02d9556a5c0d5a4f03208def23c386f8824242f0276dae98acc36af SHA512 a3ceade6b072dbc5cab09f7f337a32fc8fb5ce56e19a327df7b503eda22133aeaf98e8f9a9047b7a5655ab997f8ba886f58ed711d10fdc22f73d718cee343038
 EBUILD rasdaemon-0.7.0.ebuild 1346 BLAKE2B 0d877f64100ef2c8e321a7dfd8a591e65a6de26a2c7309dfac1b24807ce843adecca82274db350845993a1e924ed418415c23e50b76f1e3e60057d03f1bb1396 SHA512 c45512febbed1a68b1c54639c00e0a6f7380d2371540430ab3376b1908cf98851561d1b96ba96eb67bb34a7bb604409b560f06c451a62fc8a58f417c5deb47e3
-EBUILD rasdaemon-0.8.0-r1.ebuild 1812 BLAKE2B 241f3351ecab8080659d7dffb57624dd20851ef1656d5731082472aa87e7d676b7bd626b452150c707b13435b0a559e302735d638e99f10079786818856fb1cc SHA512 714640bd57a43e5faca5966c250e644cf116a5de34674c44f6d7dda5d44cb3b74a73926305d26ad9a9e6dce4dc4060495184638504a24afc3a93a00c0f9912a3
+EBUILD rasdaemon-0.8.0-r1.ebuild 1810 BLAKE2B 3accbf11b31a1d227829cfd34d51cd64ddff674f9808f754c9d32a8f42450b483c37b50e33a88e498f2743cf79afad5b1993e53f1c51b65ddf82c7b29691174b SHA512 429318a37adf55600281fcc00a3b214d07198c0ac467269006663356c44722919c030e49a371b74544a2d7f51835a900dbbb52acdf78a49407be30f7f9f21d3a
 EBUILD rasdaemon-0.8.0.ebuild 1752 BLAKE2B 10f96dcd267210df5f9eec96e8200ede9d63d9e5b97c62131fc772204976734a66a9bf6bcde8b09f084e0e39aab7d8b54ee9d5c9fdb907c75a0f59dac160ac66 SHA512 f97f8bc5651cdc83d5e3f29e5197965f157663bc9e86073a58082c0b9a95f79218cd2144b98dba2c8b5036cb79ed88f8a82b4d605c7c864a29cfab49f0b677c6
 MISC metadata.xml 1086 BLAKE2B d9017158e600a5aca8b1ca0600a36efec9f12c26493e28b129a0029caa37224b2e5341292ffdebabdc81893aebddba7b893d69f66f87ff4fd927e5310a4482c8 SHA512 3801a8c374a0d38f9efc07a288eb338739e74d1e7e41a182b871f01ce8cfd695621cfb6c883e5ce8da267e1440bf8106db6ad5ac12ef5e156bba958f72ea6297
diff --git a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
index a6e5f6592601..aea9287acd6b 100644
--- a/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.8.0-r1.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="selinux"
 
 DEPEND="
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ca8ff71fa718..4acf606ff41e 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/bacula/Manifest b/app-backup/bacula/Manifest
index 89b76d3e0541..aa5fdbc64ef2 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -9,6 +9,7 @@ AUX bacula-dir.confd 629 BLAKE2B 85eb7131fe1735ea3af0075b26c88408a11ce7653b92e27
 AUX bacula-fd.confd 241 BLAKE2B fe41e6376e46e674ef1aa32f02e2dee9721189fb56c4d25c2f49bd6bb0b9c8bcc811cd58db62b9b8bffd80514a24e9d60385a395dfdb93627d473ba7bbf05131 SHA512 0e5a21d8ed3cd39135c8db5b8c59e615161848aaca582851d3599fe0e6ad4f47c04fede13cdc648a2cbdc032de6ca00aa954111bbb2930eb006e7e0984cb882f
 AUX bacula-fix-sonames-new.patch 2090 BLAKE2B 1d181464b599fbb40b5d463b17b6364dc144bb82071e1a3454f30d6f60c8679f738b59dccbc01a73cc14f882997ca5dae438ba2d3d7d1ea20ac148e1da3e2e9c SHA512 c9f6ec30c15f22fc57bed05ed387f99102bc234d50de4762785ec17c4ef3a68d8f560c3878e5843dc3bf1b2680b41f9990dcc89a3c238760deeb5fd95ed5d50a
 AUX bacula-sd.confd 391 BLAKE2B 922ebff1772470f611661b03e6216d3bf11a09e9e552e5df59d9fcd5c14bde1b943e151892648e6176cef643ede01ec710f0aa892c35b51753331c96885cbe9e SHA512 ee7372582f6f8c7b4552ed5fd71293f712af22d0de30d02e3f5e08b3738da978eebc42dd601d88735f0412b1429be624a28d86e5f32aba2ddb127ca1ebd10e0d
+AUX fix_slibtool.patch 3842 BLAKE2B 7ff68035ebe84ecb3dae562214be5ede22e86e868ed13d8c319a4bb2f9c366adcd47424d36d774c1e1d35de10a2991bca27a94badeef839be24e19aee53db5f0 SHA512 13855ede7f74ceea838bf5faa7635d331a7ecaa4f79ff15087bdf522c8527bdeac43ac1d273d0d86ed89dad1ed82164f73e4c0c7cc8adeea06b787dc6507e3c9
 AUX fix_tray_monitor.patch 432 BLAKE2B a4c011e439978c9d767ac3aa82cc7c110ec1f93fd74c9cb1cfe60dd29860b1c4268e934b34da46d319982765cf420438eef6332c0cc3f8e0ff3ec691251480f7 SHA512 afb95521926f498aa38b3fbe389ed8fd2cc0d3a4878b6f562becd8b9adc15b7db2ddbf195336aa913a82315b41229110a235cfe5ad038cb129332f59e6538804
 AUX newscripts/bacula-dir.initd 391 BLAKE2B 80cc13d6f946e5faad95774b3cc3f4575c28b826af618bb241a4acfafb01bace37e24dae4e90cabeeb2d0ac32a224ec27a69c6e4ae2502cb34113bd32df5208f SHA512 8364fe26ef042f03ac2e3868e577e28a8b9bc1de0e53391140696d91c5df78df456292ee359e12ddf371452305e1aaffaa391b1cb3482c6c8e17154259b3cc35
 AUX newscripts/bacula-fd.initd 324 BLAKE2B cfc134247570538fed3aa1a96e51a45704cd747bda65e5bcdc6461bbcea27634909675a9c46eb3f00607c5ac8afdb481ca8ce1cd80e006bf00b59e78db58c750 SHA512 9c998c0deafe2882edbbd2ddd7e9bdc0f6cae3752a0e0f875d2350cf8eda20fb5bdb6781d1a57303cf4ebf8e719bdd7396fb0fed81726d752d035c82f26cc5cf
@@ -21,5 +22,5 @@ EBUILD bacula-11.0.6-r5.ebuild 12403 BLAKE2B 7c57abed3f2c581d9d0fd5158644096f095
 EBUILD bacula-11.0.6-r6.ebuild 12516 BLAKE2B b66af558175a9d985a28806df4e2cdc4425e4cb27a2ea4b818e7c624064ccd6f3279a94958df5e39f469987e7bd626bd3173935d53359aae98d79d3f86a5ce03 SHA512 32261ea7a73e5825770441cf7451781dab4f7641b7a8d47d6f9f90ea673f32b6a957516c70e1d62a4bb99f0cd23ce267c65b52389e01165149e32b71d0c5b2fa
 EBUILD bacula-13.0.2-r2.ebuild 12409 BLAKE2B e7908c30254dbb8b6f978a6a667ba5998169c7c26c6b70b59cbc279761e53bfefd6b290e513c0b21a6cf9f6fe081d3d7b4254f921158176bf57902978f8a367f SHA512 42d54f0eddae231319de7b62d1257dde2d154b3fe9117115f6863e3000635d92e8f45d69a8c73adafe8ce09f17385d452b9ed8ed435fa7c8b52c1516f8532aa6
 EBUILD bacula-13.0.3-r1.ebuild 12457 BLAKE2B da85f64e6f386cd93240336fede27599b3511ced789d848b32e511e26aecc5068e6755de9e4c34f3de24069228b5de4a19c1b7ea2bc58e4cbc20a1fbdc3468f2 SHA512 d28586b5cd9cbdd5a83a5087b198449eb40049073427ddd2ac62a5c3d8e15215add7f0281173302ec4665103d39e70708e06d7c889cbbe39f47e890e6951f94f
-EBUILD bacula-13.0.3-r2.ebuild 12859 BLAKE2B 9e9e82b9df345a14ea614faef3a6155f6a9f5f60257a6992ec3ea57643dfb9c721f076e97032ce41b3789d64ac188515622bc4f2dd77d10de0d7aad736886d9f SHA512 c09df86339b7cc66e7bc8ac599d2af8712845d44789a2a5e94216de5e33e199544e387f6b9f343ce46c2aefd5fef81972e137a166396d10f7a69283961b7af94
+EBUILD bacula-13.0.3-r2.ebuild 12969 BLAKE2B d31d2773665e3e6b5c637fb873f459302c9e5297b823979078bf760c0ffb199a6882fc59c8393367127c556af60bc8e97e49f8dc3754e55ca0bd9e50d9784d52 SHA512 5ebf1286fb11b929a740108cc7f0d27766158d7349eeb4bdb363d1864839875b923a83bd5514fe60a07c59e768d77b25e3a65aaf761f22b8c3a83a0aa157c9c8
 MISC metadata.xml 747 BLAKE2B bae193fb0ae5e5e92b0b6e935691f19235a230b0a7e69083aeb344db0e451ca55f16c9f3c163eab390621ab266e0f7f7ee1e75eff69589b2de0c730d2cf0d965 SHA512 df7c2a1296cb7da96928de07347df04f741b8b91de72d39c002dda3e5c9564341a5bc73b60f68752a806175fd5709b35f1eb4ecf00e85e1237c4672c0b948557
diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild b/app-backup/bacula/bacula-13.0.3-r2.ebuild
index 215b36e4ef79..024d64df49ea 100644
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@@ -134,6 +134,9 @@ src_prepare() {
 	# fix soname in libbaccat.so, see bugs #602952, #790140 and #845126
 	eapply "${FILESDIR}/bacula-fix-sonames-new.patch"
 
+	# correct library search path for slibtool usage (bug #914389)
+	eapply -p0 "${FILESDIR}/fix_slibtool.patch"
+
 	# do not strip binaries
 	sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
 	sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
diff --git a/app-backup/bacula/files/fix_slibtool.patch b/app-backup/bacula/files/fix_slibtool.patch
new file mode 100644
index 000000000000..e38448faa30c
--- /dev/null
+++ b/app-backup/bacula/files/fix_slibtool.patch
@@ -0,0 +1,67 @@
+# slibtool creates library in .libs directory but need -L. to find them
+# Bug #914389
+--- src/stored/Makefile.in.orig	2023-11-15 14:20:23.135630968 +0100
++++ src/stored/Makefile.in	2023-11-15 14:22:35.771246680 +0100
+@@ -267,7 +267,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ btape: Makefile  $(TAPEOBJS) libbacsd.la drivers ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(TAPEOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(TAPEOBJS) \
+ 	  $(SD_LIBS) $(DLIB) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ 
+@@ -277,7 +277,7 @@
+            -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ cloud_test: Makefile cloud_test.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDTESTOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcloud.o: bcloud.c
+@@ -286,7 +286,7 @@
+            -I$(basedir) $(DINCLUDE) $(S3_INC) $(CFLAGS) $<
+ 
+ bcloud: Makefile bcloud.o ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)  $(BLSOBJS)  libbacsd.la drivers
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(CLOUDCLIOBJS) $(DLIB) \
+            $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(S3_LIBS)
+ 
+ bls.o:	bls.c
+@@ -296,7 +296,7 @@
+ 
+ bls:	Makefile $(BLSOBJS) libbacsd.la drivers  ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bextract.o: bextract.c
+@@ -306,7 +306,7 @@
+ 
+ bextract: Makefile $(BEXTOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+ 	@echo "Compiling $<"
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bscan.o: bscan.c
+@@ -316,7 +316,7 @@
+ 
+ bscan:	Makefile $(SCNOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) \
+ 	../cats/libbacsql$(DEFAULT_ARCHIVE_TYPE) ../cats/libbaccats$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
+ 	   $(SD_LIBS) -lbacsql -lbaccats $(DB_LIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ bcopy.o: bcopy.c
+@@ -325,7 +325,7 @@
+ 	   -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+ 
+ bcopy:	Makefile $(COPYOBJS) libbacsd.la drivers ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+-	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
++	$(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(COPYOBJS) \
+ 	   $(SD_LIBS) -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+ 
+ cloud_parts_test: Makefile cloud_parts.c
diff --git a/app-backup/sarab/Manifest b/app-backup/sarab/Manifest
index c868511577f7..b6443c55214a 100644
--- a/app-backup/sarab/Manifest
+++ b/app-backup/sarab/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0.0-better-defaults-gentoo.patch 809 BLAKE2B 4c06df38ee68c612ebf671334d99c30d21bcea5bc16ad1b1e9c38e2824e503a12aa189f2aae254c991bf71de96244374ee1ef7ed180454905bba316705ed7676 SHA512 733484580782296c344d9c2ec69d4948359fef9c7513d9d481756c9f80fb4a369919dbbae01489dfba4b560d6c8077c755a31fcc74ba01f99148f3f63824fcee
 AUX README.gentoo 443 BLAKE2B 6a7eada85c0ae10ee4e186e3c8895e206dbccca941d5ae7b650907af450ba510adfabac76cc72b64d18fbaf3db5f9fa9f3c557f4890624f46fc6b5ab92699db2 SHA512 8eba4144634e324bf59adbcbf0dac44c7ed4ae5a89dde7f201da47dca55969d59040f0cf3ba9d632f22a92f7e3aa1d44c0d0be2061bd3facb9d3057267ebf7ae
 DIST sarab-1.0.0.tar.gz 24738 BLAKE2B b89a19f3b68345a4c0b7c70fe41d6a50fe99358167da797faa223549b70d7433a4d478b11f1de794e778f8e0537bca335333789176e14d3273d69a4071aa2a5c SHA512 246abd1893127a8aaf73537b9eb0d43921da37ddee97a02513916db2d6abdde6dd45715fbe56c53809c5442531e8172467de1b05af264a50054ecbecaa8d319f
-EBUILD sarab-1.0.0-r1.ebuild 967 BLAKE2B a19d635485371c271551625d963f4b31bc03a6c44f3a7c60480f90de611d02ba28d9b13008a2a4612feb3db55ce810483ed0db1423e59e76afc5c16482dc105a SHA512 e46fae757ccea1c5e17ebc0e823019fffbc747025c0596416e36d8bd0b1595f603207e0df8ae34cc6b1978629578b77530206081b07da77259466f245753614a
+EBUILD sarab-1.0.0-r1.ebuild 965 BLAKE2B 1d55b0b706dde1ae4700164f1399ce7e89930d081ef8f4ebe0d0d7b67118f965f42261384bd2f0715477e767f46a91a6b51368c07d34740dabf4a4e1615a9a31 SHA512 8209f31ad71dbbf7f739397c647bd6f4d7f3fe3350eb4f5582c901dcd22afdfdbae035fa9b45951a8a3061d5b7c1721a8a1dd4d4648ebf36738b9b51ceb9f8d4
 EBUILD sarab-1.0.0.ebuild 955 BLAKE2B dcf58aefc12cbbbbdcc76fcc1adbdff349d5282b348e54f477f22221b18ee207046b758c4219f26bf6d9c115e6e0c5902a6faf77b526afe70ad7c7c881a4aa6c SHA512 77e8deaac5fa43aead91a0a431ae9816e5e6b98db08815645ef4d901e74e7cd8fef7854daf6c6cba658e9a20f44b5695ae979644e1c3b7f6371045d8a35e7a9d
 MISC metadata.xml 554 BLAKE2B dbce471bab5234688583fe6ca7d11fb8f82a8ab3747f8e6274f7b1d728284c94bba33df0b10d83760f89175cc7034fc2e0b21c2698f2fcb8abe148321404b4ae SHA512 e65c593eaef63fd10667fe58ed358d77155bf96aae89f7a59ef2012b65535c4a53ddb6f4ace06b76692d4c33e848e8928d91b93b10ee8234e83b32c5ddbb26af
diff --git a/app-backup/sarab/sarab-1.0.0-r1.ebuild b/app-backup/sarab/sarab-1.0.0-r1.ebuild
index fe5e5dd83868..aca106f7760c 100644
--- a/app-backup/sarab/sarab-1.0.0-r1.ebuild
+++ b/app-backup/sarab/sarab-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sarab/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-backup/dar
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1104db3e7900..b4d49905fa36 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/jsonschema-path/Manifest b/dev-python/jsonschema-path/Manifest
index aab1e8a37c1c..8ab2f857693d 100644
--- a/dev-python/jsonschema-path/Manifest
+++ b/dev-python/jsonschema-path/Manifest
@@ -1,3 +1,5 @@
 DIST jsonschema-path-0.3.1.gh.tar.gz 39698 BLAKE2B b56f3c6c591066781c01ab32674c8fdd6193352208fbe9a3b06cae6e345711532a4abfb3f4433481eeb02a4dc7e884cc280c1b6d247ee1e647d503cea434b4f6 SHA512 00aa61aacb92d3aa11be6b3f5f69f6cb70743559849c425549a6fcc0c8c6eeff9feaef5a07da70308cc03311ca48dda7e35d429fa2a5a1aba9099fe678594038
+DIST jsonschema-path-0.3.2.gh.tar.gz 39521 BLAKE2B 871bb33c7839a3b9bf66e145c239cd6715cfaa2ae782f28b77de83228136af5259e1757856e47f0ac26f46572911553510a153f4f48e3b1d2a813160eb65c143 SHA512 e49b32c4609238d2808938976bd0022f86837e9d7d296a137d42f8e8c80d20d20fdd23a07b898063536290b36bd72df0abef64b65997a66cb3fb9c403cc275d3
 EBUILD jsonschema-path-0.3.1.ebuild 985 BLAKE2B a9458a1e6e041338e8152b7fe1bae13c291a8288ed746ab75fa6ece8d9d45a8c4e0306c043f429cdfcb120634521afd9c0fd6de83eccaffd9bfd5b55887b6e90 SHA512 e6fda039a36da1d060e7368d863feaf4f094e199b5724ec500ed1b7b2c03b3ff6a7e86a7845f151cf2c6fbdb18d5cbfc15a6208a69ac13a2fcc6b0b2ef1a8938
+EBUILD jsonschema-path-0.3.2.ebuild 985 BLAKE2B a9458a1e6e041338e8152b7fe1bae13c291a8288ed746ab75fa6ece8d9d45a8c4e0306c043f429cdfcb120634521afd9c0fd6de83eccaffd9bfd5b55887b6e90 SHA512 e6fda039a36da1d060e7368d863feaf4f094e199b5724ec500ed1b7b2c03b3ff6a7e86a7845f151cf2c6fbdb18d5cbfc15a6208a69ac13a2fcc6b0b2ef1a8938
 MISC metadata.xml 404 BLAKE2B 1ca43c4b4650286727d5676f4179f99daa52efeeeded543e3453b91033fb68e6639851b1149a93f28b2fec501acc9623bcb2cd2f58d9df59db505a7ce730807c SHA512 0e041011c6459c256ef992aecea2ac5782d608855da7ddf15340e2a66f89c4542078563dd560a03cc5b13df5c85858c4796d74f39f5a9d257d131f758d5a1bd3
diff --git a/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild b/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild
new file mode 100644
index 000000000000..364da459eeca
--- /dev/null
+++ b/dev-python/jsonschema-path/jsonschema-path-0.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-path/
+	https://github.com/p1c2u/jsonschema-path/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-path/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/referencing-0.28.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	# remove random pins due to caret operator
+	sed -i -e 's:\^:>=:' -e 's:,<[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/jupyter-server/Manifest b/dev-python/jupyter-server/Manifest
index 62d2caded2cf..fe95f053e67d 100644
--- a/dev-python/jupyter-server/Manifest
+++ b/dev-python/jupyter-server/Manifest
@@ -1,11 +1,13 @@
 AUX jupyter-server-2.0.1-skip-npm.patch 698 BLAKE2B f037094e4ba041f112e6b2b08693186c9414fee1dbb9a25be94bc7ec75be09888c2b147329ef9c4b2bdcefd54c44cbadfb658983f97537e5b277eb0fc9ae4cc4 SHA512 d20cfdc71c1c58a7c3126db80d30d34ec8f188f6b5da82accd9e02c91cb14ce750123be443d0c85b18357ae1d22117912c4605e0ee74d9dbf226c739faa17297
 DIST jupyter_server-2.10.0.tar.gz 709151 BLAKE2B 6b5c41d00efbe06e47f1ee9146cfd5670774be84982fc24ed7c27bc420c9a9667ff193d272670fdd7d0a0b2dc1414fa271c0b08e2eeddd3dc08dc901e93594aa SHA512 8238dca7314303ffcf8424f9c997d68c06fc4cf05128146ffe0d3ce495b4c2a8cf260858da8ec0ceb138f0b6789f57fc740b0c5a0bdb977c1311460def0fbf8a
+DIST jupyter_server-2.10.1.tar.gz 709933 BLAKE2B dd05748eb9e4a1af7adeb8a023c9e1336483f48d32e100f0e8dc8d80bf94afe1fb57343f168828a5856cfa0ccd0f4ffeaa6c0da50e6c98d5ed1f254a87878803 SHA512 15a65df22aa7908d3dd6d694306250e71ddc31b1e66969986ed59d9ed517c28ed474c530916b1de7eab25677f9cec29318798b0b7368c4b37ca92a1adbdfbc8d
 DIST jupyter_server-2.7.3.tar.gz 705798 BLAKE2B d5655968f17b2a5536539858769124650f41985d5d99b782e70d99140a7e61820b913b525fc10041a56b6946ec4feb7e05015a10970786d024628e8c840fae94 SHA512 ad9be38208ef4196417561355a62889e34d657f3114b710f13f974f4b453b465b7d473ced46eba873ee980d631d2648e0d4b29267011ed444247a33325f959e9
 DIST jupyter_server-2.8.0.tar.gz 708394 BLAKE2B 2beaba510b0e841203c58316db8507c8c503fdeacfbe7de1287d1ecf0740334c02b430ad7111043e21da45669cc1bd13bb313b5cd45f999490fa07c9057b1bea SHA512 e2ec60994737a9979545aaba3de1f846eb68c809cb952bfba6ce22c061f1e644a712f4b7b069ebfc393e8dd7a7bf723b2c3530a7a1b103eb1dbf42a60a59e6e6
 DIST jupyter_server-2.9.0.tar.gz 709038 BLAKE2B 68569f323087c55427d2d0b5fe7df55082809a76b25102cf08f62393c1c943bf5527ed461e392f45751f6c4182fd6423056d3719aed6681cd85ca2f4e7fca0b7 SHA512 5d695f72cc02c73345a811739e2a7006313d37b5c05894b5da7792b0174537bfe962456d996605abc4f8ec2a4e1337b1d5817b667b4b5708c599e1a96452d597
 DIST jupyter_server-2.9.1.tar.gz 709013 BLAKE2B dee0de771bb8488cccaecb49e2b4a2003f2530243013cafa7f170384380423a7c190504baabf458c59ffece28c4f60662c0530f55535dae25699be269f159743 SHA512 148c3eaa4b6ca1147961c1188e0016a634e5adae350e762903bdde000acde7ab62507e71dbe1278c2b9358ce2cf1c28c17ea8b184f3d4a2d59277910b5b44965
 EBUILD jupyter-server-2.10.0-r1.ebuild 2324 BLAKE2B ba843169dde4001d48300661fa691e995f3e4ac887eba1e9a98734686712a69acdeabb6d0ede6b82bb9dca42ad3b3a30453e016835048bf526bc4d169a69b66f SHA512 473eb729adde17a935bad53b4d274e650fafaf817763071c7c49b50355508429639e8e12fb9e314da0f81db152240d6e1f25a72dbe866522bf6fd5e11b9fa67d
 EBUILD jupyter-server-2.10.0.ebuild 2283 BLAKE2B 5afcf8963b57cfc20af18e86996ecae9705d3dabac12bfda578350a8e4ef75d73c7f50f6f6a96c0a4d80a6abb33c502218714ca510ebb4564f65b38c53487c20 SHA512 eaa1d47e875d9a6c5d100d16311a1101414f07b2255018e91eb89542865f0c8af3f5cfa49298b30338f044725b0247e728a93a5317a932ae769af6286f020a31
+EBUILD jupyter-server-2.10.1.ebuild 2324 BLAKE2B 173b1a80143610f89df89df4dfa4c8b636f356eaf5c72ddeb7d8bb5005c2bd15436190e39d1a6843b143ff70a56609e6501058f377232b20b9eaaa6900ed48a3 SHA512 243edc701dff8d75f6c131eba434f7ab37dc0f793232fdee971dc2b4c26a91891da0a7989b26fb02f20de98b178bc4a63706bafd476fe6d727b77243242603ee
 EBUILD jupyter-server-2.7.3.ebuild 2317 BLAKE2B 32c1085409c0172ceff2a210da809c96fa29e6ed7dc0c1d9141666a30faf7671098d9448f828ed3b2ccd29e0df1d537ea839dccd8c2e97ce73ec768ab4b6e270 SHA512 748b53191f6d6701e2a8b079bb0a8bd9ae5a3bc4ca9149fcb3275a4d75d38720e55a6edc3f5d62e8c482cc32c7283de6500ae1c0d49950ded90a8f86a1fe06db
 EBUILD jupyter-server-2.8.0.ebuild 2324 BLAKE2B b83528b323b9efdc76deff7eebee2521c2423b3fdfe3a9eb96f5258958d1feaeed95a7fa229269c68023568470de789c6627f1655d3a671b2c495fe2a2f80298 SHA512 1d35ef6246aee40d9f2f174a465c781984f6393394348e6d531ffd9a622a9cd74ad79967ab40e7222de5764eb2339c335f2dc1647853adbd17bcde141361d33a
 EBUILD jupyter-server-2.9.0.ebuild 2324 BLAKE2B b83528b323b9efdc76deff7eebee2521c2423b3fdfe3a9eb96f5258958d1feaeed95a7fa229269c68023568470de789c6627f1655d3a671b2c495fe2a2f80298 SHA512 1d35ef6246aee40d9f2f174a465c781984f6393394348e6d531ffd9a622a9cd74ad79967ab40e7222de5764eb2339c335f2dc1647853adbd17bcde141361d33a
diff --git a/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
new file mode 100644
index 000000000000..3c01cb7f33bc
--- /dev/null
+++ b/dev-python/jupyter-server/jupyter-server-2.10.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Core services, APIs, and REST endpoints to Jupyter web applications"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter-server/jupyter_server/
+	https://pypi.org/project/jupyter-server/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/anyio-3.1.0[${PYTHON_USEDEP}]
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-client-7.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-core-5.1.0[${PYTHON_USEDEP}]
+	dev-python/jupyter-server-terminals[${PYTHON_USEDEP}]
+	>=dev-python/jupyter-events-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-6.4.4[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-5.3.0[${PYTHON_USEDEP}]
+	dev-python/overrides[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-24[${PYTHON_USEDEP}]
+	>=dev-python/send2trash-1.8.2[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=dev-python/tornado-6.2[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.6.0[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+
+"
+BDEPEND="
+	dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-console-scripts[${PYTHON_USEDEP}]
+		dev-python/pytest-jupyter[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-tornasync[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# This fails if your terminal is zsh (and maybe other non-bash as well?)
+		tests/test_terminal.py
+		# Fails because above is ignored
+		tests/auth/test_authorizer.py
+		# Fails with additional extensions installed
+		tests/extension/test_app.py::test_stop_extension
+	)
+
+	# FIXME: tests seem to be affected by previously installed version
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest \
+		-p pytest_tornasync.plugin \
+		-p jupyter_server.pytest_plugin \
+		-p pytest_console_scripts \
+		-p pytest_timeout
+}
diff --git a/dev-python/pdm-backend/Manifest b/dev-python/pdm-backend/Manifest
index 566a687a3303..7b428555ea48 100644
--- a/dev-python/pdm-backend/Manifest
+++ b/dev-python/pdm-backend/Manifest
@@ -1,9 +1,3 @@
-DIST pdm-backend-2.1.4.gh.tar.gz 134278 BLAKE2B 38e52761d54cab96727d5015e41de76cd6d7eb6dbd02829ed2ddeeb2e2d64d42a0eb6bb09e055362e1dd181d9e7781ed9f9abcb2f96de342cd5780e1f21a8708 SHA512 4833819f8828f5e2ff204ca18478704d8d66c977c747f9b550dc1ecfee57a8adbfcddaea6dded8d8ea0c0e0c7745e0704e12acae30d183cb27cf4c1fad331791
-DIST pdm-backend-2.1.5.gh.tar.gz 134316 BLAKE2B 9337990b4ed009e506f0eee82e9f8d50fc281dbf917dc964daf75230a4c2b9cc5bf0748afe9aa7b5b6f9036249b87ec338b129136b2fd92619c12000e77a7663 SHA512 867c36a9381f4e6a2c81f2d987ce33953eaf78a43b4fa03df54f78b6c9cfe645a1ae4f3dd1a514e0d14208ad7fc75af954fa46be3c8b4b54c7ac7e16eead5aaf
-DIST pdm-backend-2.1.6.gh.tar.gz 134376 BLAKE2B 338ac4cd18d932d65e1ef123b81761707e8d602e8d0f171e26d849535a42e7f79f1b2828f8bedb775674d7a530329aa2dc3c5fe2f9c7e9042fc5ac36da5a0360 SHA512 c0f6278451efb242f0e9585d8298f8f73a0944cd462bac31d0528edf96f51b53ee7efbc58486daf8fdbcac8430e8bf6bc7869e9e455796a87e58d265789eb0de
 DIST pdm-backend-2.1.7.gh.tar.gz 134479 BLAKE2B e559792b53310d6c159ed0cfae6fd9332bbdebfe0efaa9aae7e149b4800b7231e1561723b6aebb4cd722bc47c5a8c9f13180dfe96607a08a9a5c0fba530c9098 SHA512 d47b814b427799d8b2d106b4721c770fd703143cac5de819d74c47d4808f9130bd5835d5fafe41ab3bb17abfedeb770c8863a9cb9a7c8aba0ef9315f5308e6b3
-EBUILD pdm-backend-2.1.4.ebuild 1584 BLAKE2B e76dce5a084dd9370711efb1fd154d2d04c54b87cc675e46d7eb87c1eb2c4f5f90228762b132d4d0a5babda0c608a9d0e3a3f343a3416c4cdbe7dadd055a0971 SHA512 bbe15247a370fc03ac66f50eb21e5c63cb562cb1b338bb24619c6618445d05d01476fced1fe8eb83c35c61d0ccb9130b4910a7729ea2c1bb9bf647f99e13873c
-EBUILD pdm-backend-2.1.5.ebuild 1584 BLAKE2B e76dce5a084dd9370711efb1fd154d2d04c54b87cc675e46d7eb87c1eb2c4f5f90228762b132d4d0a5babda0c608a9d0e3a3f343a3416c4cdbe7dadd055a0971 SHA512 bbe15247a370fc03ac66f50eb21e5c63cb562cb1b338bb24619c6618445d05d01476fced1fe8eb83c35c61d0ccb9130b4910a7729ea2c1bb9bf647f99e13873c
-EBUILD pdm-backend-2.1.6.ebuild 1584 BLAKE2B e76dce5a084dd9370711efb1fd154d2d04c54b87cc675e46d7eb87c1eb2c4f5f90228762b132d4d0a5babda0c608a9d0e3a3f343a3416c4cdbe7dadd055a0971 SHA512 bbe15247a370fc03ac66f50eb21e5c63cb562cb1b338bb24619c6618445d05d01476fced1fe8eb83c35c61d0ccb9130b4910a7729ea2c1bb9bf647f99e13873c
 EBUILD pdm-backend-2.1.7.ebuild 1584 BLAKE2B e76dce5a084dd9370711efb1fd154d2d04c54b87cc675e46d7eb87c1eb2c4f5f90228762b132d4d0a5babda0c608a9d0e3a3f343a3416c4cdbe7dadd055a0971 SHA512 bbe15247a370fc03ac66f50eb21e5c63cb562cb1b338bb24619c6618445d05d01476fced1fe8eb83c35c61d0ccb9130b4910a7729ea2c1bb9bf647f99e13873c
 MISC metadata.xml 402 BLAKE2B ac579efc6fd41e67d00ccbba4831c85eed6f5e4341b17533f60c95b666d8a457a5ed683440028c876b8d638fff59af97c5087612b7817dd1a9bd8b9f74cdda0a SHA512 77766986547445c26c7de4bd1d4fb495f8c22e1844fd5b4835b1cabc4aa503a36eae84460e4fceca2f71a87d5f4fc83593b33fda9ae8cafd75f74618d60476cd
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild
deleted file mode 100644
index 2e31060b91df..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild
deleted file mode 100644
index 2e31060b91df..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild b/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild
deleted file mode 100644
index 2e31060b91df..000000000000
--- a/dev-python/pdm-backend/pdm-backend-2.1.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A PEP 517 backend for PDM that supports PEP 621 metadata"
-HOMEPAGE="
-	https://pypi.org/project/pdm-backend/
-	https://github.com/pdm-project/pdm-backend/
-"
-SRC_URI="
-	https://github.com/pdm-project/pdm-backend/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/packaging-22.0[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-1.0.0[${PYTHON_USEDEP}]
-
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-# setuptools are used to build C extensions
-RDEPEND+="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	rm -r src/pdm/backend/_vendor || die
-	find -name '*.py' -exec sed \
-		-e 's:from pdm\.backend\._vendor\.:from :' \
-		-e 's:from pdm\.backend\._vendor ::' \
-		-e 's:import pdm\.backend\._vendor\.:import :' \
-		-i {} + || die
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	# this must not be set during src_test()
-	local -x PDM_BUILD_SCM_VERSION=${PV}
-	distutils-r1_src_compile
-}
-
-src_test() {
-	git config --global user.email "test@example.com" || die
-	git config --global user.name "Test User" || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index e3757440c97e..babfaf9969a4 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -2,8 +2,10 @@ DIST pydantic-1.10.13.gh.tar.gz 766572 BLAKE2B 3d4f4453469f960467ddf3512be8e97f0
 DIST pydantic-2.3.0.tar.gz 623866 BLAKE2B 77fe2d9ce385946e13ffeb5827c29bc7473667af6b53b7b3ec2432380dc792f9ce54b1cb5af68f0a548880516c763ac8c29b129d821da074b63a9a50f9ebc5c3 SHA512 19c9c066a69c8406ccf5537e62b4b5112a5cf1c32bb68498bb73b739c4525fe115348c4c4e5ef9c074dc46fd2b51ca09bcb1d4fa792dbdd2387e51aadae9e528
 DIST pydantic-2.4.2.tar.gz 654020 BLAKE2B 2f91b6bf89f87230976a2e777541bb7418382fb3534f5e61e1dc74a18e5e939508a2440d6bee9a09030beb5f2b6a60fd62c3bf30ee0ee2c7d3f71575920a47f3 SHA512 f0e0d90ead4ba754974b38f8e3d24bc017696674ca1ed3300104389d149baa41c495218a118f5e7f98bf20d34b3c17439921eaff0ccd7bf76cac96a16e592b4e
 DIST pydantic-2.5.0.tar.gz 677119 BLAKE2B 5b53df61af19d64909313195a623cf30e3343fb5404853ec61ed56a87d9ba2b554a8c8f758c72f43f325fae75f64a1d3cc9489a67356fad28c2e4f4f4c95f222 SHA512 a31fd740e2272316cecb41477a1246d5555daa2897b13efbd79c002e46891283bb50a1fc653182e05039d5fbeb34f4a9b5d44c5c27c1ec60da3af30c333855bc
+DIST pydantic-2.5.1.tar.gz 651461 BLAKE2B 4c52abec0f1fc52fdaa0bd820bbb649ffdc348c1b1537ca31b73bf4c4477055841c0cd08df5336e0388974ebe20c384349c4233af20149317d79f51ee98208c6 SHA512 5a3ca05a57297cded56a21f37e13a61e7abce3faa34b1d2f4ad1abab0205aa8b7f753b6e0ac630336ea398b9c5ebd4c7cab55df4fa0f9e965e07b5a7e9d49f3c
 EBUILD pydantic-1.10.13.ebuild 2518 BLAKE2B 84f7ee9b095b56518792f81df308652cdc725c6accef3388615bfea735c676f45e449e0c60ec030349b067a8a97833669071f493325c6644c7a73d08d348dcc3 SHA512 7fedbe4158ce80d41e8686ed19618bb818d3efdf8d508a8d4fdef7f8525a3e4e1364a340ba0d710f2b33327a280e33e5df15c0ea2920446dfee3d1b95cc4862f
 EBUILD pydantic-2.3.0.ebuild 1679 BLAKE2B ee05d706e5e5662ee2b90d6cdc0ebb5488d01d43500f6eedcd582191879a42c6feb14686ecafc90c916899567ebb575f45d509bc3e66ce39e51cce87d314c0f5 SHA512 02ce7781088c41f75be814a869380364066d594c5d0a4a92a7882963823652d94f863db85c10dace2260d10f4f33a28478e94fc4dd6887c58b2cbb3c31ed159a
 EBUILD pydantic-2.4.2.ebuild 1251 BLAKE2B f3f7d3e9f0b5c4d1e8b748cb577cd1523f734b72769e8368475b10ac349a61d65c30ff91e862875f43e5f774de584692b7cc65a70759b948aeb25a7321d94db8 SHA512 0fdbe5b15dec842d03b447049a4ed5effa6164c81354fcdf9f3cbc8a060fc1e7ca551dc61dbbc321e6dfad50c2331005b73616d0142f325cf9d87d813d48b618
 EBUILD pydantic-2.5.0.ebuild 1300 BLAKE2B 5121125f70ba11da47475687befee8730cf243f50f1053b71573846b0d1701f41c53a85211e82b6472885c81db8c638cd02ca21bac03fbf76ec58636d7e3d646 SHA512 93eac9f85c048958d7b276dc122882b7a29b797ec6faa4378705ef344159a217c5e5fc99d5f320ddae1df4bb7e5de2db63703053a479f1491c415b554cafdd8a
+EBUILD pydantic-2.5.1.ebuild 1300 BLAKE2B a13388d5dfceea3f9cd9582f8fb420ee38f678c2195d73d03b26658f43aa7d5c04140a2668b26df2b95fd5035b4e86417c32ff9881403d1720569815d486246c SHA512 9fcbf35a0e2e7e84a057dd2ac2d2a9cb553d828dea9e6c7ccbc3a9a1ad9a8e218a84eaf55d23066e25d2f13457f312a4bb8d747cecdd676dba33fd76286d192b
 MISC metadata.xml 637 BLAKE2B 57b30dc30b4ec03180df74b5a92de92ceb31cfad43b38ad0e41538c6a6f491fa8957b789ad42bec128e51862bbd802c17606c02bf17f3cf58a21622d7676c0aa SHA512 711e73027f807b8c25b4ceb95775e6417987d34f798f50d4168d5735bf5bc91a41a9b6c37737617d11968ae9b337871dc7f3bc7a89f782a91747aedcee4f48d6
diff --git a/dev-python/pydantic/pydantic-2.5.1.ebuild b/dev-python/pydantic/pydantic-2.5.1.ebuild
new file mode 100644
index 000000000000..e2c7eedd14b8
--- /dev/null
+++ b/dev-python/pydantic/pydantic-2.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Data parsing and validation using Python type hints"
+HOMEPAGE="
+	https://github.com/pydantic/pydantic/
+	https://pypi.org/project/pydantic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/annotated-types-0.4.0[${PYTHON_USEDEP}]
+	~dev-python/pydantic-core-2.14.3[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/hatch-fancy-pypi-readme-22.5.0[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cloudpickle[${PYTHON_USEDEP}]
+		dev-python/dirty-equals[${PYTHON_USEDEP}]
+		>=dev-python/email-validator-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/Faker-18.13.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/benchmark/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=()
+	local EPYTEST_IGNORE=(
+		# require pytest-examples
+		tests/test_docs.py
+		# benchmarks
+		tests/benchmarks
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p pytest_mock
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 4a61fe3586ef..3fd79928eee0 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -6,6 +6,7 @@ DIST zeroconf-0.122.3.tar.gz 158519 BLAKE2B f62d36234c4f1cd988bbf8b1d1e6f706498b
 DIST zeroconf-0.123.0.tar.gz 158902 BLAKE2B d940e9558e781d614d623701e8baf3c9a2feb292bcb0ad8241fc28e1bdf103a154cf178b37dfc9f9ae1805ee6e6d1601cd41574755fe9849243832c3bd57821e SHA512 65947861a76776a1e34807ca5b0570f93c026b8fa36456ae6bfdec747c484107ba2c2e12712ce1a81a05c6c817215f7f72aa40a48e6634f1b1be886349f8c73f
 DIST zeroconf-0.125.0.tar.gz 160220 BLAKE2B aa84106acc07d19766a1ecdb4db36367ff9d80b1f88b81c665499c59dfc95cdb3123d5252f53fb488d4f632afdff862cf138a763106da652facb4e43bc404b8b SHA512 ba24b9dbcf91090404906df0127b0ba94fe3af65aae86788ff703b14b8f4dcffe9e08bc6be3b122a16036bc87df6307066ad291f74b02846a5b79279e24c150b
 DIST zeroconf-0.126.0.tar.gz 160628 BLAKE2B 09ff7d4ccde02d258b26f0a1e72ac7fbaf61a4a6513fa7c216e0015afa07107f52469a403cf8866aa38a55b7e96dbf1ef6cecd698e3b5b8902030e02cb7aa600 SHA512 7ceaeb39e292426fcfafd62d3a34bea40ba1ff2570489d6b9de2c3be9d8e27cbbbad90fbe6de45f0be1a0d769b0756c299a2c7358bb3689c163bca1373656bc5
+DIST zeroconf-0.127.0.tar.gz 161143 BLAKE2B ee560845016ab1de0b065aaae8cd6791ddc847417241c7f2477301948945e938a2ff68206d30166a6049a7ad5919d15bcc6acac9fd9d33d17d5e77154b9f9c0c SHA512 7c8aef766dcc0f3411c4230decd5a0af18ae795e0e4253be2dc69af6ba314271a336807ace1458bb0a081455afa8cc9d8769413bbc97f024e3d3e877cd1e6f2f
 EBUILD zeroconf-0.119.0.ebuild 1405 BLAKE2B b167a28cf099dd1aaad147621c687841be3874cb7ac7e7f4df1c006a68d19985de520845aded6f9054f77bd41676d3d93b61a64298d78968eaad921594da806d SHA512 2acadec24d9e672d1bccc1ac39998ca2b6dde0c174ea6e10209e942c8981e6a143c9676ccb62436749e180c2eeec70594f73093189a177b81e10dc1d18f712c9
 EBUILD zeroconf-0.120.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
 EBUILD zeroconf-0.121.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
@@ -14,4 +15,5 @@ EBUILD zeroconf-0.122.3.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82b
 EBUILD zeroconf-0.123.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
 EBUILD zeroconf-0.125.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
 EBUILD zeroconf-0.126.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
+EBUILD zeroconf-0.127.0.ebuild 1407 BLAKE2B f03c87e5bd2d193c7ab789520ab1c8a6b82bcc05467eed483d51e697eb726d351bb38ca071c2d5c11a24f753375c9fcfaf11d2ecddc5b57d04aac0fd6bd2da46 SHA512 416020fe854b895b2382444edf75ddf71f8bb697b1e8b632fc726b5b3d3fbb4fe62d7ab184f40b0294fe183466479e800db8b41e8f5f5ee5aa6e41260a9485dc
 MISC metadata.xml 395 BLAKE2B e1ce7a8fbd6d50fd59fbce671a535a3af2fde79dcc98f146c4e361759e61ce6d7e4e241866262fcd78744c673212d1946830c3d7628956b498a98d0af36d4c3d SHA512 544cb62da7212926b63c4e19467fc3e3f7c8210320a8096dc913a846d392e9a09c2b9860312f88effc8ad7a54e0329149a68012b08c674663af5779957e037f9
diff --git a/dev-python/zeroconf/zeroconf-0.127.0.ebuild b/dev-python/zeroconf/zeroconf-0.127.0.ebuild
new file mode 100644
index 000000000000..b3ff07347a6d
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.127.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/python-zeroconf/python-zeroconf/
+	https://pypi.org/project/zeroconf/
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/async-timeout-3.0.0[${PYTHON_USEDEP}]
+	' 3.10)
+"
+# the build system uses custom build script that uses distutils to build
+# C extensions, sigh
+BDEPEND="
+	>=dev-python/cython-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-65.6.3[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export REQUIRE_CYTHON=1
+
+python_test() {
+	local -x SKIP_IPV6=1
+	local EPYTEST_DESELECT=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+
+		# fragile to timeouts (?)
+		tests/services/test_browser.py::test_service_browser_expire_callbacks
+		tests/utils/test_asyncio.py::test_run_coro_with_timeout
+	)
+
+	epytest -o addopts=
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 66af991fca47..d05b55833bf8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/elfshaker/Manifest b/dev-util/elfshaker/Manifest
new file mode 100644
index 000000000000..60cec41ecc6b
--- /dev/null
+++ b/dev-util/elfshaker/Manifest
@@ -0,0 +1,108 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST base64-0.13.1.crate 61002 BLAKE2B 3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91 SHA512 1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST cc-1.0.78.crate 61375 BLAKE2B fd4765cf5ae0dc7018bc6b56298cd0fa9bf6fe23545e845670d98ce73baee55354e77c6d87cf047f10b074f3d742deca8b5631a250c69b347b4a1fc653965d43 SHA512 b85bec4c75cb1d1e252419052e9dd22b6892e54ea36195ff483a04f785b5b103e82b30b778459fd45324ffeb2463aa4f5696baeff2779c25ffe9f65eb99ae893
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.23.crate 187259 BLAKE2B b4a7cfb8d1921d396c9e2bf350e6c61d04480a78c170d153e525ff581e8298936583744b6c59769774fdb8ad433269d01ad792f967da96e6c19d33460de937f9 SHA512 697a78ee83eaf38d83011bdf2086b3149b830d3d270e8414828b98ed2426063df43ac6eb4324f2dd694662afb86e6e4f005dee6116dfdd97adaebedefffd43fa
+DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
+DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844
+DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0 SHA512 fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
+DIST cxx-1.0.88.crate 682495 BLAKE2B f1f584dd961d6d0375d6ac7c0b25022997067c6fed76b9f3bc227fdff84209e1901ca902ddec54528621f46869b2b43a7c0f31a70642e5c234e413dc6ee760e8 SHA512 ace3368c9a97b0c74dffd90890c2060e8657476b87d138fbf1a65c5bc0682c1cc627597e564906eb40e80c7503c8ef970438b8bca045ec9c14baaec9970a1e1b
+DIST cxx-build-1.0.88.crate 84429 BLAKE2B 67eaa7120368eccfbf7646170a6f7ecb69402d6814b314090905b85f0a81411524b9925b02c4114ed9c6d1d96d4a7c83d9630f56fab8e5b890ab51cf24a14e35 SHA512 54d10970348b8d0fe9c21d5c4435eebbcd0a058a996594564d8b3140d4b6023b691afece1f14c4dd7341061072301bc762aef580dd15cb9f5cebe778cc846e5b
+DIST cxxbridge-flags-1.0.88.crate 5253 BLAKE2B 6eab1a58c966eb7b355a8781ca49b523e52f51d9b261cabe1c0df3c74a01174afa813e4947a54604760ba7a17d15288f06949258fea7af1b200e3bba97a72eb2 SHA512 fcd1231f38b0e5d84fba7c268f337c419665a269d08fe2752f8373e5152448d544e5fe0d08d6a7e769705450d07af22ec13e0040e80859fd02161527afd7a226
+DIST cxxbridge-macro-1.0.88.crate 59476 BLAKE2B 4c364d534d0d7fd789843e10633996148b31ad501084c1bf59233c97e30c38074c4344b213f32d5f946a51363ce7195360c01e8bb0893e93ab1f8e2cf31a3605 SHA512 7ced29b6a45abfa3649a2ff2cbb1801308f62e58c74e03fa74857329dfabd1c60bccfebf40ae0e041cb1cfdb6c7823157da924ff349c04afcfc78ce24e08e8d8
+DIST elfshaker-0.9.0_p20230918.tar.gz 123248 BLAKE2B 80e174a7b1598f7d0721f60a1814f031698fc001d184dca23412d610f823253cc126fcee52d16441ee31c974bcf8639b209635f145977b4721f701deb7a44551 SHA512 631d2b6592e712a4741d82139a9c6ca1505570f26c2c4d1e04b5af2a9d41996cb1e12541b4bc884bce0d9b5875232d24dc559a5baaed48fae7a9fbda86db0efc
+DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7
+DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11
+DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
+DIST getrandom-0.2.8.crate 30553 BLAKE2B 30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc SHA512 cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
+DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28
+DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
+DIST iana-time-zone-0.1.53.crate 20176 BLAKE2B 842c3c2a9f5b753363668af5162edb6f2734a51fa6c6fc8bafc3981f5f287451258f5ab31d5ea6c2a1df75934233849bba8dde4ee5aa9fcc456fbafa93d8b51b SHA512 a3f899fe9ebc7501bd22e75b2df34c3b26ad5a53afbff4fa552672d0185d8a291736c48ac2fa76dab36a6621e689b5584a2d7bd0334055994bb21077765aa7cb
+DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369
+DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441
+DIST jobserver-0.1.25.crate 21888 BLAKE2B 2ecd417446f9eb975119af4ec74c9b3463d061f5348ebca380f0ab9963ccce6dcea8c1671c7701f3f867c7e49d0ec130809a37bff466261a2fc75e80cc01d15c SHA512 0c014e7c72a070e3332463cfa6e9c9095d542a68f8631150bad0efa3706a2d6de0347bf7d1221cc3bc0f3d5f9840fe7188aad949559375403b929d43b4a524b7
+DIST js-sys-0.3.60.crate 79257 BLAKE2B 714facdab00d567d074de4a25b69487400c23194d0f58ca784159483f9e02289acadce084b1514d8816cc9e0597800de82a5298b071b7df19a24df93541f23c1 SHA512 543dfd444539fad27bafcbbf112366f53d4ccf4bc63f8bb17820d818c3e1804656697ed6268a793f383ddf6b6227f7e9b3a11fb6fbb24e10732fdbd971801665
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.139.crate 638983 BLAKE2B e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598 SHA512 ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
+DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305 SHA512 690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419
+DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
+DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
+DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
+DIST once_cell-1.17.0.crate 32736 BLAKE2B 767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f SHA512 291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
+DIST paste-1.0.11.crate 18349 BLAKE2B 02e3168fd03a4036bff486cd01bb7f7fa2c355cb6087c4b92c091e9e16d6d098fca1f142cf29fd0428fae9fc32bf96e84a0fd59ddb5f6bbbe155dcbfd1d41558 SHA512 136f7e840a20d18b6706929b0c440ea2d546d0931da91236e3b401e0dbaa74aea95510277620fbcba401f2ca7f56a315049a77ee16a4b228dcaf63f90bd2c9a8
+DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68
+DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST proc-macro2-1.0.50.crate 41667 BLAKE2B 6ee76c87013226881a0cb1221f449b052feaf1b92fa6f7a3aa82420ee1881713b8bb71ac6cebff67fad436f5c05b2a8f601a84ba361bc08a06b0b26aec0e11e7 SHA512 89ddaf9b994026519e5ddd618ffdca1fb39d31904a13229c1496dc862e2a259086ed9554821ff33f73adf6df45f446231217fa7e22922289fe6fbd71e06ddd2b
+DIST quote-1.0.23.crate 28058 BLAKE2B 81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1 SHA512 3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
+DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
+DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
+DIST rmp-0.8.11.crate 28829 BLAKE2B 42aeff1a8d4874f1cec8a19085e4f23ae33cebcfd024c28772c0cea36e096d5ff012e6063647f31b9e9c3ca311f1036566411675fe2f632dd9dc1d5d1f7f929c SHA512 27a499316542722a4d9fe4fa9cc005b6b5fa75dcf66686a5c08aa6130497b67511c0283419adb64fec09a51a563f4991f2039280d2e74f8ea4102afbe4977f38
+DIST rmp-serde-0.15.5.crate 28657 BLAKE2B bf2db6d713e8c105b337c06b97c5ba607d509fd0de1356c7b711eff47b77f5e5246a8d2b6c876f8db4baa9c0f308cbb5b447a2a5327734711701b9d8ea6f13e5 SHA512 d546e170452eb58fd684cd0b4c150b99005a39611f40cf2b6f2919822246d36206e94808569ff8249f14e50f17989b885ef6016477bab9d16be5a18a0c8428fa
+DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
+DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustls-0.20.8.crate 270142 BLAKE2B 0d9563e302eac78871eb8346c72fde2a05618dc8a966198cb4d607b41930dd54487d9f4d9c8ebbdf943b4593d4cbb75543c3aea9dddc61a06500b4b322aa726f SHA512 4f56494987cd3a56f47dd07d31c7f73d262a4d003cf9cc11e0bce5fa85c87f18124b1c364186501736f0d40a1f193a24d5d73f37a491ff81ca8eff568559e547
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scratch-1.0.3.crate 8198 BLAKE2B 804af80d09da85a88221c7aed7740a25a327bece99eeda0d7adceb3e5111917b70fb4a4e4e39c83b041d57baad2e3582e877356d58386e05ccd65e0a5334f86d SHA512 8fb3c0d36adbcd915e3adad108e35665ddd6e5622b252833349f89448a620bac6eaf1c212ffc172ec015e5af46e5637901c3442083b17ed29a2bdd9c0c48d595
+DIST sct-0.7.0.crate 27502 BLAKE2B 93912044e47473d72d7415e01cbe2545f84d7d087e7a7fb210be7524d44f69daaa58edf487ea6f8e5f06cbe25ec02062b1b55978e7cb4761b8bfd79a32d4fcc7 SHA512 175d2a912e3f35dcb110991a066d7d9b0d47a0febe4e92ab7d92a27c886a7eb9abf203c9080b3e2cbda9bedbc816bd138476363c2a0c7367d3abc7e6bce83046
+DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
+DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
+DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST syn-1.0.107.crate 237539 BLAKE2B 5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3 SHA512 58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
+DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
+DIST unicode-bidi-0.3.10.crate 43530 BLAKE2B 2bd5ffea133793ed7588ea95b0848adea16e79fc3ce9a159c33c73929a1af90e0578c44980fe114aeec1d6424d294552bcbf4089e3c196c2ed3d0751d992c216 SHA512 70f81dcf3fb3ada1eb503cfda548e083cae6e7001dc445c0a481b8f467025f17dc26ac14e487edcdc2aba8b67f94a35eb4b5083a62d5b954dafca7b734edd3e3
+DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd SHA512 ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
+DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
+DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
+DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
+DIST ureq-2.6.2.crate 105924 BLAKE2B b055cf00473a6d67d181fe6ffc9d960ee9c1ef4bc346f30466e9d8c129b82abc908344fe61957e6840b1d1cf302df12c94b0c74b49daf0e978173e36899f3c4f SHA512 712922b21d321932b6e4d8602903d92fac93549200cd10d66052f404e7734a5aab2ebfe78e14cc443df3320530454a6585aa8005fc39471cb1aa95e54dcb951c
+DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.83.crate 169618 BLAKE2B f6158596c80a0385bee0a05bd9cf0b3beee83a7958efb40244956b4fec2c83baa1a1b4605eb604f313db3508a7911c78f645acbb19f6fc93eef27e9f7f0ac109 SHA512 ec93d1334417d0329e113d5f2da7f16c0f1209d71e5cbd21a2dc9278d877e70ca2327ff7863b40505504883ed51d6bf20dda98c22ef44011a47c604a7b44e82d
+DIST wasm-bindgen-backend-0.2.83.crate 25620 BLAKE2B 3cbba20a2f5344c0ed2791de7b04ee294746606289ba83a9c139b53b56edf31eab8d3b3802cec309d5395e2404bbd75b7fab5d748a9961b36906fabeb0e66493 SHA512 dd1b65733e4d0a198d61a5287bb75db3e03ef738d2c2dcd3ce3e873c27d41c90cfcbb775ad40b2a546190db8d7213e5866f8e3f9913c28fe4b43a49054bfea44
+DIST wasm-bindgen-macro-0.2.83.crate 12075 BLAKE2B 3b358ba7c2a3563840f54f11170cde78044a8f087659daa7c784fa252f5dd4b7f6200eba425d95b568e50fd43c04c32a509994ddaf5248120feaa67586402150 SHA512 eb83e06f998e858cf25494c1d171984269e72db798147d4d1d8aeeb25ea7a35c5986b882011e131968621742ceecff976430856b4e8b7d7fd7f1237767cf01b4
+DIST wasm-bindgen-macro-support-0.2.83.crate 18530 BLAKE2B f305c9fc1f7bba5bee65a1c76fc2216c98aa306a072286e1ced048ab191f49e7e4436bf2f67d4c1fff558f59b2cef5e9b40e9e940268128ab1ebeb3c64696107 SHA512 804014c75ae5f8c1c7f0fad3f3209887fa346d74029e5f6e1830e44f7318719e65c4a643c71d87cf388f131fd370af40d536bbc15fc11c25b91cb785f56a908b
+DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 4dd1cffea1edc98dcd4993bf6fdde8100fe00d1e97322ce8bc0bdefd0c659047c8c726e5da27b59fd7a6621c1e5385c18204e834c6c6fd1fb9de52f95b40e40d SHA512 2bfc1a068fa41a9ecacce7bda494fc0485c57ccb102c1d76c87a42e00ad30b944b0cb788642e8339d050a0e831ce8306844a77292ab9f79ed765b65cdb4765e7
+DIST web-sys-0.3.60.crate 700485 BLAKE2B 13942a583dd8462b0591a19759a41f41fb17d2356b3bcd78402e420fdf5726782e5b4ed211c3716a81c1cdf64ce9b8adecaa3fa22756a3ec84eb7c3e12e3018c SHA512 d883363f99300e2d50bc5bf198f0fb8d6c53e5a778217e340573560ac07db26a71c98419fa2ced32820472126d6f97ad5773ad082521be0a1c9a374af9d61df9
+DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
+DIST webpki-roots-0.22.6.crate 242386 BLAKE2B b7c4ca7b372effa1cab48d890e468a272e0bfb7109900c4077906d088e85448c058a6be420eca24ed42bc9c0a0f1922c08c5ae6b0cfd85aa71662a5f7157791a SHA512 00413a8354e2277f50c29851ed49a97f76bacb2017d61b10333981d15bcee13eceef8711e87d2aef1ed4f8a85763c6b1e7e21d61a57e7f689fe4aa6e67f4c140
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST zstd-0.9.2+zstd.1.5.1.crate 27538 BLAKE2B 72b8e30910f3221dfb0a13861f30c75cab701ae481120a20bff68e7d150a00bd07868b030c52493d076b30d68ddf2a9c2fcb1a084dfd0ee15ea1da8afa3ed7d3 SHA512 44bbcf78aa75ba77c797bcff5fe738c97ab444fbecceaf302a2f40ca74761bfa13d2a74bbeffa0d8822688eeabdbfb77cbf835a7b4854aef3b5aedc7f4cea571
+DIST zstd-safe-4.1.3+zstd.1.5.1.crate 16677 BLAKE2B 0c5d74997bf72eb3bc47a314b07a90327cee7ce24a31f22eecf1cd9ab93cd8366359c7647e4f371a94f8932a0e08a05eea6b588fedc9a44226bbd5a7b03fc266 SHA512 e8387d866bd9cd2a4063780b36ec8b45a2c47a2103a1107ae045b17302dcd507d6740fb3681c0fdc786918fbae33b5b68e639308505de31b04b25ac43ba3b594
+DIST zstd-sys-1.6.2+zstd.1.5.1.crate 718776 BLAKE2B 6f59f1ee4b886beb6d72872bc557ee90d4da4d97b5834b028b55ff2d0566da72a49a589fdfd1a84146793342249120420253e15998deb22f34eab3159f76fa96 SHA512 25b28da7cd4465be2ff909cc30c879db4c0fe3e91c1faa8e2e7d9483f8439286123570f09bfa5aea1754a4473aa6f6851180b000df2094b6b56aec9b3b5d6d30
+EBUILD elfshaker-0.9.0_p20230918.ebuild 2630 BLAKE2B 99d02a8f067152b3f623cd28b0f90bd41511b53c3e50f227757d168641a380ae2560329f0ae64bbd2cb62b70c006e7bfbbfcc52e434c6de252d78cde71967b65 SHA512 1d2f57c7931b24303ea3c19350efa373f279e6d27ff3eea6a616b7565c27955872a8545c8a3ca99f6a6a80bc922606b3cf05a513e8a0de2e910aee8dbb4fbe35
+MISC metadata.xml 324 BLAKE2B 8448bed9352556e4fbb8cd68edd3cfd86196bd483d6b19e7ae248170fa5dfce8f780fef749953996ae89929bebd9e90a726458d0649e3eb09540bdeaf0fa2d82 SHA512 75b0c9e5a511c787585c2d45ead3704573ec50e574c4e1abf94a988f461463285688b859ed0b6f0f5def209c882a72caa3a39480fef7f72f4109b083235e4dc2
diff --git a/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild
new file mode 100644
index 000000000000..92badeb52671
--- /dev/null
+++ b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild
@@ -0,0 +1,133 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.10
+
+EAPI=8
+
+CRATES="
+	adler@1.0.2
+	ahash@0.7.6
+	android_system_properties@0.1.5
+	ansi_term@0.12.1
+	atty@0.2.14
+	autocfg@1.1.0
+	base64@0.13.1
+	bitflags@1.3.2
+	bumpalo@3.12.0
+	byteorder@1.4.3
+	cc@1.0.78
+	cfg-if@1.0.0
+	chrono@0.4.23
+	clap@2.34.0
+	codespan-reporting@0.11.1
+	core-foundation-sys@0.8.3
+	crc32fast@1.3.2
+	crossbeam-utils@0.8.14
+	cxx-build@1.0.88
+	cxx@1.0.88
+	cxxbridge-flags@1.0.88
+	cxxbridge-macro@1.0.88
+	flate2@1.0.25
+	form_urlencoded@1.1.0
+	fs2@0.4.3
+	fuchsia-cprng@0.1.1
+	gcc@0.3.55
+	getrandom@0.2.8
+	hashbrown@0.12.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hex@0.4.3
+	iana-time-zone-haiku@0.1.1
+	iana-time-zone@0.1.53
+	idna@0.3.0
+	jobserver@0.1.25
+	js-sys@0.3.60
+	lazy_static@1.4.0
+	libc@0.2.139
+	link-cplusplus@1.0.8
+	log@0.4.17
+	miniz_oxide@0.6.2
+	num-integer@0.1.45
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.17.0
+	paste@1.0.11
+	percent-encoding@2.2.0
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.50
+	quote@1.0.23
+	rand@0.3.23
+	rand@0.4.6
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.3.1
+	rand_core@0.4.2
+	rand_core@0.6.4
+	rdrand@0.4.0
+	ring@0.16.20
+	rmp-serde@0.15.5
+	rmp@0.8.11
+	rust-crypto@0.2.36
+	rustc-serialize@0.3.24
+	rustls@0.20.8
+	same-file@1.0.6
+	scratch@1.0.3
+	sct@0.7.0
+	serde@1.0.152
+	serde_derive@1.0.152
+	spin@0.5.2
+	strsim@0.8.0
+	syn@1.0.107
+	termcolor@1.2.0
+	textwrap@0.11.0
+	time@0.1.45
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.0
+	unicode-bidi@0.3.10
+	unicode-ident@1.0.6
+	unicode-normalization@0.1.22
+	unicode-width@0.1.10
+	untrusted@0.7.1
+	ureq@2.6.2
+	url@2.3.1
+	vec_map@0.8.2
+	version_check@0.9.4
+	walkdir@2.3.2
+	wasi@0.10.0+wasi-snapshot-preview1
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.83
+	wasm-bindgen-macro-support@0.2.83
+	wasm-bindgen-macro@0.2.83
+	wasm-bindgen-shared@0.2.83
+	wasm-bindgen@0.2.83
+	web-sys@0.3.60
+	webpki-roots@0.22.6
+	webpki@0.22.0
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	zstd-safe@4.1.3+zstd.1.5.1
+	zstd-sys@1.6.2+zstd.1.5.1
+	zstd@0.9.2+zstd.1.5.1
+"
+
+inherit cargo
+
+ELFSHAKER_COMMIT="9b65a536ed25d698311b7298332900c54967aa97"
+DESCRIPTION="Stores binary objects efficiently"
+HOMEPAGE="https://github.com/elfshaker/elfshaker"
+SRC_URI="
+	https://github.com/elfshaker/elfshaker/archive/${ELFSHAKER_COMMIT}.tar.gz -> ${P}.tar.gz
+	${CARGO_CRATE_URIS}
+"
+S="${WORKDIR}"/${PN}-${ELFSHAKER_COMMIT}
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/elfshaker"
diff --git a/dev-util/elfshaker/metadata.xml b/dev-util/elfshaker/metadata.xml
new file mode 100644
index 000000000000..8d6456ce322e
--- /dev/null
+++ b/dev-util/elfshaker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">elfshaker/elfshaker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ad0a6715636d..8267d3f4eece 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 06777cf7aef2..7a84b30e95b8 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Nov 2023 10:09:49 +0000
+Wed, 15 Nov 2023 16:09:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index f9e6da94d3f8..5f8747d75db3 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 552954 BLAKE2B 671acecdf3b956e40593b940db3c3c4d25b604abd0c4cdd9a525b421aa0deed29e2aee66fa7fb224997743a298d8e522e0fa6422a7a980e3a08aa5605a60fcd3 SHA512 e4720971a7c42a5c5f28e5088e9d32a3a2120739479f770ecf817f49cff3b8e1d959bcac2d314db5770addfca412ff20e25845ec84ef98a44cf6b7797a85bcf0
-TIMESTAMP 2023-11-15T10:09:52Z
+TIMESTAMP 2023-11-15T16:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVUmPBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVU7VFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB2QA/9EyUw9lM+h7X4/X8p9zPJXAIzYWCqePCu3CYXghRaRkhU04Jci72m6sxN
-SX7x2ieVa30ngkT4ba9cBImlBeBxyipeQ+25MEcWXBlOmcnxeVob7+ynX0Ez4kuP
-a1+1drBx7fIqdWk1BXqaT2P+XO64lYSFEubg8A0fsC8Y3EDvQrswG8B67S0AKO3t
-Igt8Wsw7z75j/a2WtU9Ed3ATvS3UWwbUV6s3JNJcGjigZqTAqPeBOmEFeMulsdsC
-E5ZynwPpKcRpUpKAG+4JAU+B6IasG2gu252gHEgsLjs08uOdhPDnAGwXa/n6nbJF
-wvgUvnd/n8+ovjHk4xo4SNGciD58ZDTL+yaXmHgAZtJDxZARBChzJK4EOWIq2j6M
-4RS9TBX9FshhKbHXHBWUjJfOxXEhYVFcdSN8chBWllMgyUyO5qDEpWTl8TNvYflv
-lISfD9YIcAaNLpHWm4kEmPaaU1BkAR092I6xui626at9xa1xI8xOibvsCveLdd3a
-Ui0xnw7MnAic+CpweFiboznvazrDvbe+qJr9ALmDCaIZqz6naKIsqnT/jGNZ90i0
-0CMs7aSwPP7Kik5e0mE9V9BsRtkSU5mivlDm9es1JafirNIOHKAYNPpgWUP8Kt0A
-sOCdFxcvPyhWc9t/AVkYVILlKmZ1vnLpkjlGf2n7AmigMc+vHqI=
-=ca2G
+klDtxRAAr+ZSWRCt3hOfhmbAejvNKozmylZ5pugaY5KT+NIwYb8qQFBrdkdm6O8S
+VIkcFWizEz3EZgGJ+PA8Htk1AvjXXZxCCNySFRWEIR39I6NRTXxapeVXCpHxIvbk
+r5/TGJWlsaOUf9LHpbLxzIIyv2rAqzl89/tbpvbGbYx3yqPltVhHGmFVvv7csluA
+RNJuC+C2iTe1xp+Q7lra4zyiaoPHiNUku0cxMJcPD6lfIhxar2WaV24LGz5pRgjd
+rLuI9ek44vBS4II4fjnBNLt5k1wonm5WzCpPFM6Kexsf3Ibe/5pUNzswpQOJvPkK
+0ugs93JoYf2qKGYNYJLPooOJullI7VAXlUB7INaiqdfZTd46tgvT+YeqRsm9g7XL
+vaPVc+CqZjL5GnnXETnRhJEHNawVG/mb1Kc2YKw+KrUh7PbUC1B1aBVd+yQCsHDq
+up0AQ0afGhPXJuNpLY2OjrarevWxfi6HFdAM3wd6yLkdXtgQBOipy5eIuZhZsB0M
+EbOY0ZufUfGCLVLlOA0TXEJ+JkSJ4Ldas2u/6XfIjPIjLscnCsYccOVx5S9G2M8H
+5xvXHIuwF3weK6ynKsz63a7nfxAoQ3lIEgLwLtydTWX4gNdHNPUrSWcvATnnp9NZ
+OfLLqQXos/nQo9Ei68/XCMBMvebhnxTVbVC/+epFXWfKDAHIIWM=
+=NAHy
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3f20ec067953..7a84b30e95b8 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Nov 2023 10:09:50 +0000
+Wed, 15 Nov 2023 16:09:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 86aec932654c..3c4c9138feed 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 3f8407529bba..5867d6833831 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/conky-1.19.6 b/metadata/md5-cache/app-admin/conky-1.19.6-r1
index 7e79be833255..7e79be833255 100644
--- a/metadata/md5-cache/app-admin/conky-1.19.6
+++ b/metadata/md5-cache/app-admin/conky-1.19.6-r1
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.8.0-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.8.0-r1
index 7b60c388f8aa..920b4d3c15bf 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.8.0-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.8.0-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/mchehab/rasdaemon
 INHERIT=autotools flag-o-matic linux-info systemd
 IUSE=selinux
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=dev-db/sqlite dev-libs/libtraceevent elibc_musl? ( sys-libs/argp-standalone ) dev-perl/DBI dev-perl/DBD-SQLite sys-apps/dmidecode selinux? ( sec-policy/selinux-rasdaemon )
 SLOT=0
 SRC_URI=https://github.com/mchehab/rasdaemon/releases/download/refs%2Fheads%2Fmaster/rasdaemon-0.8.0.tar.bz2
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	flag-o-matic	baa4d385108ac87993edac956a916a36	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f31ab503e3a653ee9516557bad5b2fef
+_md5_=230347fbc6b924ac64d42ef5a630ddc4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index b6dc5ea79edc..3b71b885add6 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/bacula-13.0.3-r2 b/metadata/md5-cache/app-backup/bacula-13.0.3-r2
index 148a6c0bfcf8..d2ba4c10175e 100644
--- a/metadata/md5-cache/app-backup/bacula-13.0.3-r2
+++ b/metadata/md5-cache/app-backup/bacula-13.0.3-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=!bacula-clientonly? ( ^^ ( mysql postgres sqlite ) ) static? ( bacu
 SLOT=0
 SRC_URI=mirror://sourceforge/bacula/bacula-13.0.3.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=15b1bd2fa6311d090d7bb36a1641b87e
+_md5_=af72a43cc08045e593077649c0ed8c2a
diff --git a/metadata/md5-cache/app-backup/sarab-1.0.0-r1 b/metadata/md5-cache/app-backup/sarab-1.0.0-r1
index 77a6029c9fe6..633a47725aec 100644
--- a/metadata/md5-cache/app-backup/sarab-1.0.0-r1
+++ b/metadata/md5-cache/app-backup/sarab-1.0.0-r1
@@ -3,10 +3,10 @@ DESCRIPTION=SaraB is a powerful and automated backup scheduling system based on
 EAPI=8
 HOMEPAGE=https://sarab.sourceforge.net/
 INHERIT=prefix readme.gentoo-r1
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-backup/dar virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/sarab/sarab-1.0.0.tar.gz
 _eclasses_=prefix	eab3c99d77fe00506c109c8a736186f7	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3
-_md5_=36fca740621b246b298c29aaa02a794f
+_md5_=b862b742775cf487d8097e9cf84d94a5
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8eef4b0bc8f5..472f24073b56 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/jsonschema-path-0.3.2 b/metadata/md5-cache/dev-python/jsonschema-path-0.3.2
new file mode 100644
index 000000000000..f9b3a6c8412c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-path-0.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/responses[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSONSchema Spec with object-oriented paths
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema-path/ https://github.com/p1c2u/jsonschema-path/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pathable-0.4.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/referencing-0.28.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/jsonschema-path/archive/0.3.2.tar.gz -> jsonschema-path-0.3.2.gh.tar.gz
+_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=64fc12d3ae3caee716daafebbc128ee5
diff --git a/metadata/md5-cache/dev-python/jupyter-server-2.10.1 b/metadata/md5-cache/dev-python/jupyter-server-2.10.1
new file mode 100644
index 000000000000..8b3205da8e87
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter-server-2.10.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-jupyter-builder[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/ipykernel[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-console-scripts[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-jupyter[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-tornasync[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/anyio-3.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/argon2-cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-server-terminals[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-events-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/nbformat-5.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/overrides[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/prometheus-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/send2trash-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websocket-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Core services, APIs, and REST endpoints to Jupyter web applications
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server/ https://pypi.org/project/jupyter-server/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/anyio-3.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/argon2-cffi[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jinja[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-client-7.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-core-5.1.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jupyter-server-terminals[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/jupyter-events-0.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/nbconvert-6.4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/nbformat-5.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/overrides[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/prometheus-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyzmq-24[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/send2trash-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tornado-6.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/traitlets-5.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/websocket-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/j/jupyter-server/jupyter_server-2.10.1.tar.gz
+_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=ad9c4f984b7e4ad63983520991e05453
diff --git a/metadata/md5-cache/dev-python/pdm-backend-2.1.4 b/metadata/md5-cache/dev-python/pdm-backend-2.1.4
deleted file mode 100644
index 3aa9dd0adf88..000000000000
--- a/metadata/md5-cache/dev-python/pdm-backend-2.1.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) test? ( >=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-backend/ https://github.com/pdm-project/pdm-backend/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-backend/archive/2.1.4.tar.gz -> pdm-backend-2.1.4.gh.tar.gz
-_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=46836a1f7401f5b311857c0441e1d524
diff --git a/metadata/md5-cache/dev-python/pdm-backend-2.1.5 b/metadata/md5-cache/dev-python/pdm-backend-2.1.5
deleted file mode 100644
index ec110bdf1d75..000000000000
--- a/metadata/md5-cache/dev-python/pdm-backend-2.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) test? ( >=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-backend/ https://github.com/pdm-project/pdm-backend/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-backend/archive/2.1.5.tar.gz -> pdm-backend-2.1.5.gh.tar.gz
-_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=46836a1f7401f5b311857c0441e1d524
diff --git a/metadata/md5-cache/dev-python/pdm-backend-2.1.6 b/metadata/md5-cache/dev-python/pdm-backend-2.1.6
deleted file mode 100644
index 85945b2d856b..000000000000
--- a/metadata/md5-cache/dev-python/pdm-backend-2.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git ) test? ( >=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A PEP 517 backend for PDM that supports PEP 621 metadata
-EAPI=8
-HOMEPAGE=https://pypi.org/project/pdm-backend/ https://github.com/pdm-project/pdm-backend/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/packaging-22.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pyproject-metadata-0.7.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/tomli-w-1.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pdm-project/pdm-backend/archive/2.1.6.tar.gz -> pdm-backend-2.1.6.gh.tar.gz
-_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=46836a1f7401f5b311857c0441e1d524
diff --git a/metadata/md5-cache/dev-python/pydantic-2.5.1 b/metadata/md5-cache/dev-python/pydantic-2.5.1
new file mode 100644
index 000000000000..749cd9945ad0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydantic-2.5.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-fancy-pypi-readme-22.5.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/cloudpickle[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/dirty-equals[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/email-validator-2.0.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/Faker-18.13.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/annotated-types-0.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-python/pydantic-core-2.14.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/hatchling-1.17.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Data parsing and validation using Python type hints
+EAPI=8
+HOMEPAGE=https://github.com/pydantic/pydantic/ https://pypi.org/project/pydantic/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/annotated-types-0.4.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ~dev-python/pydantic-core-2.14.3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/typing-extensions-4.6.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pydantic/pydantic-2.5.1.tar.gz
+_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=fc7fea2982291021f0bde734862071c7
diff --git a/metadata/md5-cache/dev-python/zeroconf-0.127.0 b/metadata/md5-cache/dev-python/zeroconf-0.127.0
new file mode 100644
index 000000000000..95cc275d0aa7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zeroconf-0.127.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-65.6.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] test? ( dev-python/pytest-asyncio[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( >=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+DESCRIPTION=Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)
+EAPI=8
+HOMEPAGE=https://github.com/python-zeroconf/python-zeroconf/ https://pypi.org/project/zeroconf/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/ifaddr-0.1.7[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( >=dev-python/async-timeout-3.0.0[python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/z/zeroconf/zeroconf-0.127.0.tar.gz
+_eclasses_=distutils-r1	e77a62f5bbafca793544392d5e41affb	flag-o-matic	baa4d385108ac87993edac956a916a36	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=9636bdf2522b439f69b3a5c8760189bf
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 196e4a77b617..f51fb4a2e5d8 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/elfshaker-0.9.0_p20230918 b/metadata/md5-cache/dev-util/elfshaker-0.9.0_p20230918
new file mode 100644
index 000000000000..f086d1a12e66
--- /dev/null
+++ b/metadata/md5-cache/dev-util/elfshaker-0.9.0_p20230918
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DESCRIPTION=Stores binary objects efficiently
+EAPI=8
+HOMEPAGE=https://github.com/elfshaker/elfshaker
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0 ISC MIT MPL-2.0 Unicode-DFS-2016
+SLOT=0
+SRC_URI=https://github.com/elfshaker/elfshaker/archive/9b65a536ed25d698311b7298332900c54967aa97.tar.gz -> elfshaker-0.9.0_p20230918.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/android_system_properties/0.1.5/download -> android_system_properties-0.1.5.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.1/download -> base64-0.13.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.12.0/download -> bumpalo-3.12.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.23/download -> chrono-0.4.23.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.14/download -> crossbeam-utils-0.8.14.crate https://crates.io/api/v1/crates/cxx-build/1.0.88/download -> cxx-build-1.0.88.crate https://crates.io/api/v1/crates/cxx/1.0.88/download -> cxx-1.0.88.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.88/download -> cxxbridge-flags-1.0.88.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.88/download -> cxxbridge-macro-1.0.88.crate https://crates.io/api/v1/crates/flate2/1.0.25/download -> flate2-1.0.25.crate https://crates.io/api/v1/crates/form_urlencoded/1.1.0/download -> form_urlencoded-1.1.0.crate https://crates.io/api/v1/crates/fs2/0.4.3/download -> fs2-0.4.3.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/gcc/0.3.55/download -> gcc-0.3.55.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/hashbrown/0.12.3/download -> hashbrown-0.12.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hermit-abi/0.2.6/download -> hermit-abi-0.2.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/iana-time-zone-haiku/0.1.1/download -> iana-time-zone-haiku-0.1.1.crate https://crates.io/api/v1/crates/iana-time-zone/0.1.53/download -> iana-time-zone-0.1.53.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.25/download -> jobserver-0.1.25.crate https://crates.io/api/v1/crates/js-sys/0.3.60/download -> js-sys-0.3.60.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.8/download -> link-cplusplus-1.0.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/miniz_oxide/0.6.2/download -> miniz_oxide-0.6.2.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.15.0/download -> num_cpus-1.15.0.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/paste/1.0.11/download -> paste-1.0.11.crate https://crates.io/api/v1/crates/percent-encoding/2.2.0/download -> percent-encoding-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.17/download -> ppv-lite86-0.2.17.crate https://crates.io/api/v1/crates/proc-macro2/1.0.50/download -> proc-macro2-1.0.50.crate https://crates.io/api/v1/crates/quote/1.0.23/download -> quote-1.0.23.crate https://crates.io/api/v1/crates/rand/0.3.23/download -> rand-0.3.23.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rmp-serde/0.15.5/download -> rmp-serde-0.15.5.crate https://crates.io/api/v1/crates/rmp/0.8.11/download -> rmp-0.8.11.crate https://crates.io/api/v1/crates/rust-crypto/0.2.36/download -> rust-crypto-0.2.36.crate https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download -> rustc-serialize-0.3.24.crate https://crates.io/api/v1/crates/rustls/0.20.8/download -> rustls-0.20.8.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scratch/1.0.3/download -> scratch-1.0.3.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/serde/1.0.152/download -> serde-1.0.152.crate https://crates.io/api/v1/crates/serde_derive/1.0.152/download -> serde_derive-1.0.152.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/time/0.1.45/download -> time-0.1.45.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.10/download -> unicode-bidi-0.3.10.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.22/download -> unicode-normalization-0.1.22.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.6.2/download -> ureq-2.6.2.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.83/download -> wasm-bindgen-backend-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.83/download -> wasm-bindgen-macro-support-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.83/download -> wasm-bindgen-macro-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.83/download -> wasm-bindgen-shared-0.2.83.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.83/download -> wasm-bindgen-0.2.83.crate https://crates.io/api/v1/crates/web-sys/0.3.60/download -> web-sys-0.3.60.crate https://crates.io/api/v1/crates/webpki-roots/0.22.6/download -> webpki-roots-0.22.6.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/zstd-safe/4.1.3+zstd.1.5.1/download -> zstd-safe-4.1.3+zstd.1.5.1.crate https://crates.io/api/v1/crates/zstd-sys/1.6.2+zstd.1.5.1/download -> zstd-sys-1.6.2+zstd.1.5.1.crate https://crates.io/api/v1/crates/zstd/0.9.2+zstd.1.5.1/download -> zstd-0.9.2+zstd.1.5.1.crate
+_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	flag-o-matic	baa4d385108ac87993edac956a916a36	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=a4b775bc196a1499600305f3e6262578
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 73fc46b8961c..1e1f3f31dec8 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/aria2-1.37.0 b/metadata/md5-cache/net-misc/aria2-1.37.0
new file mode 100644
index 000000000000..481de097ee3b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/aria2-1.37.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) test? ( >=dev-util/cppunit-1.12.0:0 )
+DESCRIPTION=A download utility with segmented downloading with BitTorrent support
+EAPI=8
+HOMEPAGE=https://aria2.github.io/
+INHERIT=bash-completion-r1
+IUSE=adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+-with-openssl-exception
+RDEPEND=sys-libs/zlib:0= adns? ( >=net-dns/c-ares-1.5.0:0= ) jemalloc? ( dev-libs/jemalloc ) libuv? ( >=dev-libs/libuv-1.13:0= ) metalink? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) sqlite? ( dev-db/sqlite:3= ) ssh? ( net-libs/libssh2:= ) ssl? ( app-misc/ca-certificates gnutls? ( >=net-libs/gnutls-1.2.9:0= nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) !gnutls? ( dev-libs/openssl:0= ) ) !ssl? ( nettle? ( >=dev-libs/nettle-2.4:0= bittorrent? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= ) ) !nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) tcmalloc? ( dev-util/google-perftools ) xmlrpc? ( libxml2? ( >=dev-libs/libxml2-2.6.26:2= ) !libxml2? ( dev-libs/expat:0= ) ) nls? ( virtual/libiconv virtual/libintl ) scripts? ( dev-lang/ruby )
+REQUIRED_USE=?? ( jemalloc tcmalloc ) metalink? ( xmlrpc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=5a6651cbb78d8c009318903b86769d82
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index f3dbb3647be3..6d6c0b94f3ab 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.16 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.16
new file mode 100644
index 000000000000..37400d0996d2
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.16
@@ -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.16
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.16/KEYS -> openpgp-keys-apache-tomcat-10.1.16-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.96 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.96
new file mode 100644
index 000000000000..d748bdf94dfd
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-8.5.96
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-80.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=8.5.96
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-8/v8.5.96/KEYS -> openpgp-keys-apache-tomcat-8.5.96-KEYS.asc
+_md5_=b711da39319582bfa9895d14c40940f0
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.83 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.83
new file mode 100644
index 000000000000..0d78b80caff8
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.83
@@ -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=9.0.83
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.83/KEYS -> openpgp-keys-apache-tomcat-9.0.83-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 424866c953ff..a11ec1a2673d 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/texinfo-7.1-r1 b/metadata/md5-cache/sys-apps/texinfo-7.1-r1
new file mode 100644
index 000000000000..fdfc168242e0
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/texinfo-7.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( >=sys-devel/gettext-0.19.6 )
+DEFINED_PHASES=configure prepare
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Unicode-Collate standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= dev-libs/libunistring:= ) nls? ( virtual/libintl )
+DESCRIPTION=The GNU info program and utilities
+EAPI=8
+HOMEPAGE=https://www.gnu.org/software/texinfo/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=nls +standalone static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=GPL-3+
+RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Unicode-Collate standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= dev-libs/libunistring:= ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnu/texinfo/texinfo-7.1.tar.xz
+_eclasses_=flag-o-matic	baa4d385108ac87993edac956a916a36	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=2a6b1b6ac3a813ed4e0605eef7c1c0f8
diff --git a/metadata/md5-cache/sys-apps/texinfo-9999 b/metadata/md5-cache/sys-apps/texinfo-9999
index a6071d103dc6..ad5c55a49a7a 100644
--- a/metadata/md5-cache/sys-apps/texinfo-9999
+++ b/metadata/md5-cache/sys-apps/texinfo-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:= virtual/perl-Data-Dumper virtual/perl-Encode virtual/perl-Unicode-Collate standalone? ( >=dev-lang/perl-5.8.1 ) !standalone? ( >=dev-lang/perl-5.8.1:= dev-libs/libunistring:= ) nls? ( virtual/libintl )
 SLOT=0
 _eclasses_=flag-o-matic	baa4d385108ac87993edac956a916a36	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=3dd4fa4cb724645c64f9761e0e7debb7
+_md5_=86e66408a2fa1c8d736653fed8da6777
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.39.2 b/metadata/md5-cache/sys-apps/util-linux-2.39.2
index 24233686327f..39a2712bb0ba 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.39.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.39.2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.39/util-linux-2.39.2.tar.sign )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	baa4d385108ac87993edac956a916a36	libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	30999b80ec1fe0b4af340ae819375346	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	usr-ldscript	ff03a5d223e97515fa25b5cae97ebda9	verify-sig	798e0173d334021f14ba78a786c37059
-_md5_=852890d5ad64a6694114e4c57620c225
+_md5_=a91a76465d57770342241cd9c093e7d9
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 3667015c9b49..2d4973ef8c5e 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/mold-2.3.3 b/metadata/md5-cache/sys-devel/mold-2.3.3
new file mode 100644
index 000000000000..5b954d4693e4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/mold-2.3.3
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= dev-libs/blake3:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= )
+DESCRIPTION=A Modern Linker
+EAPI=8
+HOMEPAGE=https://github.com/rui314/mold
+INHERIT=cmake toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86
+LICENSE=MIT BSD-2
+RDEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= dev-libs/blake3:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= )
+SLOT=0
+SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v2.3.3.tar.gz -> mold-2.3.3.tar.gz
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	baa4d385108ac87993edac956a916a36	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=2a70a6fd696550dcee46f9a5f8b77354
diff --git a/metadata/md5-cache/sys-devel/mold-9999 b/metadata/md5-cache/sys-devel/mold-9999
index 115102579ddc..1611896f1bc9 100644
--- a/metadata/md5-cache/sys-devel/mold-9999
+++ b/metadata/md5-cache/sys-devel/mold-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=app-arch/zstd:= >=dev-cpp/tbb-2021.7.0-r1:= dev-libs/blake3:= sys-libs/zlib !kernel_Darwin? ( >=dev-libs/mimalloc-2:= )
 SLOT=0
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	baa4d385108ac87993edac956a916a36	git-r3	5133e393e8717a3a093660f990801dc1	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	39e7a84b06eff4efd9f2e0c3d1668b98	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=308e11a1ce2ee452da05a916c33feaf1
+_md5_=2a70a6fd696550dcee46f9a5f8b77354
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index d87b17599c4a..a0dadddd349a 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.16 b/metadata/md5-cache/www-servers/tomcat-10.1.16
new file mode 100644
index 000000000000..71b13e1f1902
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.16
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.16:10.1.16 ) 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.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5: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 ~arm ~arm64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-migration-1.0.5: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.16/src/apache-tomcat-10.1.16-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.16/src/apache-tomcat-10.1.16-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	c04e82b700f977924b211c7cdbc2f096	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=b49666b79fa3d7ce15eecb36da7f6282
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.96 b/metadata/md5-cache/www-servers/tomcat-8.5.96
new file mode 100644
index 000000000000..d24ebee01a74
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.96
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-8.5.96:8.5.96 ) 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.15 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* doc? ( dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 ) test? ( >=dev-java/ant-junit-1.9: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-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 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 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.96/src/apache-tomcat-8.5.96-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.96/src/apache-tomcat-8.5.96-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	c04e82b700f977924b211c7cdbc2f096	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=8415145d180bbef7018c13f53b2c51dd
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.83 b/metadata/md5-cache/www-servers/tomcat-9.0.83
new file mode 100644
index 000000000000..427436520cca
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.83
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.83:9.0.83 ) 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.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-1.8:* test? ( dev-java/ant-junit 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-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.83/src/apache-tomcat-9.0.83-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/7.0.0/biz.aQute.bnd-7.0.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.83/src/apache-tomcat-9.0.83-src.tar.gz.asc )
+_eclasses_=java-ant-2	19239227fab7816f57abbc0c7d819396	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	c04e82b700f977924b211c7cdbc2f096	multilib	c19072c3cd7ac5cb21de013f7e9832e0	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=b39f3f0b4ddafbafd451bd7fcdb4bbb0
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index d68b25cc082e..0984d215dded 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-11-15T10:09:52Z
+TIMESTAMP 2023-11-15T16:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVUmPBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmVU7VFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBt0g//Yy6jvPC0GhDUduWtEsP9vgoWuI3eQSRaUS4nwputvvNdUFBqsA4vf9HA
-beheK+VTq6BT4PNYjd+s17V+Fg6PP6J32QOZdhZRLs3trmJ9xc/L6cX4uGCqyKi5
-b8tVUyMPetXXy2FhmFMYvw4c6a8Xsz5Yvt7bpwzghsMD2KfOmD589NNx5wDkV4XA
-8nsh9mae5Jj2woSvo0R+ckMWJcOkgs1D1+oW1kQPaSWh7hEZ1Dmfa8ACBNv5k2zq
-FgI5E2/48BeBvdqYjAXj6ghcmA72A9oIlxAYReQEYnoHXnPxW6QfQkAQ4z0TUUbV
-I12Byc736KKD7IaMbRSHwJIafvheC8Kkk7E983Iey6WwUq+VNtRsU94o0c+NZPfp
-tZ80lFS+flv6kl4PJmBd2FGM0OnbycL4qp30xSEIX/VgzWkQMrvEhzs06vY5ZGoX
-VTwWgj0RHQIIlq3CIxx7nAVJ5b/9XfqFbxn2Dk+OTzzIfm345BsxSxZv3tX4C0f0
-0Cku/ul3YT0Rmser0ltZrrqEAviMa4gi+qovsayvAiJmmwe5YBVOs6znyF01bsHV
-1D5uCHpDdJTz2B5FB6qWJdrBz5LLCtFLO/TevxRtrihDYJ2aOdLnxO+OfvL+vIVX
-EQykGONCwAi1eAx6V+eb2fWc1eXvjVc4dje/OuIukmmz0DwoVqQ=
-=ycNy
+klCzZQ//XMzF3P/4tafGYzGpXaPDBU7fzA6L19FR8gmPrKMHiJ7DUTZ2VCTTqbnc
+6xz5rV/VHFAIF3ersuS2/+2S18qaYPQmVCBw3dg9E3GYkmqd/aj8fNgVu+BCBZii
+8UKxdkdCth8cL7HFApklMSzebfKB3cksNhfx2vCTMFjxFiJNz7HZDfPlxyDMFCiH
+hre6oNvY2rAMJxHbSig/RHCq05IttqfPqqjouPuPG5WZhg6EHGQ5Ye5MU1WRJxhk
+D6ipBNPEPVtNKBEKRPGQnUxX+zNP9W7Pi/L5L0vDuLZHZmXqB7lDJtqscnn5LDz6
+YexqkGD52ED9f8F356qc8yKpd82+JkkPCToVvIeBX8ayqrDwzwBjy57asV32NMRv
+c/f1qsevqwAw997DQNNpR+OAFgUV6+yAp34Fx3UDX4faNDlyUbUb7SiZsd8yJWAZ
+F6dkREPzOqlKOGWZ90ijulqgLiiBAy2u4jvvpepfzNOPlw1rrAaHVJcuPdfuIteh
+xIVan3JY50UdtILUC+aa8wznAxRVLroBSZcV47mQc64ZHvLYgT2DSrL+Xe1eXrzi
+P8FV0oICTadpZZ/cKYp2AkIKvH9Vkd+WdCWy4CiEy/EBZ0O6tqO/oTTYMDqtpzJE
+N/BBA/ghjcQK3pAT8GvLBKSGIPuFIOQ0jEq1n8In8ZEdzDr0qLU=
+=KCd4
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3f20ec067953..7a84b30e95b8 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Nov 2023 10:09:50 +0000
+Wed, 15 Nov 2023 16:09:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a67e57767f53..3e3bdbdd4399 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Nov 15 10:09:49 AM UTC 2023
+Wed Nov 15 04:09:50 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 77179a68d983..c3a05b372796 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Nov 2023 10:15:01 +0000
+Wed, 15 Nov 2023 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 1223d8d59f5a..75a3c778cb78 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-092c2383f221620534eb948f7f81596d6b8d4a86 1700036582 2023-11-15T08:23:02+00:00
+f9f80adc828e4b93f97597fe99566affad7e0a07 1700064201 2023-11-15T16:03:21+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d695c80b960d..d12ece58a963 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1700043001 Wed 15 Nov 2023 10:10:01 AM UTC
+1700064601 Wed 15 Nov 2023 04:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 06777cf7aef2..7a84b30e95b8 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 15 Nov 2023 10:09:49 +0000
+Wed, 15 Nov 2023 16:09:50 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8c46cd7a59ea..0653f9da7ebf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index c119dc44cf09..c0fd50140aeb 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,3 +1,5 @@
 DIST aria2-1.36.0.tar.xz 1619036 BLAKE2B 7894ec705f6fefdbc6c4844efa8a645b3e7674e36d04535ac96b9daf5098a453d047109bad0db16e6fd656f63a3ec0bab5746e8ba7d549149e2364395a94399f SHA512 8203dbb75274455a78c50dd4f894e631de6931ac889f26896dceed78ec38c98cdbcf07e164744f308f2bfffeae1016beec1bfdbe8cad7f3280d11376aa0c2542
+DIST aria2-1.37.0.tar.xz 1705256 BLAKE2B 4714dd0806fb7693f45e854d544dadd87312a98eef93518f8e8ea5f3332d362724dead16c7ebfdbe594b8403ef7b44e09f4180629894506e333ec2a423828244 SHA512 df3b8b4de8fa8d78f203ea00c059e43585e18a229009f202e42e6a9e59db67d09df0dbba8a016e99ed73c82f59e4f8b26f86c2288afdbb96a6807cbe2c56e6b3
 EBUILD aria2-1.36.0-r1.ebuild 5150 BLAKE2B 8ea5bcf18525cd88401c682a15305bddf5eb53f1c0d0d55620f91680c03874bdf12c31c16f9083b5c4419ee2398ab9da6e02167cce100f878ae18b9eb52cfd68 SHA512 a11f47da7b43a28156e7d67fd36a9908d08e6289525729094131f27b0c8667962e67ec31199eefc32a8a3c758b46ace102ebe943ad8f47f150e3c284d211218b
+EBUILD aria2-1.37.0.ebuild 5153 BLAKE2B fa816d1f82a6d35d4ebd5cb0b252e0e45ccc560e5e422920b27ef60499da24cd19c70c130658b6926317e97d3342336be404e09fba4a71c7ec103415a308e937 SHA512 476d1864e7d04af14cd0e8f8efe977862f47c0ba42ee89e05dcec77014ec58bcb730101f616823b2b52d2bf070f6bb8827eaad958808e5467fc71d0aecb3129c
 MISC metadata.xml 1326 BLAKE2B 3ac9bf38699dc1fbde6888fca4fbc4374d44e53d7c323fcf35e9303929502473dba40503c7ce3deaf232f6057d184e19bbf5ff7cbc5908d79ee3e6de7dc6a097 SHA512 5367b67da846fbcb0175b1ee4a3a532731e6b5285b8c3f244a175515b557a64732e58a8db67d4a691c28e707511ff894afe746366efd74c06353fa1df8efcf8b
diff --git a/net-misc/aria2/aria2-1.37.0.ebuild b/net-misc/aria2/aria2-1.37.0.ebuild
new file mode 100644
index 000000000000..5aad543edb93
--- /dev/null
+++ b/net-misc/aria2/aria2-1.37.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+	adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
+	nls sqlite scripts ssh ssl tcmalloc test xmlrpc
+"
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="
+	?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )
+"
+RESTRICT="!test? ( test )"
+
+# Crazy GnuTLS/OpenSSL/etc. logic below:
+# 1. Those libraries are used for two purposes: TLS & MD.
+# 2. Upstream preferences are:
+#    1) gnutls [tls]
+#    2) !gnutls? -> openssl [tls+md]
+#    3) !openssl? -> nettle [md]
+#    4) !openssl? !nettle? -> gcrypt [md]
+#    5) !*? -> bundled md routines (we don't use them)
+# 3. There's also gmp usage for bittorrent with nettle.
+# 4. You can't really control features, just dependencies.
+# (we are skipping native Apple/Windows TLS support)
+#
+# We map this into:
+# ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
+# !ssl? -> nettle || libgcrypt
+RDEPEND="
+	sys-libs/zlib:0=
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( >=dev-libs/libuv-1.13:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= )
+	)
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? (
+			>=net-libs/gnutls-1.2.9:0=
+			nettle? (
+				>=dev-libs/nettle-2.4:0=
+				bittorrent? (
+					>=dev-libs/nettle-2.4:0=[gmp]
+					>=dev-libs/gmp-6:0=
+				)
+			)
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+		)
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	!ssl? (
+		nettle? (
+			>=dev-libs/nettle-2.4:0=
+			bittorrent? (
+				>=dev-libs/nettle-2.4:0=[gmp]
+				>=dev-libs/gmp-6:0=
+			)
+		)
+		!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	)
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= )
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-util/cppunit-1.12.0:0 )
+"
+RDEPEND+="
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )
+"
+BDEPEND="app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+	# Fails with USE=bittorrent && FEATURES=network-sandbox
+	sed -i -E \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcherTest/d' \
+		-e '/^@ENABLE_BITTORRENT_TRUE@	LpdMessageReceiverTest/d' \
+		test/Makefile.in || die
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+
+		# forces bundled wslay
+		--disable-websocket
+	)
+
+	# See TLS/MD logic described above deps.
+	if use ssl && ! use gnutls; then
+		# 1. if ssl & !gnutls, use openssl and disable gnutls
+		myconf+=( --without-gnutls --with-openssl )
+	else
+		myconf+=(
+			# 2. otherwise, disable openssl
+			--without-openssl
+			# 3. if ssl & gnutls, use gnutls
+			$(use_with ssl gnutls)
+
+			# 4. switch between nettle & libgcrypt
+			$(use_with nettle libnettle)
+			$(use_with !nettle libgcrypt)
+		)
+
+		# 5. if bittorrent is used along with nettle, use libgmp
+		if use bittorrent && use nettle; then
+			myconf+=( --with-libgmp )
+		else
+			myconf+=( --without-libgmp )
+		fi
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/share/doc/${PF}/README{,.html} || die
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 62d0e680c266..c9e24a69345e 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d8d2b87ec18..c3c0212f72d7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -380,12 +380,6 @@ net-misc/openr2
 =dev-db/mariadb-10.11.2
 =dev-db/mariadb-10.11.3
 
-# Sam James <sam@gentoo.org> (2023-05-19)
-# Breaks Portage's pid-sandbox at least with 5.10 kernels. Pending investigation.
-# If you're hitting this, try: FEATURES="-pid-sandbox" emerge -v1 sys-apps/util-linux
-# as a workaround. bug #906797.
-~sys-apps/util-linux-2.39
-
 # Sam James <sam@gentoo.org> (2023-05-10)
 # Lots of package breakage as usual for new versions. Masked until most/all
 # reverse dependencies are fixed. Tracker bug is bug #906077.
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 2247de14c009..e7ceb3ff1d36 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 89f9a56014d0..e80fe71532cb 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,7 +1,13 @@
 DIST openpgp-keys-apache-tomcat-10.1.15-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
+DIST openpgp-keys-apache-tomcat-10.1.16-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-8.5.95-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
+DIST openpgp-keys-apache-tomcat-8.5.96-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.82-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.83-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.15.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.16.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.95.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
+EBUILD openpgp-keys-apache-tomcat-8.5.96.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.82.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-9.0.83.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.16.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.16.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.16.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 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/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.96.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.96.ebuild
new file mode 100644
index 000000000000..f17ae55806f2
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.96.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 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-80.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/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.83.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.83.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.83.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 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/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c74abea7dfa1..9b2f88485dca 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index f186c3dad59a..baa9af38eebc 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,3 +1,8 @@
+AUX 7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch 3424 BLAKE2B a6a9ac407882b9bda5daa3c3950a84096f5949eeaedab4494c78dd541f527b9414894086c9d9fd389e00af42e9b56e8508eb466dc4311dee6020133c57c941a8 SHA512 c72f5b37cad85c8a6f927f4efdb7107560f483b0bc64192afb64f778f68c3ab73ab646cb536600428b83d9e0fe754f04fe6e8c3fad993655630072f16fa17893
+AUX 7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch 1488 BLAKE2B fa33876ee93382de2091eb4209134ecc066d18d6b3336bfd4ef00ea2dadeed43ce53d42d491cd99d3ad50503674e8b73e4589590464cf8108dd68e7c1e447f13 SHA512 4f5d5306b29b9185a1676aca166787968b7a736012bc6fec358775f488f76b428cc3ba15da63cfe53a856165c0e05887b3563614ad0985fe1fb518e06d49e1c5
+AUX 7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch 1649 BLAKE2B d4ed598172f63c698ccf652d75b246da9d3db5256a3fde0f3692124657c19a2430a7c69c7bd1687e2677fe182e8bf2820ed1ac72cc5d25b3b84267e16dd0a6ea SHA512 c7dc124438319f4340fe75b06a2c7bc5bb6fd69dfbc445eaf5bb7ea3ba2c904cde1db71e41fc985bbdc3ff27b4a5d601633f736cf8a3a7904ece8bde2ce7f802
+AUX 7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch 1867 BLAKE2B 95dad1dd7c6a5f76f3abfd905340490f19fbfe01ab40e0512ff1fb77a491ee062a8c1f6265048aab7797274f622dd13f6a7ffa560817919b288176346850f94b SHA512 b212e99ac51e06b1bc2dd2eac6fdd5716a0f0a8ebfcfce98b1f27e5a251901c5121ca997c63b59eb79c5deed023e0d3ec07aff2aad67f590b97ea918de784499
+AUX 7.1/0005-tp-Texinfo-command_data.txt.patch 7841 BLAKE2B 47b482d95904b96af0d538c1d969e7c90e82f547d5d96bab855780209378efd5b577a7e0b1b3fef1ca32cb442bb9bee74a80f0bd62237b8a8f03764a368134ae SHA512 050e87f0a0ec5f23eabaeb8ddbc12e42a65121d67da5843210ac3c80deea5ef415b274216702e236919ad42b5e25552fbd704f78c81fb3e737188417a9405195
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617 SHA512 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b
@@ -6,6 +11,7 @@ DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031
 EBUILD texinfo-6.8.ebuild 1673 BLAKE2B 32b1b2a131178eb811a9b05a08718d09790b912cafdc96caeb0d8f78746efccbf86dc1e03c974047af1ed10f60af81dc9ab03dca8e96d2b017907695afb45717 SHA512 edf6247f34b2eaffe3f95fa017e7ee50c4e1f8a0ae8382ed47d0074601fd49e8712eb893454c78026e80db299e3ba75e2683f60e5cbe7b12fee7adbb4613d55d
 EBUILD texinfo-7.0.2.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
 EBUILD texinfo-7.0.3.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
+EBUILD texinfo-7.1-r1.ebuild 2569 BLAKE2B 64806b6389775cd170f96ac6bd15cfd84a52dc29b2fef828ce0136f941886bdc2b0fdc1742f6aeae649277e93a30e34a374e1fbcf31867eeb74f3cd38860bdb7 SHA512 f6f6e1636e90d84e9fb5088da039ea402d88eb025011361708edc9d83d37817190f55d63bceb67b14151f09ef6df6379691649dbefca4e125863fdff5f5c9187
 EBUILD texinfo-7.1.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
-EBUILD texinfo-9999.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
+EBUILD texinfo-9999.ebuild 2496 BLAKE2B 79279972fa3afa424e37074703c58f42b68a61620f248ac5ac1e1637ab79689b35eb5f5abcb07414a75c9e3afcc8c7189b40a5658ef49f16ad189f17de46e020 SHA512 4467e725e4b18111dc89c4a21ca4c54a03b85b19faae57c51c4fdbcb0fd686e59837a240ed71d83280a92c09028930c79b26faea75bda4d9536d53378ec3e5a6
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch b/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch
new file mode 100644
index 000000000000..8aed47b7bc24
--- /dev/null
+++ b/sys-apps/texinfo/files/7.1/0001-tp-Texinfo-XS-xspara.c-get_utf8_codepoint.patch
@@ -0,0 +1,103 @@
+From c76bcd0feed005aaf9db28a76f4883f3ae98295b Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Mon, 23 Oct 2023 19:51:00 +0100
+Subject: [PATCH 1/5] * tp/Texinfo/XS/xspara.c (get_utf8_codepoint): Wrapper
+ for mbrtowc/btowc. [_WIN32]: Do not call btowc, as it was tested to be very
+ slow on MinGW.  Report from Eli Zaretskii.
+
+---
+ ChangeLog              |  7 ++++++
+ tp/Texinfo/XS/xspara.c | 48 +++++++++++++++++++++++-------------------
+ 2 files changed, 33 insertions(+), 22 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index e619109f5b..c4379ec56b 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2023-10-23  Gavin Smith <gavinsmith0123@gmail.com>
++
++	* tp/Texinfo/XS/xspara.c (get_utf8_codepoint):
++	Wrapper for mbrtowc/btowc.
++	[_WIN32]: Do not call btowc, as it was tested to be very slow
++	on MinGW.  Report from Eli Zaretskii.
++
+ 2023-10-18  Gavin Smith <gavinsmith0123@gmail.com>
+ 
+ 	Texinfo 7.1
+diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
+index 7c6895a7ff..e1cddcdc2a 100644
+--- a/tp/Texinfo/XS/xspara.c
++++ b/tp/Texinfo/XS/xspara.c
+@@ -684,6 +684,30 @@ xspara_end (void)
+ /* characters triggering an end of sentence */
+ #define end_sentence_characters ".?!"
+ 
++/* Wrapper for mbrtowc.  Set *PWC and return length of codepoint in bytes. */
++size_t
++get_utf8_codepoint (wchar_t *pwc, const char *mbs, size_t n)
++{
++#ifdef _WIN32
++  /* Use the above implementation of mbrtowc.  Do not use btowc as
++     does not exist as standard on MS-Windows, and was tested to be
++     very slow on MinGW. */
++  return mbrtowc (pwc, mbs, n, NULL);
++#else
++  if (!PRINTABLE_ASCII(*mbs))
++    {
++      return mbrtowc (pwc, mbs, n, NULL);
++    }
++  else
++    {
++      /* Functionally the same as mbrtowc but (tested) slightly quicker. */
++      *pwc = btowc (*mbs);
++      return 1;
++    }
++#endif
++}
++
++
+ /* Add WORD to paragraph in RESULT, not refilling WORD.  If we go past the end 
+    of the line start a new one.  TRANSPARENT means that the letters in WORD
+    are ignored for the purpose of deciding whether a full stop ends a sentence
+@@ -730,18 +754,7 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent)
+               if (!strchr (end_sentence_characters
+                            after_punctuation_characters, *p))
+                 {
+-                  if (!PRINTABLE_ASCII(*p))
+-                    {
+-                      wchar_t wc = L'\0';
+-                      mbrtowc (&wc, p, len, NULL);
+-                      state.last_letter = wc;
+-                      break;
+-                    }
+-                  else
+-                    {
+-                      state.last_letter = btowc (*p);
+-                      break;
+-                    }
++                  get_utf8_codepoint (&state.last_letter, p, len);
+                 }
+             }
+         }
+@@ -1013,16 +1026,7 @@ xspara_add_text (char *text, int len)
+         }
+ 
+       /************** Not a white space character. *****************/
+-      if (!PRINTABLE_ASCII(*p))
+-        {
+-          char_len = mbrtowc (&wc, p, len, NULL);
+-        }
+-      else
+-        {
+-          /* Functonally the same as mbrtowc but (tested) slightly quicker. */
+-          char_len = 1;
+-          wc = btowc (*p);
+-        }
++      char_len = get_utf8_codepoint (&wc, p, len);
+ 
+       if ((long) char_len == 0)
+         break; /* Null character. Shouldn't happen. */
+-- 
+2.42.1
+
diff --git a/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch b/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch
new file mode 100644
index 000000000000..242f90add70d
--- /dev/null
+++ b/sys-apps/texinfo/files/7.1/0002-tp-Texinfo-XS-xspara.c-xspara__add_next-Do-not-pass.patch
@@ -0,0 +1,44 @@
+From f038d3f13f95b5494d5523f2af9dec59ff89b79d Mon Sep 17 00:00:00 2001
+From: Eli Zaretskii <eliz@gnu.org>
+Date: Wed, 25 Oct 2023 22:35:37 +0100
+Subject: [PATCH 2/5] * tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
+ pointer to wint_t as a pointer to wchar_t, as the two types may be of
+ different sizes.
+
+---
+ ChangeLog              | 6 ++++++
+ tp/Texinfo/XS/xspara.c | 4 +++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index c4379ec56b..3d13a15517 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,9 @@
++2023-10-25  Eli Zaretskii <eliz@gnu.org>
++
++	* tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
++	pointer to wint_t as a pointer to wchar_t, as the two types
++	may be of different sizes.
++
+ 2023-10-23  Gavin Smith <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/XS/xspara.c (get_utf8_codepoint):
+diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
+index e1cddcdc2a..130e43a4db 100644
+--- a/tp/Texinfo/XS/xspara.c
++++ b/tp/Texinfo/XS/xspara.c
+@@ -754,7 +754,9 @@ xspara__add_next (TEXT *result, char *word, int word_len, int transparent)
+               if (!strchr (end_sentence_characters
+                            after_punctuation_characters, *p))
+                 {
+-                  get_utf8_codepoint (&state.last_letter, p, len);
++                  wchar_t wc;
++                  get_utf8_codepoint (&wc, p, len);
++                  state.last_letter = wc;
+                 }
+             }
+         }
+-- 
+2.42.1
+
diff --git a/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch b/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch
new file mode 100644
index 000000000000..b3fbc85f461b
--- /dev/null
+++ b/sys-apps/texinfo/files/7.1/0003-info-scan.c-write_tag_contents-Check-if-added-text-i.patch
@@ -0,0 +1,51 @@
+https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00001.html
+
+From 12ad80f3a1cfa78c8a7b3a45458df7e07251317d Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Sat, 4 Nov 2023 10:38:48 +0000
+Subject: [PATCH 3/5] * info/scan.c (write_tag_contents): Check if added text
+ is of zero length in order to avoid subsequently calling memcpy with a null
+ source argument.  Report with -fsanitize=undefined on amd64 from Sam James
+ <sam@gentoo.org>.
+
+---
+ ChangeLog   | 7 +++++++
+ info/scan.c | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 3d13a15517..efbb3b22d1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2023-11-04  Gavin Smith <gavinsmith0123@gmail.com>
++
++	* info/scan.c (write_tag_contents): Check if added text is of
++	zero length in order to avoid subsequently calling memcpy with
++	a null source argument.  Report with -fsanitize=undefined on amd64
++	from Sam James <sam@gentoo.org>.
++
+ 2023-10-25  Eli Zaretskii <eliz@gnu.org>
+ 
+ 	* tp/Texinfo/XS/xspara.c (xspara__add_next): Do not pass
+diff --git a/info/scan.c b/info/scan.c
+index d6183ae9ae..bdf272f9bf 100644
+--- a/info/scan.c
++++ b/info/scan.c
+@@ -925,11 +925,11 @@ write_extra_bytes_to_output (char *input, long n)
+ }
+ 
+ /* Like write_extra_bytes_to_output, but writes bytes even when
+-   preprocess_nodes=Off. */
++   preprocess_nodes=Off.  Note n could be 0 for an index tag. */
+ static void
+ write_tag_contents (char *input, long n)
+ {
+-  if (rewrite_p)
++  if (rewrite_p && n > 0)
+     {
+       text_buffer_add_string (&output_buf, input, n);
+       output_bytes_difference -= n;
+-- 
+2.42.1
+
diff --git a/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch b/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch
new file mode 100644
index 000000000000..6f57363fc435
--- /dev/null
+++ b/sys-apps/texinfo/files/7.1/0004-tp-Texinfo-XS-parsetexi-tree.c-reset_obstacks.patch
@@ -0,0 +1,53 @@
+https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00000.html
+https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00016.html
+https://lists.gnu.org/archive/html/bug-texinfo/2023-11/msg00073.html
+
+From 81a854e22ca2449f2351436a863e5262935f5dc0 Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Mon, 13 Nov 2023 18:43:40 +0000
+Subject: [PATCH 4/5] * tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks): Call
+ obstack_alignment_mask to use 8-byte alignment.  Needed for Debian on
+ sparc64.  Report of "Bus error" from John Paul Adrian Glaubitz
+ <glaubitz@physik.fu-berlin.de>.
+
+---
+ ChangeLog                      | 7 +++++++
+ tp/Texinfo/XS/parsetexi/tree.c | 7 ++++++-
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index efbb3b22d1..a146820671 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2023-11-13  Gavin Smith <gavinsmith0123@gmail.com>
++
++	* tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks):
++	Call obstack_alignment_mask to use 8-byte alignment.  Needed
++	for Debian on sparc64.  Report of "Bus error" from
++	John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>.
++
+ 2023-11-04  Gavin Smith <gavinsmith0123@gmail.com>
+ 
+ 	* info/scan.c (write_tag_contents): Check if added text is of
+diff --git a/tp/Texinfo/XS/parsetexi/tree.c b/tp/Texinfo/XS/parsetexi/tree.c
+index f2d69e0454..09db6fc151 100644
+--- a/tp/Texinfo/XS/parsetexi/tree.c
++++ b/tp/Texinfo/XS/parsetexi/tree.c
+@@ -43,7 +43,12 @@ reset_obstacks (void)
+   if (obs_element_first)
+     obstack_free (&obs_element, obs_element_first);
+   else
+-    obstack_init (&obs_element);
++    {
++      /* Specify 8-byte alignment.  Needed for SPARC. */
++      obstack_alignment_mask (&obs_element) = 7;
++
++      obstack_init (&obs_element);
++    }
+ 
+   obs_element_first = obstack_alloc (&obs_element, sizeof (int));
+ }
+-- 
+2.42.1
+
diff --git a/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch b/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch
new file mode 100644
index 000000000000..59b590617964
--- /dev/null
+++ b/sys-apps/texinfo/files/7.1/0005-tp-Texinfo-command_data.txt.patch
@@ -0,0 +1,221 @@
+From f1f8920d798dbcb20cb775b46a54cd81847295fd Mon Sep 17 00:00:00 2001
+From: Gavin Smith <gavinsmith0123@gmail.com>
+Date: Tue, 14 Nov 2023 21:53:49 +0000
+Subject: [PATCH 5/5] * tp/Texinfo/command_data.txt (item_LINE, itemx,
+ defblock, defline, deftypeline): Remove contain_basic_inline flag.  There is
+ no reason an @anchor should not occur inside @item, inside @table, or the
+ other commands, as no index entry is being created with the @anchor.
+
+Report from Ihor Radchenko <yantar92@posteo.net> for Org mode manual.
+---
+ ChangeLog                                     | 10 +++
+ tp/Texinfo/command_data.txt                   | 10 +--
+ tp/t/results/invalid_nestings/in_table.pl     | 90 -------------------
+ .../invalid_nestings/table_on_item_line.pl    |  9 --
+ 4 files changed, 15 insertions(+), 104 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index a146820671..0dcdb1a904 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,13 @@
++2023-11-14  Gavin Smith <gavinsmith0123@gmail.com>
++
++	* tp/Texinfo/command_data.txt
++	(item_LINE, itemx, defblock, defline, deftypeline):
++	Remove contain_basic_inline flag.  There is no reason an @anchor
++	should not occur inside @item, inside @table, or the other
++	commands, as no index entry is being created with the @anchor.
++
++	Report from Ihor Radchenko <yantar92@posteo.net> for Org mode manual.
++
+ 2023-11-13  Gavin Smith <gavinsmith0123@gmail.com>
+ 
+ 	* tp/Texinfo/XS/parsetexi/tree.c (reset_obstacks):
+diff --git a/tp/Texinfo/command_data.txt b/tp/Texinfo/command_data.txt
+index bcda173e2c..c9b5f51569 100644
+--- a/tp/Texinfo/command_data.txt
++++ b/tp/Texinfo/command_data.txt
+@@ -253,8 +253,8 @@ printindex              line,formattable_line,close_paragraph,global,contain_pla
+ listoffloats            line,formattable_line,close_paragraph,global,contain_basic_inline   LINE_line
+ exdent                  line,formatted_line,close_paragraph            LINE_line
+ # or nobrace skipspace, depending on the context
+-item_LINE               line,formatted_line,close_paragraph,contain_basic_inline    LINE_line
+-itemx                   line,formatted_line,close_paragraph,contain_basic_inline    LINE_line
++item_LINE               line,formatted_line,close_paragraph    LINE_line
++itemx                   line,formatted_line,close_paragraph    LINE_line
+ nodedescription         line,close_paragraph                               LINE_line
+ # in index entries
+ subentry                line,in_index,contain_basic_inline          LINE_line
+@@ -494,9 +494,9 @@ defmethod               block,def,contain_basic_inline,def_alias,close_paragraph
+ deftypemethod           block,def,contain_basic_inline,def_alias,close_paragraph    BLOCK_def
+ 
+ # generic, no automatic index
+-defblock                block,contain_basic_inline,close_paragraph       BLOCK_def
+-defline                 line,def,contain_basic_inline,close_paragraph        LINE_line
+-deftypeline             line,def,contain_basic_inline,close_paragraph        LINE_line
++defblock                block,close_paragraph           BLOCK_def
++defline                 line,def,close_paragraph        LINE_line
++deftypeline             line,def,close_paragraph        LINE_line
+ 
+ # def*x
+ deffnx                  line,def,contain_basic_inline,close_paragraph        LINE_line
+diff --git a/tp/t/results/invalid_nestings/in_table.pl b/tp/t/results/invalid_nestings/in_table.pl
+index f4dcef1141..76eea8b3b4 100644
+--- a/tp/t/results/invalid_nestings/in_table.pl
++++ b/tp/t/results/invalid_nestings/in_table.pl
+@@ -1107,42 +1107,6 @@ $result_errors{'in_table'} = [
+     'text' => '@indent should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @indent should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 9,
+-    'macro' => '',
+-    'text' => '@indent should not appear on @item line',
+-    'type' => 'warning'
+-  },
+-  {
+-    'error_line' => 'warning: @titlefont should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 9,
+-    'macro' => '',
+-    'text' => '@titlefont should not appear on @item line',
+-    'type' => 'warning'
+-  },
+-  {
+-    'error_line' => 'warning: @anchor should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 9,
+-    'macro' => '',
+-    'text' => '@anchor should not appear on @item line',
+-    'type' => 'warning'
+-  },
+-  {
+-    'error_line' => 'warning: @footnote should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 9,
+-    'macro' => '',
+-    'text' => '@footnote should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'warning: @exdent should only appear at the beginning of a line
+ ',
+@@ -1161,24 +1125,6 @@ $result_errors{'in_table'} = [
+     'text' => '@exdent should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @exdent should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 9,
+-    'macro' => '',
+-    'text' => '@exdent should not appear on @item line',
+-    'type' => 'warning'
+-  },
+-  {
+-    'error_line' => 'warning: @ref should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 11,
+-    'macro' => '',
+-    'text' => '@ref should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => '@ref missing closing brace
+ ',
+@@ -1206,15 +1152,6 @@ $result_errors{'in_table'} = [
+     'text' => '@center should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @center should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 13,
+-    'macro' => '',
+-    'text' => '@center should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'warning: @cindex should not appear in @item
+ ',
+@@ -1224,15 +1161,6 @@ $result_errors{'in_table'} = [
+     'text' => '@cindex should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @cindex should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 14,
+-    'macro' => '',
+-    'text' => '@cindex should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'warning: @cindex should not appear in @item
+ ',
+@@ -1242,15 +1170,6 @@ $result_errors{'in_table'} = [
+     'text' => '@cindex should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @cindex should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 18,
+-    'macro' => '',
+-    'text' => '@cindex should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'warning: @cindex should not appear in @item
+ ',
+@@ -1260,15 +1179,6 @@ $result_errors{'in_table'} = [
+     'text' => '@cindex should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @cindex should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 21,
+-    'macro' => '',
+-    'text' => '@cindex should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'warning: empty index key in @item
+ ',
+diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl b/tp/t/results/invalid_nestings/table_on_item_line.pl
+index b1184ba915..51ba523fd7 100644
+--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
++++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
+@@ -273,15 +273,6 @@ $result_errors{'table_on_item_line'} = [
+     'text' => '@table should not appear in @item',
+     'type' => 'warning'
+   },
+-  {
+-    'error_line' => 'warning: @table should not appear on @item line
+-',
+-    'file_name' => '',
+-    'line_nr' => 2,
+-    'macro' => '',
+-    'text' => '@table should not appear on @item line',
+-    'type' => 'warning'
+-  },
+   {
+     'error_line' => 'no matching `@end table\'
+ ',
+-- 
+2.42.1
+
diff --git a/sys-apps/texinfo/texinfo-7.1-r1.ebuild b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
new file mode 100644
index 000000000000..22c42c1ad707
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-7.1-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: if your package uses the texi2dvi utility, it must depend on the
+# virtual/texi2dvi package to pull in all the right deps.  The tool is not
+# usable out-of-the-box because it requires the large tex packages.
+
+# Keep an eye on the release/$(ver_cut 1-2) branch upstream for backports.
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU info program and utilities"
+HOMEPAGE="https://www.gnu.org/software/texinfo/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
+	REGEN_BDEPEND="
+		>=sys-devel/autoconf-2.62
+		>=sys-devel/automake-1.16
+		sys-devel/libtool
+	"
+elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	REGEN_BDEPEND=""
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	REGEN_BDEPEND=""
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="nls +standalone static"
+
+RDEPEND="
+	!=app-text/tetex-2*
+	>=sys-libs/ncurses-5.2-r2:=
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	virtual/perl-Unicode-Collate
+	standalone? ( >=dev-lang/perl-5.8.1 )
+	!standalone?  (
+		>=dev-lang/perl-5.8.1:=
+		dev-libs/libunistring:=
+	)
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${REGEN_BDEPEND}
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
+PATCHES=(
+	# Backports from the release/7.1 branch
+	"${FILESDIR}"/7.1
+)
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		./autogen.sh || die
+	fi
+
+	# Needed if a patch touches install-info.c
+	#touch man/install-info.1 || die
+
+	if use prefix ; then
+		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
+		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
+	fi
+}
+
+src_configure() {
+	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
+	# bug #622576
+	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
+	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
+
+	use static && append-ldflags -static
+
+	# TODO:
+	# --with-external-Unicode-EastAsianWidth
+	# --with-external-Text-Unidecode
+	#
+	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
+	# but it doesn't seem to do anything?
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+		$(use_enable !standalone perl-xs)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index 7c36a9271893..4f348154302b 100644
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -5,6 +5,8 @@
 # virtual/texi2dvi package to pull in all the right deps.  The tool is not
 # usable out-of-the-box because it requires the large tex packages.
 
+# Keep an eye on the release/$(ver_cut 1-2) branch upstream for backports.
+
 EAPI=8
 
 inherit flag-o-matic toolchain-funcs
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 6843f71de3fb..f7542fdbbfe3 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -5,6 +5,7 @@ AUX util-linux-2.38.1-check-for-sys-pidfd.h.patch 1764 BLAKE2B 4d71d6b708ad7a1d1
 AUX util-linux-2.38.1-more-posix-exit-on-eof.patch 1216 BLAKE2B ee99884ef388a342aeceff4b6988b45cfe21dfc41fa3d978f1a4b57b35682d5cb0ca48c060d9694368ed06651661984eddb9ae70a00f7eb360fad9798caaddc5 SHA512 78136beaf600f99a5404222b6d6d7499ea40fc4e6401a36bd51e8c4183b925004a0f37a079b13b9c1c0824a7f22f43a16c8358c5e8ddfe55dd0019de58579195
 AUX util-linux-2.39.1-mount-no-statx.patch 1198 BLAKE2B 1dee2438c2e8537c08b88f5835cab8db01bd06bd4dbf12dae92d3fda340e0d6b8762c132811a8617cb219fd2554a0bb6799caf8123764d7757f7ebbac1c9ca86 SHA512 dd8c0fef93bfe089bd13e4aae866255bf250303407dccc980a4c868dd4821283e1887807e485defb51a114b26fc532868dc964358a6e1d123bb8eccc8784f5e1
 AUX util-linux-2.39.1-wall-no-tty.patch 1010 BLAKE2B 175ec148ede79a66650e0ab4c2ef4ad3ccefc958a3f4627db398b3dfa27e8a9e3bf26ccdd0258fcfa719c5f964ec04a5c427c2dc64de318516cf791e0481ebd6 SHA512 4b02a04656b7b9eeafa7903a5f0efe5ae89484022cdb963b53659284da86a12c398ef51cdf0c78e446c5b2f29f6bd5965155a02923411da5655911153d3e5191
+AUX util-linux-2.39.2-fincore-test.patch 848 BLAKE2B 8320b3ddc561907f6c34e6cf916202c30ab1671cd3e4f7a41187ecbe4efab7fd172d48271073d3d8aadc5c3ae2ee06c5a73b54af0165e5a885e1c5690db40eff SHA512 0562d2102fe1dea0579afcf1353844c8b84c61c6ed1ccfce3a2f010889000623f931fd2d2a0046f570ef5e8ffa0df98b19ce046903090043b292a0529b1db4b9
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
 DIST util-linux-2.39.1.tar.sign 833 BLAKE2B 8c1e7089bcec1f47f5c7b4ba60ca1c35955bdad99683f0682f6ba08171d3102079e7584989ea764e60096e0d64e5f9ffc8757c7feba23f79dafdb7942396a96a SHA512 6d6cabd24ebe3ce7437d98d08793b0b27d6240f2a28e08e216b4b1d358c9024fa1cec6d17df6cf7f024f97647cd31990db94716a575b08ad15f3a0b75797912b
@@ -13,6 +14,6 @@ DIST util-linux-2.39.2.tar.sign 833 BLAKE2B 7d804e1e1f162c176cd7f826f505590ed5fc
 DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f479382b9e03dd8ce39b9561302b484c595005aa0bbce9b91422d9be038037143772483363c2a1eec569355316fc8d5d5765 SHA512 cebecdd62749d0aeea2c4faf7ad1606426eff03ef3b15cd9c2df1126f216a4ed546d8fc3218c649fa95944eb87a98bb6a7cdd0bea31057c481c5cf608ffc19a3
 EBUILD util-linux-2.38.1-r2.ebuild 10526 BLAKE2B b66ce8e3835a86921652c43ae6416d7129cb8c22e2d16eac3977eae36301353d9fde97228f841209832e3777017541f4fe64af8d98a063f34c040ff8f6067f72 SHA512 b9e4773e6154059c5781149b3ceb5017b0d6b72295af11689ae4977658454d45ee3d99f13fdad43c7d880df00107380470d3ab8ca2aef19fc43d206327447604
 EBUILD util-linux-2.39.1-r1.ebuild 10970 BLAKE2B 8dff56f232b8d39da5376b2d10e329ab5736496f8d077157db144e97bdb256a25e310a834d88bb8cc2021a4b56f87f8fb93bd499f3b469001a01a311edcb8713 SHA512 3bf85fa3b465b73dffd698727cb49506bbc159c00bbd6bd1ee04788f885fe4b99cf3adf7d7ab9c39e4d7e3dc0a650d789ff833b9acb96a0cd0b8925cfcf20132
-EBUILD util-linux-2.39.2.ebuild 10649 BLAKE2B e4d3129367b023c0e44ffa54468403fffd1765d202e0110fcf85ea1ce14b91ba8b4736e680a735f108eecb9c07c790682373b714e9f9ef1018de37d2106eca33 SHA512 254a0b40e110086a58655eb0ad930a970d61f3bd52ee48f6b8ff51f34a610c1ac2d4a51e46b9a877f8474d920c2f009e93bfc12ceabdfee7f98626aedcc735a1
+EBUILD util-linux-2.39.2.ebuild 10709 BLAKE2B 0fabdce799eae82edee258f586fe5b9770384d3e9aa457d53d5fb9fba107ccaa107b835ee2629b0a014c156872739909c9640c8195aa13db9e581697f6d93518 SHA512 6d69a332f9bb776e0e29a4ea5afd0075031a745660aeaf7dafcca4c83ca0a02fb74d76c48c628984657cf53860c918342250b8af173901696a78e8f6e3c83609
 EBUILD util-linux-9999.ebuild 10457 BLAKE2B b18f1badfd72af441dea9804749f6ff8d1aa36e1baca9e4145590ae9f2d6f49210795d47334bb58583639f41fca86cbc4d143331707a804e8ddb3ea2cc070ffa SHA512 67a55693d33b02b238796ebee9be191258ab420b2b6ac0e160f4f1fce9d2dc3f840a58cef8d67bf5ab67908e6717c619075731e7918ad0804d07049ad9e190c5
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch
new file mode 100644
index 000000000000..f69876fe0a18
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.39.2-fincore-test.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/627532
+https://github.com/util-linux/util-linux/commit/f5715c117e727d4ff45e0d8568f188753620356e
+
+From f5715c117e727d4ff45e0d8568f188753620356e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
+Date: Mon, 13 Nov 2023 21:05:59 +0100
+Subject: [PATCH] fincore: (tests) also use nosize error file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/
+Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
+--- a/tests/ts/fincore/count
++++ b/tests/ts/fincore/count
+@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then
+ 	OUT_COLUMNS="PAGES,SIZE,FILE"
+ else
+ 	TS_EXPECTED+=".nosize"
++	TS_EXPECTED_ERR+=".nosize"
+ 	OUT_COLUMNS="PAGES,FILE"
+ fi
+ 
diff --git a/sys-apps/util-linux/util-linux-2.39.2.ebuild b/sys-apps/util-linux/util-linux-2.39.2.ebuild
index 94d37237dd40..6655149f15a6 100644
--- a/sys-apps/util-linux/util-linux-2.39.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.2.ebuild
@@ -95,6 +95,10 @@ fi
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) su? ( pam )"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.39.2-fincore-test.patch
+)
+
 pkg_pretend() {
 	if use su && ! use suid ; then
 		elog "su will be installed as suid despite USE=-suid (bug #832092)"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index cd2a33dee210..3020f392eadf 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index d6950ac0914f..dbe929472ea6 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -4,8 +4,10 @@ AUX mold-2.3.0-no-pch.patch 457 BLAKE2B ac313a6409a2e43b6d26833231cb26c36d3d34f2
 AUX mold-2.3.2-mimalloc-visibility-interposition.patch 18190 BLAKE2B dfcc0287bf6dfbcdd91fcb9ebf9b56b3d48ef0e6c83566ce832e1279e6ef83acefaac84822b75978596613802a99318765a08eb9c60ace591b5914c1e194263c SHA512 5596bd7cc81e8f5797960aa3cc24d9f5cff3b464839df9b2ff22bf76d3c22041381415464639d0a2079710ad30acd8b9f593e3cd342aedebd398b3d1196aba67
 DIST mold-2.1.0.tar.gz 9278811 BLAKE2B b31e13f92177553adf5069cf35c8c75c7bc28f0af4d1726cdc0c6abc1c9d3baaa5be512c3a8fb9bc3c3110096a79e1c6751c701171769595a2234fc1fa8c441a SHA512 f1c98d349b35b4042109d71f7db6eb8d7d089dc3241735bbd7b5402d513dcc85ca17904828779e5fc8234650fa9fb97f47c3a2f3e89cc2fb3cb9e9110439e5a2
 DIST mold-2.3.2.tar.gz 9970530 BLAKE2B db943ad6fab336a8c9c7b5588895cc1232ebfac25fe9dd884a2fbd71ba8d76b9bf7543b4d98cbda9635a7898e980ec5dc2866ef1d02e7a80e7fb9d7f0cbca443 SHA512 dd98acb351757f99399b7d52589c339648478624323fd45c9e986eaf7f1a60f52ace4c09a2d20246e9340109641bda676735da9de89a277989851bd5f52ea9d0
+DIST mold-2.3.3.tar.gz 9965345 BLAKE2B 391d9e38f13ae185c1cd9cff9cfd31c091952cf90276ccb4d7eff41beaf1fa0537bfbafafa9ffa08ab1d09db9c52aa4abcd0a765f8edc6d058f8832b35b726ad SHA512 cbe82568151a772097c86a25eebb0b0f8fc769d6b767169280f535d41cd3f27fc4640da9b86fb4a495e571f9d712368dda95c4431f8ebb2b42227de2b22fc80b
 EBUILD mold-2.1.0.ebuild 2169 BLAKE2B b91dec8fb9890052e06cf40124f7647833a6ea786d95d44863848bfff17c0ba335f28aaac08d6971a619dbb845b9091d1134bae47f70bd811d2fde0f9ca11066 SHA512 5d27926e5003e6bd24ee3baf8258ab043aa660b7a36918500283bbec9d991ad8ea6971add52579ba6ee10a7eeeb97a6dff3a7e065c7292ced42d2f0043e33d1e
 EBUILD mold-2.3.2-r1.ebuild 2366 BLAKE2B ae029500ef4d475924cf4e6caee0b55345c6dbfc4a4280a9787af2b9562d8da87cd372165a26f24da868ba87063d05aab63811cb2af67fca07fbb90b26883df4 SHA512 1429e3b8bbd3abb7d8c33be1b73f2ac22d886b8d22e590f26ea7b446c0413dbc6b79577aa4423a0d3dcb3c48d2bcae85fd40d9189dae883145d7316e9ee8d49c
 EBUILD mold-2.3.2.ebuild 2299 BLAKE2B 82d0b9e69c44234e971de8740f7dffbe427581562420019fbb8fc52cdf6f4be891161a2c8c4029897ee644cd9787df61cc16e31ff14e33fcbf0c15e9682a2c3e SHA512 3fb1bb02abc0e36efad29b73eb62d48bfe874c67fb6cfdb569ced028a126ebdb027d5fa4c1dd460d16fc5dbb2f98bedcd79e4c4eed5514ad25a441d9a6633272
-EBUILD mold-9999.ebuild 2294 BLAKE2B 82186052b195e75f60946fb6c36730b20ccea478dfee065aaa35e2fb5ed2490e5ded76fde6a84b8b5e1c04084bd3475e05ae2679421b547993dca2f26d47715b SHA512 4e65624b420d77bf0ae35e2b1194dd4873b69ac431c1cbfe949034b98343d359f7b31ee394ef95cf97206f7b5be1cd5a6e30a1f130750df8cf3c9a92c8891c99
+EBUILD mold-2.3.3.ebuild 2306 BLAKE2B 7acad940df8ebee45296efe074191a8552a2107f10a67e974cd2f668f22011e03ae588c6e8d33a7269a6b77056bbc030b827049b9e205744b1ff946f5480e635 SHA512 53932ccf4fd75f0847fb54cd622a64bf78e61b5f1bcb29697cbc42da339e9efc345759dd343f60f02531f6724dc2f3031927dbb041e5ecf0a64226c071c09084
+EBUILD mold-9999.ebuild 2306 BLAKE2B 7acad940df8ebee45296efe074191a8552a2107f10a67e974cd2f668f22011e03ae588c6e8d33a7269a6b77056bbc030b827049b9e205744b1ff946f5480e635 SHA512 53932ccf4fd75f0847fb54cd622a64bf78e61b5f1bcb29697cbc42da339e9efc345759dd343f60f02531f6724dc2f3031927dbb041e5ecf0a64226c071c09084
 MISC metadata.xml 424 BLAKE2B a1c0cbdcb86c323fa1e6143c9665ec548f7713e74002a25b2fc26c51b60dae00922d3448a5aaecd5027a8cb026a681386ca7dea90657a3e10b25fb194dafc0d3 SHA512 1adc934e78ca0210743a1aa7479ebc4b5ea0b66a348c4408423460f02b404b885d3a8eca6e89ea8ac53ac9c76e85116965f1eef79e3f3e1f0451c8cf5ce0dfd6
diff --git a/sys-devel/mold/mold-2.3.3.ebuild b/sys-devel/mold/mold-2.3.3.ebuild
new file mode 100644
index 000000000000..2b9db9efa079
--- /dev/null
+++ b/sys-devel/mold/mold-2.3.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A Modern Linker"
+HOMEPAGE="https://github.com/rui314/mold"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/rui314/mold.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
+fi
+
+# mold (MIT)
+#  - xxhash (BSD-2)
+LICENSE="MIT BSD-2"
+SLOT="0"
+
+RDEPEND="
+	app-arch/zstd:=
+	>=dev-cpp/tbb-2021.7.0-r1:=
+	dev-libs/blake3:=
+	sys-libs/zlib
+	!kernel_Darwin? (
+		>=dev-libs/mimalloc-2:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-no-pch.patch
+)
+
+pkg_pretend() {
+	# Requires a c++20 compiler, see #831473
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
+			die "${PN} needs at least gcc 10"
+		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
+			die "${PN} needs at least clang 12"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Needs unpackaged dwarfdump
+	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
+
+	# Heavy tests, need qemu
+	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
+	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
+
+	# Sandbox sadness
+	rm test/elf/run.sh || die
+	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
+		test/elf/mold-wrapper{,2}.sh || die
+
+	# static-pie tests require glibc built with static-pie support
+	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
+		rm test/elf/{,ifunc-}static-pie.sh || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
+		-DMOLD_ENABLE_QEMU_TESTS=OFF
+		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
+		-DMOLD_USE_MIMALLOC=$(usex !kernel_Darwin)
+		-DMOLD_USE_SYSTEM_MIMALLOC=ON
+		-DMOLD_USE_SYSTEM_TBB=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/${PN}
+
+	# https://bugs.gentoo.org/872773
+	insinto /usr/$(get_libdir)/mold
+	doins "${BUILD_DIR}"/${PN}-wrapper.so
+
+	dodoc docs/{design,execstack}.md
+	doman docs/${PN}.1
+
+	dosym ${PN} /usr/bin/ld.${PN}
+	dosym ${PN} /usr/bin/ld64.${PN}
+	dosym -r /usr/bin/${PN} /usr/libexec/${PN}/ld
+}
diff --git a/sys-devel/mold/mold-9999.ebuild b/sys-devel/mold/mold-9999.ebuild
index f602c3b96e96..2b9db9efa079 100644
--- a/sys-devel/mold/mold-9999.ebuild
+++ b/sys-devel/mold/mold-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86"
 fi
 
 # mold (MIT)
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 861c7c0a3194..c195aba599d3 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index eb5ce5d01e9c..b0f43920c7e3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -9,12 +9,22 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.15-src.tar.gz 6131479 BLAKE2B 640cd6b61cfc15e80cf9f84c55e4751789b48dbb0c05b30387ee0c2731770df3eeedf0c09c4c920cafb3c1be33c3e7e6a3c8d236e566a5c1742c5b36419849c4 SHA512 7a0b8a584d7e801446f031415551ac943be21c5c4ed9e7ee1a66c43339f0625435a80465930121633eebaf5eae95c096684ee2d99ed70805ce52509a3aa7c67e
 DIST apache-tomcat-10.1.15-src.tar.gz.asc 849 BLAKE2B 13c77c4adfcf280acd61f557629b5d569ab648ed98c9632bbbae7fb61fd1d297f16c1e9055ef9d6fc26d2e5264001fbed8a524ac3bb744490045f5196d4da680 SHA512 837ea0b3d0583328a8d187cd86efaff770a578cc0b029c4bfff0058affcf0e376a8981a76d7f31327e98a97600f421beaac5ca2beb411538fbcaad55536ee2b8
+DIST apache-tomcat-10.1.16-src.tar.gz 6148509 BLAKE2B d6b8169c6761a4a27a84d0c5e8900b9ef213e4a00a4c713ebefbc5cac4c037da10686a1196bcc50ba2eca96ddb3604d51e3961048f6fd1ef2d81bcca92930d19 SHA512 a358f93642fcb9eb34e4fb30f6dc7f7a3d69ae9c83c7a50748f143e3297228db106548cb44a1c2102e63325ae39be67090a66be1920ccac5d080c8ff1f41ad8c
+DIST apache-tomcat-10.1.16-src.tar.gz.asc 849 BLAKE2B 698555997aec1f8c0a8c01a40d7c991099623db60f4e5f5e9d26a6eec6f67a12967d6d2f58ffad311b13e0266316fcfcb8a3f2f1dc9b418b3104808de88527af SHA512 85e055ce437242b64af42c2c500704ff272fc8624bc1b4d7eb4ea3e28277186a214ee177927c9ef7b593b43571d462ccdab33fcbf401c23ddd7931e61c0b4275
 DIST apache-tomcat-8.5.95-src.tar.gz 6120005 BLAKE2B 85bc74d086e8779b227af54a5f3b21e4011d8966a31ffeb0917256f1482316d97e6b759427e3c76c004ce8ac2f3d9bc57eabadd15dc4514bdf9e3160da690b71 SHA512 7532062e543c43405bda9ac8d9a99b550b4be0a0663239d97024f1c9f0b082e565a9eabd64c19baaeeacbad2c2f9b47e821538027482ae82dade42d5a95df786
 DIST apache-tomcat-8.5.95-src.tar.gz.asc 849 BLAKE2B 78a9437e10595f14a90f8f78ac7711b0b4cc2aee750f1cf4d6dd3aa51e4cb56d05ef1cd24ef1052fe776e8196c25ea793f14e00819794ef7a6065295dd638e23 SHA512 a5c90336a6d75af7bd9805a928a1ffdf2e71b75fe76a0c8a2ea5e3da0ad97693d93d488bea00c0e973565b30c6b6ef2421cb417b1243ab1bba22eb705e84d3d4
+DIST apache-tomcat-8.5.96-src.tar.gz 6135041 BLAKE2B 7bb00cb835f1c56a9eb79ab44333436782ed526bc22ba31b2522323a0ab7c80384b76d049e2d9f0703a07cd5ecd449995125b2b7ce319943ab85b65f7acb66ff SHA512 3d2652e06d81eb014623bf1b0f03c238f330487682a255a4ed37a2b722f99194d08e3083b491d962917bc21cfbefd44f0e7808248c6b90c6a87db292138144dd
+DIST apache-tomcat-8.5.96-src.tar.gz.asc 849 BLAKE2B 2f1e20008cdad11bca95146542566c64956b79ff10571b7bc8068fe65cf3025e190bc43f94d29511f12c5091f79f2a69a02afeff51f8e78aef7058264c32e35f SHA512 fa86689b1438d39ea1fbe376cef2941d09c572fba2f1aa2d4f63cfa238da94880d4e8eb6403175073bfa379434abf0571f4b85c3789714a04183c416db94f25f
 DIST apache-tomcat-9.0.82-src.tar.gz 6285653 BLAKE2B 026a3f5ec58ff78c1fe0a30507ff36b9e407c5b1d8d1902a4a94b9aee8f97ac5fc9234bc1aae50e001fb9ff05369c6445712faaeb508b0d63f18271e774676e4 SHA512 0291196832150147230a263bcfd64f7ac9ce9f6c26924f72b831d28479e7886f00b9ab3adff175785e8c5b47d8b16f7a7897acafa3474428f48cec02fd852b3e
 DIST apache-tomcat-9.0.82-src.tar.gz.asc 833 BLAKE2B 9874c7ee35d5d4d3ec352799bfc7cfb4b866d3f7da4e2619ac48c212de46dd90510ec36b44409602967bff1c863b60428ec8ca60689814adbb12e83f7ecba695 SHA512 fdb9c5f0004bbf3192cafd4b66bb479de251934a0b82eaaac9bb77894abad3269b383032220ef076f4327e6ddd5b1e76a78917b6b46f467a030351eb5fd5f749
+DIST apache-tomcat-9.0.83-src.tar.gz 6300235 BLAKE2B 207f617e6af89898be2a120376d6ee926ea1b67becfeb4e35ab7eb1c97aa09a59d714e642722f3cfeadbc71d90f49b483a02d1d2d909fdf1f28954ff8326e0f9 SHA512 28e112a9d01918434ad03c414058275bbc4e34be408c2cfe2d819c3a08cadc3c31920e279c5312529aa2f5abf1e002537012c5f06d43ba8894448afd5585c231
+DIST apache-tomcat-9.0.83-src.tar.gz.asc 833 BLAKE2B b9aa578aaf28db7837576e19ab7d3443546d29c087789c9a98650b75c387b4169c0d2b16b7dfabb1d046972a6b78b82462d5d44c85c964903627702bf31037e2 SHA512 f8aa1859e79e403587feb7c5dad44664b68f1627f953d65848e53e971cd30f2addc94572849119031978a33114a90e64e2a50fb2a0e0be3c26bc5f31ed196e3d
 DIST biz.aQute.bnd-6.4.1.jar 16296222 BLAKE2B d2229eb221dcd87ddadccc48d83f1d86c95f7fd2e551b0523d58d1e14dcf0899201f96cb09c60ada9cd9cb3b6fe5201a68e8a9bb93258d06ed29baebb4fd9260 SHA512 a9b53265fffe48934666b26e5075cb96fac4c3d4cf7273358e551e741adbb58b469eb718022e9b31088d80961c649fb23027a3fde50db1ee0a72ada55df0e96c
+DIST biz.aQute.bnd-7.0.0.jar 16567341 BLAKE2B 329b3b750e917ad513a1f767f63b96b1d0b10177a0f3c079bbf07e02aff77607e1f869bae09d09709d8cfef27cd802585e7f332e2a3e3f0ee1c31a4890e53fce SHA512 42b2e43f3e437c7b06f0d168eaf5ee499a4c517b1a01bec67fd6df92d01d037dd9088e0d5b013dfa1839f9dee35bf74903c1af7204712bf4aa72412e071ac503
 EBUILD tomcat-10.1.15.ebuild 5424 BLAKE2B 2fb20290a6706f500188c997d40a631ddde7e3e0237802e94c3dbb8a57a470a3b822810df404c2a0b1a2f151129c800ec38656792aebf474963b2778d3e52c35 SHA512 db8f9cd36802bf0f197b920b3ea7e85d97609ccad12943fa59d68352b9d46c05dadc04d59cc2e3e59cd68b9b6de73e8305ad39d47c8b4a642b4761c997d0926f
+EBUILD tomcat-10.1.16.ebuild 5425 BLAKE2B ce5acab3000fe0403f38a03d11776f18e43cc32b99bc38777b0d35810ac36736efd7b73161c07a800ccc646928d7fd16cd791753b9e2bac7a2693affb6ece676 SHA512 35d980580aac95c32fbef51dbc707521ff666ca17704537fcf5bf906296c09e0f56ee713cae419c92940e83a26368a0705f323aa0e8d203b24a465d8177a07fe
 EBUILD tomcat-8.5.95-r1.ebuild 4672 BLAKE2B fadb9b875c785d70aababb62125d9046e123bb9d451be6dcb01d43b5b292fe0f247a6215008ac902855857f0a30c43c2ed2672fda17860c4aa5b139fbe08f3d6 SHA512 4cb2c3da06f98200f40b087e7221740ceb88bc1536d9272fabc67cfe66cbbe4a27ea3a05a7d36720893d518bf7f45a3c735d629b03bca5835db2400056575415
+EBUILD tomcat-8.5.96.ebuild 4673 BLAKE2B 19f5b188bbc36e71aea45a6cf1619d039931fd65b8ac7795ab99d0483b3c5b83f7f3b3d3170c5f50f71acca29b486658469bbe5d1080a5b491549354ac63370b SHA512 8b1475295334d6ca6079cdde29c2eb0912e5b7c16de8430b9b45962568c99427011ede5fd299ef442ab72006a72e5a7179efef490c1893f6f06d34df2a19f0a1
 EBUILD tomcat-9.0.82.ebuild 5273 BLAKE2B d294e06ed9ea0119cf52c0d558d2811383c8a95ca92ec67818c612219913310c0bd04df03677c21e6b741d2263d9746d4453b9551c8235014e24798c2951bd85 SHA512 51c47f409080be92e247714bc1d754dc3c088e307099a6d2a57123135a414df1d103f8a5184c54341e20dc56d7baf7ab5d8aff8d0be3c8f0e5a94bba09362361
+EBUILD tomcat-9.0.83.ebuild 5274 BLAKE2B 1ff1fa3f563a54b2601f053a0b0af3febb0374d97ebec1d83e5716d5a08f42496a85bd815ea027439cd21579ef640d10a30546b0a1afe6c4bab2c91ca74c4050 SHA512 1fdbd29700d2ccac2219389c8a2209102246b3ccdd478aea1bbe1e3a6a7fef4f2f1b91990db6ca2b8a6fac7d8ce8d1432f50706266698e3485818a51ba8f4f2b
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.16.ebuild b/www-servers/tomcat/tomcat-10.1.16.ebuild
new file mode 100644
index 000000000000..7001a52d8c24
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.16.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2023 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
+# See bugs #203080 and #676116
+BND_VERSION="7.0.0"
+BND="biz.aQute.bnd-${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}
+	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 ~arm ~arm64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	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="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=( "${FILESDIR}/${PN}-10.1.6-build.xml.patch" )
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BND_JAR="${BND_HOME}/${BND}"
+
+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}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	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,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}"
+
+# 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 jax-rpc-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() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${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."
+
+	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."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.96.ebuild b/www-servers/tomcat/tomcat-8.5.96.ebuild
new file mode 100644
index 000000000000..571c2a833db2
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.96.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2023 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-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.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="8.5"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.15"
+
+# we don't use ~ for el and jsp because the same implementation
+# is also present in tomcat 9 and it would be impossible to install
+# both tomcat 8.5 and 9 at the same time
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	doc? (
+		dev-java/jax-rpc-api:0
+		dev-java/wsdl4j:0
+	)
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.5.86-build.xml.patch"
+	"${FILESDIR}/${PN}-8.5.95-min.java.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# 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}"
+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 -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only jax-rpc-api):$(java-pkg_getjars --build-only wsdl4j)"
+	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() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	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."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.83.ebuild b/www-servers/tomcat/tomcat-9.0.83.ebuild
new file mode 100644
index 000000000000..64cc1be4e61c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.83.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2023 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
+# See bugs #203080 and #676116
+BND_VERSION="7.0.0"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	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="9"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/jax-rpc-api:0
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/ant-junit
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.72-build.xml.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BND_JAR="${BND_HOME}/${BND}"
+
+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}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# 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},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}"
+
+# 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 jax-rpc-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() {
+	einfo "Ebuilds of Tomcat support running multiple instances. To manage Tomcat instances, run:"
+	einfo "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	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>	2023-11-15 16:36:08 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-11-15 16:36:08 +0000
commit	db3d7a26fc91ea36f0780dcc3bcc59efdab02d41 (patch)
tree	f1e4dcd66841437a53a8fad6c9efadbd060f692a
parent	55cd3ff92ff96fafc75066838cfc2af06df3a296 (diff)