gentoo auto-resync : 19:01:2023 - 05:58:31

90 files changed, 1725 insertions, 275 deletions

diff --git a/Manifest b/Manifest
index a32c93246dcd..61beea4840ee 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29783 BLAKE2B 270d5d338e47eefd765ad071f2181326688b0c975494c6c104db7b9ed7fc84ff240057baca78ef1c756f0ec174ec3f3d0ba29cfa2a84366eb5f6388b35d8b6b4 SHA512 f80c002398eddb52daf3413ba230da09a81fea362c7c0f9dbfc3e5f18655e094109c33f4f5b719d2209f1b710fd6ca6025b55e417f439c6de162f9093f9dd88f
-TIMESTAMP 2023-01-18T23:10:05Z
+MANIFEST Manifest.files.gz 29799 BLAKE2B a4b0505ec8b2eabec777cbe177ea709876a7b046b0a1b93fea6547ad912ba10b8c468518343cebc283f03725cabc0a82e8f6b3c48a606e23e9c3a408c27dec1f SHA512 baf165df2d961e1b8f84faa6a1a7b1e0e35f591c89c9a11fcb4207f96be4268b71428e35a389636d462f920cce5b9e488aea5ab1118f14808549a5bb9ad7b780
+TIMESTAMP 2023-01-19T05:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPIfE1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPI0K5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCYHhAAm2jH80Zp2agPQe+YhqKvY67t2X9x5sR2lC9zcJ41YFTBWcwWhpzcDlf0
-/zWOjECUnOqLBKMUfGnc68T7XxODKRRbF3CyI7mz5awKrcJ7183LL83wWivCuFGR
-88xQ2hdh57PSVbLYsdOh1htZNaijRqtePaoE40au3Q/pHqaKwBpFzufE3gBOeDgD
-RNri1MUuDNTDPFDrgw8hns9rdZXKOhSt3gUuY0xe+DywOVFO0qjBsq4SIJyx2sYX
-e8DFmKl+b8b/GZs6ZRPQxhhN6bk8qTEJZdbInB6pnn3xvR3MpwcpZYEfTYbcDf84
-8ioOtmqShttzfNnPsZiT6cSXyBV7o172Ufau51DqO41M5u1SmMgCqwJkfP4sWNvz
-EsyG8T9tA1XqQv9CgyhMCtLLlrj2ZN60jNw4vnW/WLZeSyOnKrz4VwBhggCRCn3g
-vzFh39WL/zBY5FlPOmynyUT11j2f7g8e+uB9u3SYCVmZIt4Qa6T5tVDG26Ey2pfR
-1swo6vnD4/fqTwQQUrU7tuQnBn1VdeQbwbD9RrA1f3sgIPdJY1Hkkkjwl5nnAM8R
-Y1f0dfzc91+yK+MJ/kzOb6hJhwwwvWLdJ1UEv7j8E7LQqrHmcPCHAgeGUSKnA0bG
-7GmWJkGcpaO1NWEvGloBD6jdXhrmpZsAGv9+a6JmsHg+4G7BZm8=
-=B3N+
+klCrDg/+MPsFGOL2vPG1yiq2zfCWMjyO5+LEjpL4VC7pUKg68EhgSxyAP9/6Eld1
+JHWywMS268hVQfGKJ3s2sbWnmpOFEEhff1dkLqV0sI/bOyGBVx525n1h5yCjKTZB
+Cjx+R1dAAlmgxnfeP0KVZ1KHD77GlLhCW8LrXkq8PxDeJzD9B8tC5mKJFd6sUsIn
+WE8wZGRLp9Ww/bOezZR6iP6q7aL7n0H2B36gtFt9y9EVl8jXFrJTMVFqvYKTr2CD
+y/q8E1v/dyBKgIUnIbMTV1oLsuq5mwuD012PxlxSFipVQ+A1ugu/PPAC+3773kuo
+GGuDn56wPl/fJj6I/B+ktOi+bshCgOJGgs98pthyTJDV/2iv0THoumB9Gc74qiHe
+DIb5aMc4PhNoZmAtZpv3qFWXtlvoIeyZJq1Yryhxg3D8N2V3RHNaiE30EGGuMrRF
+c27uvd+qYmOX8Anau8nyNZamk+vON5L0t6SulJ8qM5RjzwFxIF6MFXZ2suQdJzzo
+ryn2X65/vdAh5sHI17FfbkGN9em0iaiWlO+KhMolT24fzMB6fa3qDPn5sh6IZlJ/
+oBVuVhUwCjGqnQarfmmwpcZGa15lyPggHAq1plbyh0lQwcbdqZlSCu6tzktcitWw
+Pq/6JcrFQbzSCV3Dej5o6w4xv5k6iRxQqbkCsCsc3GHLOdk9HCE=
+=YIIU
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index afdf9cf98eff..cadf09dbfe33 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 74dc9955ed46..98d51232a163 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index abdba37a3302..3ae60ba6a097 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -3,5 +3,5 @@ AUX rasdaemon-0.6.8-bashisms-configure.patch 9566 BLAKE2B 8a59f4255ff37bda63047b
 AUX rasdaemon.confd 108 BLAKE2B 0a6f45d7984965411fe31350bc14e263c0994230b0eff4051a7210bb3e8cbdc293d8c0bccb6417802be879326f127b2fb691a8db73c37f433a258b46eb8bd857 SHA512 f22d7273c5ac57fef57dae5c5c6d765c1554a17889b96a9aedfe13e1b31d969298a537042cd70d3d9cec6896e8b5c1e3e20313e5b4feaeca2a206dc51e3f2ee9
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
-EBUILD rasdaemon-0.6.8-r1.ebuild 1462 BLAKE2B 3fc7a39aa1b485de50cbec5b24f9f163c64697f6a1c560deff1d89c9a2a8f31c206521a049d9f0b9eddda71602413cf692487558b641a0eeb70eaaa56eb8fb57 SHA512 543a5af27d7eaacc81a15f28d78b282dc8a5262a2b2ba899a3d159b8659e8317a9e68bfe14296f2f09d49ee4a5a2556e99ceb15cb70db49e1cc84c9a53bf86e9
+EBUILD rasdaemon-0.6.8-r2.ebuild 1472 BLAKE2B dbc2f9640d87137e5a7c714c077415baf2c513c5ce2e10f3ee2cff59f12cc8f096ffc625c02d9556a5c0d5a4f03208def23c386f8824242f0276dae98acc36af SHA512 a3ceade6b072dbc5cab09f7f337a32fc8fb5ce56e19a327df7b503eda22133aeaf98e8f9a9047b7a5655ab997f8ba886f58ed711d10fdc22f73d718cee343038
 MISC metadata.xml 1086 BLAKE2B d9017158e600a5aca8b1ca0600a36efec9f12c26493e28b129a0029caa37224b2e5341292ffdebabdc81893aebddba7b893d69f66f87ff4fd927e5310a4482c8 SHA512 3801a8c374a0d38f9efc07a288eb338739e74d1e7e41a182b871f01ce8cfd695621cfb6c883e5ce8da267e1440bf8106db6ad5ac12ef5e156bba958f72ea6297
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
index 68acb037cef6..63c05654e834 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.8-r1.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.8-r2.ebuild
@@ -31,7 +31,7 @@ PATCHES=(
 
 pkg_setup() {
 	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG"
+	local CONFIG_CHECK="~ACPI_EXTLOG ~DEBUG_FS"
 	check_extra_config
 }
 
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4f9e9ec5306c..ba6b5556f768 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 30d32ab71d1e..7878c02a6066 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -2,5 +2,5 @@ AUX dieharder-3.31.1-build.patch 4500 BLAKE2B 03317321419ef75c0d20300c3ae178702c
 AUX dieharder-3.31.1-cross-compile.patch 2048 BLAKE2B aee35b8d192a2e78fe1da2a35ad662c30764cc07dbf861d3ded9d551f880b5473d63a29acbd67eed50b3622c9ecd294f99f211fe14a13b4a5cb8dadef95f2b66 SHA512 effb05cc65ef8b5ca565abaebffa947b162b0d51fa3ae97d7cdff4b278737339a6a3524acc114b462df8756c07180478ea0f82be961d6dc7cc4025941d2c261f
 AUX dieharder-3.31.1-urandom-64bit.patch 2034 BLAKE2B 989640b3d5a946f3d81ec5cee9747329ecb7246b5ab0473b906d42e5faa971d1aaad43ac54be7b7cad1483cc5605ad70c0f71338b9cf9a22616d2662318bed57 SHA512 2a8d7f766b1eff4911e6aa7cd788cbbffe6ed05cfd27053042d8631786164383ca56783c43a2b4403e5cbf45c2d3d83fd46e427490d3bc2dd8eca880ea3e93da
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
-EBUILD dieharder-3.31.1-r4.ebuild 1167 BLAKE2B 28826c2b9c4200e1d523a4d7db0d927c70640fb546248b636b78090daf48cda459adffb456b09b310e85f2303b72922618857e4896fcd0fe242b6edfca3aa62a SHA512 7282d3b51bfe416a36878a7a3e62da2c04f698c7660c7c9b61ee8c041c1d45ace1acfac1f2f3e0f838b67ae3d86643a3fc0bed9e9ce43f78c83898c3b3b1ae49
+EBUILD dieharder-3.31.1-r4.ebuild 1164 BLAKE2B 417aac2985871f7c01c6e39aa491377ad781de12966cc97cae0b916e94bedc48c9fefcd3b1800934bbcda8f25e6971083be2bfb74b61e9670de303fd418dbf27 SHA512 63cc092632bcb60cbb5985389327d5476ef454633bb512682ea2ce17da2d07b306beb7981cb8aadf679aad1189cbc583a06500bd461b5d21477979e3fb3b2dbf
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index c6ed2a02f63b..19afb57f878c 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc"
 RESTRICT="test" # Way too long
 
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 18f4c38e6bae..1a0cbcdb57ac 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
index 2b1397577f2b..dfad044a2a37 100644
--- a/app-misc/grc/Manifest
+++ b/app-misc/grc/Manifest
@@ -1,5 +1,5 @@
 DIST grc-1.12.tar.gz 48744 BLAKE2B dd7ab01739dfe637c4bf8b1d877e606869f9d11fed33112b499f72714ebb383e7dcbf80f160ac87d07bdc079ff7d589b9ad10b2f005c801fd13bb305466f1f8c SHA512 37ada5c7293bd0240c18b60cd7c60990e26e91b93fe9fb3ba1198c9d665647570191e985ab29de2b6554166ef703d81f449b486e83178b35df302836b5abb8c7
 DIST grc-1.13.tar.gz 49224 BLAKE2B d2c32d42ad1bd20c7d2b2aa68da114410e625463d30f0b93644cec4ddc69241d7f3c7a5f7edaed9fe42a1d21e8a0e5668403491d09679995558c94649b9d6fa8 SHA512 d8a7e78f84f5cb925a0205a81a9564ffe3d688eaa1f90d335a6f40e17757866374b6927f223e888a358586830b3feb4779f60faa01097b0c9703793ceea3de43
 EBUILD grc-1.12.ebuild 1372 BLAKE2B 4b01893298b27720bf80d7685628bbdaa7bd76dca57efbd64e7074f09ec65711386d9a9962d0dfb5dfa5f42d00d7198459c01c9119fa3545884da2ed1ee23011 SHA512 2d169158e61a0d69661cc1a47ca403715847b0b2caa00e8d4136e166295aad0621eb7495a6826183d4bdaefe4764955e3ac7709c36ad46984bd5b6c1487021e0
-EBUILD grc-1.13.ebuild 1375 BLAKE2B ffc6d6fd1f15390a6ba86d5e2fef78bca8c1e548931525ce65c7717638b38feebd5663b2cc50a215583c748224a862daeb69017697dd18cf385c30f718793189 SHA512 74fa55f32863c7f25b3a2b0f6ee74dd122f39d1983493c66c5424d799b38fe1294bd289083f5d1735e64aad51eac6dc97c250d10056d607bc42ea535d2bb5fa0
+EBUILD grc-1.13.ebuild 1374 BLAKE2B d5df6d5d1fbe51059b09dc3bead9638f60b0925958b3914f7f4927e60efa74217cd621cafe829424bb9dc274fde3c4e8d6c524b3e6a78fef14df4d4e40c5c707 SHA512 e870dfb2eadc79be306d27cc21b864630021f1de86caba430eea41f898cf5c1e5e5ecca94e0d75b1dcc67eba0ccfd3c791838136e970b9b9f56b249e16db759b
 MISC metadata.xml 366 BLAKE2B 0abe5b9109335434db8f89e50fa987ec443c70a6b0c9073808c162b795a76357129bde9ca716dea7df51a5511db75639c3e1be2c1d1a35b3f0a4f412cd2340d3 SHA512 b44e11c62ae90d0c3bfdaf3d206dc40720dc6a611aa786734e46a5542bc666d29977828285f4234581546f554d32abbc3b6fe10cc009ce39ff1f80672df775d0
diff --git a/app-misc/grc/grc-1.13.ebuild b/app-misc/grc/grc-1.13.ebuild
index d09a8526f3d2..4d01c1914227 100644
--- a/app-misc/grc/grc-1.13.ebuild
+++ b/app-misc/grc/grc-1.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index ebd71ddb9fea..951b197238f3 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 01aa0e03dd9f..bcedb233ec84 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -7,5 +7,5 @@ EBUILD esptool-3.3.1.ebuild 1414 BLAKE2B 75baca791c525e44b5eaeefbd92dfb0e76defeb
 EBUILD esptool-3.3.2.ebuild 1448 BLAKE2B ffbd5c78f1003f811f64c2642a3878ad52a6e1f320789adf1ec100361923fc15b0f959ae784e0459075e226c5d64dac39f9b0e10b93df6f4dd405734b4b1785f SHA512 c6d8aa9f3da40d049efcaf638b67c42304447f28a28874bcf08d4c04beadcec108e97aa0d38f64e3d3fca03cb516c8c8e390c40da0e621ba72dac5f349791475
 EBUILD esptool-4.2.1.ebuild 2183 BLAKE2B 180452699b4479e20d10532506e369d3f219c017d0b5364a1acbdb067750969e160647e59e26bae1facd2339866651f1232c20db31ee696fd24714f3ff1e46c8 SHA512 802dcb2b4932eae6860ffdaafa8b173cf95afc938e55e9daff2aefac38b265df3159d6085464d1ecf5af7a7e42e87d9e81fbaa3d9ff3468b7002454fb55327a3
 EBUILD esptool-4.3.ebuild 3112 BLAKE2B ecc0f9e0655659849e101fb498b6783c67bebf6270d59887444d5dd07a69e59c23491957397058a6cfc0fa5dc2f199acdd7853a03c93cbf175148f502b4e65da SHA512 d0c861d487824c4fd195e2f488fd953fcf1d33b139be0bb91ac12e153a09000d0444eedbf25e74fd9edb41dfa27ba48a67e11a1c3939c4ce8b3ee6d885f6c005
-EBUILD esptool-4.4.ebuild 1780 BLAKE2B 82b77eae59fc84e40bde8382af4a97406daf5a216b13405481d75a2c63d3d56f08a70ff15eb7966641c463d612122b768f1876f1a1c962af9169b01117e05de8 SHA512 d7391c0855a9979368ebbcd09b09a4c22b9f84c3143cb300d8ba98ebd5e2ac610d03ce32c5c3869b4a62fc864bc5d2551748b9e72918fd0a21033497ebe895cb
+EBUILD esptool-4.4.ebuild 1778 BLAKE2B 5899ce58205dff1b54e85cfa9b92655eb30986bfa999f3e7a40255995276fd0d95d6351bc4a5f55348c314f68599573611ea387539785bde59f98073535e2416 SHA512 5bec2ddc6404aade1ee2e140741049ed807d54931b1ff2d040a51876ffee660870dca8077c23944666067e22bdc3f9622009f3b5e8794db4f5a40142e999d62a
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-4.4.ebuild b/dev-embedded/esptool/esptool-4.4.ebuild
index 073e18b731fd..618e4d42bb6a 100644
--- a/dev-embedded/esptool/esptool-4.4.ebuild
+++ b/dev-embedded/esptool/esptool-4.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8ca477e7d95f..bdf6e0aed47c 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 4a783e3aeed4..45b54548cc10 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,6 @@
 AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee
 AUX perl-5.34.0-fallback-getcwd-pwd.patch 8158 BLAKE2B a6870b26dbfadb54c5ea4f075a4a5caad8d789853aade84ff434e5d994e9fdd82cdef6314a576b8cdb3a9948aa73aa650c1ff4656e9c8bca4fb58384396332b1 SHA512 fe778c2348da48006927b179d02d33489790f41afa079fabe6350853b2b2d8c168d0db7b81f1b6c988e3ac46d733326aab4aa4423a04d6380acf74eed91cfc5c
+AUX perl-5.36.0-clang16.patch 3850 BLAKE2B f691e7e23b18c5fe32b4f17fc0c786082fb1474fc3c06a46d6ef3b8609f10537b797308f403d4ca394a2666d752421fe2e7c0c224994c5271dd9211ba5d56652 SHA512 17d022d3a5909ecdf5e2c896d9c36caba006c4b3d0ed466a2c679b874210e7f84e0efcbc0ab5eea41e3eda0344fd869af46639ac94a0b943e961fb4044ced966
 DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b
 DIST perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin 207 BLAKE2B b52e1322930d5f7b8d6e3a319d24322b5dffb2313bdc757c0c8eb8713fd03adace199c8449ccc306e49b5b71e3c1b9786b2acb0ab8780a09d718a1c54f653226 SHA512 5a7e0950f0f94bd961fa9cf3e4ab5dd30006bee0f4553da755688a32d0411a4a850a28d4f998b36e7177dcf3aba192b899ca4138e84452baffef1a0b2ed1fb7b
 DIST perl-5.34.1-zlib-1.2.12.patch.xz 180480 BLAKE2B 39da5c1ef406d018f73e641d86ff81d5257cf1f7d6c1b0caac9651a546d70a2e0fff53bf0fc584907e792cb681a961c8442ab355f8f0c2cfffbb26c997cdbac0 SHA512 b32b57721b10943e21003429b42c535f7833e450f097855162241775a161a557fe0ea86ce615d6a9c885f165f45438cabba5580f9b299796d3a3da5ea720f1ff
@@ -10,4 +11,5 @@ DIST perl-cross-1.3.7.tar.gz 118291 BLAKE2B dc9c060857d6905c817e91c3f5b1f546b76e
 DIST perl-cross-1.4.tar.gz 113861 BLAKE2B 7c7783afccc6a04ab122a7c60b1cff7f0a2725655b2b63325ca25d7b8acb0cf993b496e2a590db943054336337ad215550b6b2a565f1d91a5aa9cfe3a4c36db4 SHA512 bde73cac13c0b42c4c6783d7e30dea491d70b65131e1c8434ef75db1f39a8e15ef5857568b706e8456faa3822402676dd247a1f20f4bed983597fdd5a6b4faad
 EBUILD perl-5.34.1-r4.ebuild 26353 BLAKE2B 4eed897c147ce3bdd062e17a5ca9653956a70b50b9041e16ef7293fcb9ffafd7b74d96ec2b4497a4eaa69bf9fc4018374127593eba514adbee98df2296522c7d SHA512 e0005cc1674804e274e072e19bd4208c3bc84e1eec788689997104ec15489613fc7fc5252fafa2a3eecc8b9fc1c8560a8d0e90fa6962b1adb78d1dfbc2ef3d03
 EBUILD perl-5.36.0-r1.ebuild 25569 BLAKE2B 958bde792c70e2ef117cd335d613567851455e23e42469230b51ae0761ebdead4eb1027a682dc48400cfe7e802c6f0e2add17aef2eb2265d19fe8f214619b467 SHA512 02ceca5a0fd97d2f50a471d85112022575e2775f9d763a26db03fbbc0dc96f05182922c8aaec7d2045aa9e70ef6d40a861116201ebcf6e2d27bd7ff105982948
+EBUILD perl-5.36.0-r2.ebuild 25791 BLAKE2B c1d900a8313ab657ab2e95a23bc53cf9bcca644777ec0433354a8c25a998e8515bbd10f82723e97301aa681a50fd7fdc102234a0fbe51195fea7a50a0d69320e SHA512 b35abc304afdc60b0f769fe9988c244050ff1e07a00f9e930974a47a1505f241ec79ee91b0c42de6a2e0192241578abe71d70d280486708d60d848f84602c3fd
 MISC metadata.xml 621 BLAKE2B 8a14a3efd31858bd5be39476ff86bb9facf3984bbb1110c5b30c3af7aacfe0148357cf7c838ad94799c090a42ed036cc5a51205c3fcfd0d010833e0dad0e4820 SHA512 656902acadb21bf951bf08ca7775c095a5ec76f881215a2b7d3a42eb344a2b9e337cb9260ab87ff5a1730b5a0ef4efe852affdf2e418df9c7c39f18a0a7b89d4
diff --git a/dev-lang/perl/files/perl-5.36.0-clang16.patch b/dev-lang/perl/files/perl-5.36.0-clang16.patch
new file mode 100644
index 000000000000..dc7305a3acf1
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.36.0-clang16.patch
@@ -0,0 +1,129 @@
+https://bugs.gentoo.org/879857
+https://github.com/Perl/perl5/commit/e1ca9a418fa6b7d26fbb1931c9164141035262c3
+https://github.com/Perl/perl5/commit/fc35cee89c1a42558f50a37a6b4d5186b77f058b
+
+From e1ca9a418fa6b7d26fbb1931c9164141035262c3 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Tue, 17 Jan 2023 02:47:12 -0500
+Subject: [PATCH] Add parameter types to declarations for clang-16
+
+ANSI C style function declarations without parameter types are errors with clang-16.
+--- a/Configure
++++ b/Configure
+@@ -7927,10 +7927,10 @@ $cat >malloc.c <<END
+ #include <stdlib.h>
+ #endif
+ #ifdef TRY_MALLOC
+-void *malloc();
++void *malloc(size_t);
+ #endif
+ #ifdef TRY_FREE
+-void free();
++void free(void *);
+ #endif
+ END
+ case "$malloctype" in
+
+From fc35cee89c1a42558f50a37a6b4d5186b77f058b Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Tue, 17 Jan 2023 19:07:54 +0100
+Subject: [PATCH] Configure: Add various C99 compatibility improvements
+
+Two C99 compatibility issues are fixed by these changes: Return
+types are made explicit where they previously defaulted to int,
+and all called functions are now declared explicitly (either by
+including additional headers, or by adding prototypes manually).
+
+This avoids implict ints and implicit function declarations,
+both legacy C language features removed in the 1999 revision
+of the language.
+
+Verified with an instrumented GCC compiler on GNU/Linux.
+--- a/Configure
++++ b/Configure
+@@ -4655,7 +4655,7 @@ esac
+ # so we will take those off from locincpth.
+ case "$gccversion" in
+ 3.*)
+-    echo "main(){}">try.c
++    echo "int main(){}">try.c
+     for incdir in $locincpth; do
+        warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
+ 	     grep '^c[cp]p*[01]: warning: changing search order '`
+@@ -5798,6 +5798,7 @@ case "$intsize" in
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
+ int main()
+ {
+ 	printf("intsize=%d;\n", (int)sizeof(int));
+@@ -6871,6 +6872,7 @@ case "$doublesize" in
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
+ int main()
+ {
+     printf("%d\n", (int)sizeof(double));
+@@ -12660,7 +12662,7 @@ case "$dlsrc" in
+ dl_dlopen.xs)
+ 	echo "Checking whether your dlsym() needs a leading underscore ..." >&4
+ 	$cat >dyna.c <<'EOM'
+-fred () { }
++void fred (void) { }
+ EOM
+ 
+ $cat >fred.c<<EOM
+@@ -12679,7 +12681,7 @@ $cat >fred.c<<EOM
+ #include <link.h>
+ #endif
+ 
+-extern int fred() ;
++extern void fred(void) ;
+ 
+ int main()
+ {
+@@ -13713,6 +13715,7 @@ $cat >try.c <<EOP
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#include <string.h>
+ #define FILE_ptr(fp)	$stdio_ptr
+ #define FILE_cnt(fp)	$stdio_cnt
+ int main() {
+@@ -16220,6 +16223,7 @@ echo "Checking to see if your libm supports _LIB_VERSION..." >&4
+ $cat >try.c <<EOCP
+ #include <unistd.h>
+ #include <math.h>
++#include <stdio.h>
+ int main (int argc, char *argv[])
+ {
+     printf ("%d\n", _LIB_VERSION);
+@@ -22168,13 +22172,15 @@ pager="$ans"
+ : see if ar generates random libraries by itself
+ echo " "
+ echo "Checking how to generate random libraries on your machine..." >&4
+-echo 'int bar1() { return bar2(); }' > bar1.c
++echo 'extern int bar2(); int bar1() { return bar2(); }' > bar1.c
+ echo 'int bar2() { return 2; }' > bar2.c
+ $cat > foo.c <<EOP
+ #$i_stdlib I_STDLIB
+ #ifdef I_STDLIB
+ #include <stdlib.h>
+ #endif
++#include <stdio.h>
++extern int bar1();
+ int main() { printf("%d\n", bar1()); exit(0); }
+ EOP
+ $cc $ccflags -c bar1.c >/dev/null 2>&1
+@@ -22400,7 +22406,7 @@ EOM
+ 			for nfd in 'int' 'size_t' 'unsigned long' 'unsigned' ; do
+ 				for tmo in 'struct timeval *' 'const struct timeval *'; do
+ 					case "$val" in
+-					'')	try="$extern_C select _(($nfd, $xxx, $xxx, $xxx, $tmo));"
++					'')	try="$extern_C int select _(($nfd, $xxx, $xxx, $xxx, $tmo));"
+ 						if ./protochk "$try" $hdrs; then
+ 							echo "Your system accepts $xxx."
+ 							val="$xxx"
+
diff --git a/dev-lang/perl/perl-5.36.0-r2.ebuild b/dev-lang/perl/perl-5.36.0-r2.ebuild
new file mode 100644
index 000000000000..a6ed13d97de4
--- /dev/null
+++ b/dev-lang/perl/perl-5.36.0-r2.ebuild
@@ -0,0 +1,825 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+CROSS_VER=1.4
+PATCH_BASE="perl-5.36.0-patches-${PATCH_VER}"
+PATCH_DEV=dilfridge
+
+DIST_AUTHOR=RJBS
+
+# Greatest first, don't include yourself
+# Devel point-releases are not ABI-intercompatible, but stable point releases are
+# BIN_OLDVERSEN contains only C-ABI-intercompatible versions
+PERL_BIN_OLDVERSEN=""
+
+if [[ "${PV##*.}" == "9999" ]]; then
+	DIST_VERSION=5.30.0
+else
+	DIST_VERSION="${PV/_rc/-RC}"
+fi
+SHORT_PV="${DIST_VERSION%.*}"
+
+# Even numbered major versions are ABI intercompatible
+# Odd numbered major versions are not
+if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then
+	SUBSLOT="${DIST_VERSION%-RC*}"
+else
+	SUBSLOT="${DIST_VERSION%.*}"
+fi
+
+# Used only in tar paths
+MY_P="perl-${DIST_VERSION}"
+# Used in library paths
+MY_PV="${DIST_VERSION%-RC*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${MY_P}.tar.xz
+	mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz
+	https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz
+	https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
+"
+
+HOMEPAGE="https://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SUBSLOT}"
+
+if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+IUSE="berkdb debug doc gdbm ithreads minimal quadmath"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3:= )
+	app-arch/bzip2
+	>=sys-libs/zlib-1.2.12
+	virtual/libcrypt:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PDEPEND="
+	!minimal? (
+		>=app-admin/perl-cleaner-2.5
+		>=virtual/perl-CPAN-2.290.0
+		>=virtual/perl-Encode-3.120.0
+		>=virtual/perl-File-Temp-0.230.400-r2
+		>=virtual/perl-Data-Dumper-2.154.0
+		virtual/perl-Test-Harness
+	)
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.400.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/CPAN               2.330.0       cpan
+	src_remove_dual      perl-core/Digest-SHA         6.20.0        shasum
+	src_remove_dual      perl-core/Encode             3.170.0       enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.640.0       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.450.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.106.0       zipdetails
+	src_remove_dual      perl-core/JSON-PP            4.70.0        json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.202.205.200 corelist
+	src_remove_dual      perl-core/Pod-Checker        1.740.0       podchecker
+	src_remove_dual      perl-core/Pod-Perldoc        3.280.100     perldoc
+	src_remove_dual      perl-core/Pod-Usage          2.10.0       pod2usage
+	src_remove_dual      perl-core/Test-Harness       3.440.0       prove
+	src_remove_dual      perl-core/podlators          4.140.0       pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          4.140.0       /usr/share/man/man1/perlpodstyle.1
+}
+
+check_rebuild() {
+	# Fresh install
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		return 0;
+	# Major Upgrade
+	# doesn't matter if there's multiple copies, it still needs a rebuild
+	# if the string is anything other than "5.CURRENTMAJOR"
+	elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then
+		echo ""
+		ewarn "UPDATE THE PERL MODULES:"
+		ewarn "After updating dev-lang/perl the installed Perl modules"
+		ewarn "have to be re-installed. In most cases, this is done automatically"
+		ewarn "by the package manager, but subsequent steps are still recommended"
+		ewarn "to ensure system consistency."
+		ewarn
+		ewarn "You should start with a depclean to remove any unused perl dependencies"
+		ewarn "that may confuse portage in future. Regular depcleans are also encouraged"
+		ewarn "as part of your regular update cycle, as that will keep perl upgrades working."
+		ewarn "Recommended: emerge --depclean -va"
+		ewarn
+		ewarn "You should then call perl-cleaner to clean up any old files and trigger any"
+		ewarn "remaining rebuilds portage may have missed."
+		ewarn "Use: perl-cleaner --all"
+		return 0;
+
+	# Reinstall w/ USE Change
+	elif
+		 (   use ithreads && ! has_version dev-lang/perl[ithreads] ) || \
+		 ( ! use ithreads &&   has_version dev-lang/perl[ithreads] ) || \
+		 (   use quadmath && ! has_version dev-lang/perl[quadmath] ) || \
+		 ( ! use quadmath &&   has_version dev-lang/perl[quadmath] ) || \
+		 (   use debug    && ! has_version dev-lang/perl[debug]    ) || \
+		 ( ! use debug    &&   has_version dev-lang/perl[debug]    ) ; then
+		echo ""
+		ewarn "TOGGLED USE-FLAGS WARNING:"
+		ewarn "You changed one of the use-flags ithreads, quadmath, or debug."
+		ewarn "You must rebuild all perl-modules installed."
+		ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl"
+	fi
+}
+
+pkg_setup() {
+	case ${CHOST} in
+		*-freebsd*)   osname="freebsd" ;;
+		*-dragonfly*) osname="dragonfly" ;;
+		*-netbsd*)    osname="netbsd" ;;
+		*-openbsd*)   osname="openbsd" ;;
+		*-darwin*)    osname="darwin" ;;
+		*-solaris*)   osname="solaris" ;;
+		*-cygwin*)    osname="cygwin" ;;
+		*)            osname="linux" ;;
+	esac
+
+	myarch="${CHOST%%-*}-${osname}"
+	if use debug ; then
+		myarch+="-debug"
+	fi
+	if use quadmath ; then
+		myarch+="-quadmath"
+	fi
+	if use ithreads ; then
+		mythreading="-multi"
+		myarch+="-thread"
+	fi
+
+	PRIV_BASE="/usr/$(get_libdir)/perl5"
+	SITE_BASE="/usr/local/$(get_libdir)/perl5"
+	VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl"
+
+	LIBPERL="libperl$(get_libname ${MY_PV} )"
+
+	PRIV_LIB="${PRIV_BASE}/${SUBSLOT}"
+	ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	SITE_LIB="${SITE_BASE}/${SUBSLOT}"
+	SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+	VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}"
+	VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}"
+
+	dual_scripts
+}
+
+src_remove_dual_file() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				alternatives_auto_makesym "${i}" "${i}-[0-9]*"
+			done
+			;;
+		setup)
+			for i in "$@" ; do
+				if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then
+					has_version ${pkg} && ewarn "You must reinstall ${pkg} !"
+					break
+				fi
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i}{,-${ver}-${P}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual_man() {
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
+	case "${EBUILD_PHASE:-none}" in
+		postinst|postrm)
+			for i in "$@" ; do
+				ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*`
+				ff=${ff##*${i#${i%.[0-9]}}}
+				alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*"
+			done
+			;;
+		install)
+			for i in "$@" ; do
+				if ! [[ -f "${ED}"${i} ]] ; then
+					ewarn "${i} does not exist!"
+					continue
+				fi
+				mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die
+			done
+			;;
+	esac
+}
+
+src_remove_dual() {
+	local i pkg ver
+	pkg="$1"
+	ver="$2"
+	shift 2
+	for i in "$@" ; do
+		src_remove_dual_file  "${pkg}" "${ver}" "/usr/bin/${i}"
+		src_remove_dual_man   "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1"
+	done
+}
+
+src_prepare_perlcross() {
+	cp -a ../perl-cross-${CROSS_VER}/* . || die
+
+	# bug 794463, needs further analysis what is exactly wrong here
+	eapply "${FILESDIR}/perl-5.34.0-crossfit.patch"
+
+	# bug 604072
+	MAKEOPTS+=" -j1"
+	export MAKEOPTS
+}
+
+src_prepare_dynamic() {
+	ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
+	ln -s ${LIBPERL} libperl$(get_libname ) || die
+}
+
+# Copy a patch into the patch series
+# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug']
+# - description is optional, but recommended
+# - all arguments after descriptions are bug URLs
+add_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local src_name dest_name desc
+	src_name="$1"
+	dest_name="$2"
+	desc="$3"
+	shift; shift; shift;
+	einfo "Adding ${dest_name} to patch bundle"
+	cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}"
+	if [[ -n "${desc}" ]]; then
+		printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc"
+	fi
+	if [[ $# -gt 0 ]]; then
+		# Note: when $@ is more than one element, this emits a
+		# line for each element
+		printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs"
+	fi
+}
+
+# Remove a patch using a glob expr
+# eg:
+#	 rm_patch *-darwin-Use-CC*
+#
+rm_patch() {
+	local patchdir="${WORKDIR}/patches"
+	local expr="$1"
+	local patch="$( cd "${patchdir}"; echo $expr )"
+	einfo "Removing $patch ($expr) from patch bundle"
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )"
+	else
+		ewarn "No ${expr} found in ${patchdir} to remove"
+	fi
+}
+
+# Yes, this is a reasonable amount of code for something seemingly simple
+# but this is far easier to debug when things go wrong, and things went wrong
+# multiple times while I was getting the exact number of slashes right, which
+# requires circumnavigating both bash and sed escape mechanisms.
+c_escape_string() {
+	local slash dquote
+	slash='\'
+	dquote='"'
+	re_slash="${slash}${slash}"
+	re_dquote="${slash}${dquote}"
+
+	# Convert \ to \\,
+	#         " to \"
+	echo "$1" |\
+		sed "s|${re_slash}|${re_slash}${re_slash}|g" |\
+		sed "s|${re_dquote}|${re_slash}${re_dquote}|g"
+}
+c_escape_file() {
+	c_escape_string "$(cat "$1")"
+}
+
+apply_patchdir() {
+	local patchdir="${WORKDIR}/patches"
+	local infodir="${WORKDIR}/patch-info"
+	local patchoutput="patchlevel-gentoo.h"
+
+	# Inject Patch-Level info into description for patchlevel.h patch
+	# to show in -V
+	local patch_expr="*List-packaged-patches*"
+	local patch="$( cd "${patchdir}"; echo $patch_expr )";
+	einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )"
+
+	if [[ -e "${patchdir}/${patch}" ]]; then
+		printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\
+			>"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc"
+	else
+		eerror "No $patch_expr found in ${patchdir}"
+	fi
+
+	# Compute patch list to apply
+	# different name other than PATCHES to stop default
+	# reapplying it
+	# Single depth is currently only supported, as artifacts can reside
+	# from the old layout being multiple-directories, as well as it grossly
+	# simplifying the patchlevel_gentoo.h generation.
+	local PERL_PATCHES=($(
+		find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\
+			grep -E '[.](diff|patch)$' |\
+			sort -n
+	))
+
+	for patch in "${PERL_PATCHES[@]}"; do
+		eapply "${WORKDIR}"/patches/${patch}
+	done
+
+	einfo "Generating $patchoutput"
+
+	# This code creates a header file, each iteration
+	# creates one-or-more-lines for each entry found in PERL_PATCHES
+	# and STDOUT is redirected to the .h file
+	for patch in "${PERL_PATCHES[@]}"; do
+		local desc_f="${infodir}/${patch}.desc"
+		local bugs_f="${infodir}/${patch}.bugs"
+
+		printf ',"%s"\n' "${patch}"
+		if [[ ! -e "${desc_f}" ]]; then
+			ewarn "No description provided for ${patch} (expected: ${desc_f} )"
+		else
+			local desc="$(c_escape_file "${desc_f}")"
+			printf ',"- %s"\n' "${desc}"
+		fi
+		if [[ -e "${bugs_f}" ]]; then
+			while read -d $'\n' -r line; do
+				local esc_line="$(c_escape_string "${line}")"
+				printf ',"- Bug: %s"\n' "${esc_line}"
+			done <"${bugs_f}"
+		fi
+	done > "${S}/${patchoutput}"
+	printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST"
+
+}
+
+src_prepare() {
+	local patchdir="${WORKDIR}/patches"
+
+	# Prepare Patch dir with additional patches / remove unwanted patches
+	# Inject bug/desc entries for perl -V
+	# Old example:
+	# add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\
+	#		"Fix broken miniperl on hppa"\
+	#		"https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162"
+	add_patch "${FILESDIR}/${PN}-5.36.0-clang16.patch" "100-5.36.0-clang16.patch" \
+			"Fix Clang 16 / modern C issues in configure" \
+			"https://bugs.gentoo.org/879857" "https://github.com/Perl/perl5/issues/20715"
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# do NOT mess with nsl, on Solaris this is always necessary,
+		# when -lsocket is used e.g. to get h_errno
+		rm_patch "*-nsl-and-cl*"
+	fi
+
+	apply_patchdir
+
+	tc-is-cross-compiler && src_prepare_perlcross
+
+	tc-is-static-only || src_prepare_dynamic
+
+	if use gdbm; then
+		sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \
+			ext/NDBM_File/Makefile.PL || die
+	fi
+
+	# Use errno.h from prefix rather than from host system, bug #645804
+	if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then
+		sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# set a soname, fix linking against just built libperl
+		sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name (soname) not to reference $D
+		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
+
+		# fix environ linkage absence (only a real issue on Darwin9)
+		if [[ ${CHOST##*-darwin} -le 9 ]] ; then
+			sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \
+				Makefile.SH || die
+		fi
+	fi
+
+	default
+}
+
+myconf() {
+	# the myconf array is declared in src_configure
+	myconf=( "${myconf[@]}" "$@" )
+}
+
+# Outputs a list of versions which have been seen in any of the
+# primary perl @INC prefix paths, such as:
+#  /usr/lib64/perl5/<NUMBER>
+#  /usr/local/lib64/perl5/<NUMBER>
+#  /usr/lib64/perl5/vendor_perl/<NUMBER>
+#
+# All values of NUMBER must be like "5.x.y" or like "5.x"
+#
+find_candidate_inc_versions() {
+	local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$'
+	local dirs=(
+		"${EROOT}${PRIV_BASE}"
+		"${EROOT}${SITE_BASE}"
+		"${EROOT}${VENDOR_BASE}"
+	)
+	for dir in "${dirs[@]}"; do
+		if [[ ! -e "${dir}" ]]; then
+			continue
+		fi
+		# Without access to readdir() on these dirs, find will not be able
+		# to reveal any @INC directories inside them, and will subsequently prune
+		# them from the built perl's @INC support, breaking our compatiblity options
+		# entirely.
+		if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then
+			eerror "Bad permissions on ${dir}, this will probably break things"
+			eerror "Ensure ${dir} is +rx for at least uid=$EUID"
+			eerror "Recommended permission is +rx for all"
+			eerror "> chmod o+rx ${dir}"
+		fi
+	done
+	einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}"
+	find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f "  2>/dev/null
+}
+
+# Sort versions passed versiony-ly, remove self-version if present
+# dedup. Takes each version as an argument
+sanitize_inc_versions() {
+	local vexclude="${SUBSLOT}"
+	einfo "Normalizing/Sorting candidate list: $*"
+	einfo " to remove '${vexclude}'"
+	# Note, general numeric sort has to be used
+	# for the last component, or unique will convert
+	#  5.30.0 + 5.30 into just 5.30
+	printf "%s\n" "$@" |\
+		grep -vxF "${vexclude}" |\
+		sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg
+}
+
+versions_to_inclist() {
+	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+
+	for v;	do
+			has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ ";
+			echo -n "${v}/ ";
+	done
+}
+
+versions_to_gentoolibdirs() {
+	local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}"
+	local root
+	local v
+	for v;	do
+		for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do
+			local fullpath="${EROOT}${root}/${v}"
+			if [[ -e "${fullpath}" ]]; then
+				has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}";
+				printf "%s:" "${fullpath}"
+			fi
+		done
+	done
+}
+
+src_configure() {
+	declare -a myconf
+
+	export LC_ALL="C"
+	[[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091
+
+	# Perl has problems compiling with -Os in your flags with glibc
+	replace-flags "-Os" "-O2"
+
+	# xlocale.h is going away in glibc-2.26, so it's counterproductive
+	# if we use it and include it in CORE/perl.h ... Perl builds just
+	# fine with glibc and locale.h only.
+	# However, the darwin prefix people have no locale.h ...
+	use elibc_glibc && myconf -Ui_xlocale
+
+	# This flag makes compiling crash in interesting ways
+	filter-flags "-malign-double"
+
+	# Generic LTO broken since 5.28, triggers EUMM failures
+	filter-flags "-flto"
+
+	use sparc && myconf -Ud_longdbl
+
+	export BUILD_BZIP2=0
+	export BZIP2_INCLUDE=${EROOT}/usr/include
+	export BZIP2_LIB=${EROOT}/usr/$(get_libdir)
+
+	export BUILD_ZLIB=False
+	export ZLIB_INCLUDE=${EROOT}/usr/include
+	export ZLIB_LIB=${EROOT}/usr/$(get_libdir)
+
+	# allow either gdbm to provide ndbm (in <gdbm/ndbm.h>) or db1
+	myndbm='U'
+	mygdbm='U'
+	mydb='U'
+	if use gdbm ; then
+		mygdbm='D'
+		if use berkdb ; then
+			myndbm='D'
+		fi
+	fi
+	if use berkdb ; then
+		mydb='D'
+		has_version '=sys-libs/db-1*' && myndbm='D'
+	fi
+
+	myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
+
+	if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf -Ui_db -Ui_ndbm
+	fi
+
+	use ithreads && myconf -Dusethreads
+
+	use quadmath && myconf -Dusequadmath
+
+	if use debug ; then
+		append-cflags "-g"
+		myconf -DDEBUGGING
+	elif [[ ${CFLAGS} == *-g* ]] ; then
+		myconf -DDEBUGGING=-g
+	else
+		myconf -DDEBUGGING=none
+	fi
+
+	# modifying 'optimize' prevents cross configure script from appending required flags
+	if tc-is-cross-compiler; then
+		append-cflags "-fwrapv"
+	fi
+
+	# bug #877659, bug #821577
+	append-cflags -fno-strict-aliasing
+
+	# Autodiscover all old version directories, some of them will even be newer
+	# if you downgrade
+	if [[ -z ${PERL_OLDVERSEN} ]]; then
+		PERL_OLDVERSEN="$( find_candidate_inc_versions )"
+	fi
+
+	# Fixup versions, removing self match, fixing order and dupes
+	PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )"
+
+	# Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string
+	if [[ -n "${PERL_OLDVERSEN// }" ]]; then
+		local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )"
+		einfo "This version of perl may partially support modules previously"
+		einfo "installed in any of the following paths:"
+		for incpath in ${inclist}; do
+			[[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}"
+			[[ -e "${EROOT}${PRIV_BASE}/${incpath}"   ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}"
+			[[ -e "${EROOT}${SITE_BASE}/${incpath}"   ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}"
+		done
+		einfo "This is a temporary measure and you should aim to cleanup these paths"
+		einfo "via world updates and perl-cleaner"
+		# myconf -Dinc_version_list="${inclist}"
+		myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )"
+	fi
+
+	[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
+
+	# Make sure we can do the final link #523730, need to set deployment
+	# target to override hardcoded 10.3 which breaks on modern OSX
+	[[ ${CHOST} == *-darwin* ]] && \
+		myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
+
+	# Older macOS with non-Apple GCC chokes on inline in system headers
+	# using c89 mode as injected by cflags.SH, in addition, we override
+	# cflags, so we loose PERL_DARWIN which enables compat code that
+	# apparently on more recent macOS releases is no longer necessary
+	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
+		append-cflags -Dinline=__inline__ -DPERL_DARWIN
+
+	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
+	[[ ${CHOST} == sparc-*-solaris* ]] && \
+		myconf -Ud_flock
+
+	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
+	# Prefix itself we don't do multilib either, so make sure perl can find
+	# something compatible.
+	if use prefix ; then
+		# Set a hook to check for each detected library whether it actually works.
+		export libscheck="
+			( echo 'main(){}' > '${T}'/conftest.c &&
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+			) || xxx=/dev/null"
+
+		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
+		local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
+		myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}"
+	elif [[ $(get_libdir) != "lib" ]] ; then
+		# We need to use " and not ', as the written config.sh use ' ...
+		myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
+	fi
+
+	# don't try building ODBM, bug #354453
+	disabled_extensions="ODBM_File"
+
+	if ! use gdbm ; then
+		# workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm"
+		disabled_extensions="${disabled_extensions} GDBM_File NDBM_File"
+	fi
+
+	myconf -Dnoextensions="${disabled_extensions}"
+
+	[[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly
+
+	[[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF}
+	# allow fiddling via EXTRA_ECONF, bug 558070
+	eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})"
+
+	# setting -Dld= to tc-getLD breaks perl and all perl things
+	# https://github.com/Perl/perl5/issues/17791#issuecomment-630145202
+	myconf \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Dar="$(tc-getAR)" \
+		-Dnm="$(tc-getNM)" \
+		-Dcpp="$(tc-getCPP)" \
+		-Dranlib="$(tc-getRANLIB)" \
+		-Accflags="${CFLAGS}" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Ud_csh \
+		-Dsh="${EPREFIX}"/bin/sh \
+		-Dtargetsh="${EPREFIX}"/bin/sh \
+		-Uusenm \
+		"${EXTRA_ECONF[@]}"
+
+	if tc-is-cross-compiler; then
+		./configure \
+			--target="${CHOST}" \
+			--build="${CBUILD}" \
+			-Dinstallprefix='' \
+			-Dinstallusrbinperl='undef' \
+			-Dusevendorprefix='define' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	else
+		sh Configure \
+			-des \
+			-Dinstallprefix="${EPREFIX}"'/usr' \
+			-Dinstallusrbinperl='n' \
+			"${myconf[@]}" \
+			|| die "Unable to configure"
+	fi
+}
+
+src_test() {
+	export NO_GENTOO_NETWORK_TESTS=1;
+	export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}"
+	export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}"
+	if [[ ${EUID} == 0 ]] ; then
+		ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
+		return 0
+	fi
+	TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed"
+}
+
+src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
+
+pkg_preinst() {
+	check_rebuild
+}
+
+pkg_postinst() {
+	dual_scripts
+
+	if [[ -z "${ROOT}" ]] ; then
+		local INC DIR file
+		INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }')
+		einfo "Removing old .ph files"
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
+					rm -f "${file}"
+					einfo "<< ${file}"
+				done
+			fi
+		done
+		# Silently remove the now empty dirs
+		for DIR in ${INC} ; do
+			if [[ -d "${DIR}" ]] ; then
+				find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
+			fi
+		done
+
+	fi
+}
+
+pkg_postrm() {
+	dual_scripts
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 671d875b9264..b33ad53afb04 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 86e9d849043e..abc41105d882 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,5 +1,7 @@
 DIST libinput-1.21.0.tar.gz 988650 BLAKE2B 54c63beeff8dee93a52774220b45321d8a94261687b463319fbae9246331b532be7995a5b32c30425b9d0708b2ba69d4b4e83e8dc7ecebe6fb1237b723a266b6 SHA512 510273d68f2d4cfa61564a706b1f334f6bfca0d1c8faf0bb8aa656cf3fbd5e38d79d6fbaa01a20d38bc15777c9afc341e4ed08d35ef367ef3803ce788cbc4a0e
 DIST libinput-1.22.0.tar.bz2 796133 BLAKE2B 3552f0a9ab0690969c5a7d62882733aa7bcaed1c0e97ff3606f58558c235cb67e3c81bc5a277273d26e6847438acccfc942d2fbec312e9a0d121d8ea21896496 SHA512 62cc36845daa7bc4b8477dd71abe629309683a93de753382a90e8466915e2b96b9c6914b431747d3462c15d8ab42bc70ee755800eec60c4ad7e9f3b4f7dba76d
+DIST libinput-1.22.1.tar.bz2 794829 BLAKE2B 253f840e45ab2293503a0da09ea914b982e643c35928af6762955325a002b5bf20bf8571e705e3a050663cd0e1e26ee0cf4952a6193659f9b27ad1080008e900 SHA512 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e
 EBUILD libinput-1.21.0-r1.ebuild 2289 BLAKE2B 67343071c46f9524b95e42627c1ddee44d48185ecb8b6d4ba8d29be14b9cdc49d1551014b8560618811f39f8201e826ad6c582dc7abf932610ea3b4c63d1fbfa SHA512 df6565f7e5b581a5c68c2158b62369477cf4bbf1ee12d87bd00f38188fac9a47b98958cb3b5a582d8972ca91bf4a06a96d69a60d1230e4d3d3cb49c94119c160
 EBUILD libinput-1.22.0.ebuild 2179 BLAKE2B 7f0b6c8b324998c1163b669cdba8f8debceb1f8f5ba170e719b7c2d575863e9651ce2ab5e00e68997f2a959b0df05292ae8430790f64be15953239844a1809e6 SHA512 de0af78b1db94dca1b113294a0f5d117fb8dabc190bc6dc16a6fccde387a493337bb6bb367564dbce9708b66250da23d3bd7a1ae6d6c911967da3449ad5db11a
+EBUILD libinput-1.22.1.ebuild 2179 BLAKE2B 7f0b6c8b324998c1163b669cdba8f8debceb1f8f5ba170e719b7c2d575863e9651ce2ab5e00e68997f2a959b0df05292ae8430790f64be15953239844a1809e6 SHA512 de0af78b1db94dca1b113294a0f5d117fb8dabc190bc6dc16a6fccde387a493337bb6bb367564dbce9708b66250da23d3bd7a1ae6d6c911967da3449ad5db11a
 MISC metadata.xml 339 BLAKE2B c649f0ffaad1b1dc76c3d3184d95356b2925f642ff6b96c3eba0c31a1d96c3d9b741c1348f8ec90d02428c30a836872fe4e42e7ab5f5e5197f4a787f9147a1a8 SHA512 e9aeca6cc4451ab5b622f597f8debaecfdc672244e5e0b687ac294c20009ba42fb2ccc45e7016a2427312e1c768259005e0a7ff53026087570382652ec23cb60
diff --git a/dev-libs/libinput/libinput-1.22.1.ebuild b/dev-libs/libinput/libinput-1.22.1.ebuild
new file mode 100644
index 000000000000..a6741dc43f7b
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.22.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2014-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit meson optfeature python-any-r1 udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0/10"
+if [[ $(ver_cut 3) -lt 900 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+IUSE="doc input_devices_wacom test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
+	>=dev-libs/libevdev-1.9.902
+	>=sys-libs/mtdev-1.1
+	virtual/libudev:=
+	virtual/udev
+"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-libs/check-0.9.10 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/commonmark[${PYTHON_USEDEP}]
+			dev-python/recommonmark[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			>=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
+		')
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? ( dev-util/valgrind )
+
+python_check_deps() {
+	python_has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
+	python_has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
+	python_has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s@, '-Werror'@@" -i meson.build || die #744250
+}
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		$(meson_use doc documentation)
+		$(meson_use input_devices_wacom libwacom)
+		$(meson_use test tests)
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/Documentation/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature "measure and replay tools" dev-python/python-libevdev
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6bf741f5edc0..a9d5adc688eb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index ee43218564c7..2e28ea8b58b3 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,6 @@
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
 DIST PyOpenGL-3.1.6.tar.gz 1903892 BLAKE2B 7d1109a09703a7113aa9cc02994662df77bea1da63e81a8adbdc812514b71e04bfa51dad9e48c0e0b98327e4f7deda7a8590c340a38127d38e91659f38739220 SHA512 b6f2f083df0fd7cf8f8a1077f42fa388bce94c0edde00ed6492104af8306c9925b74649cd2c222be4205b0892e7975de2f7591d0f0bcd9540eb53c0de95fec00
 EBUILD pyopengl-3.1.5.ebuild 1183 BLAKE2B 4a8af0a68701de14c47932bcc2560bb68d7be929f95700b6e6d4b77cc4d9edab8a2ffd84a736e835eee7b8db63ff17cce63dc32c0f80eac9218f7d533343428a SHA512 bd757c5ffc41ea8eeb9f38424a55807221c1098ab00c0ce596cc38a0675a8954d16f88ab4b40e4994eb9971257a755f7dc14e4894c935e1a5dabffc702e2890a
+EBUILD pyopengl-3.1.6-r1.ebuild 1148 BLAKE2B 5d7958826e526e9e468dac319639ad5d8b731638b59bd8a8b28b959ee39f28da0687d7513f4702182ac3efa0c5f874e1e61b3a1a6c9b9462a67da830d34b5b95 SHA512 13c715f0e0b9770c2725f396b6de9eeb6e3760e7a32bb7092604c94cc776eb2e9db54cd84938a6b8f509604e0c621270ffac4f633e0d55b88f578487b664ab0c
 EBUILD pyopengl-3.1.6.ebuild 1141 BLAKE2B 450f7d3f7f29f578171e0b6e232ac52bcb5c63fdc7612c367e99605665dd0bddb8e9156c4b3255adf18cb9f5d33bfc907131dd11db34432689e8c9d92726008e SHA512 c3fb429e35962ccf58ee1b3112ed51979706db28c5cf75116e8207a01ecae690db46458a6e9af8507b301defbc91daf7426956778b2d54884ea6a4539d312638
 MISC metadata.xml 365 BLAKE2B 4f4ed59d889195fb5f979daa14ace3f8a77f9ae1330fda3eb454fca4aa5447e285a4f31c5993358d20ecc413b368cf70a7f5e55796b9b81557cff06bc7a4a5fb SHA512 2059e35cf4377763e16007e867897acfdba791681687ec0c45c9c78ea8cf89889e71dc3f4fe6720618f5adf6fe26a3440aaf938a5c1b592654fadcca7ff5ee3b
diff --git a/dev-python/pyopengl/pyopengl-3.1.6-r1.ebuild b/dev-python/pyopengl/pyopengl-3.1.6-r1.ebuild
new file mode 100644
index 000000000000..1c19aea56637
--- /dev/null
+++ b/dev-python/pyopengl/pyopengl-3.1.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="tk?"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 virtualx
+
+MY_PN="PyOpenGL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python OpenGL bindings"
+HOMEPAGE="http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="tk"
+
+RDEPEND="
+	media-libs/freeglut
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	tk? ( dev-tcltk/togl )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+# The tests need an X server with the GLX extension. Software rendering
+# under Xvfb works but only with llvmpipe, not softpipe or swr.
+BDEPEND="
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP},opengl,X]
+		!prefix? (
+			media-libs/mesa[llvm]
+			x11-base/xorg-server[-minimal,xorg]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/wand/Manifest b/dev-python/wand/Manifest
index 9414e1642596..8a29a6c8ef05 100644
--- a/dev-python/wand/Manifest
+++ b/dev-python/wand/Manifest
@@ -1,5 +1,6 @@
+AUX wand-0.6.11-sphinx-6.patch 1352 BLAKE2B bf9d8892392f806a665c8491da68b95a2699e06beb3270c8390ee625a819205d973d084bc7c7831f0d5d64918824c433d471c61e4f2131030d0cad8b12345425 SHA512 9229a734c1ff35f69e2e4b6d0a5d05580690db1f49e8663fef386b7506b2a050c46373b3842f600fb8e896954ce92fb49ea967e0e74cca792ef468951181fd23
 DIST Wand-0.6.10.tar.gz 11885159 BLAKE2B 206a652fa87a69f4d7af6156b2dc2b0ff515f317f9ad3d938ee15e50043ab3e3ffc052e0650ebfb2e5f5c5d1d1f1500f4880578a6cd7765d6c3af02f877fd843 SHA512 bde72e0ec56898c0885e483ec8dafc5dd2fbc1319736b5d46074cb00d1643c5368fbf66e0c8ff918dbe4b7b6ac4901551ee2c8563317c90c269e7ccfe53edf6f
 DIST Wand-0.6.11.tar.gz 11883567 BLAKE2B 561bcf6645f6eb41737c5e999f01e2719b5170d6e662e3812b4bd444fa77331175a22eff95eeb94ce17ecbe6dbef9a97e9a4f509f878431b64b357843fb15061 SHA512 4e551c2942835872f52247c2d642faf2ad4bad6bb206376e4f8dc5cdabe981e73b7e0f58a705d5dcbf8f95c445ed13bbe6b8443b9b29d0056e7aaf50565a608d
 EBUILD wand-0.6.10.ebuild 799 BLAKE2B f2bc63190935d06f760e8d9d0873cadec7d0c137aca69287d52cf11ccec2721746c9f4140986c6eb7c6acccdaf51c636ede579b66b8d27dfef5c3285ca2803d5 SHA512 7626ba0fdc11089be8fd1c4fcd906d46bb538100312af595aa5a2751c5525c65ca3ed2866e42a27491851ff0c9ca575b331d3f77ba4b5bfc16e7ce05b5be1ec3
-EBUILD wand-0.6.11.ebuild 799 BLAKE2B f2bc63190935d06f760e8d9d0873cadec7d0c137aca69287d52cf11ccec2721746c9f4140986c6eb7c6acccdaf51c636ede579b66b8d27dfef5c3285ca2803d5 SHA512 7626ba0fdc11089be8fd1c4fcd906d46bb538100312af595aa5a2751c5525c65ca3ed2866e42a27491851ff0c9ca575b331d3f77ba4b5bfc16e7ce05b5be1ec3
+EBUILD wand-0.6.11.ebuild 847 BLAKE2B 5d14b7b078daa774cb64e092598dc6a63168649df1fdce0da8c11a34735252b3976ae0461bfe1b3b181f1d80e5ceea8e21a29e7f1b778e665c4a14995f718ee1 SHA512 ccad3042ff7ba1481d3135f816b686529e5f055d54f96564e5255ca9004e3736bf7ce59652f778e4f97590e50da798de628da63e0b68fbfcc3a9b68fa455811f
 MISC metadata.xml 534 BLAKE2B 0c2295ce9b9805ceff22c9549adfa46578a5d5d1d4f13b7af416ad23f305ee24275deb7204a68076901e6060d41a3935580e24578d2fe56a2c32817ab83165b5 SHA512 68f30bc7ad8cf6a451acf550c02b76e1f71a8c66c9ffc8832995bd292bd460d16c9526e5bb2daaed9cabece9591499f9dd3b0f11d748af247c78654d6104ee13
diff --git a/dev-python/wand/files/wand-0.6.11-sphinx-6.patch b/dev-python/wand/files/wand-0.6.11-sphinx-6.patch
new file mode 100644
index 000000000000..4da4354e67ca
--- /dev/null
+++ b/dev-python/wand/files/wand-0.6.11-sphinx-6.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/889906
+https://github.com/emcconville/wand/commit/460f605f45d406b6d0e2f3e6af7bfa2c62c66882
+
+From 460f605f45d406b6d0e2f3e6af7bfa2c62c66882 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 14 Jan 2023 22:30:03 +0100
+Subject: [PATCH] docs: fix build with Sphinx 6.0.0
+
+See https://github.com/sphinx-doc/sphinx/commit/93cf1a57d916a1ff96c8e8a0356d0256e40489ac
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -263,11 +263,11 @@ def __repr__(self):
+ intersphinx_mapping = {'http://docs.python.org/': None}
+ 
+ extlinks = {
+-    'issue': ('https://github.com/emcconville/wand/issues/%s', '#'),
+-    'pull': ('https://github.com/emcconville/wand/pull/%s', '!'),
+-    'branch': ('https://github.com/emcconville/wand/compare/master...%s', ''),
+-    'commit': ('https://github.com/emcconville/wand/commit/%s', ''),
+-    'cli': ('https://imagemagick.org/script/command-line-options.php#%s', '-'),
++    'issue': ('https://github.com/emcconville/wand/issues/%s', '#%s'),
++    'pull': ('https://github.com/emcconville/wand/pull/%s', '!%s'),
++    'branch': ('https://github.com/emcconville/wand/compare/master...%s', '%s'),
++    'commit': ('https://github.com/emcconville/wand/commit/%s', '%s'),
++    'cli': ('https://imagemagick.org/script/command-line-options.php#%s', '-%s'),
+ }
+ 
+ # fall back if theme is not there
+
diff --git a/dev-python/wand/wand-0.6.11.ebuild b/dev-python/wand/wand-0.6.11.ebuild
index cb0ffa456453..13b137e5a7a5 100644
--- a/dev-python/wand/wand-0.6.11.ebuild
+++ b/dev-python/wand/wand-0.6.11.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-sphinx-6.patch
+)
+
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b295ebbe5610..56b9c9c27ce8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 6263ca75a4e2..f8623d812675 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -1,5 +1,3 @@
-DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
 DIST dejagnu-1.6.3.tar.gz 622059 BLAKE2B d22d66a233c2643c98f45d260585790b4c1293de2bc84470e7942e0364e0cb15f55888a3b6ab13e82823f4e03198159c93e1904571a5df3fcd6f2da568078726 SHA512 1a737132bd912cb527e7f2fcbe70ffff8ccc8604a0ffdecff87ba2a16aeeefd800f5792aeffdbe79be6daa35cedb1c60e41002ca4aabb5370a460028191b76c4
-EBUILD dejagnu-1.6.2.ebuild 520 BLAKE2B 5d35364056aa60b443fef9785257ed648c3493e599c680cfc210e95153cf12282764d97e391d3e115bd5ecffea9f4c618baf90a1847eb2488be94ba8d69d61ef SHA512 d0d23efa9a108005965090718a4102c47c07c6186200d642cbafce55d0982a9e2f5bb1842aa383bf18a5d52a4ee34e87adaaa96a4e37daae061f1df25dd020cb
-EBUILD dejagnu-1.6.3.ebuild 595 BLAKE2B ed7f69ec64cd0e83064330ce228844a0ed42f9ab9877626933e261c5f9df6b7ec9a956ea44ca6b9659485e16e2ed2f12f88f07c5445ff6dd21d385e7fe5a31a1 SHA512 acfc28fc9cd72edabd16b7d8986e5ca3b51849feb05afdab03f893ed2c52955bb72074ca408260331d4f20f1b6b43a781ef98e50180858906da30b31cb5303e6
+EBUILD dejagnu-1.6.3.ebuild 556 BLAKE2B 59552c10836df48da9eff8c690925fdb969e541941f19062ba885c1b31218e83e39654965aa8e0e8a1dd4370efe91d5d35c0ad2095d4482538377819bb6d9a21 SHA512 08a6464e55fe8cc8088f5bc6afbe8361defc935dd5a838bced1200b2e6b54cad07045f0dc3029cc4badc25d76dddd1a6fb7c6477f60f1e80a874a458493849e5
 MISC metadata.xml 346 BLAKE2B bcd7b010b14ca00937b7241ff66ef048fc645e1724c33e18d12c3a91d6a117889535fdeba947d2c7071ee5b75b85c3354955014ed8b943685df39a3376fa764e SHA512 cc7e8b6ebd769fdf5fabe1009b7ab1fbd5884e6df686121df1e6fc58d1ebea51e3c15b1be7d6f455ddf3142a2e6ac57780d26a34b4421259df5745689ebbe1a8
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
deleted file mode 100644
index fece44705350..000000000000
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Framework for testing other programs"
-HOMEPAGE="https://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RESTRICT=test # needs fixing
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-RDEPEND="${DEPEND}"
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 4d4a2813baa1..62413d665908 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,10 +11,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="test"
-
-#RESTRICT="!test? ( test )"
-RESTRICT="test" # needs fixing
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-tcltk/expect"
-#DEPEND="test? ( dev-tcltk/expect )"
-BDEPEND="app-alternatives/awk"
+BDEPEND="
+	app-alternatives/awk
+	test? ( dev-tcltk/expect )
+"
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 1d30767115f4..5e4ac88c2d57 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,7 +1,9 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7a549efc2cf530c087dd718c7d01f5bcf8b9208965e066770064b6d8db7a9f6ab9a3f3a4612f6fcc8d146c1e8 SHA512 5255930d6898ce35a41e3e553363964663d2b686d12732ff6140fa1d06fcc3806adf28e24ec35ab0712eec0562c52c3943afe9ecce468b0053b852ffeb04c3dc
 DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
+DIST pahole-1.24_p20221024-patches.tar.xz 22088 BLAKE2B b39458400411dd7da0f568257f42164952e170b952e4893a92d769e17ce4cf0de88b727808a38195438fe10e5537f245bf101f647f383b6df7642c5446fa5d45 SHA512 93f160f01023c5402535a34d59005f0a3e056662a2764722480d71b6e522f3bfef0d642084467d1fbea96e23386b4cbb708243713d59eb84f4f767c1ac5ab3f5
 EBUILD pahole-1.23.ebuild 1093 BLAKE2B fb7f97012a131093123ecd97e5800a0de8c653a6c8095906781b44da88d4412d888704c5e924ebce1a9ee888db356cd5cf23a2c7da159ca9db3c0298ecd19193 SHA512 0bc03b41b3edab165a7bd25a2660310bf75548ee56f404808df5ed1002b200f21a6741110669930decd93ea8554cbe9243330dc4cdd4a8d04d34413e0a7aebed
 EBUILD pahole-1.24.ebuild 1089 BLAKE2B fc944b60897285106af282a7fb54a5b21cd027ce41f63b3dec854178447bec28360af4d4a396618c7820c9b5e76e033f920236ea1141668532638589e64ee229 SHA512 16af24361e6dbbf19a38bc09baeb8b899056687d72d4ab6257c838f40b471bc318c2b7eaa12f91aaa05ed54924bc1d0b273722e52be41fe02bd9bdd743e7d92c
-EBUILD pahole-9999.ebuild 902 BLAKE2B 656b7cdb4b94bfa6e3dcc3503b0e908873e04782d9f91cb8d6ce8176dcb513e68343da79ebccd2d6c49a60d67926a00fdf8cd697b4589693d22a6cd2d144c96a SHA512 53460af56af1f33e295d77a5b15b73074ec3a9ce3be9672c53249855984d732670036f078a4b6c5f6404ec4beadfefd0f5e0ffc8eeeaa451bcd26fae39944e3c
+EBUILD pahole-1.24_p20221024.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
+EBUILD pahole-9999.ebuild 1698 BLAKE2B ae7281d783be25d0d5cf060986e75cd7d1df973ddea10be0173306f36e258edb79e5d441f5b9262b51bd758a20217294411d3b7b3f67f8d039f9f2eb8d134439 SHA512 0afbe223fa78b2c40e8cc253582768338fa23ce76cf307157696e7cf0239cf305755f8e525c051e15ac117ea04fdd279948d6dbf9f0b9163173bcf2ab895fb5e
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.24_p20221024.ebuild b/dev-util/pahole/pahole-1.24_p20221024.ebuild
new file mode 100644
index 000000000000..5d98a672167d
--- /dev/null
+++ b/dev-util/pahole/pahole-1.24_p20221024.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Snapshots
+	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+
+	# Patch rollups from git format-patch. Sometimes there are important
+	# fixes in git which haven't been released (and no release in sight).
+	# Patch rollups are a bit better for understanding where changes have
+	# come from for users.
+	SRC_URI="
+		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+	"
+	S="${WORKDIR}"/${MY_P%%_p*}
+else
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-2" # only
+SLOT="0"
+IUSE="debug"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
index 2b542cf4434e..5d98a672167d 100644
--- a/dev-util/pahole/pahole-9999.ebuild
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -1,19 +1,44 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake python-single-r1 git-r3
+inherit cmake python-single-r1
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
 HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+	inherit git-r3
+elif [[ ${PV} == *_p* ]] ; then
+	# Snapshots
+	#SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+
+	# Patch rollups from git format-patch. Sometimes there are important
+	# fixes in git which haven't been released (and no release in sight).
+	# Patch rollups are a bit better for understanding where changes have
+	# come from for users.
+	SRC_URI="
+		http://fedorapeople.org/~acme/${MY_PN}/${MY_P%%_p*}.tar.xz
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz
+	"
+	S="${WORKDIR}"/${MY_P%%_p*}
+else
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+	S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="GPL-2" # only
 SLOT="0"
-KEYWORDS=""
 IUSE="debug"
+if [[ ${PV} != 9999 ]] ; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
@@ -28,6 +53,8 @@ PATCHES=(
 )
 
 src_prepare() {
+	[[ -d "${WORKDIR}"/${P}-patches ]] && PATCHES+=( "${WORKDIR}"/${P}-patches )
+
 	cmake_src_prepare
 	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
 }
@@ -36,9 +63,3 @@ src_configure() {
 	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
 	cmake_src_configure
 }
-
-src_test() { :; }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 021d5e33bb7e..75c6e978d454 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 4fef1bf02af8..bdae47538958 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,5 +1,6 @@
 DIST evolution-3.46.2.tar.xz 13295660 BLAKE2B 7dda0049f8579cef35367435f90e31977d33b389fe823bc5e7677566bd6d3d73ef414b3419041c9183f4fc9e95ff944e5a8664445f8371c5518e40703bca8981 SHA512 f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734
 DIST evolution-3.46.3.tar.xz 13372368 BLAKE2B 55e7f551d91e867f2307caf82f43640ee593c9b18f83c8f2ec2c3493075bb87a4421bc2df722156b3a12e6ac84536e1db92de2dfca72315a09cd99828811f0e8 SHA512 3c832509dba78a07dd7521c049214377108a1866c754afb1c756f9a487b648612480b4a17d853d9ec59f1c209667b29b5711f1e5e1b336e344cbed7bf8dd4069
 EBUILD evolution-3.46.2.ebuild 4101 BLAKE2B 3f8582edc0911c2e9fbfac04d6237043716ba0c15199fe822c63b49af3df58e20893ae8e16cfe512f6afa67b4fea25ca284e7f52fbcec533ba65a8a5566fc29e SHA512 fc23022c2bb0434a29a258b49e4cac1d274400f395429ad8ae097d2f43f764dac49a840bd6f32a7dec7fef20e99f0ef7f8877526ae97f07ffa64ebb875285b19
+EBUILD evolution-3.46.3-r1.ebuild 4039 BLAKE2B ea8427b79dcbd77f8cd46106cadc32aefc430a56821a9bfdac75e1b5305ddb0775f4c922a7ac625fcebec0e716d867636eda2088fbd54af9637a794261e8790b SHA512 65ce4a1bae7c4e82d0a4759dc0edc4f764ee399dc8be45a7b185434da16405273b1d67cd440c93fd72dcd48f82d3f13a7be8e7bb91f8f9c647f70d498f4e07c2
 EBUILD evolution-3.46.3.ebuild 4104 BLAKE2B 1110a84745a4a460d9ad307012f6a6e70056bd1e0382f213255041264f9dbd6bf40d65665b72358c48a3d0c14eea383a33d684a89a2e786fe98a2d15d1095c13 SHA512 39fd571e9e01d109db28df1dd00c666eab4e4ca0578f807a2a58b2bef4471f7fed4b429c1033825918326682c6b9c79e8d7280129fe24739134198e1622faade
 MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405
diff --git a/mail-client/evolution/evolution-3.46.3-r1.ebuild b/mail-client/evolution/evolution-3.46.3-r1.ebuild
new file mode 100644
index 000000000000..aa8049682a72
--- /dev/null
+++ b/mail-client/evolution/evolution-3.46.3-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-text/enchant-2.2.0:2
+	>=dev-db/sqlite-3.7.17:3
+	>=dev-libs/glib-2.66:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-3.0:3.0
+	>=net-libs/webkit-gtk-2.38.0:4.1=[spell?]
+	>=x11-libs/cairo-1.9.15[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7
+	>=x11-misc/shared-mime-info-0.22
+
+	app-text/cmark:=
+	>=app-text/iso-codes-0.49
+	>=app-accessibility/at-spi2-core-2.46.0:2
+
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12.21:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.26.3:2 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11
+	)
+	weather? (
+		>=dev-libs/libgweather-4.2.0:4=
+		>=sci-geosciences/geocode-glib-3.26.3:2
+	)
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+		-DENABLE_MARKDOWN=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b4d701adeb1c..b36b0e6c13b8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index cb668141c6fe..e77905a2b367 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,3 +1,5 @@
 DIST libchamplain-0.12.20.tar.xz 222168 BLAKE2B 72093eecffca24a5f255269472216f24d0804b7c8daf7cf9dc1273df9afc3fe5664dd2ca7d351bf94065f61bf4a419b3babcf3e9b2ed9a0f67c9947190aaa476 SHA512 514e4bd2803ace0d87a95a318a03bc2f2ccc454129146d76590d1b1f5666c95a4fb7013e2ad0cfafc5844d7d8b732c81a44cd0e7d51c505adcfe55c55abb4f6f
+DIST libchamplain-0.12.21.tar.xz 223748 BLAKE2B afe6b409107d12b8c674d9335d00ca21cf7faf036fd852b48ec371fb76dcd35cc30d4bc3dab555667069d7d41411eea31343240de9bd29dcc2e0f290bc925641 SHA512 8e3b4a292056b1d90be128dab347b1953e6acd00b1abf56fcc496eea15688ef232b81afe39147a9d6059ab248e3ceb7e07683c23501671b93797b0a87faccca9
 EBUILD libchamplain-0.12.20.ebuild 1439 BLAKE2B 2eda03c776f6f66ed777908a77a8772c24c63d03b88a9b9dd15e6bed69f2ad3eccc89b26f2dec520d1fbd6d2287e748a75e4d73fdcace1588ab0f096c624ae84 SHA512 d5bd5193244a61f354510ad8caa177513697d51933a038dcc4a6976b43eb5137f140234022b8a58b9ff6f1164f14e82e88bcc6b9674768aca5b6153361b2ca82
+EBUILD libchamplain-0.12.21.ebuild 1453 BLAKE2B 2c623c4b714b85caa84f9a617275945c13bf2912b0ebb291d9581085dd9bb180f8b3ef0a030f4c207dfae051cf28383bc76178d6ae3cba3db4b37534bed25e6d SHA512 67db82baa1be92efb30b6a0cfd4b04ee30573d9a36c053a8e35f895e9e6454ca94a9f304895fc0cb230b43bf7ee9d587326295b1801116ef4196b34bfb6af0b8
 MISC metadata.xml 731 BLAKE2B 5eebc6658951aa336948a944f02a538988503ce51ec4615a3e40c20b97aef40821b684e3a1421e46cf49bc6151d668f4d16ee655a5a86e7c25f5ace9bc976b71 SHA512 e1fa3a71f9afd87ecc79e751bf23ecb6fa9983d0466a4bc5d10aa8a01eb89d379f8ff3d812823cd3e68cc1b6f75cf4fc49a8b48ac690306a812b0d9c1c7d6f41
diff --git a/media-libs/libchamplain/libchamplain-0.12.21.ebuild b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
new file mode 100644
index 000000000000..28d12931004e
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.21.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
+
+SLOT="0.12"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="+gtk gtk-doc +introspection vala"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( gtk )
+" # gtk-doc build gets disabled in meson if gtk widgetry is disabled (no separate libchamplain-gtk gtk-docs anymore)
+
+RDEPEND="
+	>=dev-libs/glib-2.68:2
+	>=x11-libs/gtk+-3.0:3
+	>=media-libs/clutter-1.24:1.0[introspection?]
+	gtk? (
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0
+	)
+	>=x11-libs/cairo-1.4
+	dev-db/sqlite:3
+	>=net-libs/libsoup-3:3.0
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	media-libs/cogl:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.15
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	use vala && vala_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dmemphis=false # TODO: What's the state of this vector renderer?
+		$(meson_use introspection)
+		-Dlibsoup3=true
+		$(meson_use vala vapi)
+		$(meson_use gtk widgetry)
+		$(meson_use gtk-doc gtk_doc)
+		-Ddemos=false # only built, not installed
+	)
+	meson_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ea223c8fe374..4605e2c38102 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 5814ace3346d..35777843ba19 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jan 2023 23:10:01 +0000
+Thu, 19 Jan 2023 05:10:01 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0c9ee692b16f..e488f2ac4b23 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-18T23:10:05Z
+TIMESTAMP 2023-01-19T05:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPIfE1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPI0K5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDepg//cZo9iMhlUGUBpDg/BqoPJkn4GUKhJwPEJlslheY2htM+IAXVZh1DE78o
-aaxOPmsMmvhxh2q4vswUiZ16BWHMG7JcIIrC0lAFQEeRTGV68zNLWoRd0TPgHdV9
-yhpn27slsRmlYdp9qFtOzq4ixkj5yaEqcRP1gipGOmTB8ydSqywC+oI8jBRQMxTb
-VJzSVjoEPt1H3A6dwn+TRQZqRAyaLlJqo2kOJfFP136PSvoNKBrOGu8v9T9v8O48
-tMxZLIvuAOXBqe+lJVtcaZpBP367Xlk0NVG/Ry3lUnTIkrA7xlTdrEevKI/ek0Vs
-t+Z0JR2CiAV+PNHvVZ5SMCqDbojq+et3i79ZTdsDvu/AK5AWkOrDRzCTe3Lj/aHf
-jQXaizan8w7iXWC9sen3yKjZoBhGWdV5UmgvNovnkLkleRwdSX54z6exiWJKXqGE
-/5y2ltOnriyUtHsO6Wj4p46+TYmeyiW49q5GGSGFT1yvnGRHUnBDosimOdSdqZW0
-9yID1P/BUqRvkz+174O/stJyjUOHmHUPRlP+OLgGlUDSGUb+msrOqD+uGnAYQg7P
-BMMnmRHQlzoORpVXvH11Vnfo1QwR6ujpHGBbNk/SSR6FWalYE99NNDl+Tk1gBnpG
-HluUxH4dwsO+XASEtMVhyUYnO8V111iN561P36aRUK+AySKyA9w=
-=GJIb
+klAWug//Xrlml0hQvXSYfi75dBtVuCHI/6aC8xBX/VDI5uX8fgUYgWN5zoRILHqj
+81EQ1oWcFNev8Z3xlWJ0UcNzi7b9HuobiHZXtV3Da5VcGOAX8gIXnbViU9qiZS6S
+GaSGzKLfedFL7q7DzAjNn46a4Jpi4J7nGBeuMfLlWZXZlN6ol0V6pSN2KHpeA2Fb
+75PmTZ2i7sLBBsG+gU4az1EOTF4so/CRd9uSdyaiUCg1ZTAunT5KVthcjTW0k3Kl
+chfZdfrCdHtw+kkaR0mWpi7kzC2MS0w6cf7WcQl+6zTdCs8dJ0gDrjdpKBgmd+2O
+zGIr4P1xgrKHEr+H+AQ/FZK9PfYSOCYjMPYiGKZfBpB0uzE9fmNsFG2HCtpsY6DS
+91oeAycvFYuAHZV2Wip+4U1Ro0MprWrOQ1N2uLqtagzAOhRdYGnbmVjPGufkRvMC
+RU6i4EywoHul7xfp6rwzGFPWerdneXwyL+NyrXOcefGyUMdgmNB2i2wRInheT5cD
++gOvRwIKxBF/vgeDBCn5AsPRh5V3gNLugT+C4Wf0LmO+1HIyDGm7zIV+v5UQJWVt
+PYuVtUE35B0VbxG0STPl22REpyP6BMZ4U2bjemF0EgKNbbeTbA0NuG9uzq1KFFeW
+bbffxMaY5H2iJq9igWVHzZWn/y5thJ97PS+5zxU/7j9sreRxBgU=
+=4TYN
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3e0879ba5a5a..35777843ba19 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jan 2023 23:10:02 +0000
+Thu, 19 Jan 2023 05:10:01 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 8826d50445e4..f24da61e7777 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 3e5346845e49..cab7108c56b8 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/rasdaemon-0.6.8-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.8-r2
index 8fce7a89be16..dd839a02a371 100644
--- a/metadata/md5-cache/app-admin/rasdaemon-0.6.8-r1
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.8-r2
@@ -11,4 +11,4 @@ RDEPEND=dev-db/sqlite elibc_musl? ( sys-libs/argp-standalone ) dev-perl/DBI dev-
 SLOT=0
 SRC_URI=https://github.com/mchehab/rasdaemon/archive/refs/tags/v0.6.8.tar.gz -> rasdaemon-0.6.8.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1e3c8bb7c823393eec9b1a3f9abe364f
+_md5_=bbcbbd830ca67bdf83ea3dd896da4607
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index b2a192ae43bf..09b343b12f94 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4 b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
index 6585564aec80..ed64c1eefd33 100644
--- a/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
+++ b/metadata/md5-cache/app-crypt/dieharder-3.31.1-r4
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.phy.duke.edu/~rgb/General/dieharder.php
 INHERIT=autotools flag-o-matic
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=sci-libs/gsl:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.phy.duke.edu/~rgb/General/dieharder/dieharder-3.31.1.tgz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d74fba315366f78c3008195308214010
+_md5_=ab222e33b66fd9132751509f86c1ebdc
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 4391b64ad587..511a75245635 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/grc-1.13 b/metadata/md5-cache/app-misc/grc-1.13
index 3e7e7d4cab5c..99f0e8586b5f 100644
--- a/metadata/md5-cache/app-misc/grc-1.13
+++ b/metadata/md5-cache/app-misc/grc-1.13
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/grc.html
 INHERIT=python-r1
 IUSE=python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/garabik/grc/archive/v1.13.tar.gz -> grc-1.13.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b4ad7a87f2651bec0e90a475ec7dff3b
+_md5_=3fb15c2420ba21347c258ee47bde0067
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index c12375809d77..ef1b9c598719 100644
--- a/metadata/md5-cache/dev-embedded/Manifest.gz
+++ b/metadata/md5-cache/dev-embedded/Manifest.gz
diff --git a/metadata/md5-cache/dev-embedded/esptool-4.4 b/metadata/md5-cache/dev-embedded/esptool-4.4
index 5ccc8eb97a2d..2b6283215772 100644
--- a/metadata/md5-cache/dev-embedded/esptool-4.4
+++ b/metadata/md5-cache/dev-embedded/esptool-4.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/espressif/esptool
 INHERIT=distutils-r1
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_9? ( dev-python/bitstring[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_9(-)] dev-python/pyserial[python_targets_python3_9(-)] dev-python/reedsolomon[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/bitstring[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_10(-)] dev-python/pyserial[python_targets_python3_10(-)] dev-python/reedsolomon[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/bitstring[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/ecdsa-0.16.0[python_targets_python3_11(-)] dev-python/pyserial[python_targets_python3_11(-)] dev-python/reedsolomon[python_targets_python3_11(-)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressif/esptool/archive/v4.4.tar.gz -> esptool-4.4.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e390f6bc3cf6e3c17195b19f205696fd
+_md5_=d51185ece95ec2409f68261a5b409623
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 507824b270de..32cbed96c1e5 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/perl-5.36.0-r2 b/metadata/md5-cache/dev-lang/perl-5.36.0-r2
new file mode 100644
index 000000000000..2e7a09f1f6df
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/perl-5.36.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 >=sys-libs/zlib-1.2.12 virtual/libcrypt:=
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 >=sys-libs/zlib-1.2.12 virtual/libcrypt:=
+DESCRIPTION=Larry Wall's Practical Extraction and Report Language
+EAPI=7
+HOMEPAGE=https://www.perl.org/
+INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+IUSE=berkdb debug doc gdbm ithreads minimal quadmath
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 >=sys-libs/zlib-1.2.12 virtual/libcrypt:=
+SLOT=0/5.36
+SRC_URI=mirror://cpan/src/5.0/perl-5.36.0.tar.xz mirror://cpan/authors/id/R/RJ/RJBS/perl-5.36.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.36.0-patches-1/perl-5.36.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.36.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.4/perl-cross-1.4.tar.gz
+_eclasses_=alternatives	ad206653f4297ab882a84e8fb7940190	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=50bebd1722131e45f351aaa144fff0af
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7aaa3cf051f2..5203b4908cd0 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libinput-1.22.1 b/metadata/md5-cache/dev-libs/libinput-1.22.1
new file mode 100644
index 000000000000..bf6f06a066aa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.22.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/commonmark[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/commonmark[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/commonmark[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_9(-)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=8
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
+INHERIT=meson optfeature python-any-r1 udev
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.27:= ) >=dev-libs/libevdev-1.9.902 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=https://gitlab.freedesktop.org/libinput/libinput/-/archive/1.22.1/libinput-1.22.1.tar.bz2
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=122ead3de40fbc74176543610d012135
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c05e76a831f7..259ec7599411 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/pyopengl-3.1.6-r1 b/metadata/md5-cache/dev-python/pyopengl-3.1.6-r1
new file mode 100644
index 000000000000..f60a6bebb219
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopengl-3.1.6-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/numpy[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygame[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,opengl,X] !prefix? ( media-libs/mesa[llvm] x11-base/xorg-server[-minimal,xorg] ) ) test? ( media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[tk?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[tk?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[tk?] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl )
+DESCRIPTION=Python OpenGL bindings
+EAPI=8
+HOMEPAGE=http://pyopengl.sourceforge.net/ https://pypi.org/project/PyOpenGL/
+INHERIT=distutils-r1 virtualx
+IUSE=tk test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freeglut virtual/opengl x11-libs/libXi x11-libs/libXmu tk? ( dev-tcltk/togl ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[tk?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[tk?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[tk?] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyOpenGL/PyOpenGL-3.1.6.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=7ddc4c16ec5486f9adbe91704eacbf88
diff --git a/metadata/md5-cache/dev-python/wand-0.6.11 b/metadata/md5-cache/dev-python/wand-0.6.11
index 65575d018174..dadc88a0d9bf 100644
--- a/metadata/md5-cache/dev-python/wand-0.6.11
+++ b/metadata/md5-cache/dev-python/wand-0.6.11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/Wand/Wand-0.6.11.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=33be84b00d61eee927775533c4b801f3
+_md5_=5655391e1465e83788d2eac32a79cab3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ef6e6c06b50a..9bb8f67a1b52 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/dejagnu-1.6.2 b/metadata/md5-cache/dev-util/dejagnu-1.6.2
deleted file mode 100644
index bf0d8c7b113b..000000000000
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-lang/tcl dev-tcltk/expect
-DESCRIPTION=Framework for testing other programs
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=dev-lang/tcl dev-tcltk/expect
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.2.tar.gz
-_md5_=5e3980afbdf58bfec41a3e4874126d0a
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6.3 b/metadata/md5-cache/dev-util/dejagnu-1.6.3
index b0fe8798d1d8..faed74c43b90 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.3
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.3
@@ -1,4 +1,4 @@
-BDEPEND=app-alternatives/awk
+BDEPEND=app-alternatives/awk test? ( dev-tcltk/expect )
 DEFINED_PHASES=-
 DESCRIPTION=Framework for testing other programs
 EAPI=7
@@ -7,7 +7,7 @@ IUSE=test
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-tcltk/expect
-RESTRICT=test
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.3.tar.gz
-_md5_=5cc649c387b53ab791442d28ecfdefa8
+_md5_=273e36909f1405d0c9cbe28daca92c79
diff --git a/metadata/md5-cache/dev-util/pahole-1.24_p20221024 b/metadata/md5-cache/dev-util/pahole-1.24_p20221024
new file mode 100644
index 000000000000..a105db8b8dd5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pahole-1.24_p20221024
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=8
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+INHERIT=cmake python-single-r1
+IUSE=debug python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.24.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-util/pahole/pahole-1.24_p20221024-patches.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5f71914197ea473987293b909da93b9d
diff --git a/metadata/md5-cache/dev-util/pahole-9999 b/metadata/md5-cache/dev-util/pahole-9999
index 06e96f040928..401649c23432 100644
--- a/metadata/md5-cache/dev-util/pahole-9999
+++ b/metadata/md5-cache/dev-util/pahole-9999
@@ -2,7 +2,7 @@ BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[cur
 DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
 DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
-EAPI=7
+EAPI=8
 HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
 INHERIT=cmake python-single-r1 git-r3
 IUSE=debug python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23c95e8017e5e28fc8eb3733e0bab8fb
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5f71914197ea473987293b909da93b9d
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 315d6903c057..15cde74b730c 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/evolution-3.46.3-r1 b/metadata/md5-cache/mail-client/evolution-3.46.3-r1
new file mode 100644
index 000000000000..4e158d5fd597
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.46.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17:3 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 >=app-accessibility/at-spi2-core-2.46.0:2 gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12.21:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef )
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake gnome2 readme.gentoo-r1
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17:3 >=dev-libs/glib-2.66:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.46.3:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-3.0:3.0 >=net-libs/webkit-gtk-2.38.0:4.1=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 >=app-accessibility/at-spi2-core-2.46.0:2 gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12.21:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.26.3:2 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-4.2.0:4= >=sci-geosciences/geocode-glib-3.26.3:2 ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.46/evolution-3.46.3.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d0a42f13be7dab83ee0e1314bbda954a
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 0ddebb2a226a..877038d088af 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/libchamplain-0.12.21 b/metadata/md5-cache/media-libs/libchamplain-0.12.21
new file mode 100644
index 000000000000..f15b5cb2f017
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libchamplain-0.12.21
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1.15 app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.0:3 >=media-libs/clutter-1.24:1.0[introspection?] gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) >=x11-libs/cairo-1.4 dev-db/sqlite:3 >=net-libs/libsoup-3:3.0 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/cogl:=
+DESCRIPTION=Clutter based world map renderer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/libchamplain
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson vala xdg
+IUSE=+gtk gtk-doc +introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.68:2 >=x11-libs/gtk+-3.0:3 >=media-libs/clutter-1.24:1.0[introspection?] gtk? ( x11-libs/gtk+:3[introspection?] media-libs/clutter-gtk:1.0 ) >=x11-libs/cairo-1.4 dev-db/sqlite:3 >=net-libs/libsoup-3:3.0 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/cogl:=
+REQUIRED_USE=vala? ( introspection ) gtk-doc? ( gtk )
+SLOT=0.12
+SRC_URI=mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.21.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=8965622de8718ee1d371a4da86ca61dd
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index df8ba7e85391..43952a28ab9f 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
deleted file mode 100644
index 92d414acc1cb..000000000000
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.190
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=The OpenBSD network swiss army knife
-EAPI=7
-HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
-SLOT=0
-SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.190.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.190-2.debian.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4d4e05540548a81fb044df6db7186d1e
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
deleted file mode 100644
index bcf1c5f1ebd2..000000000000
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.195
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=The OpenBSD network swiss army knife
-EAPI=7
-HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
-INHERIT=toolchain-funcs
-KEYWORDS=amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=!elibc_Darwin? ( dev-libs/libbsd ) !net-analyzer/netcat !net-analyzer/netcat6
-SLOT=0
-SRC_URI=http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195.orig.tar.gz http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.195-2.debian.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1b89ded7aafe3472f278bcb540168c21
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.218_p5 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.218_p5
index b91d53521e15..607c0594093f 100644
--- a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.218_p5
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.218_p5
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenBSD network swiss army knife
 EAPI=8
 HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
 INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=!net-analyzer/netcat !net-analyzer/netcat6 !elibc_Darwin? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.218.orig.tar.gz mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.218-5.debian.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1f4e662e513e5738d502424e229d5ca9
+_md5_=ba0028132c80fbb1e9d4c7ed3c38aa1a
diff --git a/metadata/md5-cache/net-analyzer/openbsd-netcat-1.219_p1 b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.219_p1
new file mode 100644
index 000000000000..84f7fbdc18e0
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/openbsd-netcat-1.219_p1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=The OpenBSD network swiss army knife
+EAPI=8
+HOMEPAGE=https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd
+INHERIT=toolchain-funcs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=!net-analyzer/netcat !net-analyzer/netcat6 !elibc_Darwin? ( dev-libs/libbsd )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.219.orig.tar.gz mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_1.219-1.debian.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=89ecd1920237858351df1f8758e13bbc
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 7b13869b7c46..f2db9ed89bb3 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-18T23:10:05Z
+TIMESTAMP 2023-01-19T05:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPIfE1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPI0K5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4RBAAllov00o1UgNpf/vtGRLoHnAi/edDrxy+/sFB7a0cxRdte+xLbROdOwKd
-4bjdLB4+k1h4O5TFM7e8Lzkox62OuPYh9ik1Lt3zh6KJAZPc78cEUSLbgCy/uHFA
-WhlrqfgIcPu2rdL67aPT80qJ8kaS8l9ATi74Ny7i/7d2uh84AHTkgwP6uNJ7FjXW
-midIk9odYD3hO6fMIIdxt3GOQN9d+vzwOX4lLyZREeDWfeu2LauDXufFG/GiUP6p
-EHF2pJF4rsSth9HsK/ORQmSJCvGzf0FxTbY+57ohWr9+JQ5JLM/C4qsQAheDKJTU
-Z3H4uKT3KO6EnbCEZ6MnFRpggW6tri9Li8x10JYSLS04xj0c0JjM5es3c+967dOW
-bRtuy8RejmhInWU+iAMaCGZi1tPL0bl3tHnnHtSrhhVi+WqovJmAiKmrxaQRvkN0
-/njVIjj+x9VLhxKqw8T9y//ivDv63eXY6W/L64tuKFxh9gIbL2Kw0239tki0Y8AI
-/ol7Fwigyt0u5KYIP8d57h7llAgNCuuW3b6e7uSexzm7PTi2P0DE6TgSAd+k2o/T
-/I7TEQfIbV4F/W0yqEpZitD5JJj3WK50hqROrmF9cDhVwgVWnPZ+OlzAnuBcmaE6
-Ht39PnePQ+pjKOiZqbud7+aQ7B6tEXG41MIaNsmlvhJa4EaRzTA=
-=hBF6
+klBgkxAAj/GulYMJGcNxImrJt2bf+yoShZymj5g+umD4jtRveAzYS9u6qHR1txed
+9Vw2dSiY2whcJQxJS8PzaxuFrzbOE6eBuMtnG37BxxsFnVrE6HkBmMyIaUsrJT1L
+zD9YgECFEh8f0XxDcytZiuV//3l4ACPIg8+a6HwBr+rrM1xGW6HmGSa8IgxFXW+U
+DitmMZQPsKJcSsE8VYL0lIeGl5aAvCh5+ldKlXySrg5RR9uhrDkDJ+0MrJrfT6Cy
+ezq0KYiJzZ5tSSyg3eOD/MDDpcs51sG2eAI7sUmOC+u/qkMKmmiiBIyGIxe98fXs
+DhyOtEpyPU5JieHVnqNfmAyCBFT+1NhPRvtox3kaiplUpsa44eOPmTZEbI6qxesA
+bhuHSiPA1jM3zYypO/OrHiG1OnPhQ5JWYuTOyZ9JoSHMfHBaJ5GkvQym36UCJ+bm
+Cyu0IU3HyIpA1d8v241oKpvjy80TrI+srNUrQXDbzcEyaXiD6IomqITmdXKr/dQ2
+leaaUV16Kamxao4jbvoO4h625GvPjivcY0DI8nONHtRW3jCG9ia3arNyPNKL6OHc
+GB7ZRVIWJXlYShFs3G9B3cNTaOWcaI3GdiyQJNC4D9rvdPWE5krUAy4LMJrg+Lc8
+Nn8bgmo1NHUA/nO78AvI/BMFbVRlHNvAvFS4mAhrccvmdyQaMbc=
+=djb1
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3e0879ba5a5a..35777843ba19 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jan 2023 23:10:02 +0000
+Thu, 19 Jan 2023 05:10:01 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 08f2fc0de982..7584b32d8741 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Jan 18 11:10:01 PM UTC 2023
+Thu Jan 19 05:10:01 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9ad0af26107b..960959d37185 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jan 2023 23:15:01 +0000
+Thu, 19 Jan 2023 05:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 6808f70d1c9c..e6b836a99998 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-c728871c7314838f496f516e46a2d7a528572927 1674082686 2023-01-18T22:58:06+00:00
+8447b2c20881b1d6b1fe417f16c82e39e24c1ac5 1674096515 2023-01-19T02:48:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 884541eec0ac..d261ebe87c38 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1674083401 Wed 18 Jan 2023 11:10:01 PM UTC
+1674105001 Thu 19 Jan 2023 05:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 5814ace3346d..35777843ba19 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 18 Jan 2023 23:10:01 +0000
+Thu, 19 Jan 2023 05:10:01 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 728924b06901..35db46ad1e56 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest
index 05249630cbf6..b3108aae5dd3 100644
--- a/net-analyzer/openbsd-netcat/Manifest
+++ b/net-analyzer/openbsd-netcat/Manifest
@@ -2,14 +2,13 @@ AUX openbsd-netcat-1.105-musl-b64_ntop.patch 12296 BLAKE2B 6c67948bc99aebe60e43d
 AUX openbsd-netcat-1.190-darwin.patch 2045 BLAKE2B d2e0633b38eeb19d6e8dd3dfc6c11fc5b9e47898a5bd1a7793a29a19eff32eb2aa389d8056eb41749a2a75f9254c1bc39b19d29798eea0b9eb85a6a0cf828284 SHA512 527ec082c617e81aaa48e648d07437eddfb65f7dd8ba6e69042c53e00921ddeec53298e85421e847046bcfd7a93425deca5fccf6a9ff2d31b1bcddce3012ce40
 AUX openbsd-netcat-1.190-darwin13.patch 1055 BLAKE2B 9aa8cd60a0d36f58a2c10476e6a754c5961375bc3747dceb7ad7a000fa423f9d139be8f9e78986b15a72fbe20c0f48409e461719cff1a27f4fa1867466cf8941 SHA512 ccdafb9dc20e7f03dd54967d1abf9b0840a5c9dfe54bb33342eb8f70c41dea588a00d6a4b423663a83e26e87c685bc32c711587a53b76a53ec4eb45c361a4071
 AUX openbsd-netcat-1.195-darwin.patch 2312 BLAKE2B 3f3f463b7e438772522e6e8e64dda8be6feeb674b424326e2b3d4eac1031d455544d7c047336c4a64a9ab4c5982eae8d6269d0d8901f7f10df326cbe324847ba SHA512 31f3dd9713daad1844a96f3bb5691d6dfaaf69e81a8c6a67b985e65868365e3e4b8b7b67798d8a82e64f3c1f53a21c7cd7b4df6d94062bcf90022c741b1dad66
-DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a
-DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe
 DIST netcat-openbsd_1.195-2.debian.tar.xz 35984 BLAKE2B eedac24eedc243ad1d58576be76f4f98392e1f455863fa3cdc06bde2714612819b7dfa98dd45c1739a65680469460410f5e4b2f4144f4c24fea04b59dda4d0da SHA512 2a5cc6d04112fdde007be4b9adb3aee44060570c0cb2ae0e33e54af3d37c0b2ff4d6c96edf1f16047365106c7c3720195b38417af3c332226c9be81d49caa552
 DIST netcat-openbsd_1.195.orig.tar.gz 22480 BLAKE2B 53c750c168d7ea5dc2ca653598e42700e2b3ee888d946a09503a22fa3bcbc2c73658f38787314bef628d609ad370223f6889b7019760bf51817f73fc570e1dcc SHA512 ea95cda028f2759835ea8832db0174c178b002d5a917f4c51594445a5377a30d6114ac261071eea98d3d0b60ae1ec72102609db1625dbc5a6e57c67e28d2ff51
 DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc
 DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6
-EBUILD openbsd-netcat-1.190.ebuild 1518 BLAKE2B 901b4c5b0f4c58c6b542667e0740d3058a7e22003805a3520555f7f1b843d5e1338a47db60900db527acc47cb91c3b99d292e34a768fa75dcb44a7f3fc229f2b SHA512 1c26caaa2c5978ddb0348e1c6c2e2855736f8df3517020930ee3dfeb6e24edd08b88e665258a80aeb38d845b6aac5bf20c085edea6450e600c1027a1e836ccd7
+DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6
+DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115
 EBUILD openbsd-netcat-1.195-r1.ebuild 1726 BLAKE2B 7a39b11ed5c6b50e934df489464e56fc10fdeb84ddd95bdf5fadf2d7c7046163b1295f5fe369fc6c837a6de57fd03ee6d1ed00bf207ed9ae0611abe291042a1b SHA512 949579a7edd220a4584b76d0179ae1d43b3fa69cd04f8915d4caa36c3390639773ee98faa094d16ae98df53ad9c7ad4991cb6f9b3bdb58bae921801bfe18dbd8
-EBUILD openbsd-netcat-1.195.ebuild 1524 BLAKE2B e0d11d336a9a2d3ab6bd67c5eb30106a0a58b80f4f0c656853f6f1826167dfc94c62f291b5029a4cf5707ea61547c458916bbfc40f5fbb767ac0f8028bad237e SHA512 2b76e272f75e54a52a30b1debda6aaab7df03be3f054cf3d17234c04bdd881a720c9c74f1c2dde61c1da9c445c2826124d735b909f8d5f2ccb159c6f30b60f3f
-EBUILD openbsd-netcat-1.218_p5.ebuild 1765 BLAKE2B 9b04d309b48eaa0b459af986ce5bbf9fc6a9fc1fb5a77b7702a77c4640ac227369e8f26a297e294dec339d1ffe427e279867dfa89fa1a9bfcab169d58414d9d9 SHA512 7c21a778d9bcccc461b7c27d8c07d99c983dce8d6845fc8e96ae3c61671e021d2964739c2c15aba259cba6c7cf73e1cb9c9cfbf9f9e77c00d6aa993b90023883
+EBUILD openbsd-netcat-1.218_p5.ebuild 1761 BLAKE2B b4a16c5f9abdbce151c6acbc093d98f38e047af5af44a1b90db220b50216450eac71dd0055533f64828d6da5bda4364254ba8c7ddb93bb3cd9bcd644bbc5ca3b SHA512 00debb58166901d4b4221cfe44c857ea4fe1738aae36856632948d7d517d6209d825c9e2261276a53deb7177f30a25472310409a620c831a3fa91b054ae93317
+EBUILD openbsd-netcat-1.219_p1.ebuild 1765 BLAKE2B 584a9965815a6cc85b9b37f200eef3958b7b0624dfab7c9832855305bcd52a29bc811fde22d94aa4d29d54df7f9c3f0bb4e31a84458a772fda4270dc18422690 SHA512 9eb7914ea552ec8c148b046f6eee6ea59691ee479e81a8e3f6e3177ac21c14042d9ace05fb7e6255aaaf8e53560adc551dcd49e6596db564fa8699f6ae88e148
 MISC metadata.xml 245 BLAKE2B ac72ef778f5d556deab2ebcf80116f69791bc0590fea00ad21d361df28a3d1b96fb42db2de7f7545ad6f38137b9c26510efa2a2a251ca5646f77476dfb27d339 SHA512 ad4d8a54ad37031eaf3e1f1a06d53b85f504bdeeda433eee0a6101c2ccbc5b8da2d33725c9b0dfd013c3c5ad218171f6010722f443f81124086bc8c54a216b06
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
deleted file mode 100644
index 70a973b584c8..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
-	https://salsa.debian.org/debian/netcat-openbsd"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
-	!net-analyzer/netcat
-	!net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
-	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
-	done
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${P}-darwin.patch
-	fi
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin nc
-	doman nc.1
-	cd "${WORKDIR}"/debian || die
-	newdoc netcat-openbsd.README.Debian README
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ ${KERNEL} = "linux" ]]; then
-		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
-		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
-		ewarn "to the running kernel will do. See bug #490246 for details."
-	fi
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
deleted file mode 100644
index d82b685da2a0..000000000000
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.195.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="The OpenBSD network swiss army knife"
-HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/
-	https://salsa.debian.org/debian/netcat-openbsd"
-SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz
-	http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86 ~amd64-linux ~x64-macos"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!elibc_Darwin? ( dev-libs/libbsd )
-	!net-analyzer/netcat
-	!net-analyzer/netcat6
-"
-
-S=${WORKDIR}/netcat-openbsd-${PV}
-
-src_prepare() {
-	for i_patch in $(<"${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}"/debian/patches/"${i_patch}"
-	done
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this undoes some of the Debian/Linux changes
-		eapply "${FILESDIR}"/${PN}-1.190-darwin.patch
-	fi
-	default
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin nc
-	doman nc.1
-	cd "${WORKDIR}"/debian || die
-	newdoc netcat-openbsd.README.Debian README
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	if [[ ${KERNEL} = "linux" ]]; then
-		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
-		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
-		ewarn "to the running kernel will do. See bug #490246 for details."
-	fi
-}
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
index e877bbe04ee7..b60dcaa1673f 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/netcat-openbsd-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
 
 RDEPEND="
 	!net-analyzer/netcat
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
new file mode 100644
index 000000000000..df4845a47877
--- /dev/null
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="The OpenBSD network swiss army knife"
+HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd"
+SRC_URI="
+	mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz
+"
+S="${WORKDIR}"/netcat-openbsd-${MY_PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+
+RDEPEND="
+	!net-analyzer/netcat
+	!net-analyzer/netcat6
+	!elibc_Darwin? ( dev-libs/libbsd )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	local i
+	for i in $(<"${WORKDIR}"/debian/patches/series) ; do
+		PATCHES+=( "${WORKDIR}"/debian/patches/${i} )
+	done
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# This undoes some of the Debian/Linux changes
+		PATCHES+=( "${FILESDIR}"/${PN}-1.195-darwin.patch )
+
+		if [[ ${CHOST##*-darwin} -lt 20 ]] ; then
+			PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch )
+		fi
+	fi
+
+	if use elibc_musl ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch )
+	fi
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin nc
+	doman nc.1
+
+	cd "${WORKDIR}"/debian || die
+	newdoc netcat-openbsd.README.Debian README
+	dodoc -r examples
+}
+
+pkg_postinst() {
+	if use kernel_linux ; then
+		ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older"
+		ewarn "and kernel header is newer, nc will not listen correctly. Matching the header"
+		ewarn "to the running kernel will do. See bug #490246 for details."
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 33820ac18633..7b2e69fe8b9f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index e7cde6a4c67f..b8cce32d1394 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -3,4 +3,4 @@ DIST streamlink-5.1.2.tar.gz 494342 BLAKE2B f916aab0fcd346e9945de04335309c61cb83
 EBUILD streamlink-4.3.0.ebuild 1395 BLAKE2B dba4163937369a5b50311ee57103cfe1408a857a93066a9881df0e4ef8c18b446df215904b7a1b713800272aac2ff201be5d98fe1142e218c676506d3c2d73c5 SHA512 b41080cc87d8f70c2ee6514a3407b83d55f583e82df31b8229d08f682021343fe9ca6e02c16a91cadfefcafd19fdfc0377450b6503ef880d05906f08d868d47e
 EBUILD streamlink-5.1.2.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
 EBUILD streamlink-9999.ebuild 1529 BLAKE2B 958bfa808f760c61033d8bc314c2d457cbe40ab4f9453cadaf7d9ee8d23a64562a3a9ead3f5ac24516e147c69f1194dfdbdf0125d2af701a9eb87012ad1c7c87 SHA512 5e380040120a622ca487250b539b134e05fc717a234d9bc1d207c14d7e53414bff72c53bc5c378363ac860d3d437789c0baf2e65469dee4ea0ac92ba43ba598d
-MISC metadata.xml 379 BLAKE2B 21a218ca77644378c3f697dc3fa4419cdaa9c45a39412d8dcace6b84d15a3aca6e835fd664fbcc6ee894a041b5513f0253d59b9d4529380782c92b1e3f7bef8f SHA512 f1d9151410ce62fff5c475f648c6b17d360def428ebf464282019672b4acf2efe0abfc03b8207417ba741c897a1e7b7789426e5f133ac57826f82b12ef39939c
+MISC metadata.xml 374 BLAKE2B 8c5f72454d8d00a99c18328838cc9c3be82cd9d68405f6e702239b8475a9162f3ba945b142bf2f5762fcc4ac52cae95c8e2d5c0707b1028c11faba2341a2d8e9 SHA512 038e509b340b1cc31382b0a1edf0c273fe99ca7c8c40370039a01cf6a95101d1217db7fea64bc67f5c113c99d504ceb7256008c1539c4d7e13ad6ceb8b922a58
diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml
index 808c293896b0..c8aa42c057c3 100644
--- a/net-misc/streamlink/metadata.xml
+++ b/net-misc/streamlink/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>leio@gentoo.org</email>
-		<name>Mart Raudsepp</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">streamlink/streamlink</remote-id>