gentoo auto-resync : 26:12:2023 - 01:33:45

author: V3n3RiX <venerix@koprulu.sector> 2023-12-26 01:33:45 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-12-26 01:33:45 +0000
commit: 15bb7733ddb1f16a0e3936969282ecc42419829a (patch)
tree: 56c720cc03bec3e9758966b4083b5916feca6962
parent: 026061ba423025e6713112920f290759cdee03c4 (diff)
203 files changed, 3215 insertions, 2793 deletions
diff --git a/Manifest b/Manifest
index 54ee36234362..801d9dcb310a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29270 BLAKE2B 045a5676b868942e2f37db5d4483abec5e6244413362014238302275fd6d415f2ae3f2dc82340ab45da5800f75e4805f35540ef4d657345958737430c141900c SHA512 3ed05078a51f12a21df1ab806131ce5d036c308822618ed3c57df2835193876cd0690645a9358f0320f4243c83adf4547bbc33f75f6e5ffedc4b43b08bc62082
-TIMESTAMP 2023-12-25T18:40:22Z
+MANIFEST Manifest.files.gz 29248 BLAKE2B 5f8ea2b32b66d852d5b4b83d5cb98fb98eabf0f78a1d4af8d3e225011d330482843af401c4291aa2b730adc3eefba764975d930f9d178c073700232d79381f99 SHA512 93a1e944943138ca7a74460157d6966604dced0ca5c7a8bfcb984174f0fffaa0d0184afb91af101b8f87eb1b8a3ce58f0f3e1a5fce0454613e8f4f854df3a0ea
+TIMESTAMP 2023-12-26T01:10:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJzJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWKJ/VfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klC4Ng/8D8Jy4bVIoJj+XzCGL3lPQwFPkRUUq76swi2rM+asL5hWD2E/QnfRBG/J
-e8FLFru+XiMkSkQZAds9n1os6h4FlxhHXnZTX8/nwqHSvPSwtuRfKoilsDma75EE
-KpW5ZOeO6CKGQo+mH2esIxAiZZqAyMynGgovVxvgZWzY6Uyjagoa7Oj+qG7bJdor
-vySuCPH9DgAxj2sGFObfHe7nmRHYjTA5KDiQFQW5H43OAqTc6RUa5r2RC7xMIH+z
-bCQ4WCDCYwJfUIZu6Y3ct3YmGqw53I6JhSaV9R3g1jDVQ5qZTQgGPygAqgXyJTuj
-lGPOybXChl6QrZcvdvXuH8GxSZx0Rlr0s1CB06vsSslWxVcvIQN1Wa0QH3BBTcDX
-aX3yjNbpIOYeKvgQB+ytUa3nFd+3NYMhaBM4lPTcwqlpQnv+7hWNIBycajLiAa65
-d6c49r0DgUTheHW7auF6y43qiN8+PM3yHVRFWsWsdodSMNM/xrktfG+Yidm9Kzwv
-H4j1mAxFVm4NFpL3t/Ynqog+SLM19HcNlgXzTUw+skcfWlaSWlvXXlRAMrs0IO2b
-YFhRxvHUo3EsNGHXaEjnJM70THaGkgNnAXYFMY0q68MuhdKu+jrH4nUxaEtXFdSp
-TH7BMPxJmopyrI0U+5TU7NA6BKtjqmX+cDvB2gJ+v5A7JXN6f+4=
-=jodo
+klCioQ//bfpsvbHRMy8Wt1lvEFWKckbQMz3ykmB1MJxhaxDC8d1m8t/xHCSZ+ka5
+CXT7mV618tXmdM6zV8Ua4gmfl4r+ZJkE94DGklGiwGa3tS/mP7C+loqRGwy2TFDx
+UCzd8fpau6CIFHe7Ed6Cb+r666gVzwrKSE9ZSGtqc4G4d6C4PpbdtpT1Q4taBF9K
+10os6t/yvbrJSywM84tTDYnbfLEh4JbesBdBuDyoqEMoSS8skrv0uwoYWKh/T89m
+wy7cptz+hxlfVrF3a+4sq+lnNlgCj6tJfJEJRBQwieH4Zp+6VMihgSiYdHkIDul9
+n6hOC7/34I1ECCwvg2NWaNQkbxVjMVoYIqcFgBu98SxhxLsJpJuV+ul2jqIsGySE
+FRGCCWQUq0yoxcXmlsapQXWAd1LLJ3+6np22BllxKFYKDjI8HZCcY9eHsbsxqTDA
+ke3AqH3dNr11Rj2Z+aPwOmP7HifUrv6/KSK5vbfvVZmbnZyFGDOo4tCYIndSKvkN
+k8oQUgvqJ+VYquGa9T7as6T6bBpctvH8o86PSut3bjJeKkBo9OtRXL7LBTxwNpDB
+n0iBD0GSCg4o5i7e8d/j7uQj+il5j/TVP94vyxn1f3Oc6MDkbVgsszFLhNbm55DS
+NCZ0IyIJwa4rbJMRizCBIhSyVvivFtATgfDWqnqHPhAiXB5HymE=
+=pOtB
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index ce12c7903d76..65f351470de7 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 25b6fa6e08a7..c3e810f36240 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/duplicity/Manifest b/app-backup/duplicity/Manifest
index 37bdb2fe0bc5..2c1906d831ef 100644
--- a/app-backup/duplicity/Manifest
+++ b/app-backup/duplicity/Manifest
@@ -1,12 +1,7 @@
-AUX duplicity-1.0.1-fix-docs-cmd.patch 642 BLAKE2B 02fc2a2efcfbd6cabe6da997efbf02401df0560edc239b949f89357c66735b6a7282c356fd93ce2b1163543e1fb95ab17332a4ac9f0aea16ae5ec92f232c6c8b SHA512 410515e48aa5c64aa72bb6930bedc5542f57265d31c80bca1c95244d2e87bcf74a822308d27263f48726349a8271db6663b14159c6c3f4b10d25869078fdce6b
-AUX duplicity-1.2.2-fix-docs-cmd.patch 616 BLAKE2B e138d8778896254cbf0daabf5457ff7a4fdc6600d9618eef2ce1cc8eb24d88bb8d8ba69ae691d31f5dfa1937c474dedd67cb2fd0a8f1270617ec64fa3300fc00 SHA512 e94433b2c7e50c8e3a5f1c46653b656ac079cc87501c4dfb8b8c78b5895a666c537bea713e51de299b7f05eeb3c68bc3d224ea570f79a0f425f744b1e52c15af
-AUX duplicity-1.2.3-fix-docs-cmd.patch 621 BLAKE2B ca8f2aa4099ffac152cb7844e5f871679fac0a8c28a19f9c445b820b4a40ec95835f70cdbd2db16f22e2f7dacbb961147f85810682744e058525930ef78dd4e6 SHA512 df3da633bd6d2d1ff250a8d51824be13756d59809fb893ddc48fa7449ef80b5f43464bbfaaaba5efb1bbb3782745a2375e321944b86d2e902f617381b088a9d9
 AUX duplicity-2.1.1-fix-docs-cmd.patch 612 BLAKE2B 5ca3ddb929e492d54ff337b08d5e729c2e54054838541783eee9685313191e844eaadc19362c488c24d3cf9538bf279729b021ed458af1cc34d1034842467f10 SHA512 531028745892557ea133c28d0c6f8816991bada6f5134e5623eeb83db35e1d5b59790458406279af427a2b166c3b5d5d22b052939f8ae34b4dfd0699ed318fb8
 AUX duplicity-2.1.4-fix-docs-cmd.patch 583 BLAKE2B 0f57dee13013e53b21196a2ee0a6518d472d20203b69daf0042051d3b3b0288d376b505167c3442da1ff7944e7f7e5444f0c5cd25a54ebc89ed87ca7f84f8b31 SHA512 a438332f371f8c23ddcb7ef66820490652cad6036e93b0e1bf258a979460f512e091cf562d301aee4d8340feb0d7ac780bdb740f75fcbd9427f682b6131cbe2c
-DIST duplicity-1.2.3.tar.gz 1438570 BLAKE2B 12afa69f537d2207343c1638df1cf69ad3e170b2f1368e5d8b86716ccc67564834798e2076a90f021bae8f1d8574ff50f0615fd873cdcddf1399349974d8d4c2 SHA512 d2a31b4ed2c0a188d6d2ac543d3d4a474b4c10028a3005b26f57bd57e8c7441eb96e361aa9805fedc6aa09e76e86d3d1e99800669dfb7b2510233e2c0aba15de
 DIST duplicity-2.1.1.tar.gz 1420132 BLAKE2B 35cfa7c6c2caa647f3b2046783185973203b5d838c0d1a1a8e24982f1c7f74a1d025e0b0740c0c7bc14d516c59d3e691a2712b19b30882e9dbb411cecb90f4be SHA512 fb19b1723e1e220ca72a41c3678ca29d889b2315c7fd043334d55cc2040d991e66480d71c6cc3f2ee5d17d9e1d9fb24ddc4c0ed771bbbefb6f1f6aa14cbe0347
 DIST duplicity-2.1.4.tar.gz 1556341 BLAKE2B d8302a7097519fd593fc05c8390101e615eaf11333e9d15e1ba7756b8ed9764709db80df41c741ee39eda0fa6de22c910b53db32d558c1ab09867c66724a056c SHA512 91804c6f4dc13d700cbe4747317f9611f530996de8a22a0907d714fb6f8a7fadc3371c270a2257c24324c0233bb4501a4b7d33aea7631862568c8530f7173ef1
-EBUILD duplicity-1.2.3.ebuild 1125 BLAKE2B 9874a0f6755e920108d0f470ed49019244f490f2b0e3b6764b81760d5e0bdfcbe2687ea0195e6fa7477e74ab9d040f9271d69eeee205436952621c036bec1ce5 SHA512 ed5c81c476a67b5d0680a6277d6f0001140cea1916ddecc9cac695183948a89a20528af83a6c0f148220d28bb5abc6805f81e07cecffba2b6298700b9b047314
-EBUILD duplicity-2.1.1.ebuild 1105 BLAKE2B 4692bad0d78c119663718d6a9003bf3ed2cb5efcd12928408b7436b65d4eb76e7bc57802673da348e3c4472a64c9468a9a33cf4adb04d7ca88679073a0e900c6 SHA512 aca08b7e7b068422d6b7416d66c159e947df88f1d2a7855a00a9e2893cc2dd041e3cc65655247aa77cf4116f1876c6cf53f25b3262b8b9680295b5d160965703
+EBUILD duplicity-2.1.1.ebuild 1104 BLAKE2B fc8c76dd34743ba358f516ca05debab6e085e71f1cf414be67dd154aca79ba02532aec6e2f710607b0ccf9412dcc6b8a41a2ede7acf1a0b1a5889733b9252fb1 SHA512 b5ec8d99dbf16be127b5d35433263745b2ae86eb7afb4c06607c7bdc62cede321667bbd41c7b0b4e0896e5da34e64032ef97a30520bcf164cd88f7f8a2461611
 EBUILD duplicity-2.1.4.ebuild 1106 BLAKE2B 00f2105cdc6b2f27998734a9cce83faa46f33c8010fc86739a4e1477d48356fe9c80af65062f52f20a633c68a010b0cc674bffacb91fa8b3239be146fae34e57 SHA512 9df3d61d61a466351cc0991ba70a1a212ea07900634cd3dbaf21ab357ae27b429d1d208df4169928cbb5b11fe87e0615e43a2ed3ca8db106cff484a7ec83b174
 MISC metadata.xml 404 BLAKE2B 9fa4c854c3f8ad4cf2583806f1335a86271123390ff3b2ae887fa5c2acae5e7a69c38a79d6ca09d9a6a30d2d81b5806f1fa0e580a55ac37fa61a54a52d348193 SHA512 9c0ff92038e96fca050bd49d48d5dd0027fa1e5e1cd5269e7cb42e3fdf2b526365ce8df8dba918feeb2dbe246bf1e2163b42b77ce0f8b5bf5b990ab8b9722dd8
diff --git a/app-backup/duplicity/duplicity-1.2.3.ebuild b/app-backup/duplicity/duplicity-1.2.3.ebuild
deleted file mode 100644
index f8569946b908..000000000000
--- a/app-backup/duplicity/duplicity-1.2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_10 python3_11 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Secure backup system using gnupg to encrypt data"
-HOMEPAGE="https://duplicity.gitlab.io/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="s3 test"
-
-CDEPEND="
-	net-libs/librsync
-	app-crypt/gnupg
-	dev-python/fasteners[${PYTHON_USEDEP}]
-"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		app-arch/par2cmdline
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	s3? ( dev-python/boto3[${PYTHON_USEDEP}] )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-docs-cmd.patch"
-)
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	elog "Duplicity has many optional dependencies to support various backends."
-	elog "Currently it's up to you to install them as necessary."
-}
diff --git a/app-backup/duplicity/duplicity-2.1.1.ebuild b/app-backup/duplicity/duplicity-2.1.1.ebuild
index cc8bfbda51fd..5912d6e8f64c 100644
--- a/app-backup/duplicity/duplicity-2.1.1.ebuild
+++ b/app-backup/duplicity/duplicity-2.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://duplicity.gitlab.io/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="s3 test"
 
 CDEPEND="
diff --git a/app-backup/duplicity/files/duplicity-1.0.1-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-1.0.1-fix-docs-cmd.patch
deleted file mode 100644
index e1382720d17e..000000000000
--- a/app-backup/duplicity/files/duplicity-1.0.1-fix-docs-cmd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- duplicity-rel.1.0.1/setup.py	2022-03-19 15:08:36.755624771 -0400
-+++ duplicity-rel.1.0.1/setup.py	2022-03-19 15:09:38.332763172 -0400
-@@ -94,17 +94,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'CHANGELOG.md',
--                u'CONTRIBUTING.md',
--                u'COPYING',
--                u'README.md',
--                u'README-LOG.md',
--                u'README-REPO.md',
--                u'README-TESTING.md',
--                ],
--            ),
-         ]
- 
-     if not os.environ.get(u'READTHEDOCS') == u'True':
diff --git a/app-backup/duplicity/files/duplicity-1.2.2-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-1.2.2-fix-docs-cmd.patch
deleted file mode 100644
index 7ac49ecacd86..000000000000
--- a/app-backup/duplicity/files/duplicity-1.2.2-fix-docs-cmd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- duplicity-1.2.2/setup.py	2023-05-01 09:21:01.020192022 -0400
-+++ duplicity-1.2.2/setup.py	2023-05-01 09:21:51.268882266 -0400
-@@ -95,17 +95,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'CHANGELOG.md',
--                u'CONTRIBUTING.md',
--                u'COPYING',
--                u'README.md',
--                u'README-LOG.md',
--                u'README-REPO.md',
--                u'README-TESTING.md',
--                ],
--            ),
-         ]
- 
-     # short circuit fot READTHEDOCS
diff --git a/app-backup/duplicity/files/duplicity-1.2.3-fix-docs-cmd.patch b/app-backup/duplicity/files/duplicity-1.2.3-fix-docs-cmd.patch
deleted file mode 100644
index 03b090d0545e..000000000000
--- a/app-backup/duplicity/files/duplicity-1.2.3-fix-docs-cmd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- duplicity-1.2.3/setup.py.orig	2023-05-11 12:33:14.480474449 -0400
-+++ duplicity-1.2.3/setup.py	2023-05-11 12:33:19.204538723 -0400
-@@ -95,17 +95,6 @@
-                 u'bin/rdiffdir.1'
-                 ]
-             ),
--            (u'share/doc/duplicity-%s' % Version,
--                [
--                u'CHANGELOG.md',
--                u'CONTRIBUTING.md',
--                u'COPYING',
--                u'README.md',
--                u'README-LOG.md',
--                u'README-REPO.md',
--                u'README-TESTING.md',
--                ],
--            ),
-         ]
- 
-     # short circuit fot READTHEDOCS
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 079d77a64478..f1f5b7318451 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/sbctl/Manifest b/app-crypt/sbctl/Manifest
index 98722895ab67..8a1dea61ff83 100644
--- a/app-crypt/sbctl/Manifest
+++ b/app-crypt/sbctl/Manifest
@@ -4,6 +4,10 @@ DIST sbctl-0.11.tar.gz.sig 566 BLAKE2B c840d5375cb00be3daa5522d0dfb78bf4ba093901
 DIST sbctl-0.12-deps.tar.xz 21415148 BLAKE2B cf16f7dd3341f7fef273d542f879d5e0a60b8b648fcd1efc8c85a66f0342b0631c5d273417777ecdd4231709ba6ef59592d40adc70a55b59af1aa36987019492 SHA512 f969ca335f14b9f3df52188e00ea68dbd69eef3bcbf71bbd162d0487f28f040ab14ce755ef56b554e7bde3e1c587f0f09ee7b4331edf5baa380b904694f0ad9f
 DIST sbctl-0.12.tar.gz 1642221 BLAKE2B 69ebaeb8e81dd45d4e46438a8275c371253e0711fc48aefb9ee4b30b1a594681f355e2940e342d54b35561b315213b70a2ec1743933fd8047f88fea55b09775c SHA512 dd64490cf6a59d24ab8a93e6b433225383b2dfc0006b5d6331c1efe4cfc896619d636a526f0ed312f6dd4d89a047deacb3a013cf84cd2cdddc5997c5630cf1e5
 DIST sbctl-0.12.tar.gz.sig 566 BLAKE2B f8b33fb7525311f1213bad0c7712be6596828fd0f5f748f97fc7f0df0b92a2017e990655c1af43d2bda330a3ff10cfb76a285b14a30895a986635986b1c2bc63 SHA512 41471decc60e23115d3d34ef4146e7a4782b7dfa4a8609e8d1b8529ab85fafb124a2862b7f9d70128af6f15bf5a6c85ed49c60fb66eb3bb857143e285c262fd5
+DIST sbctl-0.13-deps.tar.xz 21415148 BLAKE2B cf16f7dd3341f7fef273d542f879d5e0a60b8b648fcd1efc8c85a66f0342b0631c5d273417777ecdd4231709ba6ef59592d40adc70a55b59af1aa36987019492 SHA512 f969ca335f14b9f3df52188e00ea68dbd69eef3bcbf71bbd162d0487f28f040ab14ce755ef56b554e7bde3e1c587f0f09ee7b4331edf5baa380b904694f0ad9f
+DIST sbctl-0.13.tar.gz 1642040 BLAKE2B 569f42ca5694a4db0b1b66ef58dc255ec337a99f8025c61c58d5b54860e09f543e29e63b0e3adf65e3883abacabf6c1554e8849a8b25569ea05414d86fe0cfc4 SHA512 02c1f3e745f83f0e0a2fe90974f940a314aadbe26bd0d0c3e314bb3720b72c74715a26c891f8b22023f40eb8d1d8d24a7d2b1bc1c5d60f9781971f7e97224a4c
+DIST sbctl-0.13.tar.gz.sig 566 BLAKE2B e0996fc4732501b1e66b7c65c9f4523a0c9f4b714e8b985bf5ad8b6d662dff99ddd4f4269374cf8e9e206c1ae8884ad312cd20cc8fcf33ed0af1ca0d1d81e967 SHA512 9435943dda069a5ae5629ab1880158349127654f122a2e5251cf8625db00cb12e85a671c24dda630c2e9beb312cc1c6cf2c24edc7d3a37e6b22ddb871e5c8682
 EBUILD sbctl-0.11.ebuild 850 BLAKE2B e349e11143d6c459b3c0d57192c2e2b076ef9bc36d2dd2b00ef820f5d78673aff8048a2dab943a7f64d2a7e78a22cc34db3a4b80b904567e5643e69dca0be935 SHA512 0becb4857f2605b613c5de80dc18462b9a83c38abb0c37ebf38ed96ec91b5090095f7f834e47a1b8b9d0bcbfdeecfbae9748f599b354d46e3509a4eb4f373034
 EBUILD sbctl-0.12.ebuild 862 BLAKE2B 07664ff9120cd94e1fd12609463a6770315e84c2d8cd3ae602ad317e26d163cb35d78eb7fa2cf044df7a23850001e0b6bb63f08d06030e383697f1dc52a1c7d0 SHA512 32ddaaa63086db358c0cbb903febbb8e73f0528d03c429ba98ba4d093ad39b44597dc7ec85f0b953d170126f52f105f8fbf12093dca8237766375de9f78c831e
+EBUILD sbctl-0.13.ebuild 862 BLAKE2B 07664ff9120cd94e1fd12609463a6770315e84c2d8cd3ae602ad317e26d163cb35d78eb7fa2cf044df7a23850001e0b6bb63f08d06030e383697f1dc52a1c7d0 SHA512 32ddaaa63086db358c0cbb903febbb8e73f0528d03c429ba98ba4d093ad39b44597dc7ec85f0b953d170126f52f105f8fbf12093dca8237766375de9f78c831e
 MISC metadata.xml 395 BLAKE2B 97800aba6234078f4a8cb45403e13ce6b0c38c27480d8b351d8d28c11daee6672c920d8a713bde6ff861e15137df4c4c4991fe717008d81a1e4fa3e3299a5cdc SHA512 3c6022f6d5fe33aa7d22469ea24c46adafa90d12024f9f13f76ca55d1d7930560a31640247ac8ceef54eb6789654f06733e685ef2b8a68e68816784215f165f2
diff --git a/app-crypt/sbctl/sbctl-0.13.ebuild b/app-crypt/sbctl/sbctl-0.13.ebuild
new file mode 100644
index 000000000000..6d78f5f02945
--- /dev/null
+++ b/app-crypt/sbctl/sbctl-0.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module verify-sig
+
+DESCRIPTION="Secure Boot key manager"
+HOMEPAGE="https://github.com/Foxboron/sbctl"
+SRC_URI="https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz
+	verify-sig? ( https://github.com/Foxboron/${PN}/releases/download/${PV}/${P}.tar.gz.sig )"
+SRC_URI+=" https://dev.gentoo.org/~ajak/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-text/asciidoc
+	verify-sig? ( sec-keys/openpgp-keys-foxboron )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/foxboron.asc"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.sig}
+	fi
+
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 81f2a16b112d..e29eac565fee 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -4,5 +4,5 @@ AUX xca-2.4.0-man-page.patch 903 BLAKE2B f734d19e252d0cfb566f4a309359d088701dce6
 DIST xca-2.4.0_p20230526.tar.gz 1818483 BLAKE2B bac990117d1d6a4f80d4ad2317653d8817c7d97e3ea4e92e6fcb6a1531eb782ead4a0504748107697be6e98816e89f33f43de1a8073394e4ead39c16dee3987e SHA512 1252a8230149b04c98dab6ec5fc7f424b6eb1552553831e1c53690fa55ce919537d20741dd9f0e9ac7495d3f80503d2b6b5f0c9322912226363e2b5feb66e416
 DIST xca-2.5.0.tar.gz 1850445 BLAKE2B e12666fc0513cd04bd61d4e182851c055c120425ad8d2fb2698396429b7afb4cc57c77be6d6cc3f63f9d49d5a179123b336d43dde57ef4a3274e7ba1a06f22f7 SHA512 8b283509849c9ac34d5250c780dc0c7a6319eb3201ae892fc2c38e5257d7db4e565e88167a687ffc1ca436068a41cd48fad59d3ecc8235678d46cf026280bd5e
 EBUILD xca-2.4.0_p20230526-r1.ebuild 1717 BLAKE2B b27e3fcc801831f8a3aa6b07aff4088ed9f84f3ace8190776d22a51500fccfbe2b160f81b17e45fa641c9835b91cf668fe7cbe515d79d91fc9d7076ec9c15080 SHA512 718ce20a3b8de4b2ed55e980dc8f5966ee5295db837d396835c36846c467b0ea5a43487c2183e90b8a0d0cb93d2d72d2668c90cdac75b329716cc4145a72c37c
-EBUILD xca-2.5.0.ebuild 1423 BLAKE2B df5ae31b5e0eb15bc1f9a983ccb7788fed15d2efe8f1fc25beeed1372eba44a867c4d1305131eab4347151a6b3a177609339f82c3459de08ac20100eeb78d8ee SHA512 ad83655fc76d256a276ee17ef32e4f05304f145de79032453dfbdb5fcbd1f863856916611aedb1033de29580aaf3276250725b21855bff46ce7f3795bd000d41
+EBUILD xca-2.5.0.ebuild 1422 BLAKE2B 5bb20ef5e402e71edc6f742da5c0c952f7c77dbb189cd467d41220ea4778e1e72d22d1af5aecb92b2c92fcff724cfc3809d0d7496285d874f7fffbe9c7358579 SHA512 5d0c71bd48fb1ed2fc8e877226e845e1f5f1483e0d98882b1d7b8ab0fd3c3c7c06e13c026b8f584e8953a1b792f1f5a609372a389506f27ea2fe6e5b8d942da3
 MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/xca-2.5.0.ebuild b/app-crypt/xca/xca-2.5.0.ebuild
index 64d168ba24ab..d1a0d3ae5764 100644
--- a/app-crypt/xca/xca-2.5.0.ebuild
+++ b/app-crypt/xca/xca-2.5.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/xca-RELEASE.${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d51988d11b13..530cc1bbe87b 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 169e2f66d1a6..6af7d683f5da 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -20,7 +20,7 @@ EBUILD emacs-27.2-r14.ebuild 14379 BLAKE2B 14b13ae5c72bc6c00580f43e6d1fae406147c
 EBUILD emacs-28.2-r10.ebuild 17261 BLAKE2B 9c89146ecc8b2cb386e924c9cae716843f368434447a60b670116a96d96fb379f29d4526eae6f79ed65827353aaf0818897653e5a2ee736f5cfdac5ffa16b242 SHA512 9826bdd31055ca0c34ad1b16dea7f652a0b35021b2c3baeb9a8a0db177183bded3559cbffd883cf07d8e3f44d108c9d2470a3b9f352577c8f20eefe08473caf0
 EBUILD emacs-29.1-r1.ebuild 18597 BLAKE2B 71dd2c29145575dc8afc7c78efacc10ff522ab02f1ce0d5e7276a02813df4e70c3e08e0e31efd026b24200847d7f8857384571571d36588c07d67fb608b959fa SHA512 882c011761c347c7cb2be4441a7ebd2927ecd65e16abb0f3e7399409d5f20d3b8353d9143007dd97522b54278ff280e90953544d0778fee6a3b6c170dd5ffe4e
 EBUILD emacs-29.1-r5.ebuild 19164 BLAKE2B 17eb8d1fc7987faa7f0fe1ff977282e6694c02a29b533311a7c9e9a2acb752148aea6e219600e54488da86e3630fcb797d4bc98cac3d724966c35994bb5c9978 SHA512 012af23bf83fbf66fc449c032eaac0734606573538dbf30c5720feca467e2d2dfbb53d790a2dd023a5562e1503a4645e1de336ced7d5d8e4667c8f9a4c3f7c67
-EBUILD emacs-29.1-r6.ebuild 19240 BLAKE2B 0ea6b12e14623455d5638fb31dc48d64e3f5c18ac044ae36f2d2eed9555f1931b2115b218410eb071badf5bb9cbabe2f3254bdcda9a6f5805bb0fe89f5e8164e SHA512 6080824b82bb1c27aea107d4d7b5d5c2ca1530d23470f462070514ae0b6a9b23e8fbbb920606a263ad5812b20fae4c89050339b3991503bd3b1cd47eee861d50
+EBUILD emacs-29.1-r6.ebuild 19239 BLAKE2B f0ad2be0a1206ce25efa28bf9a740a79795c6889acba51df06b68d5590de6f61868ae4220967a22c80448f6c3ae17357fd35f6cab47861dabd833b93d5eaadad SHA512 643bfb73bd488b6453411307c60785e683ba1e2762f32a3276c7d906f4858dfcc89eb0486a3ce26a2246291f0af072e2896ff9c9929a44567ce0d7dc1339565e
 EBUILD emacs-29.1.90.ebuild 19105 BLAKE2B 8baf766c1aceba9d90a2053046e4a5eaa5c9213b6225df9ddcf565ddcfd2924d0ca99bfada511a7cc6e34ebb39e294c1f1d27cfb18ee839b074d3c60254817e5 SHA512 70ce704d270e818bd4bd0955f0d6d4b7c5ffcb948da66a48ca0d699cfd3488695634137fc6b623b167a125e41ef252a024f214019fbc7f6c6548b8345b2e525c
 EBUILD emacs-29.1.9999.ebuild 19105 BLAKE2B 8baf766c1aceba9d90a2053046e4a5eaa5c9213b6225df9ddcf565ddcfd2924d0ca99bfada511a7cc6e34ebb39e294c1f1d27cfb18ee839b074d3c60254817e5 SHA512 70ce704d270e818bd4bd0955f0d6d4b7c5ffcb948da66a48ca0d699cfd3488695634137fc6b623b167a125e41ef252a024f214019fbc7f6c6548b8345b2e525c
 EBUILD emacs-30.0.9999.ebuild 19159 BLAKE2B c7c2d703afa42a1916f64c70f633f28dd26d9c962eea23e02efc3e55c564ce02530dfab259c6e9af25806144491ea63a06f175e7923bda344b3d29ad03eb3f04 SHA512 2d9515f20ec2e4cdec1e78028021611f1697c9bdc21b7c87051b452b4b52751efbd4d5ea77036c15055faaa66374974062760e4a25a021838a8b2f680402794f
diff --git a/app-editors/emacs/emacs-29.1-r6.ebuild b/app-editors/emacs/emacs-29.1-r6.ebuild
index 2f5b047d8ae4..a7a032a0e910 100644
--- a/app-editors/emacs/emacs-29.1-r6.ebuild
+++ b/app-editors/emacs/emacs-29.1-r6.ebuild
@@ -36,7 +36,7 @@ else
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index dbce03dd45b1..1f0408113386 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 03a35e40d077..e4667dcb274b 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,6 +1,3 @@
-AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
-DIST htmlcleaner-2.26-src.zip 414195 BLAKE2B c73533054bf7a8a66a767e53cbafecca1f174cb3be16e116ddd0e025e627603e225323e9095ea40b38a06c661ebe9f2a9e1f53736bf74fd8a2e41d909381c4fb SHA512 df1f9ccc696d538289a0addd19f8d955a3bcb0da88640208c513b2f4f0c4a3ee516b459aa3aae25d36d6ec09c4082b96484df287fb422add2eb160072668af5a
 DIST htmlcleaner-src-2.29.zip 394326 BLAKE2B 6317e5dd51facd901e7a5bdc72322c58deb5d3a2e2d0a784e6cd71b938c7b46b7a612d0610a1e5f96ac6c55714942e00ffa68f2259416fe1e6be8cb5ad96c0b3 SHA512 87c3884f56c01d4f34be71b5a016a839f949f03ea429a3c10cc5518fe954b09aa42d05fdf821e7b0bf2115787cffff6ae72dbe13e3d7e08537c4ffbf51d6b34f
-EBUILD htmlcleaner-2.26.ebuild 1166 BLAKE2B 3a47cb454c26c29ba25b8e03d698f0e19cc381ec6609d30275aa9146416ba2dc5edd7cf77b64ffc7c2c3c07dd4ebaa229af07603ae0c6ec76236bbebdca24be5 SHA512 a473317d619edb39df2b19bb9cd653c0252d5de110855dd481630271777763c91cf67dd5aabe0a2869d1d0b8b50ca8b9976597b4af1f42321db18f34fef8fb48
-EBUILD htmlcleaner-2.29.ebuild 1043 BLAKE2B a7f3ca9f8cc9ea3e05b38e21dfca41bbfefbe70f852301e2d0ccd43fbb065c81e8951c6c9d36b57c06eb35826bda42b970257e1848bb8002f9ff430f037e307d SHA512 389dcd5d5a421572bec6c02bb262645b352260d87ddfc200c73633a2564ec09b11aa398a8191ed6e1d369444c4ce6c5f605028751ea856e326781fbc834b2906
+EBUILD htmlcleaner-2.29.ebuild 1042 BLAKE2B 255983940abdba15b969450efbd26ccfe6bdb0713fb21aa8d74118fd44529b2a8e9a8c5298f68e5d114e8aa22076eb51a37b2d7e75024f4c93a47770513474e5 SHA512 eca94d241a1e918e9f420a9f39fb28957c756c2b096fd19c7548208e378c9b407be48baaa9366de70379044d1c45f269434f126dffade0dfaf3c94e0824be65b
 MISC metadata.xml 957 BLAKE2B b3efa9952daa1c7027db845d6a7f8c079240c2128d8bb454490990722f2cf66c0f6ebfca4795bd0d166d45e6b4dc764c0ad6bdb53b95945043cf864b6e9d0f22 SHA512 b804e88d45556cddf4a6e2da621a8eb971935370b82c875a9e0dda0772bb23b94a874214d1727335b3ca358f5d10bd363723ba8629413f9169dbf28dd0ef588d
diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
deleted file mode 100644
index 0e10ccee4816..000000000000
--- a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java
-index b09c6d6..f4e83f0 100644
---- a/src/test/java/org/htmlcleaner/DomSerializerTest.java
-+++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java
-@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest {
- 	            + "</html>";
- 
- 	    final String expectedOutput = 
--	            "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+	            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- 	            + "<html>\n" + 
- 	            "    <head/>\n" + 
- 	            "    <body>\n" + 
-diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-index 3e1d1e9..d406c40 100644
---- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-+++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
-@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest {
- 	            + "</html>";
- 
- 	    final String expectedOutput = 
--	            "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-+	            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- 	            + "<html>\n" + 
- 	            "    <head/>\n" + 
- 	            "    <body>\n" + 
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
deleted file mode 100644
index 11ae5880fbc2..000000000000
--- a/dev-java/htmlcleaner/htmlcleaner-2.26.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="net.sourceforge.htmlcleaner:htmlcleaner:2.26"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="HTML parser written in Java that can be used as a tool, library or Ant task"
-HOMEPAGE="http://htmlcleaner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${PV}/htmlcleaner-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jdom:2"
-
-RDEPEND="
-	${CP_DEPEND}
-	>=virtual/jre-1.8:*
-"
-
-DEPEND="
-	${CP_DEPEND}
-	dev-java/ant-core:0
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/junit:4 )
-"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.24-fix-tests.patch"
-)
-
-JAVA_CLASSPATH_EXTRA="ant-core"
-JAVA_SRC_DIR="src/main/java"
-JAVA_MAIN_CLASS="org.htmlcleaner.CommandLine"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-src_prepare() {
-	default # https://bugs.gentoo.org/780585
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-ant-task
-
-	insinto "${JAVA_PKG_SHAREPATH}"
-	newins example.xml default.xml
-}
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
index 40eba0ef93f7..a3637d08cc40 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 CP_DEPEND="dev-java/jdom:2"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e800e7e86de0..99433c4af7b5 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 1e8216061b98..59a9f8ae9381 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -20,6 +20,6 @@ DIST erlang_doc_man_26.2.tar.gz 1746046 BLAKE2B 20f3c5203313bc40595f9a0996c1a31c
 EBUILD erlang-25.3.ebuild 5402 BLAKE2B 99b78642048e7c9e5f115453a4fbdffb50a642c87f08843f533bad2acd5d3f73db36f8c37d70a71041be622d04e0de71a947756cc044538e66fa745ae0fb89b5 SHA512 feb89ce4954cd8870841076aad0d0a15304256d327caec348e0575b3477e826d09273c32a0d626237c41b5a323f8893239de61889bd658c6c06afb229cd51e29
 EBUILD erlang-26.0.ebuild 5403 BLAKE2B dc28e624bc18a7aa9c60be803f661876c2b8d93d6a94e4d877ae71aa316a997c4bdd0f14b9746c5b4c5ed4d72084260939b6af1d17a70564f21eb971dbdab2a7 SHA512 8a4cffd00d929a3619e486301c4db7ee235c41cc1d2f63f6c2f3ea62d7ca4b883547fae101b29ecb0575923bb56baea9e6f24dbf49a221c09218474889307afa
 EBUILD erlang-26.1.2.ebuild 5407 BLAKE2B ae809d6e7eab47fc7bc87cffeff0d8127950ffa4254fa8b10f68802c9cc1b95e69a5c998225b7aae0fc4584a70875cfbfede4a4443bd61413cc12aaa0a43f99e SHA512 225b641ccbb57ef21b8805d18019eb86042df1e66463a29925297133316136da9cab4a18958ba6ff729be7b3f851535862cd98117c3afee25dc0d776ac4fb621
-EBUILD erlang-26.2.1.ebuild 5336 BLAKE2B e269c843fff08682bb46e9d540d0b1961be2022b35fe06340fae942b56d6cbcff2d1a2d3558873c0befa26560489060f76ba903c20281bd3d2b5d06bfc2bee3c SHA512 1460d30115e6256eb1761bac70de9526dbba708cc9c404e37f582f60e5b3158d5f3b56ac370d4a122a71f6197ccdcbda3fff935c96be381aa236713d6694486f
+EBUILD erlang-26.2.1.ebuild 5335 BLAKE2B 419be5229c3572b8b28b82db45d592bbaf560d98e76794969ef6d5981e4eb8fb6b5d166e3fca4bfbd574b4a20e6a5c098200941d17894ff4b7fb02a36a93ff5d SHA512 79d046f1e0551b4a209a5e2b00e35d94486f56bc42c4609444eed33c16fc4521d42219da6aeab77ef5f3486ac1c2efc00df6915d2aba855d92c7b38918bbf1d1
 EBUILD erlang-26.2.ebuild 5339 BLAKE2B 17142694baeb1a0c6256bb4b89682ef064e3629a06430b5bb894c8d7416cebac5d9f5f748321153259d74de11f73d942dbae58d31a44f08be24f1c2a8125f1f3 SHA512 964b947a8a8b0080c4eb13fe1e5db648722edd5cf39992a5ff85b8f20ebdd4cfede15bbd95c0cb52c2d0309a434f9509221c82f8267edc48aeb258d4de5441f1
 MISC metadata.xml 624 BLAKE2B aa99e3487778663cc634e71ed1d22b63ce829d2180c41c390737c7c5761982de8db5755c82db0753cc36c45888409095cbe5f0df3f31f2bf09c12a67c091fcaf SHA512 29910d752f37bf7cb020f8d18790c477a4702e767dec059be9487cb7edf98dfef3b4bdaf37e4275281a26104187ddabfbc9ba9c104fd8bee19a306c3dee4281e
diff --git a/dev-lang/erlang/erlang-26.2.1.ebuild b/dev-lang/erlang/erlang-26.2.1.ebuild
index 41d1cf6fa20d..e036fe342699 100644
--- a/dev-lang/erlang/erlang-26.2.1.ebuild
+++ b/dev-lang/erlang/erlang-26.2.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 92cec0176d1c..af3f043a8491 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apache-arrow/Manifest b/dev-libs/apache-arrow/Manifest
index 558c5b001b4e..bba9158b1059 100644
--- a/dev-libs/apache-arrow/Manifest
+++ b/dev-libs/apache-arrow/Manifest
@@ -1,19 +1,7 @@
 AUX apache-arrow-11.0.0-shared-lz4.patch 456 BLAKE2B b6c8263ac0cf52e49004836ebd10095aa35e5261265f273d7c22dfc6b7a90ceae5882b9c4de51674f11e8b96e84f881141212e197a80dea9db567da7c033a3ea SHA512 11fab04e1c1da46b6407c52a3bfed12e7bffc36046dd8dc379d1a368010f01eaf7b5f791ecb9fb4d15dd778106b401663ea8c1aceb80e799201b71837c18203f
 AUX apache-arrow-14.0.1-gcc14.patch 336 BLAKE2B 22517d03395a26f2a5089693e575cee794005d752b5531b436780c46d2fd7753cca7e7c129ee0a6699990afac2411892d64bb313bd1a370a7e9d496dcfd2f07c SHA512 8d22b1cafdb83933921e161cb12d2cc14c0244cfa570e52ec3c4061ab447c89469c1812ef94e0aba3a3fa862db6068d1c7ab098704ff03b06ef30873d5618e4d
-DIST apache-arrow-11.0.0.tar.gz 19956186 BLAKE2B dff0faecbde9e2d19f092fd0c48a7ac7a401da6dbfd17f30af1b35c9e3fd3e1ba5611311f5bcb08383368de195cff783a178a9397a63a1c4f740a81349f8b8d3 SHA512 46df4fb5a703d38d0a74fde9838e9f9702b24b442cb225517516c335a5ab18955699000bf0b2fc7d1698ada6d2e890ba3860933b6280f5160b0fce8a07484d0e
-DIST apache-arrow-12.0.0.tar.gz 20159048 BLAKE2B 43b4f36e1d1f84fc83c46a3627ad72cead38310f4325b8d21d17d726cd416016f0839d312c80737c0a921da6aefee537413e30309a656301c19834c2986d734e SHA512 f815be4fb20b6001ba5525270765fe239b5468708a7be34b93b60ee0ce63464727d183c9756fbc33bffd199019e1f06a7fddd306ce8388435cea7771070a2ca9
-DIST apache-arrow-12.0.1.tar.gz 20172604 BLAKE2B bf66761d33ceb778c2f53c2e643e0c2bb4448f29eaa94d17e9815628665f4965fde28bd47fce4a5874717d2161c3f8adbb2e8a0e6658a51ae6d617e4f09d202b SHA512 551ae200551fcc73b7deddcc5f0b06633159ab1308506901a9086e4e2e34e4437f26d609fdbacba0ebe7d1fe83bdb8e92a268e9e41575d655d5b2d4fbef7a7ce
 DIST apache-arrow-14.0.1.tar.gz 20968461 BLAKE2B 01a4269f98ba2a4de1d6bc29f43a4e97132f8b7bdb3c3d022e0c0ba498527003e8bec0ea0b054f19ae54749f45fe39675f651f6c9e34e815df5a9b9926512431 SHA512 31d19f0ca80349f63db74bae813256b47907f85725a9bf01ef6f32406e79828ebb4701faedb52696b6a5b3bb89ad4e136485fd5eb35d396dd42147c11d4d2713
-DIST apache-arrow-arrow-data-11.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
-DIST apache-arrow-arrow-data-12.0.0.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
-DIST apache-arrow-arrow-data-12.0.1.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
 DIST apache-arrow-arrow-data-14.0.1.tar.gz 3570422 BLAKE2B df1f8d1c4e321ca0abdce598b09945aa9e63114199e7f2eb0fc549323dadf703b917efd90c04a2d540d763a44128d76c6ee12788a983d4b9536d04297316b656 SHA512 0be19960b0d22fc2e07bf84f11148e69d6fa82f10627eb2a5e4b762b1d4cf4e151a57c5a1dc761d6d8ed29881ea589e4cfe0cd47d5c7cbf7b6107143b4a45e82
-DIST apache-arrow-parquet-data-11.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
-DIST apache-arrow-parquet-data-12.0.0.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
-DIST apache-arrow-parquet-data-12.0.1.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
 DIST apache-arrow-parquet-data-14.0.1.tar.gz 1013835 BLAKE2B cb4e544b6588ddad503f9692ee2eee5d4f1e931f10654b7253e11ffd2feb4c957dec047a1b1644c1f1538a3bf7ea726e5a9ae9b7d0c3bb0d55d27f088b5c5be3 SHA512 d4c2af20d6a88c1beb44770982f4aa324ea4ee375e8f556339074875af15c48f4398d972c1eec35eba5d209e9e62df4bdbf73ebc8148a7bb05ffa2d69c97df61
-EBUILD apache-arrow-11.0.0-r2.ebuild 2769 BLAKE2B 5980db7dea23555b53bf6ba67114fce657286aece4a9fa88a5c4a2d54a6ce63849442ee77c37ec80f65abd55557676e0d7f6c5162627c681c8887c0c733ffacd SHA512 dad0f7bc837131e3380577e05cb33d4eb19754378ed6174ff5105061028a47dc87ee3c1646b0356283b0564a0d0a137babcdcf6cb1a8faba2ee0924b9a8467cf
-EBUILD apache-arrow-12.0.0.ebuild 2811 BLAKE2B 0904addeae5d3e83b646f68441cf07a79b40cfdda7e4d66f346a65979bab86d44a0b1f998d00399341bb8c5b315e0cd0786821dc6219693a48cf13df580e4890 SHA512 4b670550310209b3380bebaaaf45a43a1c3180ffbb1ab989fc8856059011a2f3999efa39e186ed4510e66d86a7939fc60c062c15a1b28f7164cbaf1019458799
-EBUILD apache-arrow-12.0.1-r1.ebuild 2837 BLAKE2B 5e7ccb388584bb789abc9e8ef805439eea8df300f68b837a5ad1cbdc7fe8994745612e2988759bf07a4903eb719ce94e81ea3c413b63b95dba9ba27229532ecb SHA512 a431c9534b0b732a31b762e23a528035a940342e543b348f73cb5809a6f26109c0a0462220c2819c41896ba23aa8153082e9ffcde568017ed3ac3638c7303a34
 EBUILD apache-arrow-14.0.1.ebuild 2870 BLAKE2B 0eb52053da7b1dce11063a45bdf7490017195ad9112d85e6ccdd977a6a2479b4115044f3de0ecd4cc2a2a41e46079267af7ddd7b23ab94bb2f5e4674892c862a SHA512 bdc34ccd49ee75bc7928424ff7cc9b36b39889bfcd3a0369a01b3fd151ec54caaf57378f71fee11748ea1cd395fc2ea88f7ae501ac6fdb107208f5001b80c202
 MISC metadata.xml 804 BLAKE2B 147cae82bbb858c9a443246c0a75d71551cd8848f995f06b3c34e59bb14b70c7e5c45aa4322d74b558a685a13cdf638c39f5834b5f8ec688b56857e0c3a203b6 SHA512 d315cdb2a44df6d71e9d44a87643c081663a3e82f33d97ded812ebda2f65cc45aad978fd2bed34d26ea6ae58a1157243ee0ff39bcaafafbae6ff212024722336
diff --git a/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild b/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild
deleted file mode 100644
index 53701dd50256..000000000000
--- a/dev-libs/apache-arrow/apache-arrow-11.0.0-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929
-PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac
-
-DESCRIPTION="A cross-language development platform for in-memory data."
-HOMEPAGE="https://arrow.apache.org/"
-SRC_URI="
-	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
-	test? (
-		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-parquet-data-${PV}.tar.gz
-		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-arrow-data-${PV}.tar.gz
-	)
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli )
-	bzip2? ( app-arch/bzip2 )
-	compute? ( dev-libs/libutf8proc )
-	dataset? (
-		dev-libs/libutf8proc
-		re2? ( dev-libs/re2 )
-	)
-	lz4? ( app-arch/lz4 )
-	parquet? (
-		dev-libs/libutf8proc
-		dev-libs/thrift
-		ssl? ( dev-libs/openssl )
-	)
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/xsimd
-	json? ( dev-libs/rapidjson )
-	test? (
-		dev-libs/boost
-		dev-cpp/gflags
-		dev-cpp/gtest
-	)
-"
-
-REQUIRED_USE="test? (
-		json
-		parquet? ( zstd )
-	)
-	ssl? ( json )"
-
-S="${WORKDIR}/${P}/cpp"
-
-PATCHES=( "${FILESDIR}/${P}-shared-lz4.patch" )
-
-src_prepare() {
-	# use Gentoo CXXFLAGS, specify docdir at src_configure.
-	sed -i \
-		-e '/SetupCxxFlags/d' \
-		-e '/set(ARROW_DOC_DIR.*)/d' \
-		CMakeLists.txt \
-		|| die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARROW_BUILD_STATIC=OFF
-		-DARROW_BUILD_TESTS=$(usex test)
-		-DARROW_COMPUTE=$(usex compute)
-		-DARROW_CSV=ON
-		-DARROW_DATASET=$(usex dataset)
-		-DARROW_DEPENDENCY_SOURCE=SYSTEM
-		-DARROW_DOC_DIR=share/doc/${PF}
-		-DARROW_FILESYSTEM=ON
-		-DARROW_HDFS=ON
-		-DARROW_JEMALLOC=OFF
-		-DARROW_JSON=$(usex json)
-		-DARROW_PARQUET=$(usex parquet)
-		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
-		-DARROW_USE_CCACHE=OFF
-		-DARROW_USE_SCCACHE=OFF
-		-DARROW_WITH_BROTLI=$(usex brotli)
-		-DARROW_WITH_BZ2=$(usex bzip2)
-		-DARROW_WITH_LZ4=$(usex lz4)
-		-DARROW_WITH_RE2=$(usex re2)
-		-DARROW_WITH_SNAPPY=$(usex snappy)
-		-DARROW_WITH_ZLIB=$(usex zlib)
-		-DARROW_WITH_ZSTD=$(usex zstd)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
-	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	if use test; then
-		cd "${D}"/usr/$(get_libdir)
-		rm -r cmake/ArrowTesting || die
-		rm libarrow_testing* || die
-		rm pkgconfig/arrow-testing.pc || die
-	fi
-}
diff --git a/dev-libs/apache-arrow/apache-arrow-12.0.0.ebuild b/dev-libs/apache-arrow/apache-arrow-12.0.0.ebuild
deleted file mode 100644
index 9091784721ce..000000000000
--- a/dev-libs/apache-arrow/apache-arrow-12.0.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929
-PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac
-
-DESCRIPTION="A cross-language development platform for in-memory data."
-HOMEPAGE="https://arrow.apache.org/"
-SRC_URI="
-	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
-	test? (
-		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-parquet-data-${PV}.tar.gz
-		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-arrow-data-${PV}.tar.gz
-	)
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli )
-	bzip2? ( app-arch/bzip2 )
-	compute? ( dev-libs/libutf8proc )
-	dataset? (
-		dev-libs/libutf8proc
-		re2? ( dev-libs/re2 )
-	)
-	lz4? ( app-arch/lz4 )
-	parquet? (
-		dev-libs/libutf8proc
-		dev-libs/thrift
-		ssl? ( dev-libs/openssl )
-	)
-	snappy? ( app-arch/snappy )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/xsimd
-	>=dev-libs/boost-1.81.0
-	json? ( dev-libs/rapidjson )
-	test? (
-		dev-cpp/gflags
-		dev-cpp/gtest
-	)
-"
-
-REQUIRED_USE="test? (
-		json
-		parquet? ( zstd )
-	)
-	ssl? ( json )"
-
-S="${WORKDIR}/${P}/cpp"
-
-PATCHES=( "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" )
-
-src_prepare() {
-	# use Gentoo CXXFLAGS, specify docdir at src_configure.
-	sed -i \
-		-e '/SetupCxxFlags/d' \
-		-e '/set(ARROW_DOC_DIR.*)/d' \
-		CMakeLists.txt \
-		|| die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARROW_BUILD_STATIC=OFF
-		-DARROW_BUILD_TESTS=$(usex test)
-		-DARROW_COMPUTE=$(usex compute)
-		-DARROW_CSV=ON
-		-DARROW_DATASET=$(usex dataset)
-		-DARROW_DEPENDENCY_SOURCE=SYSTEM
-		-DARROW_DOC_DIR=share/doc/${PF}
-		-DARROW_FILESYSTEM=ON
-		-DARROW_HDFS=ON
-		-DARROW_JEMALLOC=OFF
-		-DARROW_JSON=$(usex json)
-		-DARROW_PARQUET=$(usex parquet)
-		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
-		-DARROW_USE_CCACHE=OFF
-		-DARROW_USE_SCCACHE=OFF
-		-DARROW_WITH_BROTLI=$(usex brotli)
-		-DARROW_WITH_BZ2=$(usex bzip2)
-		-DARROW_WITH_LZ4=$(usex lz4)
-		-DARROW_WITH_RE2=$(usex re2)
-		-DARROW_WITH_SNAPPY=$(usex snappy)
-		-DARROW_WITH_ZLIB=$(usex zlib)
-		-DARROW_WITH_ZSTD=$(usex zstd)
-		-DCMAKE_CXX_STANDARD=17
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
-	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	if use test; then
-		cd "${D}"/usr/$(get_libdir)
-		rm -r cmake/ArrowTesting || die
-		rm libarrow_testing* || die
-		rm pkgconfig/arrow-testing.pc || die
-	fi
-}
diff --git a/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild b/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild
deleted file mode 100644
index d5fbf06edf70..000000000000
--- a/dev-libs/apache-arrow/apache-arrow-12.0.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-ARROW_DATA_GIT_HASH=d2c73bf78246331d8e58b6f11aa8aa199cbb5929
-PARQUET_DATA_GIT_HASH=b2e7cc755159196e3a068c8594f7acbaecfdaaac
-
-DESCRIPTION="A cross-language development platform for in-memory data."
-HOMEPAGE="https://arrow.apache.org/"
-SRC_URI="
-	mirror://apache/arrow/arrow-${PV}/${P}.tar.gz
-	test? (
-		https://github.com/apache/parquet-testing/archive/${PARQUET_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-parquet-data-${PV}.tar.gz
-		https://github.com/apache/arrow-testing/archive/${ARROW_DATA_GIT_HASH}.tar.gz
-			-> ${PN}-arrow-data-${PV}.tar.gz
-	)
-"
-S="${WORKDIR}/${P}/cpp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli:= )
-	bzip2? ( app-arch/bzip2:= )
-	compute? ( dev-libs/libutf8proc:= )
-	dataset? (
-		dev-libs/libutf8proc:=
-		re2? ( dev-libs/re2:= )
-	)
-	lz4? ( app-arch/lz4:= )
-	parquet? (
-		dev-libs/libutf8proc:=
-		dev-libs/thrift:=
-		ssl? ( dev-libs/openssl:= )
-	)
-	snappy? ( app-arch/snappy:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/xsimd
-	>=dev-libs/boost-1.81.0
-	json? ( dev-libs/rapidjson )
-	test? (
-		dev-cpp/gflags
-		dev-cpp/gtest
-	)
-"
-
-REQUIRED_USE="
-	test? (
-		json
-		parquet? ( zstd )
-	)
-	ssl? ( json )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-11.0.0-shared-lz4.patch" )
-
-src_prepare() {
-	# use Gentoo CXXFLAGS, specify docdir at src_configure.
-	sed -i \
-		-e '/SetupCxxFlags/d' \
-		-e '/set(ARROW_DOC_DIR.*)/d' \
-		CMakeLists.txt \
-		|| die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARROW_BUILD_STATIC=OFF
-		-DARROW_BUILD_TESTS=$(usex test)
-		-DARROW_COMPUTE=$(usex compute)
-		-DARROW_CSV=ON
-		-DARROW_DATASET=$(usex dataset)
-		-DARROW_DEPENDENCY_SOURCE=SYSTEM
-		-DARROW_DOC_DIR=share/doc/${PF}
-		-DARROW_FILESYSTEM=ON
-		-DARROW_HDFS=ON
-		-DARROW_JEMALLOC=OFF
-		-DARROW_JSON=$(usex json)
-		-DARROW_PARQUET=$(usex parquet)
-		-DPARQUET_REQUIRE_ENCRYPTION=$(usex ssl)
-		-DARROW_USE_CCACHE=OFF
-		-DARROW_USE_SCCACHE=OFF
-		-DARROW_WITH_BROTLI=$(usex brotli)
-		-DARROW_WITH_BZ2=$(usex bzip2)
-		-DARROW_WITH_LZ4=$(usex lz4)
-		-DARROW_WITH_RE2=$(usex re2)
-		-DARROW_WITH_SNAPPY=$(usex snappy)
-		-DARROW_WITH_ZLIB=$(usex zlib)
-		-DARROW_WITH_ZSTD=$(usex zstd)
-		-DCMAKE_CXX_STANDARD=17
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	export PARQUET_TEST_DATA="${WORKDIR}/parquet-testing-${PARQUET_DATA_GIT_HASH}/data"
-	export ARROW_TEST_DATA="${WORKDIR}/arrow-testing-${ARROW_DATA_GIT_HASH}/data"
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-	if use test; then
-		cd "${D}"/usr/$(get_libdir)
-		rm -r cmake/ArrowTesting || die
-		rm libarrow_testing* || die
-		rm pkgconfig/arrow-testing.pc || die
-	fi
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3b28c30114ec..12a55e07f89b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 4250d5577dd4..8dc5eea12d18 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6563840 BLAKE2B cc7938c4a9f3b80a9b7
 DIST pypy-exe-7.3.13-1.ppc64le.gpkg.tar 10936320 BLAKE2B eaacb2af2c5f62fd487893e4d97ab288ead1c81a0b3ba99782f11ab95ac525c81bc37af5093e76843a17c8ce792aa601befe51b6774908a5328fd4ad449651f8 SHA512 733ec08aa5ab055ec4983e677c8261a4b62006c88a01f0e9ff9abed45781da5144eb4acd41ed7203f74622cd35cbb89c1384ec113c915e38a8d9d81288952b19
 DIST pypy-exe-7.3.13-1.x86-musl.gpkg.tar 9656320 BLAKE2B 61f608aaaa316a64de7445fd856aedf34e11bb08d5f1d7819faa198c7014d397244acd54eb35fe95fc79ef53c5ff770f6e608a0868508422386f110c4357fb69 SHA512 0c3799d15688496ff67007323e0398e7b82becb83d77db4585b5439107f3b4244cff658b908d125d1615391265cc5add2ba5116027bf67c7603c49de54b73f02
 DIST pypy-exe-7.3.13-1.x86.gpkg.tar 9574400 BLAKE2B 29b9d82995b503f5fa933c0ab3ea988b0321768692974d232040afc1b24fb45905f1ae526f57e443110e7341ed310753e4a0ffd161979b0bdc8e6cf1374ca540 SHA512 9046ae99f4996188c04a098e5d716e885545437f5e31e1c75268b45f80d4743b1c431a2aeed990746530ce3c6077a985ff535f813fabcf2ccac91ed8dbc4f2ef
+DIST pypy-exe-7.3.14-1.amd64-musl.gpkg.tar 12943360 BLAKE2B dcb129b19ba43ba92697f6b9133591ca02923b2d5b2bcbbc8c2936ea0aaa7c77caffe264fc5ed35bb46621b4ab47ebeaa8079a56558d39153b26d95c42d1b809 SHA512 783c09d6054209a0c4c7fbd366bf712fd53deb14a8083e1bb18cb5e4f2c5cbd2c638e42a0b8e2abc7d5fcd3b1437004532089ac8c35fcda512f3695e4105c2d7
+DIST pypy-exe-7.3.14-1.amd64.gpkg.tar 12861440 BLAKE2B 88ff25e6ecd12ac2844317923e4d353608bdcc8b65c3a828b5728d0b92759a8c6844b4b0e62563cd24c13b755416176f670a288e26317d8b114af3a1d774f5de SHA512 fa1407b2dae1e6e796611921a32a1f655ecf932601211c0257e6b3877636d99140c2a3617c6601a517eda1c1166f2b9d2fc47edf51703d7e0342699906bd1eaf
+DIST pypy-exe-7.3.14-1.arm64-musl.gpkg.tar 10895360 BLAKE2B c8ad4bd01df3ac990e54e6b22cca5d19d2b1c145e8672def6ef5e80e8b1240ec497fb5bfbcedafd2165e654a813ec5091eed6be797bba6c8ce431bf176e68818 SHA512 705ac967d776003c504df4c4c74549ba52c9b91e8145ed6e7d51e35603b5d2800350f159312077ff754254ec8ab539817d989d61b3ab289fdf32e52c85a58992
+DIST pypy-exe-7.3.14-1.arm64.gpkg.tar 10864640 BLAKE2B 6bf4cf7188edeca9cc94c4764c3c1f1cefb36e6430c3ec8c014ae25a91f9a1e6fd87701d0a6d06a36d3a607eef5c01605d6ed86fb1112901ca4b3827fec8c5c0 SHA512 fd85453a5729be5905a2eaf58109fa19268358244989d24d4a7fd4e627a60ff083d6ef96a3a244016ec87f4d3f76ee777f5fe6e356ef8819621b3740c0b19fc5
+DIST pypy-exe-7.3.14-1.ppc64le-musl.gpkg.tar 6696960 BLAKE2B 7478945b927d9df57e1242edbb57b99ab004d3e62159fbcdfb4ea6d406e1df73cfdb2e56bd87dc716b070792973ddffb2b9e535a0c63fe12548457920e20f29e SHA512 4e10026546933bbb734aa203b94941bb63471ab44396a405f6a0273a05e3f9225c8ec46011866e246681591f3ec9896d83a1246a1ca393739f864cdee53e8da8
+DIST pypy-exe-7.3.14-1.ppc64le.gpkg.tar 11110400 BLAKE2B 2651e0d0b592020a7b70a6bc43bd6d1eecc3842022a7fe09668abed088c2b6cbddc91f6dfa23a1474199290a2b1cc90111c3d5225c55b88e96ca26e19fe836f0 SHA512 aba7abe80d340ecedaaaf47747a109a32cf15bc0b2b16e3272440e8405b91314e423668c301a5cefa4a6b49c3718611012c138f5dc969cc78b5c8c53407ccdac
+DIST pypy-exe-7.3.14-1.x86-musl.gpkg.tar 9830400 BLAKE2B 2c8b24951ed3f74ffca0be4e4f3c9e841240591d2b66a996f7028011270b292702e827ca59a1591a439fa3adcc1d5e3167d87fd9a15799985389acc3ede9b82d SHA512 dac584239b247738165d650b9b7da87cf006ee88081f32b8daaebd1dfb62aef86c0278b93a1b161ffd7bb0d15675fb7c85f18b373202389536c671194dffc227
+DIST pypy-exe-7.3.14-1.x86.gpkg.tar 9861120 BLAKE2B 02fb30d79d4dc7f844179f9f8ea42e8e4db607bf58b43f944dc2c2dcfaf1adf3acede93c32785bf46bb259af546a891471f558db7a00e653bf169760130dc0eb SHA512 e586be487950f0e33c558c8a2fc9f97fc46e9b4e5c113870661e45ee3c553b21686818eb36829b525201c24ec4c13da14bb22c723ae118ca40f222d2bf826458
 EBUILD pypy-exe-bin-7.3.13.ebuild 1947 BLAKE2B ced9c32c68bc0d6991a3c023c5ac6f3952cae5be14c39bbaf498c2efa249715235747526090d59f6a39da4645c83551ebfebabb2a2c7a25343c5acb64d9a1d6e SHA512 3ca0ae4098385dbd208bb3d069b17f9654b2b61b8d85fc822776a91e69341a60492c101310c24fc10a7d0e68b080ce28976d1bc9d5c120dbb40d4af04a7215ae
+EBUILD pypy-exe-bin-7.3.14.ebuild 1949 BLAKE2B 144e22713546812ee4664e6c7f092188d521a4c5788f2b1473d2e0fe7ad3b49a16f6965ac4ee194e51d5b64e599b5d80f84fce2cc13b1c667f245f6f75e16847 SHA512 a6905d688350e83368fb1ab2ba273b730adf4be279b45ee3d78d2721532cfd0a1919b694be446df9c7cd2c2fbdf023614dcbd9ef5554c006b9fad0fc4f5cdd87
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.14.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.14.ebuild
new file mode 100644
index 000000000000..577201cf8c2d
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.14.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy-exe:${SLOT}
+"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}
+"
+
+src_install() {
+	insinto /
+	doins -r */image/usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index c087ccb62cfe..422250f0ca7c 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1
+DIST pypy2.7-gentoo-patches-7.3.14.tar.xz 5344 BLAKE2B 841556694ad6bb61ea96e063c125508d574fa0be493f930435dff784a35def18c17d510c7123229cf85d576111b4a721cb52341ebb5f618d731335fbcf9ed267 SHA512 ccc8d03a17825607fb41c1e3926ff17908bd644542d9431c8f9291ed10a852416cf91b09c5c0ba0446f73208755b3bbb742c926be55875cfd69646f1ac7a8cae
 DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b
+DIST pypy2.7-v7.3.14-src.tar.bz2 19910947 BLAKE2B 3d03b16b4e6344b8590aaf1815202782bb355ab21422c5ea5b40cd84f36fa2ff37b2493313a3faf242039b9b91e3c8ea8fe1237a487a0dac44e4c27bf29f5f85 SHA512 e806aedc1625c1601fa623c3b03881f820d37455c5432bef345f85ef0300247f7725efe3bf470fe533aa422dbceaadca636d0c4bf74c65e1e04c0f82380e53f0
 EBUILD pypy-exe-7.3.13.ebuild 4060 BLAKE2B 5c6883e608eba8f972af83966b23dfd3e13edfeeb511d1a47f303b60746d5cb08ab9bdb9914b5b7dd2ff6ef630e15a0fca3a3c3f253e4f76aca7145ff72cf35c SHA512 d5dc8433dd88b0ae58b3283ad233dd7524acf31763e917e46ab8f837623d340f4d487a06fce679a7e91fa96cf89acf98171a423acf4b0251776f1e2abdf41c0c
+EBUILD pypy-exe-7.3.14.ebuild 4062 BLAKE2B b9437200b3738b7e2d76cc05aee4847d4b4e4757ce3631391f345a66d7dc5ed587bcff75d4c8d2d158181578800dc0aaaca794107170ead0ee0072855164cb1a SHA512 e89eea8f316311d8b84b3e493029579d66774e4f41fb6af9d6ce1696470a8d22c967375bba37cfafa1e6288a04f55f2c199311ad8cc0e5073bc915601193affa
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.14.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.14.ebuild
new file mode 100644
index 000000000000..6f7eef22f3b8
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.14.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+DEPEND="
+	>=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+"
+RDEPEND="
+	${DEPEND}
+	!dev-python/pypy-exe-bin:${PYPY_PV}
+"
+# don't enforce the dep on dev-python/pypy with USE=low-memory
+# since it's going to cause circular dep with unhelpful error message
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)
+"
+
+check_env() {
+	if ! has_version -b dev-python/pypy; then
+		if use low-memory; then
+			eerror "USE=low-memory requires (a prior version of) dev-python/pypy"
+			eerror "installed."
+		else
+			ewarn "CPython 2.7 will be used to perform the translation.  Upstream"
+			ewarn "recommends using (a prior version of) dev-python/pypy instead."
+		fi
+		elog "You can install a prebuilt version of PyPy first using e.g.:"
+		elog "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+
+		if use low-memory; then
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+	fi
+
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp
+	if use low-memory || has_version -b dev-python/pypy; then
+		einfo "Using already-installed PyPy to perform the translation."
+		interp=( pypy )
+		if use low-memory; then
+			local -x PYPY_GC_MAX_DELTA=200MB
+			interp+=( --jit loop_longevity=300 )
+		fi
+	else
+		einfo "Using CPython 2.7 to perform the translation."
+		interp=( python2.7 )
+
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 288848860ce5..6e4af980d565 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,4 +1,7 @@
 DIST pypy2.7-gentoo-patches-7.3.13.tar.xz 5340 BLAKE2B 843a7a5e4c2fd56fc4db51ba388736c0aa6593d45b145503f6428783a9fd815a77e2a06809077effced6fccf75c0dd38527a0695211852fd2a4c61b34e40c15c SHA512 cc8f6fc69f00030609a8d79f05a60b2e185141e9fc70a53b476b60a183dd0500627023658c6a57c2412f32af1db6fae91a361a4992d84e7dfbadb7eb4a98b8a1
+DIST pypy2.7-gentoo-patches-7.3.14.tar.xz 5344 BLAKE2B 841556694ad6bb61ea96e063c125508d574fa0be493f930435dff784a35def18c17d510c7123229cf85d576111b4a721cb52341ebb5f618d731335fbcf9ed267 SHA512 ccc8d03a17825607fb41c1e3926ff17908bd644542d9431c8f9291ed10a852416cf91b09c5c0ba0446f73208755b3bbb742c926be55875cfd69646f1ac7a8cae
 DIST pypy2.7-v7.3.13-src.tar.bz2 19907651 BLAKE2B ce80db193afadbc721e781cbfe3d72bfe420eef3ede408f23213ab5d87a9a42c025d3c31c742dcb55a039b618930ebc4899d704f060d294f2e492d4d754effba SHA512 deeca234abbe526102cec637dc88399f462f64ae66c38782e6f3372b484d25fa4e88b906f783ba515bed17d2e82626d1c94fd6ee9b8b64e393f9bc0f5ee2b07b
+DIST pypy2.7-v7.3.14-src.tar.bz2 19910947 BLAKE2B 3d03b16b4e6344b8590aaf1815202782bb355ab21422c5ea5b40cd84f36fa2ff37b2493313a3faf242039b9b91e3c8ea8fe1237a487a0dac44e4c27bf29f5f85 SHA512 e806aedc1625c1601fa623c3b03881f820d37455c5432bef345f85ef0300247f7725efe3bf470fe533aa422dbceaadca636d0c4bf74c65e1e04c0f82380e53f0
 EBUILD pypy-7.3.13.ebuild 7044 BLAKE2B 318cb3094bdfe996eab44bff918703747e01d28accba19c111b62a64ea2c41b899222db2ef964bacf4db83eb31b48ad3c1a0ed16c3dce98fbe0498938b2f8090 SHA512 5815a10db7550687502c5109a5927d3752f3263beb641de2cca22a87a83d744ba5d1a64ca6d8f6a1f026a3c5d596b0f9e2fc25b1b58149b5e16c1f90e45db54c
+EBUILD pypy-7.3.14.ebuild 7046 BLAKE2B d1944efab0f0b0a034081c4b012a9a4dab5b829bdccc2a43c0410680620555eeb39c1ddc936aef3d2ea9eaba7dc5ea1ca315f38abc1e8099ca35694b0b97f2d4 SHA512 7c25069635329e92065922c6668915b9816bfde79b4779cc907c457af6da7e7c1940e3d8267623af7c5179711efdd777aa7c1a0a9d2fec38e4e5eebbca02a748
 MISC metadata.xml 565 BLAKE2B 956a62e9d3632a7ab9ade67527bae54fe0b58d79a6c2f26dc7017a6b8d337f7e5a155b747f24b98f345eb9e1d15c3f38d8530212ad16cfa5292d6cb1ecbf3e91 SHA512 6dd5bc7712533a926b7efdba10c3bea32c813d703916f6bf152ff14f7561cdc466354c8fdbb9640afe415daa3cf2d9365351261e89b8aadfae7b74afd48ae061
diff --git a/dev-python/pypy/pypy-7.3.14.ebuild b/dev-python/pypy/pypy-7.3.14.ebuild
new file mode 100644
index 000000000000..1ef22f293672
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.14.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 full-stdlib gdbm +jit ncurses sqlite tk"
+RESTRICT="!full-stdlib? ( test )"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy-c - <<-EOF
+			import sysconfig
+			print sysconfig.get_config_var("SOABI")
+		EOF
+	)
+	[[ ${soabi#pypy-} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	einfo "Generating caches and CFFI modules ..."
+
+	if use full-stdlib; then
+		# Generate Grammar and PatternGrammar pickles.
+		./pypy-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+			import lib2to3.pygram
+			import lib2to3.patcomp
+			lib2to3.patcomp.PatternCompiler()
+		EOF
+
+		# Generate cffi modules
+		# Please keep in sync with pypy/tool/build_cffi_imports.py!
+		cffi_targets=( pypy_util ssl audioop syslog pwdgrp resource )
+		use gdbm && cffi_targets+=( gdbm )
+		use ncurses && cffi_targets+=( curses )
+		use sqlite && cffi_targets+=( sqlite3 )
+		use tk && cffi_targets+=( tkinter/tklib )
+
+		local t
+		# all modules except tkinter output to .
+		# tkinter outputs to the correct dir ...
+		cd lib_pypy || die
+		for t in "${cffi_targets[@]}"; do
+			# tkinter doesn't work via -m
+			../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		done
+
+		# Verify that CFFI module list is up-to-date
+		local expected_cksum=2d3acf18
+		local local_cksum=$(
+			../pypy-c - <<-EOF
+				import binascii
+				import json
+				from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+				print("%08x" % (binascii.crc32(json.dumps(x)),))
+			EOF
+		)
+		if [[ ${local_cksum} != ${expected_cksum} ]]; then
+			die "Please verify cffi_targets and update checksum to ${local_cksum}"
+		fi
+
+		# Cleanup temporary objects
+		find -name "_cffi_*.[co]" -delete || die
+		find -type d -empty -delete || die
+	fi
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+
+		# broken by expat-2.4.5
+		--ignore=lib-python/2.7/test/test_minidom.py
+		--ignore=lib-python/2.7/test/test_xml_etree.py
+		--ignore=lib-python/2.7/test/test_xml_etree_c.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	if use full-stdlib; then
+		doins -r include lib_pypy lib-python
+
+		# replace copied headers with symlinks
+		for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+			dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+		done
+
+		if ! use gdbm; then
+			rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+		fi
+		if ! use sqlite; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+				"${ED}${dest}"/lib_pypy/_sqlite3.py \
+				"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+		fi
+		if ! use tk; then
+			rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+				"${ED}${dest}"/lib_pypy/_tkinter \
+				"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+		fi
+	else
+		# install only the absolutely minimal subset of modules needed
+		# for pypy3 build
+		local lib_py_modules=(
+			# base modules needed to even start pypy (and import site)
+			codecs.py
+			copy_reg.py
+			encodings
+			genericpath.py
+			linecache.py
+			os.py
+			pkgutil.py
+			posixpath.py
+			re.py
+			runpy.py
+			site.py
+			sre_compile.py
+			sre_constants.py
+			sre_parse.py
+			stat.py
+			string.py
+			sysconfig.py
+			traceback.py
+			warnings.py
+			UserDict.py
+
+			# needed for python_optimize
+			compileall.py
+			getopt.py
+			py_compile.py
+			struct.py
+
+			# needed for rpython
+			argparse.py
+			atexit.py
+			base64.py
+			bdb.py
+			bisect.py
+			cmd.py
+			code.py
+			codeop.py
+			collections.py
+			colorsys.py
+			contextlib.py
+			copy.py
+			ctypes
+			dis.py
+			fnmatch.py
+			functools.py
+			gettext.py
+			hashlib.py
+			heapq.py
+			inspect.py
+			io.py
+			json
+			keyword.py
+			locale.py
+			logging
+			new.py
+			opcode.py
+			optparse.py
+			pdb.py
+			pickle.py
+			platform.py
+			pprint.py
+			random.py
+			repr.py
+			shlex.py
+			shutil.py
+			StringIO.py
+			subprocess.py
+			tempfile.py
+			textwrap.py
+			threading.py
+			tokenize.py
+			weakref.py
+			zipfile.py
+		)
+
+		local distutils_modules=(
+			# needed by site
+			__init__.py
+			errors.py
+			sysconfig.py
+			sysconfig_cpython.py
+			sysconfig_pypy.py
+		)
+
+		local lib_pypy_modules=(
+			# needed by site
+			_sysconfigdata.py
+
+			# needed by rpython
+			cffi
+			_ctypes
+			_ffi.py
+			_functools.py
+			_sha.py
+			_sha256.py
+			_sha512.py
+
+			# NB: we're deliberately skipping _hashlib to avoid some deps
+		)
+
+		cd lib-python/2.7 || die
+		insinto "${dest}/lib-python/2.7"
+		doins -r "${lib_py_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib-python/2.7/distutils || die
+		insinto "${dest}/lib-python/2.7/distutils"
+		doins -r "${distutils_modules[@]}"
+		cd - >/dev/null || die
+
+		cd lib_pypy || die
+		insinto "${dest}/lib_pypy"
+		doins -r "${lib_pypy_modules[@]}"
+		cd - >/dev/null || die
+	fi
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	"${PYTHON}" -m compileall \
+		-x 'bad_coding|badsyntax|make_ssl_data|lib2to3/tests/data' \
+		-q -f -d "${dest}" "${ED}/${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index a7490915ffd1..6706465d6624 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,2 +1,3 @@
 EBUILD pypy3-7.3.13.ebuild 583 BLAKE2B 9308115fd68cc96beed284dcd1eec6f3a404254b422cd7f88dbf6ffbc30e69050d3613bcc34151a4fd64375d1901b0899e32f42d843c68ab281c7ed10c5b9611 SHA512 df2c8d9903a9e772bce5c5d93203a31b68ee8e413ce5b721d6c59d9542f65ff13c9676ee22080cf1b361cb5762dfc22d1a5ee3a498c6aa2ba6d13731e9cd09de
+EBUILD pypy3-7.3.14.ebuild 585 BLAKE2B 5c5704a58e65e6d2bc4272988aaf0ca2e4b2bb21aa316c629ebb8594500743add0a901704f0a2ded2aa803841d4ec16a754884f435ece9a8682da1a70a1a2bff SHA512 3513a60f7264acf12d10d9b1921e843460db4aadaca2b0137a624a870a2ee31a44c52ed065d0cab4a9c35c1c24fbaaffbfd1dab838d1e12117ee53e528e8e481
 MISC metadata.xml 317 BLAKE2B 9da451fe362dc5c1f6b3412b33065ab6e316e5ae49fd8e6a8e7485cd5cb7440c316c7c5c9b504a69c4f21a6370317edfe11f388238665133b8557a26acbfe1eb SHA512 96039ea2033b920e595e05c8749ee7e316e951bc6ff544a2f4d175d862cf7537401cbba1d4535f20245bbcac32d5ce1261d04aee412953401b513ecc5e7217bc
diff --git a/dev-python/pypy3/pypy3-7.3.14.ebuild b/dev-python/pypy3/pypy3-7.3.14.ebuild
new file mode 100644
index 000000000000..ecf195f8f782
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYVER=3.10
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+S=${WORKDIR}
+
+LICENSE="MIT"
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+gdbm ncurses sqlite tk"
+
+RDEPEND="
+	=dev-python/pypy3_10-${PV}*:${SLOT}[gdbm?,ncurses?,sqlite?,tk?]
+"
+
+src_install() {
+	dodir /usr/bin
+	dosym pypy${PYVER} /usr/bin/pypy3
+}
diff --git a/dev-python/pypy3_10-exe-bin/Manifest b/dev-python/pypy3_10-exe-bin/Manifest
index 71841d0820ab..a49e922a9fce 100644
--- a/dev-python/pypy3_10-exe-bin/Manifest
+++ b/dev-python/pypy3_10-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy3_10-exe-7.3.13_p3-1.ppc64le-musl.gpkg.tar 6522880 BLAKE2B 6c1a9c390e35
 DIST pypy3_10-exe-7.3.13_p3-1.ppc64le.gpkg.tar 10065920 BLAKE2B 951899b54a4fd248643625df6fa6926ed831b7b43d3020c62b109101877a06f5413ed41e1bf165b23bb66e2bfc4b910f84d6a3a9ad67cfaee2e8fbe5dec96bac SHA512 24b72ddedadce461b8dbaedc25dc582e8f215b194431a9a946b3d21725506730564e3ec64e640ae29baee0fae132e7b756b781444a6c0080890953234afb509f
 DIST pypy3_10-exe-7.3.13_p3-1.x86-musl.gpkg.tar 8806400 BLAKE2B 92152ea6f9c7a75934cb3a507d2c1ec17f91465aa3d5fb8f2cf8add2708d721a90d90c15656ada1c2ee0bf2290891cce090fed2b8ea4c8b9a17bccf3239ba1e9 SHA512 73292601e8ffb2c977a1b1253878d17bdf686d8a3b5ef7a737319aabfafe342c1b210f0773765203a41b55359a7c4fbe4958cc9813fc6849bf78ff5c5aaca7b0
 DIST pypy3_10-exe-7.3.13_p3-1.x86.gpkg.tar 8765440 BLAKE2B 1ea5c757b5f87846000ed010ef9eecb40ff278b3bf97211037e184a0c96f643f17656a0801ae0fc8ff45f7fc20372474439d1e3a7ba38755a1f64cc56d5670c3 SHA512 88a7ab0d960f89d38ef1703eaf8afdfad18b9b1ee046295914bb4968f719759e3dd9a604930348568feb60afd466258705bd9c6e26f6c760f56ffb0ddf1038e7
+DIST pypy3_10-exe-7.3.14-1.amd64-musl.gpkg.tar 12001280 BLAKE2B 9f0507d48bea2773b0d648bf2817f3228c6cd985e2c5229456887af00a0d4b8e9f4d0f8a2c0dabd73880c06ab93c89ca7ddc5aa5cec8720407d14ed40303604b SHA512 7f2740e94100ff64b2e492d30d4f4ca7f313586b29eb2edbd6c405fcbee1712f253205d09a010cf6992c593b3bdc593732ab76eb41b154aaf170cfa46e2da800
+DIST pypy3_10-exe-7.3.14-1.amd64.gpkg.tar 12011520 BLAKE2B 256a561cc40aa2fa980766e19f253bfca5d301a0e79de419d18d13b23b038db593835cfcb5faa3089cec9e86fcee98b09498d951d549a66aac1545c5c7e39a47 SHA512 e250e7f2d7acdd7dd521cae9ed12b344759970280da4c4c8ee3f3d667449c31fd3762be9ae44093b7d0b7a963a1a3c82586ee298a6bea425e77638162c3662ea
+DIST pypy3_10-exe-7.3.14-1.arm64-musl.gpkg.tar 10199040 BLAKE2B 782501fb169ad7ab0c22d10b58a559b3063d8c67db707c66147864b69d16dbde55027c841ad8548aaf574e20df95d87af7fdd7fb52030c9a2d71fc6a16ecda4e SHA512 9c353521198b6ff35213075177a5cea4d1f76d8148823077221f8fb2e32fc55cbe89590a69e36e670d97700c888f705cc26dd237ea137759cb44c311dbf89a49
+DIST pypy3_10-exe-7.3.14-1.arm64.gpkg.tar 10117120 BLAKE2B 4135a346b1d6e34ae90e5bfb255d3ca840fcfd13cd848b3b6562a650b364a9ff1f91a5eb81070252297bef87bc511cefeecf30e274be1c06b731eb33a88fbc33 SHA512 b60eade588eafbdea5285c31cda25c1f735da586ef56e7c81f98b883c481d866837680b86d5fdafa847282d1a83e1b7da9b4a95096041f7932ec6f77c74b897d
+DIST pypy3_10-exe-7.3.14-1.ppc64le-musl.gpkg.tar 6737920 BLAKE2B 3578757c8fc2da1079808107272cff3b49ae295d8fea1009d9787faab68e8f32c6e633093394d83feb629b39a4c149d083cb80a1e48b2e892570f0ee43f72ba3 SHA512 f5c66d9f96d4ba94c54739812d315b92a99ca2f85c777c6fd8b704405ba8d2fc9f28e4ced24fab0548ceadee3e2b60288dafb9b023653439c2a0596d05b45d3b
+DIST pypy3_10-exe-7.3.14-1.ppc64le.gpkg.tar 10362880 BLAKE2B f9422fb581ea1196d97ad420ebf192a6de343cd9024a030e987267a0c51b1a7070783ddd123c862cca7338c99011368bc5a8b6e603b15ae8e70358dd13275e97 SHA512 e9b55117a13767a855b4f25e0c3550370d9d4e4110aa7e685b4131e07dfaef9a68a01e3e18620aee40d9152a37e01271ada0e112d71dc92cafcc1ba240bf03a5
+DIST pypy3_10-exe-7.3.14-1.x86-musl.gpkg.tar 9031680 BLAKE2B ebd345010960b2c30e8ba68b79b5986c88c3657577c4cab36f8edd28e7df6f7e0f37a42a696cd6e6b17a2bc40896cab4280b1da9c0883925711d5eb46f827dda SHA512 ae2974c7c792900152d65114fd08c81ace540d13ab428de2fa8018bd8a1f279b13cac7c0b7b75b77335feb1463c537f2e7009d362ef42a1c54af7b5097d27d5b
+DIST pypy3_10-exe-7.3.14-1.x86.gpkg.tar 9021440 BLAKE2B 48a724bcfc5751413abcdf7adfe906a221e3541bdb8c550ad3711be0a8420b60c7716372eac6cbbadcae496fa135864507293fb9d3c287fa82eb921bf9107726 SHA512 7499e54bf34d9786b414bde6cc6265fc9c7372136461577af9af3a74a1775144168ce8100a3c9dc090491b24a863442bec29db4117bb326dd1c878925794575f
 EBUILD pypy3_10-exe-bin-7.3.13_p3.ebuild 2034 BLAKE2B 2929a8321810f24f9acdf39df73ac574f6f251f527aca9f88c9391672ea1f20f7b0a63ca9ec253b5eed2ced2157390b90f5ba085bf823dca0fb468909c279c48 SHA512 b08ceef463a43a3a3945129844f489763df275d84ac6d96a84f9817b3940ffb65a9956919e3d3e8d61e932585b395b55d6b5401ce307dc92761b710c10fe05b6
+EBUILD pypy3_10-exe-bin-7.3.14.ebuild 2036 BLAKE2B de1e4d8df35611557315fa2a5502e9eb4bbf5c6870fab8cc9187839dfd2c80400f8c24cde3078b06a3080ba7d7508582b32479d7a1ef59e22066dbf04f522282 SHA512 3842581febdaa65140fda3fb96db5f127c63e0956aa089f5cc152f453baa5edf64f2248a09a7e69717be95bed6141e3cb8395e86fce9b465c7695678f2071a96
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14.ebuild b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14.ebuild
new file mode 100644
index 000000000000..3933dcac88c9
--- /dev/null
+++ b/dev-python/pypy3_10-exe-bin/pypy3_10-exe-bin-7.3.14.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+PYVER=3.10
+MY_P=pypy3_10-exe-${PV}-1
+
+DESCRIPTION="PyPy3.10 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy3_10-exe:${SLOT}
+"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy${PYVER}-c-${PYPY_PV}
+"
+
+src_install() {
+	insinto /
+	doins -r image/usr
+	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10-exe/Manifest b/dev-python/pypy3_10-exe/Manifest
index 1ebb96dbf816..5d7e6e429a15 100644
--- a/dev-python/pypy3_10-exe/Manifest
+++ b/dev-python/pypy3_10-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6
+DIST pypy3.10-gentoo-patches-7.3.14.tar.xz 4772 BLAKE2B 3866dd6a86f88bf10d5a9a639defea0dbe3cb301ccb23d015b147a220f0e32041dc46497e43ad03c1c486291bb56752d77eaa2703e164e58f4f6af3e6b1e2433 SHA512 5da998beefaabe1307a16f1d9d4239453b9017aaabefbdb34d70ce339bfb9f8b7a258cdfcba74e0241bf140b3d2aae500710309d1dddb667154be7c482e88daa
 DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
+DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 EBUILD pypy3_10-exe-7.3.13_p3.ebuild 2859 BLAKE2B d25fd1d2fe4db8b14b32822743d303e1fe164d4236af519bc231a0db118cd32f950582bcd2e1c6de0522c10ff8d26d383bd0c8c2bb4ab0c4376066354a9ef624 SHA512 8e89ddb61bb26cf58e290ad7488b9cddc9698a2aadeb88897a5b901997b93806bc54cd50ce66a109613d919d6c55b29548e23396442974f8924bef248c1e051d
+EBUILD pypy3_10-exe-7.3.14.ebuild 2861 BLAKE2B aa9e25b2a21232e0c5ac08939cf4376911920c7c7dba220f810be9b3b1c544395315b5e9a066d3e2a4b797ac19aff419d696cac554322483a9c308a45d389a89 SHA512 482398a63227ae2eaac531825b4e3c4bab022c729b64cfb29747bbb80d2eff9d7b576a06ab04902868fc4d27e6716afd9dcfc3b7532ea9c74c8082de8aff0747
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild
new file mode 100644
index 000000000000..9eec2da0971d
--- /dev/null
+++ b/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs flag-o-matic pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV}"
+
+DESCRIPTION="PyPy3.10 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libintl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/pypy
+	virtual/pkgconfig
+"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	# Yes, yuck, but it's being worked on upstream (bug #918971).
+	# https://foss.heptapod.net/pypy/pypy/-/issues/4042
+	append-flags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+		--withmod-bz2
+		$(usex ncurses --with{,out}mod-_minimal_curses)
+	)
+
+	local interp=( pypy )
+	if use low-memory; then
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
+	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_10/Manifest b/dev-python/pypy3_10/Manifest
index b4f2a3d56e9f..be8dd4c40674 100644
--- a/dev-python/pypy3_10/Manifest
+++ b/dev-python/pypy3_10/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.10-gentoo-patches-7.3.13_p3.tar.xz 9780 BLAKE2B a72cfc6723ad914f012309eac7606a37f2e6dd2c5f83c049c0d68466dae45a366536f2065c1ccdc9516339cb8949b146e410ab04b1cbbff3b9d62620a039040d SHA512 c1beb5c661dd0c0d94bebb23b82972ac9442caf777c377923c31b3f82b007396d0c3ef9874fc01cf765986cc7c6a941628f7e377a732a0706e99e3acb6fc5db6
+DIST pypy3.10-gentoo-patches-7.3.14.tar.xz 4772 BLAKE2B 3866dd6a86f88bf10d5a9a639defea0dbe3cb301ccb23d015b147a220f0e32041dc46497e43ad03c1c486291bb56752d77eaa2703e164e58f4f6af3e6b1e2433 SHA512 5da998beefaabe1307a16f1d9d4239453b9017aaabefbdb34d70ce339bfb9f8b7a258cdfcba74e0241bf140b3d2aae500710309d1dddb667154be7c482e88daa
 DIST pypy3.10-v7.3.13-src.tar.bz2 23067819 BLAKE2B 6e2bfd83bcf16feef006dad39ab6d8f452418ee6bc4043edaa590db702f39275e775004bdba762736a901da94cb5274cd34f2811461048d46ac0f4af04158702 SHA512 16fbc76558152b3eadca999d56197a6bf906cbb7bb75035ccd3501372af0f0c22533d22ba231a40b7c02afa11f0d692a6ae85ba6d5e1607b737b8c68209b7c43
+DIST pypy3.10-v7.3.14-src.tar.bz2 23828709 BLAKE2B 15b3197953ff6271ddc9aad317f06094e1744111b7236447f029299dcc8a8ee089a8d91eec46d634489e0e89c94c0b18fda97dee51b3030ac62b0beeea7d6413 SHA512 4162d60d3869cfc87b1850266b9c7147413d3a7184a3c0c2edf1d1270ba3dff2db8047c7f2b5bbdd4c4d5136823adc078a5d45d575715984bab6633d1462f694
 EBUILD pypy3_10-7.3.13_p3.ebuild 6312 BLAKE2B eaf56803de815ba2b66ce1f41c545589e0db710337c3635c939dc606465c5754fffeb97069c08b8dd4522bc6431009bc17d527362e3a1de0c4aa69b198abddce SHA512 c92b97d4257cae186b013bdae4caa8ae7bf1045567ebfeb8432c39179693e6a3c2122ba9c8f98d173f3e9043d373e930ccc486190c5db4483071c5834d6ecdc1
+EBUILD pypy3_10-7.3.14.ebuild 6314 BLAKE2B 529442108d44e4612a66c4bbb1a511f5472840b1d5f952a9a12a9ad6e0ca771d589474f69fa7790c4f47e7e99201011b76a884d60711bf11d1e07e52b05049cf SHA512 de94b475e6dcfcd5ea24eed5710856af9167a9a3276eb13ec598a93b90e0f55ec27ebebef4f763905017e4d2efa58489242206d9341d8b9a0ae44d7adc041e71
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_10/pypy3_10-7.3.14.ebuild b/dev-python/pypy3_10/pypy3_10-7.3.14.ebuild
new file mode 100644
index 000000000000..723a5ebe36a9
--- /dev/null
+++ b/dev-python/pypy3_10/pypy3_10-7.3.14.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.10
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy310-pp73-384"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!~dev-python/pypy3-7.3.12_rc1
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3_9-exe-bin/Manifest b/dev-python/pypy3_9-exe-bin/Manifest
index 841c6c3b9635..32cc4b2c9028 100644
--- a/dev-python/pypy3_9-exe-bin/Manifest
+++ b/dev-python/pypy3_9-exe-bin/Manifest
@@ -6,5 +6,14 @@ DIST pypy3_9-exe-7.3.13-1.ppc64le-musl.gpkg.tar 6389760 BLAKE2B 1eb0a9aed7e28227
 DIST pypy3_9-exe-7.3.13-1.ppc64le.gpkg.tar 9963520 BLAKE2B 07e02711f40e336077162887f1e39e761c295ef13300be46871082a4ecc998bedabbca38aba2a22d76899dd367d25194cf60f5ebe75fd89306c6661beaf4383e SHA512 939850b6d1c4acf634e9fb7eacabefb4888938fda2e333dd658e46304b281619b737cf3b5c1969c4114269a5a2ad90a193a1e7ca3bf57d67c4b777d308997cdf
 DIST pypy3_9-exe-7.3.13-1.x86-musl.gpkg.tar 8704000 BLAKE2B 22e5b403fe30d147d4eeff43b4ff010f5234a759a4383d2131a04e871039ac19f0c9918f43d2958554c0d25c2a1ad5532ab90a11bb2b401ec00f804b8a4f0b58 SHA512 3e9f5f3529473beaa13e1c473743449d08eb636f45fe6f94ecd5dc3560f2b48bd46ba9dc7aef9fbb54c94fd822e1835f0b58b611522a5349d54e5c509a5c1384
 DIST pypy3_9-exe-7.3.13-1.x86.gpkg.tar 8642560 BLAKE2B c5f481f79ba67c5250d6d72d3582ff72be3f55516f14acbfe6720b65d7d6b1464c9a2703f7bb75e9479c5a1e83b07f0c6fa628a55a019eeb9ac939cb68275e99 SHA512 0eadc7cf710c2c02ef9c0ba7ae0c45a9055bb65f0f341d5039e41934d3217b0cd92ee169569205a7b14217f92e91da9b8d376b0dfb25c6c41be150771711ba36
+DIST pypy3_9-exe-7.3.14-1.amd64-musl.gpkg.tar 11878400 BLAKE2B 200c9e8ad15eff269c26edb0db30fb642502f969a35290e86d1aa1814a1b331dbf2b5cbb7848164b2383f2e7b1bd03ed69f44c010c8240bc34d9ca44d638c5a0 SHA512 7e41264432aab6f70e552931e27be8ee0126b9eb530a8d7b5f7cac32f1e5778965481f92c92cb1ab485a6d3f0196300741d591e20ce2f0c53af08e6f25224236
+DIST pypy3_9-exe-7.3.14-1.amd64.gpkg.tar 11857920 BLAKE2B e65451a17c7c253ccf6865e0c1e4767cc382322f0d3d6d476e847db0f0535eb82db5ff1716f1e5114fb73fee9f9fa2ac8b3251cd53ba3a271e0a6a9170b38a85 SHA512 2e0c1fbff05f8b3f24b442f53cbe2c937d108176b86195483b2de718b48c198a3efd2916d1206bbf2b8579b93657a954b688445918ff306dcde1d0157dd3f84f
+DIST pypy3_9-exe-7.3.14-1.arm64-musl.gpkg.tar 10024960 BLAKE2B 68191a2c591d88dda53064572e85a4df07fd72c4219a89e73bcb03b87cee307aa385f4d8d366edf6ae7338b2f494d73c06e2b7f74f9251787d3fba9b92ba98bc SHA512 90870861fc0e9d70ab750b2ef259c056019173b475b514edf563231e05488cd3fd47d61ccd2d7742482b2c463fcb5280daf1f48089f16ef99eb43f9b24e69cc8
+DIST pypy3_9-exe-7.3.14-1.arm64.gpkg.tar 10024960 BLAKE2B 7e386315979ce7f4da6883906c3c754ad021df0ca7e5a9b57d81dc2bb1c09158d81b9960320bbdab47433d5b45d84f8024dc575a6f215c5e502bda3828797b60 SHA512 5311e5d8a6196398bc891b24d2b2ac0efe8ff64d254d27d04fae7e1d20418d77a19408a4276830b90951c1baf5f331bf4632476ac1e3845cbc8e4d47d0e578e5
+DIST pypy3_9-exe-7.3.14-1.ppc64le-musl.gpkg.tar 6584320 BLAKE2B 7fdcf4a6ed39a0c25be6dac0c3b5880e7aa7f5ea179b8790ac9d520b69fc1165554094d783d9d9327a3b3305b839c5ff3d94bcae04139606d6f10290f263c5c2 SHA512 299b851b509ef0905313761f82d89034cfe3cae5defeeb938635cb6a5d456ff9f3254b3875177d3720622168fdd0e8d635c62ddb6179d1ff2652ea333e1e730a
+DIST pypy3_9-exe-7.3.14-1.ppc64le.gpkg.tar 10260480 BLAKE2B 94ec718a5c37dbf6b15e91346147918284e9778b8f5240dc0169fe13cd2356fbea87ae0c24a718f86e04929cc63a8e8e0b5291da4c257338c7f4f419448848ef SHA512 809f76e514ef3a050be570b81e56a872573a7125c55581104057505a13d11580d2f0f71a3e59c6fd22b2dcd3fb3cd1e2ae046ff4dcb9bf2c791675e112ff6526
+DIST pypy3_9-exe-7.3.14-1.x86-musl.gpkg.tar 8888320 BLAKE2B 6aa189e8a5e80bbed01216808d2b7b543831a19e0039f7e8ed037881ea6a5a22ecc3acb1179a7892a4896dd2ef783ce169689a8f6c45bbaef662528cc2b74264 SHA512 4b68eae8185ece64a59b0ba952779f8fa31594f874dbccf125a9243ff656b86e0381d4ac39f70f2456edf58a2715277e0ee29840126437643587c4dfcf065904
+DIST pypy3_9-exe-7.3.14-1.x86.gpkg.tar 8919040 BLAKE2B 3896f0db4893fb54bc085f79a861cafc2395a3160efe8efe344530052e5c9e4547121e6e3263e4e1ad36ea7aa45de62b454bd89a5ddefd999d088be612b9d97a SHA512 1dd32f1e05817f18ca76a3c5ad38b100ac8601a2df20307fbec1336b0139a7e2a701759a833b5991875458a117a772bb94b7aba80f7a2712ff380a2e3d9be62e
 EBUILD pypy3_9-exe-bin-7.3.13.ebuild 2024 BLAKE2B 4c187873f36c357f98926b74ca630433f108857489e3b7edf38dfa95b6204792fd7f1114032f331bcd62c6779138f6476a8415fcb7b469d0673d15fb9002de64 SHA512 caf6b5685a328ee31e399d5586e1f404ada1d3008fcd4630d2d1976770797c540dee0db6550a3a707616d0ee0d2d218fcbacff77eb89fbcdfec3004cef8b78e0
+EBUILD pypy3_9-exe-bin-7.3.14.ebuild 2024 BLAKE2B 4c187873f36c357f98926b74ca630433f108857489e3b7edf38dfa95b6204792fd7f1114032f331bcd62c6779138f6476a8415fcb7b469d0673d15fb9002de64 SHA512 caf6b5685a328ee31e399d5586e1f404ada1d3008fcd4630d2d1976770797c540dee0db6550a3a707616d0ee0d2d218fcbacff77eb89fbcdfec3004cef8b78e0
 MISC metadata.xml 241 BLAKE2B 4f18c355c71824c25df283b2d463a5abbf2295446e74b960e868dd78d4910ac066725450478087567a6e66b7a8948d99e053f13a7e58dbf2b89fdaf5c2f3436c SHA512 c46e70ffd66754ad84c64806f2bbff25ba9a688f035176a4565afc95351ce10fffba64bbde89965501460b05978c7e59b3d84db6a8cb6efff4055d4b7a5ab5d8
diff --git a/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild
new file mode 100644
index 000000000000..d714e8dea6e4
--- /dev/null
+++ b/dev-python/pypy3_9-exe-bin/pypy3_9-exe-bin-7.3.14.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pax-utils unpacker
+
+PYVER=3.9
+MY_P=pypy3_9-exe-${PV}-1
+
+DESCRIPTION="PyPy3.9 executable (pre-built version)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	elibc_glibc? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86.gpkg.tar
+		)
+	)
+	elibc_musl? (
+		amd64? (
+			https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.amd64-musl.gpkg.tar
+		)
+		arm64? (
+			https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.arm64-musl.gpkg.tar
+		)
+		ppc64? (
+			https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.ppc64le-musl.gpkg.tar
+		)
+		x86? (
+			https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_9-exe/${MY_P}.gpkg.tar
+				-> ${MY_P}.x86-musl.gpkg.tar
+		)
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="${PV%_p*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# sys-devel/gcc for libgcc_s.so
+RDEPEND="
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/8
+	sys-libs/ncurses:0/6
+	>=sys-libs/zlib-1.1.3:0/1
+	virtual/libintl:0/0
+	elibc_glibc? (
+		sys-devel/gcc
+		>=sys-libs/glibc-2.35
+	)
+	!dev-python/pypy3_9-exe:${SLOT}
+"
+
+PYPY_PV=${PV%_p*}
+QA_PREBUILT="
+	usr/bin/pypy${PYVER}-c-${PYPY_PV}
+"
+
+src_install() {
+	insinto /
+	doins -r image/usr
+	fperms +x "/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_9-exe/Manifest b/dev-python/pypy3_9-exe/Manifest
index 5daeebc2a3b2..bcfffc355b78 100644
--- a/dev-python/pypy3_9-exe/Manifest
+++ b/dev-python/pypy3_9-exe/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
+DIST pypy3.9-gentoo-patches-7.3.14.tar.xz 5808 BLAKE2B 92ab7e9129838ff22cc13a64fe1ffe9ffd3af45ec777bde531ce2e15b87681e17fca2f1dc037ee4798bca5a9312ca4c961ec97b0a53bf5e6dc36fd12241151c9 SHA512 dffd17558d5ec2625682e5476ea53a9fe273f553b94d2589628e23ac3b45c50b5bf3ba9c7d92935e477374d9220af6ed310abae1270175f091a8c5a267a4bacd
 DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
+DIST pypy3.9-v7.3.14-src.tar.bz2 24683302 BLAKE2B 318fe17b423ce9c5b374cbceacf480ddbad7862bd6507d74289bbc0bd8ba8cf350ad21297b1e2dab7dfe6e7f542d929259be8d57867420b8a9a59284532aa9e2 SHA512 77db85092ca8ce419e30b274ec001566bbd275d88e74e5a3a3d0d557b18beb5a1e98428487f338e46f64893e54bf426464d372056c37a87a2b42b36c7d0fb536
 EBUILD pypy3_9-exe-7.3.13.ebuild 2662 BLAKE2B 9b78336e1adc2bc216953a6e464f8dc433ceda3898dbcd6ff96b60f886cd35b6d0532e22f5d77b6a1247b0f203cac01d1dd85b23eed8b7f9ecb7a822d45b841f SHA512 6e7019c636edfd391824b725d1552fcde4960284e9ba2c595aa6973cf65586a7c8ffe6ca61694904328c777898dacf5bd79c5d57117d4512e293af95bd928902
+EBUILD pypy3_9-exe-7.3.14.ebuild 2662 BLAKE2B 9b78336e1adc2bc216953a6e464f8dc433ceda3898dbcd6ff96b60f886cd35b6d0532e22f5d77b6a1247b0f203cac01d1dd85b23eed8b7f9ecb7a822d45b841f SHA512 6e7019c636edfd391824b725d1552fcde4960284e9ba2c595aa6973cf65586a7c8ffe6ca61694904328c777898dacf5bd79c5d57117d4512e293af95bd928902
 MISC metadata.xml 498 BLAKE2B 8dbcdb7c3a4a2fa5d1a922fd5197fb5e3337adcaec1e7d382f25f8696c80726e5b79843477bf8e5ce131aecde6e2c4c283548c5b337e54cb58aaa066013c445a SHA512 8a9bb514bbf3bf328aa63734e1fdc106f6aaf5ccb88c29ad8a686ab2724f3d1f4727163500013dd16e7b34232b881cf47d2f174212b5428ee076af27cf43628d
diff --git a/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild
new file mode 100644
index 000000000000..a6d7ba06e1b1
--- /dev/null
+++ b/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit check-reqs pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.9
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3.9 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	dev-libs/expat:0=
+	dev-libs/libffi:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libintl:0=
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${SLOT}
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-python/pypy
+	virtual/pkgconfig
+"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+		--withmod-bz2
+		$(usex ncurses --with{,out}mod-_minimal_curses)
+	)
+
+	local interp=( pypy )
+	if use low-memory; then
+		local -x PYPY_GC_MAX_DELTA=200MB
+		interp+=( --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	cd "${T}"/usession*-0 || die
+	newbin "testing_1/pypy${PYVER}-c" "pypy${PYVER}-c-${PYPY_PV}"
+	insinto "/usr/include/pypy${PYVER}/${PYPY_PV}"
+	doins *.h
+	pax-mark m "${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3_9/Manifest b/dev-python/pypy3_9/Manifest
index f1663407d20d..0ab70cf286b5 100644
--- a/dev-python/pypy3_9/Manifest
+++ b/dev-python/pypy3_9/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3.9-gentoo-patches-7.3.13.tar.xz 7476 BLAKE2B 70f80c489686e92e933a200d2e92a095a80e2300814ec4e1f3cb31ec5f5500a45667f7bfe9570ea5eef3933fdda33a9930bdf2cf683c28e3ddb610bebeeca6dd SHA512 5170f5141beb93b3b37cc94f85324c88182967eaff2f8ca26b81d63d5b0d20414a139ca44c250c07b46c747e27c97fd0fe5a2365f6636aba2dd28df3bc55cdca
+DIST pypy3.9-gentoo-patches-7.3.14.tar.xz 5808 BLAKE2B 92ab7e9129838ff22cc13a64fe1ffe9ffd3af45ec777bde531ce2e15b87681e17fca2f1dc037ee4798bca5a9312ca4c961ec97b0a53bf5e6dc36fd12241151c9 SHA512 dffd17558d5ec2625682e5476ea53a9fe273f553b94d2589628e23ac3b45c50b5bf3ba9c7d92935e477374d9220af6ed310abae1270175f091a8c5a267a4bacd
 DIST pypy3.9-v7.3.13-src.tar.bz2 23452374 BLAKE2B b5ce8dd78e4851b5c7fa6aa0c6f2f5c198a3b2d1e4691ccb20d1b229397d60ac41eaecef37f7c76e4de837876bdd6c1e4276302afc292080e0a38f1a58869580 SHA512 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59
+DIST pypy3.9-v7.3.14-src.tar.bz2 24683302 BLAKE2B 318fe17b423ce9c5b374cbceacf480ddbad7862bd6507d74289bbc0bd8ba8cf350ad21297b1e2dab7dfe6e7f542d929259be8d57867420b8a9a59284532aa9e2 SHA512 77db85092ca8ce419e30b274ec001566bbd275d88e74e5a3a3d0d557b18beb5a1e98428487f338e46f64893e54bf426464d372056c37a87a2b42b36c7d0fb536
 EBUILD pypy3_9-7.3.13-r1.ebuild 6311 BLAKE2B a026679c0a4e092f2219f4f63718623012a62552439598525c080dc98d6b0bbbb4c561a0204b089989a66ca38ff3d614c1151480e70616e2cb083d9cc3d09363 SHA512 65f1ef6b8775982c6fe834a5aff09c0aae2d2e6a0f28bc07a885346c6263fb135444f9fdd397c083fa6196f712190e486f5fc013ee0184612d181ca1d40c8ca8
+EBUILD pypy3_9-7.3.14.ebuild 6311 BLAKE2B 02ece4d982b6444166c1ec035f3a95e2af738b25df03a8614d06edce6318df28f04d553464e55f2112ac79ee1ef124ef67495db291445ab436a5d4bf559910b3 SHA512 a83d9ce03cace746c3b113e89a31880b67287876f0e7d53daed16195e1668d8e2c04aa045762d13126adaf29b8bbc5b1ffcd84003730ca5ee09240c827639676
 MISC metadata.xml 531 BLAKE2B 0f727c7ced9fb24ba0dc0b41d51c177b3711de33b838bf46cfdde5d8b751de9694873c13fe8153747f2cb533c078c54f004ee84b1c3c57b6f8d62128ffb9dba2 SHA512 331b66647a58047ded4bcf1529e3ca16b21cbb37afa82d8be0a4b6ad605e17bf3f1478fad1ea3b9c970bdf5162cb41e6adcb029a261fcbf894e807998b9219f6
diff --git a/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild b/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild
new file mode 100644
index 000000000000..6a263ec2fbb4
--- /dev/null
+++ b/dev-python/pypy3_9/pypy3_9-7.3.14.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multiprocessing pax-utils toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+PYVER=3.9
+MY_P="pypy${PYVER}-v${PYPY_PV/_}"
+PATCHSET="pypy${PYVER}-gentoo-patches-${PV/_rc/rc}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language"
+HOMEPAGE="
+	https://www.pypy.org/
+	https://foss.heptapod.net/pypy/pypy/
+"
+SRC_URI="
+	https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy39-pp73-336"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ensurepip gdbm +jit ncurses sqlite tk"
+# many tests are failing upstream
+# see https://buildbot.pypy.org/summary?branch=py${PYVER}
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/${PN}-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?]
+		>=dev-python/${PN}-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-lang/python-exec[python_targets_pypy3(-)]
+	dev-libs/openssl:0=
+	dev-python/gentoo-common
+	ensurepip? ( dev-python/ensurepip-wheels )
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-7.3.12_rc
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	mkdir bin || die
+	# switch to the layout expected for cffi module builds
+	mkdir include/pypy${PYVER} || die
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/bin/pypy${PYVER}-c-${PYPY_PV} pypy${PYVER}-c || die
+	cp -p "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/* include/pypy${PYVER}/ || die
+	# (not installed by pypy-exe)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/pypy${PYVER}/ || die
+	mv pypy/module/cpyext/parse/*.h include/pypy${PYVER}/ || die
+	pax-mark m pypy${PYVER}-c
+
+	# verify the subslot
+	local soabi=$(
+		./pypy${PYVER}-c - <<-EOF
+			import importlib.util
+			import sysconfig
+			soabi = sysconfig.get_config_var("SOABI")
+			magic = importlib.util._RAW_MAGIC_NUMBER & 0xffff
+			print(f"{soabi}-{magic}")
+		EOF
+	)
+	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
+
+	# Add epython.py to the distribution
+	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate sysconfig data
+	local host_gnu_type=$(sh pypy/tool/release/config.guess)
+	local overrides=(
+		HOST_GNU_TYPE "${host_gnu_type:-unknown}"
+		INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}"
+		LIBDIR "${EPREFIX}/usr/$(get_libdir)"
+		TZPATH "${EPREFIX}/usr/share/zoneinfo"
+		WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip"
+	)
+	./pypy${PYVER}-c -m sysconfig --generate-posix-vars "${overrides[@]}" || die
+	local outdir
+	outdir=$(<pybuilddir.txt) || die
+	cp "${outdir}"/_sysconfigdata__*.py lib-python/3/ || die
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy${PYVER}-c - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed"
+		import lib2to3.pygram
+		import lib2to3.patcomp
+		lib2to3.patcomp.PatternCompiler()
+	EOF
+
+	# Generate cffi modules
+	# Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py!
+	# (NB: we build CFFI modules first to avoid error log when importing
+	# build_cffi_imports).
+	cffi_targets=(
+		pypy_util blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma posixshmem
+		ctypes_test testmultiphase
+	)
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy${PYVER}-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+	# testcapi does not have a "build" script
+	../pypy${PYVER}-c -c "import _testcapi" || die
+
+	# Verify that CFFI module list is up-to-date
+	local expected_cksum=a4138e48
+	local local_cksum=$(
+		../pypy${PYVER}-c - <<-EOF
+			import binascii
+			import json
+			from pypy_tools.build_cffi_imports import cffi_build_scripts as x
+			print("%08x" % (binascii.crc32(json.dumps(x).encode()),))
+		EOF
+	)
+	if [[ ${local_cksum} != ${expected_cksum} ]]; then
+		die "Please verify cffi_targets and update checksum to ${local_cksum}"
+	fi
+
+	# Cleanup temporary objects
+	find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die
+	find -type d -empty -delete || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	dodir /usr/bin
+	dosym pypy${PYVER}-c-${PYPY_PV} /usr/bin/pypy${PYVER}
+	insinto /usr/lib/pypy${PYVER}
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r lib-python/3/. lib_pypy/.
+	insinto /usr/include
+	doins -r include/pypy${PYVER}
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/include/pypy${PYVER}/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "/usr/include/pypy${PYVER}/${x##*/}"
+	done
+
+	dodoc README.rst
+
+	local dest=/usr/lib/pypy${PYVER}
+	rm -r "${ED}${dest}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${ED}${dest}"/ensurepip || die
+	fi
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/sqlite3 \
+			"${ED}${dest}"/_sqlite3* \
+			"${ED}${dest}"/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/{idlelib,tkinter} \
+			"${ED}${dest}"/_tkinter \
+			"${ED}${dest}"/test/test_{tcl,tk,ttk*}.py || die
+	fi
+	dosym ../python/EXTERNALLY-MANAGED "${dest}/EXTERNALLY-MANAGED"
+
+	local -x PYTHON=${ED}/usr/bin/pypy${PYVER}-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}/usr/bin/pypy${PYVER}-c-${PYPY_PV}" "${PYTHON}" || die
+
+	einfo "Byte-compiling Python standard library..."
+	# exclude list from CPython Makefile.pre.in
+	"${PYTHON}" -m compileall -j "$(makeopts_jobs)" -o 0 -o 1 -o 2 \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+		--hardlink-dupes -q -f -d "${dest}" "${ED}${dest}" || die
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/python-sense-hat/Manifest b/dev-python/python-sense-hat/Manifest
deleted file mode 100644
index de85f1e723a1..000000000000
--- a/dev-python/python-sense-hat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-sense-hat-2.4.0.gh.tar.gz 27396 BLAKE2B 7f7482e17f80a3598c92f53f7a5b99ce4f5da10a5fc9ba6de656b6e18db323f8133f720d1486c3ecbe9badfdfe597c5365d2ba17ff637933d3053ec52f36dcfa SHA512 b2ce6c231b814d415dcf72b1031b29fd2309ccf194b8996401b1d3d7ff356ad4ed83a9ecff7c182410f789c3f1f47c3a6d64dd53884abf952f928734b94e54a5
-EBUILD python-sense-hat-2.4.0.ebuild 596 BLAKE2B eb167b8b31a8e76f366ae2ec77429abec36691dc283df8c9c4123e21b71f55d17f430cdeab20066b838b7f37bf7e41a89ada7665599856db51a8a075533eb15d SHA512 b8b6587287c02d17b49c41a760f22e206ac13221deea1bd196f78d451e34b6e39f9cdacecc3849244085f96902fd966d0e2d783b3048965e5f1e409c8ae222a7
-MISC metadata.xml 696 BLAKE2B 8c66d39989f0a29eb4b674afdfea3787c8ea4446d7fd41713f1a77d5e76c926f71200b685e3ca243dfac9c88ac9b7c11569fc36dc5c08e39e6aad24cc2ff94f7 SHA512 4c8725ab9fd8388006ccba8befe362e59962d9cc368d541dc57686544c10d81b891ff20788f6e209d79eaaabce3f857045b88acc5fb87a54995046e4b6ad21e9
diff --git a/dev-python/sense-hat/Manifest b/dev-python/sense-hat/Manifest
new file mode 100644
index 000000000000..3fd9ef55cef0
--- /dev/null
+++ b/dev-python/sense-hat/Manifest
@@ -0,0 +1,5 @@
+DIST sense-hat-2.4.0.gh.tar.gz 27396 BLAKE2B 7f7482e17f80a3598c92f53f7a5b99ce4f5da10a5fc9ba6de656b6e18db323f8133f720d1486c3ecbe9badfdfe597c5365d2ba17ff637933d3053ec52f36dcfa SHA512 b2ce6c231b814d415dcf72b1031b29fd2309ccf194b8996401b1d3d7ff356ad4ed83a9ecff7c182410f789c3f1f47c3a6d64dd53884abf952f928734b94e54a5
+DIST sense-hat-2.6.0.gh.tar.gz 26598 BLAKE2B eabb9cae494584bb05d4d6e7111284925c2be8c8abcfe0f346f148ab2e29bae4ee3adf46aa1c83ad098760f7adf57635fa7b392effa5ffab065562c0f8a60e17 SHA512 23a10b7af223bf373ecef987c40da6ec7b7e802169b8abb0a810dce369d969276c290aef9b9e6e70ee3824ce6d238dcc2654e06d87d0e05b056d11f64ac9209a
+EBUILD sense-hat-2.4.0.ebuild 639 BLAKE2B 09aaec1c75bac78c413bc5736275edb086638ee5df26408225e770802f43149fd6bb9dcb815170d1047f979b6786bcb83adc5006d1a618a4e8fc57e5ff1a13a1 SHA512 a9871f4858dc734f4c38ffaf62d33323054fea14cb9b7181e7ce9db2a1e42c8afe97ecf759714035882ad646870148aca9ffd44919769cae2096eba336f16bb0
+EBUILD sense-hat-2.6.0.ebuild 642 BLAKE2B dd371d659e3cdb424d46d9e0f0c4e9be57ea0b89c9d70d4590a9f988e768d8ed3c818f66223f80e7e90f5880c78a76658ce3a432b3475a3341eee2113c6b5458 SHA512 deb7746a932662ec5f5845729863469cb66d823c6ffa14db14fe0899d41af1aa7cd92672ac682e6f34ea1383eaa41d4b9c9ebe9f85bf66d781458c0d2682f2d9
+MISC metadata.xml 696 BLAKE2B 8c66d39989f0a29eb4b674afdfea3787c8ea4446d7fd41713f1a77d5e76c926f71200b685e3ca243dfac9c88ac9b7c11569fc36dc5c08e39e6aad24cc2ff94f7 SHA512 4c8725ab9fd8388006ccba8befe362e59962d9cc368d541dc57686544c10d81b891ff20788f6e209d79eaaabce3f857045b88acc5fb87a54995046e4b6ad21e9
diff --git a/dev-python/python-sense-hat/metadata.xml b/dev-python/sense-hat/metadata.xml
index 036fcee9c23f..036fcee9c23f 100644
--- a/dev-python/python-sense-hat/metadata.xml
+++ b/dev-python/sense-hat/metadata.xml
diff --git a/dev-python/python-sense-hat/python-sense-hat-2.4.0.ebuild b/dev-python/sense-hat/sense-hat-2.4.0.ebuild
index f2e7bd4fe801..8fd3c87b3cc6 100644
--- a/dev-python/python-sense-hat/python-sense-hat-2.4.0.ebuild
+++ b/dev-python/sense-hat/sense-hat-2.4.0.ebuild
@@ -4,13 +4,15 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+MY_PN="python-${PN}"
 PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
 DESCRIPTION="Raspberry Pi Sense HAT python library"
 HOMEPAGE="https://github.com/astro-pi/python-sense-hat"
-SRC_URI="https://github.com/astro-pi/python-sense-hat/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/astro-pi/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/sense-hat/sense-hat-2.6.0.ebuild b/dev-python/sense-hat/sense-hat-2.6.0.ebuild
new file mode 100644
index 000000000000..e628fd7360e8
--- /dev/null
+++ b/dev-python/sense-hat/sense-hat-2.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+MY_PN="python-${PN}"
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Raspberry Pi Sense HAT python library"
+HOMEPAGE="https://github.com/astro-pi/python-sense-hat"
+SRC_URI="https://github.com/astro-pi/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm ~arm64"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/rtimulib[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2183314c3de1..c2813fddb10b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 19f0c3d070f3..ae755966658b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -7,5 +7,5 @@ EBUILD diffoscope-247.ebuild 4035 BLAKE2B 95aac565c6f708ea5738484b9e1e272eff126c
 EBUILD diffoscope-250.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69
 EBUILD diffoscope-251.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69
 EBUILD diffoscope-252.ebuild 4036 BLAKE2B b997b6c76b2783d696d5f57c36a4d33733033ab5f9d8b3a6387adf1dd23e2df6fa773d61e91fa56dac6225bb2c9ead0c69d26fa540bd6bca2dc1337ce16d5383 SHA512 4f2f5617dc12c7ad7c6fc7d24fd6aafba15f75a21a2e55a0abc2b5aa8eadf6f03e5875c519dfb676200704fb3dda0e2b4039888a844ceba91923d1b15e26bc69
-EBUILD diffoscope-253.ebuild 3749 BLAKE2B a3f3107ee86e350e386451bb6f58c32c1b5efdd3f3262788dcf42a3a8d70066c3fbb573bb6bcc1368f2787a2bb19262d92a20c7893078cb9981721d960c4bf60 SHA512 653904f1bf3dc4a0b4f397033184062d65e9d15264ea9f0194843db9a6c89d81b452c6705c083f7214f138c04983e1004dc7b510306873ce721f17f4ce3f34d9
+EBUILD diffoscope-253-r1.ebuild 3674 BLAKE2B 7916dd7a87101fc97ce207e5558656795492ed53860614e60800c354a2da209229d8bd3f471ac1d8f176a43ce80a1383d0ac4ed149b78a9375ac8da4882add42 SHA512 1692dfcd7f03834a086f4a5656fd1ca1c1435d68ef5e2a9967f4b5bf06ae9fdc1d4009c95e36ab297df3374a7c82f6f16795c939a01b1d420aee66f8002008eb
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-253.ebuild b/dev-util/diffoscope/diffoscope-253-r1.ebuild
index d3eab7ae5279..5db2f28b4041 100644
--- a/dev-util/diffoscope/diffoscope-253.ebuild
+++ b/dev-util/diffoscope/diffoscope-253-r1.ebuild
@@ -24,7 +24,10 @@ ssh tar test tcpdump zip zlib zstd"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/python-magic[${PYTHON_USEDEP}]
+	|| (
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		sys-apps/file[python,${PYTHON_USEDEP}]
+	)
 	dev-python/libarchive-c[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/tlsh[${PYTHON_USEDEP}]
@@ -71,9 +74,6 @@ RDEPEND="
 	zlib? ( app-arch/gzip )
 	zstd? ( app-arch/zstd )
 "
-# Presence of filemagic's magic.py breaks imports
-# of dev-python/python-magic: bug #716482
-RDEPEND+=" !dev-python/filemagic"
 
 # pull in optional tools for tests:
 # img2txt: bug #797688
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 10885aa11116..1d0c8f3115a4 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index eafc7de348c8..60ba37ed7734 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,6 @@
 DIST swaylock-1.7.2.tar.gz 37368 BLAKE2B 146d73255a0d1439cf75ccb2fff528e47929718eaa75dc5a1567feeac59e65ebf674679e559dd634f375b5ca1bd44f6fe195f7362441b1979eaa222ba35812b8 SHA512 0593f7dfb258bd77796cb757e2e52d01829e0746306ce7991313a2982feead698c22753db53b00719ac1c82f6573563bcf5815f68c06680aa8ee6d419cac7549
 DIST swaylock-1.7.tar.gz 37149 BLAKE2B 7675b56a28ce932bd163cd41ce498295b61aff51d204c5323b187ddde9ea17f6ef1ac2777272fd92703e49f44b3f749645b4715a75ed54845590513e7dddd524 SHA512 44c5a4e482674caeb86da78e49d4593128a14adad2d6e46994f984b2b2b893416d6ceeb6b0b5746ad5594892e65c9dab9764bbe4bf617a90d92622a41b791ed0
-EBUILD swaylock-1.7.2.ebuild 1168 BLAKE2B 89ed4961d880a3be47725fe1b4dcd42adca53d59952c2508dcb15d9a36a050396ba821fadcf1ab8143922a88e027d1dc13cb41abd503b4d4e4f549384f053f9d SHA512 cbb34cf93322561ae3f83069a1ec96a58f6af34c85bfc913424706ffc83385f9fa68ce57bbd0fd817260e166618c11e6e45cb632980963618940f69b633bca0f
+EBUILD swaylock-1.7.2.ebuild 1167 BLAKE2B 564620990f93b7fe7b375527d205f505a93549d74d0dde7698a3448c6c29e4ae8ff60387a835c0805fd6124b890acc09f10e4d0a79f3ec8584f328455c99cbd3 SHA512 180a9ce570629483a0c80b117120a8db7e0fbade02f1f068a100eaaff7a785285f670e11b9343778ee6293178ee4751c62ce356c6f6529f88649500228a39329
 EBUILD swaylock-1.7.ebuild 1166 BLAKE2B 92ea949101a89f704935eba363f0dcf52dfab46c06c4483d62354b4ec8804e45b3c824f924014c379dff6a8debbf6442d6a51a9755f926e31b70034b4000a050 SHA512 46036c39bf893afa679e66d1f1e9c25eef51513a760215c8cec0ddcbfd570fbc73d17a46fbd59575a11d58bc0c7a50e9afec190add89566c5ef7e02192399645
 EBUILD swaylock-9999.ebuild 1170 BLAKE2B 2c6d3d8d484ef4a79cbd9ddeb4fbfd1740b78bee65fdcbaf5d69d77337723ff09369ae942abe34c610abc264c467c2bd1e90141f393c969ec19d6cb4dd6e5712 SHA512 ee85b65f4fb05740cd137b42673b4b338fa9056557f31ff7000072e7905b586a26c3e48ea9ac1d02e814afb955565fe1dc3e114791e6f81c9115f3ed88b091be
 MISC metadata.xml 1182 BLAKE2B 26d1cd8d48c9d3cd61c9c00838f5ca27f5794e8ad23177c99f14b80e7b5fb0238b361feecb7f24c871e653532bcc7ac6ad797f554151002cad43faba4f3f3963 SHA512 e3a00a1c6f35bb616b8934e0b841930f8efdc282096cacf0a615478444090d49ac4062b3d5b0cdf40ea22cc0a9835d403ef7716aefaed8cae8cfe508a99ff879
diff --git a/gui-apps/swaylock/swaylock-1.7.2.ebuild b/gui-apps/swaylock/swaylock-1.7.2.ebuild
index a1be23a04a10..c4c5243a8942 100644
--- a/gui-apps/swaylock/swaylock-1.7.2.ebuild
+++ b/gui-apps/swaylock/swaylock-1.7.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index fa8559258217..98c07559797a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 4cdcef6e0394..3a5ce1d239c0 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,10 @@
+AUX kio-5.113.0-fix-crash-malformed-exec.patch 1629 BLAKE2B aa05b4b860cfd17f5676227ebffa42c9f5a0454eb3c5f1e5805ab80cf0bdeaa830cdb3f60d30895598edf8fc13803498094957a78368d709bac17f9d594695ae SHA512 1a307e14847928053440eb6cdf34a99f3296026f82e25a640619027df7d76a5ea72d6586a740ab5331b2fd74c4ef093a21e9c9cef350f53e521fc712be2d6561
+AUX kio-5.113.0-fix-crash-while-copying.patch 6118 BLAKE2B 0dee76a2102cc044deceb755ca8cd9438a40ba8f1710538325e4ca4b51a28de658ee04a8cc7585e4e72e9885f418bd864ac7f196edf8c30b57b61d95110b9233 SHA512 566ff7ce4032d3a83013f24370fc4f73f4b6e2c61b8288332cda7db61f5628eced0388e953223b333d17d8d33e5f4071345ffde35c024a4007c130e2660b94b9
 DIST kio-5.112.0.tar.xz 3798280 BLAKE2B 735ce95f4efff32f62f440700bf63e178686d376dcbeee57fe4d7a322fb577a023c1b54ef5a769e7045142710603e03ceaa96025e2273df204218f8664755f66 SHA512 25229d22d25efaf3cc0b172a99b724859c61638caa4cd0d8a84293697d7f734d815b97a884e48a44baf8db2697acbd0d4d3cac15b1eca7f8c6edace902680e09
 DIST kio-5.113.0.tar.xz 3798768 BLAKE2B bd72d5b10cb76ffdb4074684c29764acaca53f9da3d228bf801c8b7365fe1b878b53261ed029e8836cb78a2621443d2c552e8715678d44dd484e9517258d9bff SHA512 25524882e46bec036cb8bd536c758df1570cdfd3dd037f22f9a764801ed2838aa109bf10c17021a1993d78c7f31e45e37b3861764efe47023ebfacfacf5e9024
 DIST kio-5.247.0.tar.xz 3349268 BLAKE2B 7645c1181831301f217482613cf05063e6b44bfd2b1492051e6024adf341095cf8b480654e09291029118404099b69c3658deb88b7b1e39106dfc4833519caec SHA512 da56980d742d847ebe3e9156297425aba5a328a4ca0898a3e00907e0a5005b735d5712553d84c1e1e8c12bfbf14e63970df3d9f883fddf491bfddd5bc187286b
 EBUILD kio-5.112.0.ebuild 2347 BLAKE2B 30baa33d0e1f157353faca3fe4a2304cc1574bcb1611a757bd669bdf8f74ebf9d7890a3acfeb203d71dd493cb3032b07b4e2eb2272ffe558699f9f7b20197d26 SHA512 a8e7b2b896a9d7721c10835527d0a578ee5a235a25883f8a09bda00639d9d18b4e56d7ae0384b8996f456fd88dd0d77baa5c91ba6afad4cffacb637b36b40405
+EBUILD kio-5.113.0-r1.ebuild 2585 BLAKE2B b6c21042dba1e8f64c2fcf89608ad696e4f8aebd88746c2f5c26bbad530697597e7c3eb1040c58c05db9f2f18c7c064a9122ee646e5dd455eaee0310a1353b8b SHA512 36cd7afa9f968cf35334eb607c7828d2d64c826d71656da99aada6be8e961b7f3b85c39e3bc60e29c380da179a30ac697d677e75d40da2f80b95da3c46090054
 EBUILD kio-5.113.0.ebuild 2437 BLAKE2B 42e4cc0898c4dc6fbb30b03673f14547ee28098ec5161fe351f50cb53992a0069735acf7de17d96519e2376a895c378e9be766d0c52b4bdaf008b732b0a7f13a SHA512 b94d864d9a46d9e8de3235c3995f53751c3aa037d23564521dd0040caeec4d3aac3772bc376bb7d400a18ac92dc418c191ec0073dcec3c351914c8a3ebd1e1d4
 EBUILD kio-5.247.0.ebuild 2209 BLAKE2B 318161549c9c2cae619d5d3f19bed89fa194b28e61abc2f51aeb7903eb3effeb38b2916268dc388e4565d32cb80b1fcf3b9ca14d1c1ef1f7c33cfb224007dd7d SHA512 fe5572ae56ca7ce9ba8c8f0281bcaf10d256adf8a5b61873ad52005a093132575098722bf30fa4b82f54e182b27c48a74104177c7b2ba7d27c21a33b410da8fa
 MISC metadata.xml 776 BLAKE2B c30d6d930265af6c0f0d5e01e2ad7b4c7961190f013e9447dea890880f947a0ad006ac523e7363e50a58221d807e1b9ce78270800a20226906e48980eb332b6a SHA512 ccf86c003f2933287e41fcac9980f07006b3bde5a303f241d7a1fadeffa0b22656ea6e51fadd5ea5c40d7e8fa0debaf16a0ac004db317a18c99d80461bc82115
diff --git a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch
new file mode 100644
index 000000000000..3688fa4af276
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-malformed-exec.patch
@@ -0,0 +1,41 @@
+From ebad60218b9d9e6901ae48c3dec9b90da963809c Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Wed, 13 Dec 2023 07:44:01 +0100
+Subject: [PATCH] kpropertiesdialog: don't trip over malformed Exec
+
+when the user incorrectly put env vars into the Program field the
+resulting desktop file will be somewhat malformed and literally contain
+
+> Exec='FOO=1 Bar'
+
+this then needs careful handling when parsing so we don't accidentally
+drain the execline list. when this scenario appears we'll need to assume
+the last item in the list is the program as we can't really tell if it
+is a program that looks like an env var or an env var without program
+
+BUG: 465290
+(cherry picked from commit 78d4364677fbe658c6e05d19bb158f895403ccc9)
+---
+ src/widgets/kpropertiesdialog.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
+index 93ec0759cf..25061825af 100644
+--- a/src/widgets/kpropertiesdialog.cpp
++++ b/src/widgets/kpropertiesdialog.cpp
+@@ -3379,6 +3379,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin(KPropertiesDialog *_props)
+             execLine.pop_front();
+         }
+         for (auto env : execLine) {
++            if (execLine.length() <= 1) {
++                // Don't empty out the list. If the last element contains an equal sign we have to treat it as part of the
++                // program name lest we have no program
++                // https://bugs.kde.org/show_bug.cgi?id=465290
++                break;
++            }
+             if (!env.contains(QLatin1String("="))) {
+                 break;
+             }
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch
new file mode 100644
index 000000000000..845e6bc64339
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.113.0-fix-crash-while-copying.patch
@@ -0,0 +1,184 @@
+From 6bea074739d5a75920d5540bc266549df5642511 Mon Sep 17 00:00:00 2001
+From: Akseli Lahtinen <akselmo@akselmo.dev>
+Date: Fri, 1 Dec 2023 11:27:26 +0000
+Subject: [PATCH] WidgetsAskUserActionHandler: Use QPointer to check the
+ validity of parent widgets
+
+If Dolphin is closed during the copying process,
+and the overwrite/skip dialog appears,
+this crashes the copying process since the
+parent shows to faulty location.
+
+Use QPointer to check that the parent widgets are still
+valid. If not, we just use nullptr, and the dialogs
+will still open.
+
+This also cleans some repetition in code.
+
+BUG:448532
+(cherry picked from commit bdef648edd54e146c30e881d8eb95990a59c5bbc)
+---
+ src/widgets/widgetsaskuseractionhandler.cpp | 90 +++++++++------------
+ 1 file changed, 39 insertions(+), 51 deletions(-)
+
+diff --git a/src/widgets/widgetsaskuseractionhandler.cpp b/src/widgets/widgetsaskuseractionhandler.cpp
+index fe2975d0ce..9cbaaec99f 100644
+--- a/src/widgets/widgetsaskuseractionhandler.cpp
++++ b/src/widgets/widgetsaskuseractionhandler.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <QApplication>
+ #include <QDialogButtonBox>
++#include <QPointer>
+ #include <QRegularExpression>
+ #include <QUrl>
+ 
+@@ -40,7 +41,10 @@
+     void savePersistentUserReply(KIO::AskUserActionInterface::MessageDialogType type, KConfigGroup &cg, const QString &dontAskAgainName, int result);
+ 
+     WidgetsAskUserActionHandler *const q;
+-    QWidget *m_parentWidget = nullptr;
++    QPointer<QWidget> m_parentWidget = nullptr;
++
++    QWidget *getParentWidget(KJob *job);
++    QWidget *getParentWidget(QWidget *widget);
+ };
+ 
+ bool KIO::WidgetsAskUserActionHandlerPrivate::gotPersistentUserReply(KIO::AskUserActionInterface::MessageDialogType type,
+@@ -106,6 +110,36 @@
+     }
+ }
+ 
++QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(KJob *job)
++{
++    // This needs to be in qpointer, otherwise copying process
++    // will crash if done in background and dolphin is closed
++    QPointer<QWidget> parentWidget = nullptr;
++
++    if (job) {
++        parentWidget = KJobWidgets::window(job);
++    }
++
++    return getParentWidget(parentWidget);
++}
++
++QWidget *KIO::WidgetsAskUserActionHandlerPrivate::getParentWidget(QWidget *widget)
++{
++    // This needs to be in qpointer, otherwise copying process
++    // will crash if done in background and dolphin is closed
++    QPointer<QWidget> parentWidget = widget;
++
++    if (!parentWidget) {
++        parentWidget = this->m_parentWidget;
++    }
++
++    if (!parentWidget) {
++        parentWidget = qApp->activeWindow();
++    }
++
++    return parentWidget;
++}
++
+ KIO::WidgetsAskUserActionHandler::WidgetsAskUserActionHandler(QObject *parent)
+     : KIO::AskUserActionInterface(parent)
+     , d(new WidgetsAskUserActionHandlerPrivate(this))
+@@ -128,22 +162,8 @@
+                                                      const QDateTime &mtimeSrc,
+                                                      const QDateTime &mtimeDest)
+ {
+-    QWidget *parentWidget = nullptr;
+-
+-    if (job) {
+-        parentWidget = KJobWidgets::window(job);
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = d->m_parentWidget;
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = qApp->activeWindow();
+-    }
+-
+     QMetaObject::invokeMethod(qGuiApp, [=] {
+-        auto *dlg = new KIO::RenameDialog(parentWidget, title, src, dest, options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest);
++        auto *dlg = new KIO::RenameDialog(d->getParentWidget(job), title, src, dest, options, sizeSrc, sizeDest, ctimeSrc, ctimeDest, mtimeSrc, mtimeDest);
+ 
+         dlg->setAttribute(Qt::WA_DeleteOnClose);
+         dlg->setWindowModality(Qt::WindowModal);
+@@ -161,22 +181,8 @@
+ 
+ void KIO::WidgetsAskUserActionHandler::askUserSkip(KJob *job, KIO::SkipDialog_Options options, const QString &errorText)
+ {
+-    QWidget *parentWidget = nullptr;
+-
+-    if (job) {
+-        parentWidget = KJobWidgets::window(job);
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = d->m_parentWidget;
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = qApp->activeWindow();
+-    }
+-
+     QMetaObject::invokeMethod(qGuiApp, [=] {
+-        auto *dlg = new KIO::SkipDialog(parentWidget, options, errorText);
++        auto *dlg = new KIO::SkipDialog(d->getParentWidget(job), options, errorText);
+         dlg->setAttribute(Qt::WA_DeleteOnClose);
+         dlg->setWindowModality(Qt::WindowModal);
+ 
+@@ -373,16 +379,6 @@
+         return;
+     }
+ 
+-    QWidget *parentWidget = parent;
+-
+-    if (!parentWidget) {
+-        parentWidget = d->m_parentWidget;
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = qApp->activeWindow();
+-    }
+-
+     const KGuiItem primaryActionButton(primaryActionText, primaryActionIconName);
+     const KGuiItem secondaryActionButton(secondaryActionText, secondaryActionIconName);
+ 
+@@ -412,7 +408,7 @@
+         hasCancelButton = true;
+         break;
+     case AskUserActionInterface::SSLMessageBox:
+-        d->sslMessageBox(text, metaData, parentWidget);
++        d->sslMessageBox(text, metaData, d->getParentWidget(parent));
+         return;
+     case AskUserActionInterface::Information:
+         dlgType = KMessageDialog::Information;
+@@ -442,7 +438,7 @@
+ 
+     QMetaObject::invokeMethod(qGuiApp, [=]() {
+         auto cancelButton = hasCancelButton ? KStandardGuiItem::cancel() : KGuiItem();
+-        auto *dialog = new KMessageDialog(dlgType, text, parentWidget);
++        auto *dialog = new KMessageDialog(dlgType, text, d->getParentWidget(parent));
+ 
+         dialog->setAttribute(Qt::WA_DeleteOnClose);
+         dialog->setCaption(title);
+@@ -492,15 +488,7 @@
+ 
+ void KIO::WidgetsAskUserActionHandlerPrivate::sslMessageBox(const QString &text, const KIO::MetaData &metaData, QWidget *parent)
+ {
+-    QWidget *parentWidget = parent;
+-
+-    if (!parentWidget) {
+-        parentWidget = m_parentWidget;
+-    }
+-
+-    if (!parentWidget) {
+-        parentWidget = qApp->activeWindow();
+-    }
++    QWidget *parentWidget = getParentWidget(parent);
+ 
+     const QStringList sslList = metaData.value(QStringLiteral("ssl_peer_chain")).split(QLatin1Char('\x01'), Qt::SkipEmptyParts);
+ 
diff --git a/kde-frameworks/kio/kio-5.113.0-r1.ebuild b/kde-frameworks/kio/kio-5.113.0-r1.ebuild
new file mode 100644
index 000000000000..b2f3e4451367
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.113.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_HANDBOOK="optional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="acl kerberos kf6compat +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X?]
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	sys-power/switcheroo-control
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		=kde-frameworks/kdoctools-${PVCUT}*:5
+	)
+	kerberos? ( virtual/krb5 )
+	kf6compat? ( kde-apps/kio-extras:6 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-while-copying.patch" # KDE-bug 448532
+	"${FILESDIR}/${P}-fix-crash-malformed-exec.patch" # KDE-bug 465290
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		-DKF6_COMPAT_BUILD=$(usex kf6compat)
+		-DWITH_X11=$(usex X)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index f122bb1cb136..087feedf96c6 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index dc6ae795e167..c3a27bf532ac 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,6 +8,6 @@ DIST postfix-3.8.4.tar.gz 4864184 BLAKE2B 200ce3d72444da05e42fc8627002d53d68c1b3
 DIST postfix-3.9-20231224.tar.gz 4901720 BLAKE2B a49da1ef8c38efddf25b39828a30966d2be8b5db6d8dee436ba7059c01b71d4959b20f0d30366cf5adea039e3a82a0e191944822483d3852a166fbc90ca4892d SHA512 7c683f55e74f49805142fcd022d52aeec174611cd2da4d3662154f8c4d612f6ad61ee7bde2f31c806d906094b481b73a9be7a95be896e27b2583c76c40b678bd
 EBUILD postfix-3.8.2.ebuild 8190 BLAKE2B 6e288a094b3cd29fd88623352eca1511d35c85a0afdab6e3a0fce46200138fbd5baef569225a480514133e42c0ff3f84f3bfc1c1ad09362bcc52c93af21271e7 SHA512 dacb1a50669e5513e9de246a7c6b5ebad59e7b723420781655df68607d84771c18d06ef8baab004d1d36394246944683e9dae8a2308d09b0c7408bfca48c7830
 EBUILD postfix-3.8.3.ebuild 8191 BLAKE2B 81be823c18f649d1e12b7144ff2308d640d717ff9fb7e178cae6eb852f20ced7c7ed1b05e9c2d96369b0a383037650b0f03331f79af21db4ba980a383492f633 SHA512 24dbf9a8e1ae39b5cf6924c1c6aac6d69ab42f457a3be4e88f2bac8622665221bb89207cf03f14e559ebe5f189e7b6cf1a01efeb4ccc093a5106472b41cd4a8d
-EBUILD postfix-3.8.4.ebuild 8358 BLAKE2B ac5e89c7fe84f9f49956948937922fd96c8a30a5479102de74aa78bf5e2e9a9306ac4028963c062020e9d9e73ca84ff9cc8105c19cd1e44eff4440e597ebdeee SHA512 2114f27e28f44c7b158dd312476727d6e0a92791c6a0441f2411a20ceea51c945dabd86fff831bf09403136404cfa67bcf578194c0e0576f07fc0d08386b6d6f
+EBUILD postfix-3.8.4.ebuild 8356 BLAKE2B 5dbf54301ec32f81903066255675c3a79b35fdc404bea3d10bb13669a1972ebf8629817156b1a43241613693c695c3d1530e2614c667d14043bdbaa4a01b6824 SHA512 57256b2e88929c0ac4500d062bcbe8e2feb26049b974b99e14c1828122d4331ace189a85f7562ba63f0f3379b72f4db4e3c7b6ec3dddd98e9122d76d280d7ecc
 EBUILD postfix-3.9_pre20231224.ebuild 8207 BLAKE2B a7d97777bc8527771e0caaaba00b9e9ce151d4fbf1ab49ef908c80a8af56a509e6af41abec5f150af169d230dd080844a809791f527a3586b9dd4b4e14a05fb6 SHA512 fab6fcbf0256013ff4932a60a6dd91be84c2ee5392b00010a4a7d9f267ef1a1b9a66d33e079a39aad161217a8abf3af8d6e60d99d48bd427124dbd6239115280
 MISC metadata.xml 853 BLAKE2B 96b2b5c531692f1eba1bc4c543ba4df77754d11802e9754ac102907d00dc1284fe449384d3c8c4e53c343e3424f79cf654b7a0c6a112d0ec973f8da585045ff7 SHA512 15c4521a70f25d8d5261c1c981d7ab41cdf542a1630c6857037e0b3e3ab0a51f6dbb4edee9ee9857d0b7a130c5da6f475e1be6a02728edecb23defa004be48eb
diff --git a/mail-mta/postfix/postfix-3.8.4.ebuild b/mail-mta/postfix/postfix-3.8.4.ebuild
index df928682c150..0ec2a32fae58 100644
--- a/mail-mta/postfix/postfix-3.8.4.ebuild
+++ b/mail-mta/postfix/postfix-3.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND="
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 552e45489775..ee7385e90329 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 88dd490795c3..57697526a159 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,3 +1,5 @@
 DIST easyeffects-7.0.7.tar.gz 3359508 BLAKE2B 16c4fd322eefcd16bb8a83a5443e482689b2f4665556f306e11c072b869f9929d5c7b781f7adbba7faacb71a07c0bdd2b61efb6584131e61e2bfa6dedcdf3c8d SHA512 3ceadf6c8acff64a98cf6c0e2c5386aa7b6d4649d49a9879574415bb7959b9c7243870bc30ea38bb3de3ee5b4d9ab9892eb8809069c08b2a50ab7f2342f6a1e4
+DIST easyeffects-7.1.3.tar.gz 3426093 BLAKE2B 62ff40388df2a3452d23968881ab7d247c5504abc4524564e919cc520700e64978914248f00fb8b3ae251b895850d9a4dee763576baf2c43af3cd1105d2b62d5 SHA512 9e277b0c432f5015b33d4ac6961d5eec4cbf498dd2e947d231a9c13d8c7b7680f7ded7bf3d55d2c72ebf46de94308447a0b1e3b8cbbb13ce96c3a79bf027ffa3
 EBUILD easyeffects-7.0.7.ebuild 2046 BLAKE2B eee6f202ac140bb8a0235a9319a9c7c0b1554fd5750c4a672699abbaf0b4d02d40e491e99f22b237e424126869cece8763d95d1d29e41f88d289c8a8738c56df SHA512 c0acf5b74a42b5f8b229f52c110b35ae8bb6742bc77bb685e34291ebb55f35bb367e434f471b1a5b24845b304e70f9eeb43ad45d477bde9014c9f717217b5cb6
+EBUILD easyeffects-7.1.3.ebuild 2261 BLAKE2B 2737d952f28e55cd8fdd928c783c5bc8b366baf0d11a0149db97f1e128eff4fdc1bff0bc9c9bd965d692c028258486c2abbad6600717a843618c91c5b8dba1ae SHA512 ec8df68bffb9154504e4fd6b849c668f4a8d66fb7681e588eee8070189fbc3dcf4343c3a355b1d67a66f47e6448a82b78e477cbe8c83c6b09046c22fb96acfe1
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-7.1.3.ebuild b/media-sound/easyeffects/easyeffects-7.1.3.ebuild
new file mode 100644
index 000000000000..d3af93f6daff
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-7.1.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson toolchain-funcs
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+# Reminder: since 7.0.8 upstream recommends >=>=media-libs/lsp-plugins-1.2.10
+# but as of late December 2023, the tree remains stuck at 1.2.6.
+# Update the dependency when possible (Bug #915777).
+COMMON="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.10.0:4
+	>=gui-libs/libadwaita-1.2.0:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/gsl:=
+	sci-libs/fftw:3.0"
+# Only header files are used from these two
+DEPEND="${COMMON}
+	media-libs/ladspa-sdk
+	media-libs/libsamplerate"
+RDEPEND="${COMMON}
+	>=media-libs/lsp-plugins-1.2.6[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! tc-is-gcc; then
+			if ! tc-is-clang || [[ $(clang-major-version) -lt 16 ]]; then
+				die "${PN} can only be built with GCC or >=Clang-16 due to required level of C++20 support"
+			fi
+		elif [[ $(gcc-major-version) -lt 11 ]] ; then
+			die "Since version 6.2.5 ${PN} requires GCC 11 or newer to build (Bug #848072)"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
index f015c5c61056..452cb1b783b9 100644
--- a/media-sound/sooperlooper/Manifest
+++ b/media-sound/sooperlooper/Manifest
@@ -4,5 +4,5 @@ DIST sooperlooper-1.7.8.tar.gz 858042 BLAKE2B 762ccdacdd3a44a009d35b591095636bc2
 DIST sooperlooper.png 2644 BLAKE2B 84149d70c63931a2b0f9864da1aed850bbf564fb1f2d8bd97bd270a353ed7ef1d978a5bda7fd6c4641284f61d1655b15eef033353d7ed6a3751f96d2cd07fe07 SHA512 d98c807db122f8a377e18a3ea0f23518ef97a480707b0de685fe842745a1565fe2071ba6c8487ef1bcf6802f9a209ad434b7daba84ede4c24cbaad8de935490e
 DIST sooperlooper_1.7.8~dfsg0-2.debian.tar.xz 13644 BLAKE2B b91fbee90c1f2b676932db9a6cd98aa8006232b3c4e58e5a514da67abc30fa03bea6e47fa5b0edf9ab8be5912269820646adbe96d08f99d5aba671cebd9c8372 SHA512 3f61d4f8c735bf23853d3c26ba81c140b7ad3a5da6a72e53c3341f88b3fda49c7aa8157278c9950f759f2e427c373aa4aea9a89a358b83bcfa46ebba6f82a176
 EBUILD sooperlooper-1.7.4.ebuild 1330 BLAKE2B cbf211a937dbc3d4e11a276c61c18438a2c1dc61ebaf366bc4ce53d88827454d8494f459c220c5d33496fa2a5d9047ef8a9c2982e4141c23f881217cc4e34064 SHA512 c366b1f0ff061b4460d18ea4a7f386f909bb358073fad346ebd6c1f8e6d2afc2ff472066a7b84d456cd9c3895293454dc6873f8ea52d3e77027e93a8bc3a33df
-EBUILD sooperlooper-1.7.8_p2.ebuild 1535 BLAKE2B 3d91b959e22dd67eb9fa76b476cf9d7606fa000924a35d36640551b8d61ec1382fcc74249f27a7343ea976462602a9686174cd08641d0df04224831f977208e1 SHA512 d6fb97a332d5dfd4b59cf10d0e333b5c87f254c00e9e2f0b040ca61b931ecbddc86270e6dafbbffc5c7f207d7883ae117534831a81b817bcf570720d7e5eb3ed
+EBUILD sooperlooper-1.7.8_p2.ebuild 1534 BLAKE2B bb47c7d8b129a4366500252467e15f1ec962e68e44e2b868ce8baf07e48168d70d480df7fbc104eeb466e8188dc3e4623e0eea0418a4779b52011caf5be2cfa1 SHA512 89c0b7686bfb666c3fc2a9721bbf8d24dceb6ea9692408e61f7aa9b0cf173644ea055b88d08dbfb2aa14e3d6dd16dd21a4e2cad4cbd184bb3acc0891b38ec914
 MISC metadata.xml 337 BLAKE2B b93bb5a5de4848fa69ba5ccade6c4464edd6f15c45e0490735f8dbd0aa227da70f47f7c335a2b4a1592db387c93a8e7f677c399ab37055404635016a6cf3bb5d SHA512 610383ba6ffd7b37a2ef859640e0a0096c85aa9f9c68eb376b22a865998ea364ef28c61fe4b47a9d9d6c3cdbeb575be727b399059be81b27e58a5d2053259b73
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild
index a48eff3d34f2..f40e4d764de0 100644
--- a/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild
+++ b/media-sound/sooperlooper/sooperlooper-1.7.8_p2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://sonosaurus.com/${PN}/${P/_p*}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="wxwidgets"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 3bfe365d984d..b833375c7b9f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index fdef759f0b85..d49e9af7f538 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 18:40:17 +0000
+Tue, 26 Dec 2023 01:10:08 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index c1e138f4762a..875972f31be6 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 557720 BLAKE2B 1bc79beb7b22c2ce6b80e7677302891c872d6ac116096c06d9dbba6d7683aec51bbbcefe97cf8126dd25818fe0c936a6b25df9e1c8c1be9da6a5c9580fff46e2 SHA512 273602eb349fcbbef4c2202ec5c33b66d702f53716aad3f0abfbf14db5c7ba667dd6fefa620e348109b82427555dd8d45ab0b261320d92f551c7162d8f78de5f
-TIMESTAMP 2023-12-25T18:40:22Z
+TIMESTAMP 2023-12-26T01:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJzJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWKJ/RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDTTw//aSmwQgfVPaG8FMCYxRQN+w2pYP8JyRi2cbNPv/O/ZOnbQm0E1KVRVt9F
-tX454zRRrC1eAlT+niU7RZbQD4YdvaJwrZLnwecf/CtQwk0s+torVLwIW4zc8sLD
-5q+MRFx8K618l++80NVO+W6QFq16pqcrChE5t/N5PsuyjptIKN8Po9RT3vOyTvp3
-S4hTTbzbaysxw88Mr/SX7hSfZNCYMkF1MnNOQxe6m9qQ7SPbzxaa01IZ/GxmY3CM
-VCbpN3RnLOhx+OcRlsZ/lfCfSJ4VYuTDWV1x4boiZnX8oE2Og2b5cpoyA2yvaCJM
-xzpjdiHLt+ZvvHSli0De/kjqED5LorQ+OrE4OqxHI0/C5MEUTrsPYb2BnzGFV7e+
-S7HMEtvZRES5jMZ4etQa/Ey6jYcnqjqGr4wEYGtxxnpaCF6DhzWllyydSmR/2uhM
-5hUI9iefsb5COgfpsxEU0LEiMMWb+dKCXzNSDNMHZZPZAM82lk6x3kstC0y9jMxq
-j398ITijymYHvXU2FSQK1WDkHueLqjK+VRlTPcso0udLzDSh8Zna0fFRxTtldqHd
-5XwvaU3Tq/tlxPObbx5bLCHGQ+V48vlQgOolfIdYYCLlySJCJcsn33Ac6VfLMvWQ
-LmM1u2GtZMM4Bh78mcD15NwSj6MDvePpNezY0BE6p2heHLpqObw=
-=eQec
+klCrfA//SR6JDR+fMYgMwfb/n3Mm/R8tPv2yboJ12XpvE8Bh07f2mItfbPz80GLq
+HI/tKYsdmyFM1RFa3WlqObqjebPJYCSZMmgpRLsBGI2TcGBQGvTRCzio6/nLsLm1
+9XQvM8Y2QWjaQ6ASctIlJLdEao/e7yHmBPiFkZYB0OQmiV+Bf9HJk+vByOLegXyg
+VLA2Tzh/r0q3Cm6Uo5WDQ0WbzZPI9oYpZSmtEQ+j25NI/hKYBwy3Vryigzre5jLd
+UJd8PxeJgw2bGyPsRlOGwkJKb1llfL/0J/RhzIbtG5ZIAT8u/S/4xYh7qXJElZZv
+XJNABbUP1cevXpKmyH2CmDLWZtQqyVXbErlnwy/3EPeBqt09r9JS68fRQ7aj3EyM
+4n2NkjkFK/X/qgr+ERRK/JR5OYvgE+qvjW9MIY+QV+f/Nu7BYrcw7u4iyjETi7vj
+fSegXQ/GSMPGSsl9aqOZ+MFU0z7X7Ifj9tlbToR0jqHQHRRGuqW0keGGmUqYa+sS
+XWWAE3TsSu8ZCzMviYdznOGjVjn0FfHsHagnQmt7d/uSn4jhSudFPN1NoVFoZ/j2
+6cTVf7wfNMyEUtHBaG53hHacw127pLXeQswNakJnkUVXTfxEYDIl4Wh3cay7CEch
+d7A6NCDbY7vBRtbj5xJrqgNE8blTb297cN+T0DnYtAJ54mODe7E=
+=Q60s
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index fdef759f0b85..d49e9af7f538 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 18:40:17 +0000
+Tue, 26 Dec 2023 01:10:08 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6553605db68d..d662576cf718 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index b87a24bf8061..195c85fcdef7 100644
--- a/metadata/md5-cache/app-backup/Manifest.gz
+++ b/metadata/md5-cache/app-backup/Manifest.gz
diff --git a/metadata/md5-cache/app-backup/duplicity-1.2.3 b/metadata/md5-cache/app-backup/duplicity-1.2.3
deleted file mode 100644
index 53ab67ac0413..000000000000
--- a/metadata/md5-cache/app-backup/duplicity-1.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/par2cmdline dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Secure backup system using gnupg to encrypt data
-EAPI=8
-HOMEPAGE=https://duplicity.gitlab.io/
-INHERIT=distutils-r1 pypi
-IUSE=s3 test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3
-RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/future[python_targets_python3_10(-)?,python_targets_python3_11(-)?] s3? ( dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/d/duplicity/duplicity-1.2.3.tar.gz
-_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=9215f9ce9083875b9be5cff4bafcfdde
diff --git a/metadata/md5-cache/app-backup/duplicity-2.1.1 b/metadata/md5-cache/app-backup/duplicity-2.1.1
index 28ea4b058309..d400f23ee8fa 100644
--- a/metadata/md5-cache/app-backup/duplicity-2.1.1
+++ b/metadata/md5-cache/app-backup/duplicity-2.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://duplicity.gitlab.io/
 INHERIT=distutils-r1 pypi
 IUSE=s3 test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
 RDEPEND=net-libs/librsync app-crypt/gnupg dev-python/fasteners[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paramiko[python_targets_python3_10(-)?,python_targets_python3_11(-)?] s3? ( dev-python/boto3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/d/duplicity/duplicity-2.1.1.tar.gz
 _eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=f8e659e90504e32fd982d235d3211c92
+_md5_=322d25c4a6b3ce62ae2e61f2eb8e0db5
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 659dbb7e25b4..909c4646c1f7 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/sbctl-0.13 b/metadata/md5-cache/app-crypt/sbctl-0.13
new file mode 100644
index 000000000000..a44e5ee59599
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/sbctl-0.13
@@ -0,0 +1,14 @@
+BDEPEND=app-text/asciidoc verify-sig? ( sec-keys/openpgp-keys-foxboron ) >=dev-lang/go-1.18 app-arch/unzip verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=install unpack
+DESCRIPTION=Secure Boot key manager
+EAPI=8
+HOMEPAGE=https://github.com/Foxboron/sbctl
+INHERIT=go-module verify-sig
+IUSE=verify-sig
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/Foxboron/sbctl/releases/download/0.13/sbctl-0.13.tar.gz verify-sig? ( https://github.com/Foxboron/sbctl/releases/download/0.13/sbctl-0.13.tar.gz.sig ) https://dev.gentoo.org/~ajak/distfiles/app-crypt/sbctl/sbctl-0.13-deps.tar.xz
+_eclasses_=go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	9e5a8f7b134fd3ed3785755097fe8ef0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=27312ab5dbe5c129ed28d74ac03b6369
diff --git a/metadata/md5-cache/app-crypt/xca-2.5.0 b/metadata/md5-cache/app-crypt/xca-2.5.0
index ec23e12cc3ed..3a05758b6083 100644
--- a/metadata/md5-cache/app-crypt/xca-2.5.0
+++ b/metadata/md5-cache/app-crypt/xca-2.5.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://hohnstaedt.de/xca/
 INHERIT=cmake xdg-utils
 IUSE=doc
-KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=BSD
 RDEPEND=dev-libs/libltdl:0= dev-qt/qthelp:5 dev-qt/qtgui:5 dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-libs/openssl:* doc? ( app-text/linuxdoc-tools )
 SLOT=0
 SRC_URI=https://github.com/chris2511/xca/archive/refs/tags/RELEASE.2.5.0.tar.gz -> xca-2.5.0.tar.gz
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2308e0dc242be9050ef6815f9c6867e7
+_md5_=c93566fca06b5df2afbc7e4683c719b8
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6251db137279..112a8aed3eeb 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-29.1-r6 b/metadata/md5-cache/app-editors/emacs-29.1-r6
index 5620c9719e8a..894b368cf128 100644
--- a/metadata/md5-cache/app-editors/emacs-29.1-r6
+++ b/metadata/md5-cache/app-editors/emacs-29.1-r6
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/emacs/
 IDEPEND=app-eselect/eselect-emacs
 INHERIT=autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
 IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux small-ja-dic sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-util/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29
 SRC_URI=mirror://gnu/emacs/emacs-29.1.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-29.1-patches-6.tar.xz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=cc117323106e371bcb51449ecb1b6c78
+_md5_=caef170c694560cbba06c077d0308890
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1ffd8a1914ad..e7cf26830642 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.26 b/metadata/md5-cache/dev-java/htmlcleaner-2.26
deleted file mode 100644
index fab22ace096f..000000000000
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.26
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jdom:2 dev-java/ant-core:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=HTML parser written in Java that can be used as a tool, library or Ant task
-EAPI=8
-HOMEPAGE=http://htmlcleaner.sourceforge.net/
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.26/htmlcleaner-2.26-src.zip
-_eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	7c4c66a18e7b619373f3a3bcff542907
-_md5_=8e7fc31f99f05f7c15a65a1edc87ad8d
diff --git a/metadata/md5-cache/dev-java/htmlcleaner-2.29 b/metadata/md5-cache/dev-java/htmlcleaner-2.29
index f0c6eb9a2b68..00eaaf883bc0 100644
--- a/metadata/md5-cache/dev-java/htmlcleaner-2.29
+++ b/metadata/md5-cache/dev-java/htmlcleaner-2.29
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://htmlcleaner.sourceforge.net/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-java/jdom:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/htmlcleaner/htmlcleaner/htmlcleaner%20v2.29/htmlcleaner-src-2.29.zip
 _eclasses_=java-pkg-2	b6d755b4f6afabfd933932be28b46368	java-pkg-simple	4ab397252045e0aeb290efb05ea956c7	java-utils-2	7c4c66a18e7b619373f3a3bcff542907
-_md5_=272a23c969732e9866aeaed6de6b6b2f
+_md5_=bdc4b78f91125c0db951540fc86eee05
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ea54be5ebb9f..dd6ee82b0bdd 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/erlang-26.2.1 b/metadata/md5-cache/dev-lang/erlang-26.2.1
index 5cdcda02b56a..4865e121621f 100644
--- a/metadata/md5-cache/dev-lang/erlang-26.2.1
+++ b/metadata/md5-cache/dev-lang/erlang-26.2.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.erlang.org/
 INHERIT=autotools elisp-common flag-o-matic java-pkg-opt-2 systemd toolchain-funcs wxwidgets
 IUSE=doc emacs java +kpoll odbc sctp ssl systemd tk wxwidgets java
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=acct-group/epmd acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) ssl? ( >=dev-libs/openssl-0.9.7d:0= ) systemd? ( sys-apps/systemd ) wxwidgets? ( dev-libs/glib:2 x11-libs/wxGTK:3.2-gtk3[X,opengl] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0/26.2.1
 SRC_URI=https://github.com/erlang/otp/archive/OTP-26.2.1.tar.gz -> erlang-26.2.1.tar.gz https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_man_26.2.tar.gz -> erlang_doc_man_26.2.tar.gz doc? ( https://github.com/erlang/otp/releases/download/OTP-26.2/otp_doc_html_26.2.tar.gz -> erlang_doc_html_26.2.tar.gz )
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	28044ae40e7846886b6f5eca24661629	java-utils-2	7c4c66a18e7b619373f3a3bcff542907	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5
-_md5_=ea53c70f01c42b96127d116b69163c6c
+_md5_=8bbdf751eafd5289fc197e6b6d1f1d40
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a9efd878e173..1539fb6af3bf 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/apache-arrow-11.0.0-r2 b/metadata/md5-cache/dev-libs/apache-arrow-11.0.0-r2
deleted file mode 100644
index bbddf3e9dd64..000000000000
--- a/metadata/md5-cache/dev-libs/apache-arrow-11.0.0-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd json? ( dev-libs/rapidjson ) test? ( dev-libs/boost dev-cpp/gflags dev-cpp/gtest )
-DESCRIPTION=A cross-language development platform for in-memory data.
-EAPI=8
-HOMEPAGE=https://arrow.apache.org/
-INHERIT=cmake
-IUSE=brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
-REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-11.0.0.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-11.0.0.tar.gz )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2c815b5ad9249986eea8d9f38cd05592
diff --git a/metadata/md5-cache/dev-libs/apache-arrow-12.0.0 b/metadata/md5-cache/dev-libs/apache-arrow-12.0.0
deleted file mode 100644
index 00f9695e94b7..000000000000
--- a/metadata/md5-cache/dev-libs/apache-arrow-12.0.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
-DESCRIPTION=A cross-language development platform for in-memory data.
-EAPI=8
-HOMEPAGE=https://arrow.apache.org/
-INHERIT=cmake
-IUSE=brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) compute? ( dev-libs/libutf8proc ) dataset? ( dev-libs/libutf8proc re2? ( dev-libs/re2 ) ) lz4? ( app-arch/lz4 ) parquet? ( dev-libs/libutf8proc dev-libs/thrift ssl? ( dev-libs/openssl ) ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
-REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/arrow/arrow-12.0.0/apache-arrow-12.0.0.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-12.0.0.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-12.0.0.tar.gz )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5193745c50fd6ccf802872a8b044e1e9
diff --git a/metadata/md5-cache/dev-libs/apache-arrow-12.0.1-r1 b/metadata/md5-cache/dev-libs/apache-arrow-12.0.1-r1
deleted file mode 100644
index fd703d82d408..000000000000
--- a/metadata/md5-cache/dev-libs/apache-arrow-12.0.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= re2? ( dev-libs/re2:= ) ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= ) dev-cpp/xsimd >=dev-libs/boost-1.81.0 json? ( dev-libs/rapidjson ) test? ( dev-cpp/gflags dev-cpp/gtest )
-DESCRIPTION=A cross-language development platform for in-memory data.
-EAPI=8
-HOMEPAGE=https://arrow.apache.org/
-INHERIT=cmake
-IUSE=brotli bzip2 compute dataset +json lz4 parquet re2 snappy ssl test zlib zstd
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2:= ) compute? ( dev-libs/libutf8proc:= ) dataset? ( dev-libs/libutf8proc:= re2? ( dev-libs/re2:= ) ) lz4? ( app-arch/lz4:= ) parquet? ( dev-libs/libutf8proc:= dev-libs/thrift:= ssl? ( dev-libs/openssl:= ) ) snappy? ( app-arch/snappy:= ) zlib? ( sys-libs/zlib:= ) zstd? ( app-arch/zstd:= )
-REQUIRED_USE=test? ( json parquet? ( zstd ) ) ssl? ( json )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://apache/arrow/arrow-12.0.1/apache-arrow-12.0.1.tar.gz test? ( https://github.com/apache/parquet-testing/archive/b2e7cc755159196e3a068c8594f7acbaecfdaaac.tar.gz -> apache-arrow-parquet-data-12.0.1.tar.gz https://github.com/apache/arrow-testing/archive/d2c73bf78246331d8e58b6f11aa8aa199cbb5929.tar.gz -> apache-arrow-arrow-data-12.0.1.tar.gz )
-_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e4b750616ba7c8ee8e9e80ee5e2d69b1
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index da80eba10d54..a3f7506a3e60 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/pypy-7.3.14 b/metadata/md5-cache/dev-python/pypy-7.3.14
new file mode 100644
index 000000000000..fc7062ea8493
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-7.3.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.14:7.3.14 >=dev-python/pypy-exe-7.3.14:7.3.14[bzip2?,ncurses?] ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
+DESCRIPTION=A fast, compliant alternative implementation of the Python language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=pax-utils
+IUSE=bzip2 full-stdlib gdbm +jit ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy-exe-bin-7.3.14:7.3.14 >=dev-python/pypy-exe-7.3.14:7.3.14[bzip2?,ncurses?] ) dev-libs/openssl:0= gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= )
+RESTRICT=!full-stdlib? ( test )
+SLOT=0/73
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.14.tar.xz
+_eclasses_=pax-utils	91d47e5d20627c717aa878b9167c62a8
+_md5_=1ac12c522c3db1d8ba9ed3241ff9352a
diff --git a/metadata/md5-cache/dev-python/pypy-exe-7.3.14 b/metadata/md5-cache/dev-python/pypy-exe-7.3.14
new file mode 100644
index 000000000000..894fc7da3162
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-7.3.14
@@ -0,0 +1,15 @@
+BDEPEND=!low-memory? ( || ( dev-python/pypy dev-lang/python:2.7 ) )
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= )
+DESCRIPTION=PyPy executable (build from source)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=check-reqs pax-utils toolchain-funcs
+IUSE=bzip2 +jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=sys-libs/zlib-1.1.3:0= dev-libs/libffi:0= virtual/libintl:0= dev-libs/expat:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy-exe-bin:7.3.14
+SLOT=7.3.14
+SRC_URI=https://buildbot.pypy.org/pypy/pypy2.7-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy2.7-gentoo-patches-7.3.14.tar.xz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=0c3e76dc3abc4e7d011ed4798d507c93
diff --git a/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.14 b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.14
new file mode 100644
index 000000000000..8510aa9d5451
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy-exe-bin-7.3.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy executable (pre-built version)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=pax-utils unpacker
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy-exe:7.3.14
+SLOT=7.3.14
+SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy-exe/pypy-exe-7.3.14-1.gpkg.tar -> pypy-exe-7.3.14-1.x86-musl.gpkg.tar ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=192dce14df91c2e1b983a7929ae2c9b9
diff --git a/metadata/md5-cache/dev-python/pypy3-7.3.14 b/metadata/md5-cache/dev-python/pypy3-7.3.14
new file mode 100644
index 000000000000..f0ab5c9161e8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-7.3.14
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.10) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+IUSE=+gdbm ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND==dev-python/pypy3_10-7.3.14*:0/pypy310-pp73-384[gdbm?,ncurses?,sqlite?,tk?]
+SLOT=0/pypy310-pp73-384
+_md5_=43c75f44cb6bc53369b1051f794e7931
diff --git a/metadata/md5-cache/dev-python/pypy3_10-7.3.14 b/metadata/md5-cache/dev-python/pypy3_10-7.3.14
new file mode 100644
index 000000000000..431a490c4bbf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_10-7.3.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.14:7.3.14[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.14:7.3.14 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !~dev-python/pypy3-7.3.12_rc1
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.10) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+INHERIT=multiprocessing pax-utils toolchain-funcs
+IUSE=+ensurepip gdbm +jit ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3_10-exe-7.3.14:7.3.14[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-7.3.14:7.3.14 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !~dev-python/pypy3-7.3.12_rc1
+RESTRICT=test
+SLOT=0/pypy310-pp73-384
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.10-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.10-gentoo-patches-7.3.14.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=8c32d8e0f33019759b41c60eefe31d1b
diff --git a/metadata/md5-cache/dev-python/pypy3_10-exe-7.3.14 b/metadata/md5-cache/dev-python/pypy3_10-exe-7.3.14
new file mode 100644
index 000000000000..462d099ee361
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_10-exe-7.3.14
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pypy virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= >=sys-libs/zlib-1.1.3:0= virtual/libintl:0= ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.14
+DESCRIPTION=PyPy3.10 executable (build from source)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=check-reqs flag-o-matic pax-utils toolchain-funcs
+IUSE=+jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= >=sys-libs/zlib-1.1.3:0= virtual/libintl:0= ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.14
+SLOT=7.3.14
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.10-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.10-gentoo-patches-7.3.14.tar.xz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=33146a71e4351d12c9a5337a7b27e677
diff --git a/metadata/md5-cache/dev-python/pypy3_10-exe-bin-7.3.14 b/metadata/md5-cache/dev-python/pypy3_10-exe-bin-7.3.14
new file mode 100644
index 000000000000..c880a540bd5d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_10-exe-bin-7.3.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3.10 executable (pre-built version)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=pax-utils unpacker
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy3_10-exe:7.3.14
+SLOT=7.3.14
+SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_10-exe/pypy3_10-exe-7.3.14-1.gpkg.tar -> pypy3_10-exe-7.3.14-1.x86-musl.gpkg.tar ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=8b81637f8cc4e046003ffc1e9ef1ad81
diff --git a/metadata/md5-cache/dev-python/pypy3_9-7.3.14 b/metadata/md5-cache/dev-python/pypy3_9-7.3.14
new file mode 100644
index 000000000000..4a42e52502a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_9-7.3.14
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=|| ( >=dev-python/pypy3_9-exe-7.3.14:7.3.14[bzip2(+),ncurses?] >=dev-python/pypy3_9-exe-bin-7.3.14:7.3.14 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-7.3.12_rc
+DESCRIPTION=A fast, compliant alternative implementation of the Python (3.9) language
+EAPI=8
+HOMEPAGE=https://www.pypy.org/ https://foss.heptapod.net/pypy/pypy/
+INHERIT=multiprocessing pax-utils toolchain-funcs
+IUSE=+ensurepip gdbm +jit ncurses sqlite tk
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=|| ( >=dev-python/pypy3_9-exe-7.3.14:7.3.14[bzip2(+),ncurses?] >=dev-python/pypy3_9-exe-bin-7.3.14:7.3.14 ) dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:0= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !<dev-python/pypy3-7.3.12_rc
+RESTRICT=test
+SLOT=0/pypy39-pp73-336
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.14.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=5a076236654398f5dc4065ace80fbab2
diff --git a/metadata/md5-cache/dev-python/pypy3_9-exe-7.3.14 b/metadata/md5-cache/dev-python/pypy3_9-exe-7.3.14
new file mode 100644
index 000000000000..52590f56d45c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_9-exe-7.3.14
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pypy virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= >=sys-libs/zlib-1.1.3:0= virtual/libintl:0= ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.14
+DESCRIPTION=PyPy3.9 executable (build from source)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=check-reqs pax-utils toolchain-funcs
+IUSE=+jit low-memory ncurses cpu_flags_x86_sse2
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0= dev-libs/expat:0= dev-libs/libffi:0= >=sys-libs/zlib-1.1.3:0= virtual/libintl:0= ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:7.3.14
+SLOT=7.3.14
+SRC_URI=https://buildbot.pypy.org/pypy/pypy3.9-v7.3.14-src.tar.bz2 https://dev.gentoo.org/~mgorny/dist/python/pypy3.9-gentoo-patches-7.3.14.tar.xz
+_eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=96bd95ca7c6bf51a82837573e54479f4
diff --git a/metadata/md5-cache/dev-python/pypy3_9-exe-bin-7.3.14 b/metadata/md5-cache/dev-python/pypy3_9-exe-bin-7.3.14
new file mode 100644
index 000000000000..3c4a5d1e90ab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3_9-exe-bin-7.3.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=PyPy3.9 executable (pre-built version)
+EAPI=8
+HOMEPAGE=https://www.pypy.org/
+INHERIT=pax-utils unpacker
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2:0/1 dev-libs/expat:0/0 dev-libs/libffi:0/8 sys-libs/ncurses:0/6 >=sys-libs/zlib-1.1.3:0/1 virtual/libintl:0/0 elibc_glibc? ( sys-devel/gcc >=sys-libs/glibc-2.35 ) !dev-python/pypy3_9-exe:7.3.14
+SLOT=7.3.14
+SRC_URI=elibc_glibc? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.x86.gpkg.tar ) ) elibc_musl? ( amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64-musl/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.amd64-musl.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64-musl/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.arm64-musl.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le-musl/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.ppc64le-musl.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86-musl/pypy/dev-python/pypy3_9-exe/pypy3_9-exe-7.3.14-1.gpkg.tar -> pypy3_9-exe-7.3.14-1.x86-musl.gpkg.tar ) )
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=dd796b5a16c5b6cecbecefeebeb23760
diff --git a/metadata/md5-cache/dev-python/python-sense-hat-2.4.0 b/metadata/md5-cache/dev-python/sense-hat-2.4.0
index 16e4961fb712..0dcb3ca60acd 100644
--- a/metadata/md5-cache/dev-python/python-sense-hat-2.4.0
+++ b/metadata/md5-cache/dev-python/sense-hat-2.4.0
@@ -11,6 +11,6 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rtimulib[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.4.0.tar.gz -> python-sense-hat-2.4.0.gh.tar.gz
+SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.4.0.tar.gz -> sense-hat-2.4.0.gh.tar.gz
 _eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=56134ec85c958239235e3fb357cb4b85
+_md5_=70a80cf02a02879b19403e874f4220b3
diff --git a/metadata/md5-cache/dev-python/sense-hat-2.6.0 b/metadata/md5-cache/dev-python/sense-hat-2.6.0
new file mode 100644
index 000000000000..3b1f7a9e7db2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sense-hat-2.6.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rtimulib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DESCRIPTION=Raspberry Pi Sense HAT python library
+EAPI=8
+HOMEPAGE=https://github.com/astro-pi/python-sense-hat
+INHERIT=distutils-r1
+IUSE=python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~arm ~arm64
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/rtimulib[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+SLOT=0
+SRC_URI=https://github.com/astro-pi/python-sense-hat/archive/v2.6.0.tar.gz -> sense-hat-2.6.0.gh.tar.gz
+_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=4d88ba485c678bbd8df8ce5832e2dfcd
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9ee8fa23cc26..a2a89d93c1c2 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/diffoscope-253 b/metadata/md5-cache/dev-util/diffoscope-253
deleted file mode 100644
index 98f369b8c8fb..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-253
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-arch/p7zip app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://diffoscope.org/archive/diffoscope-253.tar.bz2
-_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=fb4cfdb2baf06aa38939d1101df423fe
diff --git a/metadata/md5-cache/dev-util/diffoscope-253-r1 b/metadata/md5-cache/dev-util/diffoscope-253-r1
new file mode 100644
index 000000000000..68bbdd05d157
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-253-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/p7zip app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( || ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=|| ( dev-python/python-magic[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sys-apps/file[python,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) dev-python/libarchive-c[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/distro[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/tlsh[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/pypdf[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( virtual/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) python_targets_python3_10? ( dev-lang/python:3.10[ncurses] ) python_targets_python3_11? ( dev-lang/python:3.11[ncurses] ) python_targets_python3_12? ( dev-lang/python:3.12[ncurses] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://diffoscope.org/archive/diffoscope-253.tar.bz2
+_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=f675f4289f59d7d7f258d71c20075b6f
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index a84bcd386b57..24df616a4dcd 100644
--- a/metadata/md5-cache/gui-apps/Manifest.gz
+++ b/metadata/md5-cache/gui-apps/Manifest.gz
diff --git a/metadata/md5-cache/gui-apps/swaylock-1.7.2 b/metadata/md5-cache/gui-apps/swaylock-1.7.2
index 9dfafdd2c5a1..39e6937b9c59 100644
--- a/metadata/md5-cache/gui-apps/swaylock-1.7.2
+++ b/metadata/md5-cache/gui-apps/swaylock-1.7.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://github.com/swaywm/swaylock
 INHERIT=fcaps meson
 IUSE=+gdk-pixbuf +man +pam +filecaps
-KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon virtual/libcrypt:= gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) pam? ( sys-libs/pam ) filecaps? ( sys-libs/libcap )
 SLOT=0
 SRC_URI=https://github.com/swaywm/swaylock/archive/v1.7.2.tar.gz -> swaylock-1.7.2.tar.gz
 _eclasses_=eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	fcaps	c0a086b957a1b183a8d136eabf02f191	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=7ff08980b0c8b1e10966af66b876acd3
+_md5_=f43c282be5466c861b06d2cf2fc8fc48
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 68fcd9a481c5..a11e70830858 100644
--- a/metadata/md5-cache/kde-frameworks/Manifest.gz
+++ b/metadata/md5-cache/kde-frameworks/Manifest.gz
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.113.0-r1 b/metadata/md5-cache/kde-frameworks/kio-5.113.0-r1
new file mode 100644
index 000000000000..02bb266caecd
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.113.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=app-alternatives/ninja >=dev-util/cmake-3.20.5 designer? ( dev-qt/designer:5 ) handbook? ( >=kde-frameworks/kdoctools-5.113:5 ) doc? ( >=app-doc/doxygen-1.8.13-r1 ) doc? ( dev-qt/qthelp:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.113:*
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5[ssl] >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 =kde-frameworks/kauth-5.113*:5 =kde-frameworks/karchive-5.113*:5 =kde-frameworks/kbookmarks-5.113*:5 =kde-frameworks/kcodecs-5.113*:5 =kde-frameworks/kcompletion-5.113*:5 =kde-frameworks/kconfig-5.113*:5 =kde-frameworks/kconfigwidgets-5.113*:5 =kde-frameworks/kcoreaddons-5.113*:5 =kde-frameworks/kcrash-5.113*:5 =kde-frameworks/kdbusaddons-5.113*:5 =kde-frameworks/kguiaddons-5.113*:5 =kde-frameworks/ki18n-5.113*:5 =kde-frameworks/kiconthemes-5.113*:5 =kde-frameworks/kitemviews-5.113*:5 =kde-frameworks/kjobwidgets-5.113*:5 =kde-frameworks/knotifications-5.113*:5 =kde-frameworks/kservice-5.113*:5 =kde-frameworks/ktextwidgets-5.113*:5 =kde-frameworks/kwidgetsaddons-5.113*:5 =kde-frameworks/kwindowsystem-5.113*:5[X?] =kde-frameworks/kxmlgui-5.113*:5 =kde-frameworks/solid-5.113*:5 sys-power/switcheroo-control acl? ( sys-apps/attr virtual/acl ) handbook? ( dev-libs/libxml2 dev-libs/libxslt =kde-frameworks/kdoctools-5.113*:5 ) kerberos? ( virtual/krb5 ) kf6compat? ( kde-apps/kio-extras:6 ) kwallet? ( =kde-frameworks/kwallet-5.113*:5 ) X? ( >=dev-qt/qtx11extras-5.15.9:5 ) >=dev-qt/qtconcurrent-5.15.9:5 test? ( sys-libs/zlib ) test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=8
+HOMEPAGE=https://develop.kde.org/products/frameworks/
+INHERIT=ecm frameworks.kde.org xdg-utils
+IUSE=acl kerberos kf6compat +kwallet X debug designer +handbook doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.113:5
+RDEPEND=>=dev-qt/qtdbus-5.15.9:5 >=dev-qt/qtdeclarative-5.15.9:5 >=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtnetwork-5.15.9:5[ssl] >=dev-qt/qtwidgets-5.15.9:5 >=dev-qt/qtxml-5.15.9:5 =kde-frameworks/kauth-5.113*:5 =kde-frameworks/karchive-5.113*:5 =kde-frameworks/kbookmarks-5.113*:5 =kde-frameworks/kcodecs-5.113*:5 =kde-frameworks/kcompletion-5.113*:5 =kde-frameworks/kconfig-5.113*:5 =kde-frameworks/kconfigwidgets-5.113*:5 =kde-frameworks/kcoreaddons-5.113*:5 =kde-frameworks/kcrash-5.113*:5 =kde-frameworks/kdbusaddons-5.113*:5 =kde-frameworks/kguiaddons-5.113*:5 =kde-frameworks/ki18n-5.113*:5 =kde-frameworks/kiconthemes-5.113*:5 =kde-frameworks/kitemviews-5.113*:5 =kde-frameworks/kjobwidgets-5.113*:5 =kde-frameworks/knotifications-5.113*:5 =kde-frameworks/kservice-5.113*:5 =kde-frameworks/ktextwidgets-5.113*:5 =kde-frameworks/kwidgetsaddons-5.113*:5 =kde-frameworks/kwindowsystem-5.113*:5[X?] =kde-frameworks/kxmlgui-5.113*:5 =kde-frameworks/solid-5.113*:5 sys-power/switcheroo-control acl? ( sys-apps/attr virtual/acl ) handbook? ( dev-libs/libxml2 dev-libs/libxslt =kde-frameworks/kdoctools-5.113*:5 ) kerberos? ( virtual/krb5 ) kf6compat? ( kde-apps/kio-extras:6 ) kwallet? ( =kde-frameworks/kwallet-5.113*:5 ) X? ( >=dev-qt/qtx11extras-5.15.9:5 ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
+RESTRICT=test !test? ( test )
+SLOT=5/5.113
+SRC_URI=mirror://kde/stable/frameworks/5.113/kio-5.113.0.tar.xz
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	ecm	8487192c99c6441f261397f082f93a64	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	frameworks.kde.org	50e5e124e8a083f031e4122130830388	kde.org	60fcb935e4206806bf9f38e3537521a2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	virtualx	817571665ee28575da44ee08135089e5	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=cdfca2488cc7f708cbe32edf76aabc1e
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index a552837c9da6..b3167a24e8d0 100644
--- a/metadata/md5-cache/mail-mta/Manifest.gz
+++ b/metadata/md5-cache/mail-mta/Manifest.gz
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8.4 b/metadata/md5-cache/mail-mta/postfix-3.8.4
index b8bc2aa92b70..6a54b33ed27a 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.8.4
+++ b/metadata/md5-cache/mail-mta/postfix-3.8.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://www.postfix.org/
 INHERIT=pam systemd toolchain-funcs
 IUSE=+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mysql nis pam postgres sasl selinux sqlite ssl
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=|| ( berkdb cdb lmdb ) ldap-bind? ( ldap sasl )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-3.8.4.tar.gz
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	pam	b56d0c9c20fc5b553f13c8ae165a10a5	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=8e4c10bcbd9991d39e923b8f37e780bb
+_md5_=ad3d3b833c48ecf620e79b4d621ecdd1
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index da37cb5cf33c..af8f06a78541 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/easyeffects-7.1.3 b/metadata/md5-cache/media-sound/easyeffects-7.1.3
new file mode 100644
index 000000000000..b0a8ac16447d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-7.1.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool sys-devel/gettext virtual/pkgconfig >=dev-util/meson-1.2.1 app-alternatives/ninja dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm pretend test
+DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.2.0:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile media-libs/libsoundtouch >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 media-libs/ladspa-sdk media-libs/libsamplerate
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=8
+HOMEPAGE=https://github.com/wwmm/easyeffects
+INHERIT=gnome2-utils meson toolchain-funcs
+IUSE=calf +doc mda-lv2 zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.10.0:4 >=gui-libs/libadwaita-1.2.0:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile media-libs/libsoundtouch >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/gsl:= sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.2.6[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v7.1.3.tar.gz -> easyeffects-7.1.3.tar.gz
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	576e6bbef90e9753368f8b4ad0bd5383	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=45ffe0a6b2fbe286caf12a188107b169
diff --git a/metadata/md5-cache/media-sound/sooperlooper-1.7.8_p2 b/metadata/md5-cache/media-sound/sooperlooper-1.7.8_p2
index ff8415b03056..7a02306bda64 100644
--- a/metadata/md5-cache/media-sound/sooperlooper-1.7.8_p2
+++ b/metadata/md5-cache/media-sound/sooperlooper-1.7.8_p2
@@ -7,10 +7,10 @@ HOMEPAGE=https://sonosaurus.com/sooperlooper/index.html
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=autotools wxwidgets toolchain-funcs desktop xdg
 IUSE=wxwidgets
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/liblo-0.18 dev-libs/libsigc++:2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2:2 media-libs/rubberband sci-libs/fftw:3.0= virtual/jack wxwidgets? ( x11-libs/wxGTK:3.2-gtk3 )
 SLOT=0
 SRC_URI=https://sonosaurus.com/sooperlooper/sooperlooper-1.7.8.tar.gz mirror://debian/pool/main/s/sooperlooper/sooperlooper_1.7.8~dfsg0-2.debian.tar.xz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2 https://dev.gentoo.org/~pacho/sooperlooper/sooperlooper.png
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	wxwidgets	9a707a3f9f1ea7aa703b1e46552291e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7ee1cc6a9ed249b5c1da84451d6d3797
+_md5_=1454ddcf8e0ce90272d645910420e3fb
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 0cd758288d55..6b63614a719a 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-1.8.4 b/metadata/md5-cache/net-im/gajim-1.8.4
new file mode 100644
index 000000000000..ed21ebe93bb7
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.8.4
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-python/gpep517-15[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-15[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] app-arch/unzip virtual/pkgconfig >=x11-libs/pango-1.5.0 >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=8
+HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
+IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm64 ~loong ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_10(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/omemo-dr[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_11? ( dev-python/idna[python_targets_python3_11(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_11(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_11(-)] dev-python/precis-i18n[python_targets_python3_11(-)] dev-python/pyasn1[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pycurl[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_11(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_11(-)] dev-python/css-parser[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_11(-)] dev-python/jaraco-classes[python_targets_python3_11(-)] dev-python/python-axolotl[python_targets_python3_11(-)] dev-python/qrcode[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] dev-python/omemo-dr[python_targets_python3_11(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_11(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_11(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_11(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.8/gajim-1.8.4.tar.gz
+_eclasses_=distutils-r1	8e0ad2c111b259a711c8eaef98a17690	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	474cb53a7d1b62721a91809a1d702661	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=05979532fef74be40d3958d64d54aceb
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 1a730d9cb7b9..8922a910c437 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/quassel-0.14.0-r2 b/metadata/md5-cache/net-irc/quassel-0.14.0-r2
index f47d761dcaf6..945bdd3d4d73 100644
--- a/metadata/md5-cache/net-irc/quassel-0.14.0-r2
+++ b/metadata/md5-cache/net-irc/quassel-0.14.0-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://quassel-irc.org/
 INHERIT=cmake optfeature pax-utils systemd xdg-utils
 IUSE=bundled-icons crypt +dbus gui kde ldap monolithic oxygen postgres +server spell syslog test urlpreview
-KEYWORDS=~amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtnetwork:5[ssl] sys-libs/zlib monolithic? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap:= ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:* oxygen? ( kde-frameworks/oxygen-icons:* ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) !monolithic? ( server? ( acct-group/quassel acct-user/quassel crypt? ( app-crypt/qca:2[ssl] ) ldap? ( net-nds/openldap:= ) postgres? ( dev-qt/qtsql:5[postgres] ) !postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] ) syslog? ( virtual/logger ) ) gui? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 !bundled-icons? ( kde-frameworks/breeze-icons:* oxygen? ( kde-frameworks/oxygen-icons:* ) ) dbus? ( >=dev-libs/libdbusmenu-qt-0.9.3_pre20140619 dev-qt/qtdbus:5 ) kde? ( kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/ktextwidgets:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) spell? ( kde-frameworks/sonnet:5 ) urlpreview? ( dev-qt/qtwebengine:5[widgets] ) ) )
 REQUIRED_USE=|| ( gui server monolithic ) crypt? ( || ( server monolithic ) ) kde? ( dbus spell ) ldap? ( || ( server monolithic ) ) postgres? ( || ( server monolithic ) ) spell? ( || ( gui monolithic ) ) syslog? ( || ( server monolithic ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://quassel-irc.org/pub/quassel-0.14.0.tar.bz2
 _eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	pax-utils	91d47e5d20627c717aa878b9167c62a8	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5caeac20872d5059cadeb54b61aff9fc
+_md5_=26012fc9409b7225d71ad80eae1a6cf9
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index f37b7803e9cf..e790162bfe3c 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/grpc-1.60.0 b/metadata/md5-cache/net-libs/grpc-1.60.0
new file mode 100644
index 000000000000..50c7b4d58299
--- /dev/null
+++ b/metadata/md5-cache/net-libs/grpc-1.60.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND==dev-cpp/abseil-cpp-20230802.0*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-23.3:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= systemd? ( sys-apps/systemd:= ) test? ( dev-cpp/benchmark dev-cpp/gflags )
+DESCRIPTION=Modern open source high performance RPC framework
+EAPI=8
+HOMEPAGE=https://www.grpc.io
+INHERIT=cmake flag-o-matic
+IUSE=doc examples test systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND==dev-cpp/abseil-cpp-20230802.0*:= >=dev-libs/re2-0.2021.11.01:= >=dev-libs/openssl-1.1.1:0=[-bindist(-)] >=dev-libs/protobuf-23.3:= dev-libs/xxhash >=net-dns/c-ares-1.15.0:= sys-libs/zlib:= systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0/37.160
+SRC_URI=https://github.com/grpc/grpc/archive/v1.60.0.tar.gz -> grpc-1.60.0.tar.gz
+_eclasses_=cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f5316afa1d8223d94ef51d5aaeec8332
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4
index 05317484d934..44b0ddbc11bd 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 )
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.4.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b0d2c9167d706c6c8054c8b5c5c0a2b3
+_md5_=85e173dd0b6bbe9711116c06aa048b59
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r410 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r410
index 44345d2d2312..bb6875c4e090 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r410
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r410
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=4.1/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.4.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a6dffe5de628a67a724724efcf883bd1
+_md5_=5f96140aee58fcc1e47ea94f39501e6d
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r600 b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r600
index 0256ada306c9..87fecc25be1d 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r600
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.42.4-r600
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.webkitgtk.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=check-reqs flag-o-matic gnome2 optfeature python-any-r1 ruby-single toolchain-funcs cmake
 IUSE=aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X
-KEYWORDS=~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.16.0[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=gui-libs/gtk-4.4.0:4[introspection?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=media-libs/libepoxy-1.4.0 >=net-libs/libsoup-3.0.8:3.0[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3 sys-libs/zlib:0 >=app-accessibility/at-spi2-core-2.46.0:2 media-libs/libwebp:= >=dev-libs/glib-2.70.0:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl,X?] media-libs/gst-plugins-base:1.0[opengl] >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) jpegxl? ( >=media-libs/libjxl-0.7.0 ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) media-libs/mesa media-libs/libglvnd wayland? ( >=dev-libs/wayland-1.15 >=dev-libs/wayland-protocols-1.15 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) !<net-libs/webkit-gtk-2.38:4
 REQUIRED_USE=|| ( aqua wayland X )
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=6/0
 SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.42.4.tar.xz
 _eclasses_=check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	cmake	0f2e0c197fad0312f3c4765c9cf36271	flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	c8951c1dfcc1d43e3f967f61fd0ec59c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	ruby-single	e045ee439d34b230e588900a87a11904	ruby-utils	820207a5d3f0e2e31c28080f131f2037	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=f40b28a4bb70656db917a3e334d19d78
+_md5_=52035d56d3c3b03c0de866871ccc3c03
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 3409b4fd0272..bab7b6e8a5db 100644
--- a/metadata/md5-cache/net-news/Manifest.gz
+++ b/metadata/md5-cache/net-news/Manifest.gz
diff --git a/metadata/md5-cache/net-news/amphetadesk-0.93.1-r2 b/metadata/md5-cache/net-news/amphetadesk-0.93.1-r2
index 3cae0ff5169d..2bd1cf1e2792 100644
--- a/metadata/md5-cache/net-news/amphetadesk-0.93.1-r2
+++ b/metadata/md5-cache/net-news/amphetadesk-0.93.1-r2
@@ -3,8 +3,8 @@ DEPEND=dev-lang/perl dev-perl/libwww-perl dev-libs/expat dev-perl/XML-Parser vir
 DESCRIPTION=Free syndicated news aggregator
 EAPI=8
 HOMEPAGE=https://www.disobey.com/amphetadesk/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=Artistic
 SLOT=0
 SRC_URI=mirror://sourceforge/sourceforge/amphetadesk/amphetadesk-src-v0.93.1.tar.gz
-_md5_=3c693e69ca5697592565b841463bffb9
+_md5_=bd58075e90c31d8400e535c727fa7f7c
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index c65bf1bdc92b..595c292a46aa 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/frp-0.42.0 b/metadata/md5-cache/net-vpn/frp-0.42.0
deleted file mode 100644
index a69c22bac9e2..000000000000
--- a/metadata/md5-cache/net-vpn/frp-0.42.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
-EAPI=7
-HOMEPAGE=https://github.com/fatedier/frp
-INHERIT=go-module systemd
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/fatedier/frp/archive/v0.42.0.tar.gz -> frp-0.42.0.tar.gz https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz
-_eclasses_=go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	9e5a8f7b134fd3ed3785755097fe8ef0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=bead530d8bc586d56afbb0debfdf5460
diff --git a/metadata/md5-cache/net-vpn/frp-0.43.0 b/metadata/md5-cache/net-vpn/frp-0.43.0
deleted file mode 100644
index 73779d3b6e22..000000000000
--- a/metadata/md5-cache/net-vpn/frp-0.43.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
-EAPI=7
-HOMEPAGE=https://github.com/fatedier/frp
-INHERIT=go-module systemd
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/fatedier/frp/archive/v0.43.0.tar.gz -> frp-0.43.0.tar.gz https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz
-_eclasses_=go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	9e5a8f7b134fd3ed3785755097fe8ef0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=ae748b2d608e9a5d79e02e52f13c2eae
diff --git a/metadata/md5-cache/net-vpn/frp-0.44.0 b/metadata/md5-cache/net-vpn/frp-0.44.0
deleted file mode 100644
index 8bcd2981b045..000000000000
--- a/metadata/md5-cache/net-vpn/frp-0.44.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
-EAPI=7
-HOMEPAGE=https://github.com/fatedier/frp
-INHERIT=go-module systemd
-KEYWORDS=~amd64 ~riscv
-LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/fatedier/frp/archive/v0.44.0.tar.gz -> frp-0.44.0.tar.gz https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz
-_eclasses_=go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	9e5a8f7b134fd3ed3785755097fe8ef0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=ae748b2d608e9a5d79e02e52f13c2eae
diff --git a/metadata/md5-cache/net-vpn/frp-0.53.2 b/metadata/md5-cache/net-vpn/frp-0.53.2
new file mode 100644
index 000000000000..d51e4a25c588
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/frp-0.53.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/go >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
+EAPI=8
+HOMEPAGE=https://github.com/fatedier/frp
+INHERIT=go-module systemd shell-completion
+IUSE=+client +server
+KEYWORDS=~amd64 ~loong ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+REQUIRED_USE=|| ( client server )
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fatedier/frp/archive/refs/tags/v0.53.2.tar.gz -> frp-0.53.2.tar.gz https://dev.gentoo.org/~zmedico/dist/frp-0.53.2-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-env	96e1747610bbb2f5c5d3fb16f0f3a83a	go-module	9e5a8f7b134fd3ed3785755097fe8ef0	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	shell-completion	bb7eb6bc232cd6c4bf8af739cdd2ee14	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
+_md5_=074b6854a62c3bf934ce6ab894e8c686
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1 b/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1
new file mode 100644
index 000000000000..680935098311
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tor-0.4.7.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=configure install prepare setup test unpack
+DEPEND=>=dev-libs/libevent-2.1.12-r1:=[ssl] dev-libs/openssl:=[-bindist(-)] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd:= ) zstd? ( app-arch/zstd:= ) test? ( >=dev-libs/libevent-2.1.12-r1:=[ssl] dev-libs/openssl:=[-bindist(-)] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd:= ) zstd? ( app-arch/zstd:= ) || ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) )
+DESCRIPTION=Anonymizing overlay network for TCP
+EAPI=8
+HOMEPAGE=https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/
+INHERIT=edo python-any-r1 readme.gentoo-r1 systemd verify-sig
+IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos
+LICENSE=BSD GPL-2
+RDEPEND=acct-user/tor acct-group/tor >=dev-libs/libevent-2.1.12-r1:=[ssl] dev-libs/openssl:=[-bindist(-)] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd:= ) zstd? ( app-arch/zstd:= ) selinux? ( sec-policy/selinux-tor )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.torproject.org/dist/tor-0.4.7.16.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.7.16.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.7.16.tar.gz.sha256sum https://dist.torproject.org/tor-0.4.7.16.tar.gz.sha256sum.asc )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	verify-sig	798e0173d334021f14ba78a786c37059
+_md5_=ef72d8551cc285956cf6ab1a3072544e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index bf0fb44ca915..5b2a091747a5 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-6.5.9 b/metadata/md5-cache/sys-kernel/zen-sources-6.5.9
deleted file mode 100644
index 2ba42c19385d..000000000000
--- a/metadata/md5-cache/sys-kernel/zen-sources-6.5.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=The Zen Kernel Live Sources
-EAPI=8
-HOMEPAGE=https://github.com/zen-kernel
-INHERIT=kernel-2 unpacker
-IUSE=symlink build
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=6.5.9
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.5-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.5-11.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.5-11.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.5-11.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.5.9-zen1/linux-v6.5.9-zen1.patch.zst
-_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	5f1a05e8ec7196f00c7754b57f927f06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=7ce3785ab684ca84637f35c3a08edd45
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-6.6.3 b/metadata/md5-cache/sys-kernel/zen-sources-6.6.8
index a5674c92abc0..3de8e2c7787f 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-6.6.3
+++ b/metadata/md5-cache/sys-kernel/zen-sources-6.6.8
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.6.3
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-5.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.6.3-zen1/linux-v6.6.3-zen1.patch.zst
+SLOT=6.6.8
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.6.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.6-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.6-10.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.6.8-zen1/linux-v6.6.8-zen1.patch.zst
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	5f1a05e8ec7196f00c7754b57f927f06	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc	unpacker	aa6a4e924009232d8b78b31e932c30b5
-_md5_=091304dd6440493dac7dcf561bc878d3
+_md5_=9d92dfd0db5d65b6aedf54641a5e024d
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 2ddad7d3862f..d0495dc99077 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.38-r6 b/metadata/md5-cache/sys-libs/glibc-2.38-r6
deleted file mode 100644
index 211e5a6f752d..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.38-r6
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.12 dev-lang/python:3.11 dev-lang/python:3.10 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison compile-locales? ( sys-apps/locale-gen ) doc? ( dev-lang/perl sys-apps/texinfo ) test? ( dev-lang/perl >=net-dns/libidn2-2.3.0 ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6.2 sys-devel/gnuconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) virtual/os-headers
-DESCRIPTION=GNU libc C library
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/libc/
-IDEPEND=!compile-locales? ( sys-apps/locale-gen )
-INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
-IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
-RESTRICT=!test? ( test )
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.38-patches-6.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
-_eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=c3027b7decfe402aa51132f06648b31f
diff --git a/metadata/md5-cache/sys-libs/glibc-2.38-r8 b/metadata/md5-cache/sys-libs/glibc-2.38-r8
index 96b467b38298..78050b814d73 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.38-r8
+++ b/metadata/md5-cache/sys-libs/glibc-2.38-r8
@@ -7,6 +7,7 @@ HOMEPAGE=https://www.gnu.org/software/libc/
 IDEPEND=!compile-locales? ( sys-apps/locale-gen )
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !<app-misc/pax-utils-1.3.3 perl? ( dev-lang/perl ) >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -14,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.38-patches-9.tar.xz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=flag-o-matic	78cf3cc2d5572fddf5e5e10c70f7c81a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	21162ec96c87041004a75348d97342dd	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	474cb53a7d1b62721a91809a1d702661	systemd	c8b03e8df84486aa991d4396686e8942	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	eed10cf5e5a06916e654d31f5a1925cc
-_md5_=fc3949ad2cde7a7b1123b152ad5338f4
+_md5_=19af329e198396ed6adf55a8b32cb8e1
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9d75093b1ba1..123e35a1e2ef 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 16029 BLAKE2B 82fcb93c2025e8e21503f13a6044edd656efca4de0e5a3b59be46c0eb521fcef33fdb7cdfb9f70d48396991f51b2bfdb1daf2b7a558d95b45c8cf68d898a9b3a SHA512 0c0c66a9acb07fabf26f7cc0178a7bb41fec00525d831ca231e8652b16eced74bcaf8b5c886f774789b2313057e9ddb14c08e2397de4fa715ec27f8f9133cbeb
-TIMESTAMP 2023-12-25T18:40:22Z
+TIMESTAMP 2023-12-26T01:10:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWJzJZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmWKJ/RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBkgA//Xh+Gcuil4QFP5RjkX7nZwb8BvV19mQH0fEt0gIYEA0ex86FCUj8iHv2h
-fluR3Y3vPdKpC6Qvneon6sDMI7MRQnlmH5rgl2gqr5+VKodDuhVb9UklYZbgIL4/
-p4oEWxBSlXVKrE+4UtEa0xj1uFHiHfspApuirUU4DJEEa27qfOAL1jWRvNfjeO+n
-PtXGfbUkLa+33AQGFekwZXITx+AptubCtRaHICDunOujfhLAUoMeeICWtB7EDgX4
-nNh7pch1i7QBeQFDtjWZoQTjeF47am9ZanINe/G84kcr2MlShLEU5huvqLYiOniZ
-yfyC6zUq3Q77ArbBm7pDmU0C+JEdLeJzCW2NYYKkYAPhUuYqtclrb8/1N14tmJfS
-Rm+XOtZ49Cdc8Zaq1O4yUrZ0622HPhIqkIg5yce99myIZ7Gj1mWr+bcT07F94ok1
-ZJs3piWyzuyq9CEO08cvOyAqrJKYTUIDziAruk6L6mxnhpYojDCvKbJap+dhOoHL
-904m8t0M7EaO4/NgobcMFSkDRd2dlvBmdpkPpBKwv7KTQn32t2k/xA+cIb7bzz9T
-hKE9mjq/Flh4zrFwpPa0lG4+eGGVop1To+C4MfW3lCmMCupnY5Z5RCUp9hKypOXu
-YBq7lm53QMKHomRQ3KWQwgdjIN4AKTQa0PrB3oQUp3lY3qvOAjw=
-=CZaV
+klC70hAAhIToPItOYreRrzngRNyaMzODfxcwXzEgSnfV0iFPksamS006Sd+5V+vy
+O1RBsj4VIg0NVgy4sv+lA68bkYXdGYZn2mrTpXURS0tnaJA7Lq9WAlRQYJjnV3Vk
+z4ij55xZD6wOwHtPdjz6MhdHfZN2VVTa2YtysbbEXrP8T+fZgPNvrr9HxxG2Yno7
+fSwVyb1qRn5Wx4/O1Swvr4v3N9j9zoJE1YMPbuJFbuWxLsBYxk8ClNE0B4XyjF2o
+g8UU5w387HX7zt1cuU8P9H2D3M3zWjeqQy7HPCMRG40ktcRaDpTX/Ot/dbVsZ0hg
+XTiowrZict2WoFJ+6C2Zo7O5eQA1cM46aJH1TvYV5+nYwPx9xaA9ZcQiFfD+C37C
+FnR10is8UaCa+Te8YvI9aMhC4VZT519cT8sAaDsxExGBvrgquMfhfIN21s3RbT5B
+DzuYKN7BrIaWee169duKh29oFB7JG6W48dWu/bt6P7Q/3kaTt4Ttf9vlzOl9abKO
+7A8qWh/0PYYzXb02DUcKGY1zz5E9KXNpfwlmG86VQTda9Qf9laFTg/9W4t69PCLZ
+TiBRujXMqW3JqBrh4XIFltQLqE/kB9+M5C+2N6aOxiSTXx0PHTWKYeHKXE8Zlr2B
+Yg8MhDtGesb6r7ge8sExAzJu/9p+NBSMyq/YSTA09QtwJCA7uLc=
+=+M+Y
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ab883e569e58..d49e9af7f538 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 18:40:18 +0000
+Tue, 26 Dec 2023 01:10:08 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7b19dd3173ab..77cbf730afb3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Dec 25 06:40:17 PM UTC 2023
+Tue Dec 26 01:10:08 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ca9dba371961..020bdf1dab05 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 18:45:01 +0000
+Tue, 26 Dec 2023 01:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 21ebab511fd5..0f0260426b26 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-4c4b9f5d58c6ae61ba470c86f56ab11880f804e6 1703528499 2023-12-25T18:21:39+00:00
+461411849f77e2b4ed09bcfd1b5f9a26ef488148 1703549178 2023-12-26T00:06:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 00b928640cb3..ff0936d2f639 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1703529601 Mon 25 Dec 2023 06:40:01 PM UTC
+1703553001 Tue 26 Dec 2023 01:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index fdef759f0b85..d49e9af7f538 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 25 Dec 2023 18:40:17 +0000
+Tue, 26 Dec 2023 01:10:08 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9b0729a3aba1..d61e465ac4fb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 3b8852e7c96c..89d46ca74ddb 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,8 +1,10 @@
 DIST gajim-1.7.3.tar.gz 3753831 BLAKE2B c7b8b1dc47b1faf9f1c0803e7931cb00bfbf31075fe481d557ec0f308c79e7580d0054d224781a67eaeea24dba40e40de5faf55d633d71f759022a1ac113f6e4 SHA512 66135e88784350bab79b61debc1b65144a82f8eee2c1841d21e4f511b3792361e57b60304d2478654e563687e8302426d76063e748236f4e1c959511c7c28665
 DIST gajim-1.8.0.tar.gz 3835799 BLAKE2B 030293fc8114877c6d060cd0feae0fecdcecbb26aac8817e1db7db59aee3ee79973efc94584434641ccd39adcf809e0c7a86a017ab46c9695666d898fb7b7905 SHA512 724290de6d438aacd929a9759d7a712068c303caf9002a1a70ddc0e9aa16387054d3e4efacf84eced28f49ef79749c764d5fe67fcb23c3baef3a2b7714df218e
 DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570dc071752838a2463019cdf6ea4198f2a349f3935c33d988cd6908cf31dba572bac31f9363675433328e6d679b SHA512 b417d76a4225f16730441dee7befacd6db5be782c9271b789d5f9c10232e342f2d46930eef79a58839c13b2887926591d953a87a7544e32c7bf80d2c65390e31
+DIST gajim-1.8.4.tar.gz 3710470 BLAKE2B e23eafe707bc482a050fcef44df9e68af552444cce173c506538ebe01557a894dc0ba8b9afe18f195fd0b00b717b1268531a960b1c8b868c22081135d14e3079 SHA512 1a5b028c0e308eb15417c8c11584bc0e8b0218fead5155093ede4bc3961b6bee2b47bc3510f751dc70194634d6ca94d4a675f6891c8f050859fb4729020e52cb
 EBUILD gajim-1.7.3-r1.ebuild 2826 BLAKE2B 3252f39b4fe60c4d049310e744851aa2883fb973756b0f1e6a6b261a96056d0235b203ade0bf82625e145768985ee89a9b390dcd80fdb4208eca912fad789a6b SHA512 6e351104f148ce136903be001aa8a1c18c3e09b94459678079bf16603ad7198f63251d606e1818f9b231b30ea38de34fda4c80b8e6ce7f58b54a672c955a129f
 EBUILD gajim-1.7.3.ebuild 2609 BLAKE2B 3ca58a71c4b3e51fb605d031e55a6caa104d5e53e8d1e0e382a3b1bacc38859d0bb2598ce119b005f36b6ef0c67388ee2b7e4e03bfabfe257cd5c65c74e97d8a SHA512 49e1fcdd326c29f480d672bec91b941c3aa7a3d014a226ec8f87de7bf675a8909e5ab2af8afa788193f4c6bf378bc442951c6720e817887e810bd43d91d3d2c7
 EBUILD gajim-1.8.0.ebuild 2986 BLAKE2B 87fda1d68756188525313fffab21464af480a523e91ff73f50ca23fc02f19a0e5e2286610cf045435365905e9791bf1bc049d999b684abfab73a9eb92e0e2ce7 SHA512 1983904536ac220949fe24a654b1a3575290742fd70fa318f983ab36e06ec985c11687bd2e0c888e7e0cd295eac44d498d6eb6e7ad848d3c2ec9fde91ba2ce77
 EBUILD gajim-1.8.1.ebuild 3012 BLAKE2B 59b7c17fd46b660e3359417b3a43b1256afc983eda3b2a417f3dfa192a15b033c4ae2a3c2e9d8104c22f9f33de5b6a1e7456bb4b1aaba828cf5be51c60795228 SHA512 a848e69a0c9be9d32327ff209465c9b2bbdae4bd731e11b42bd82933b94b1778fb38d398131189a3fc986fafc9e8ef29398b9f74af26bbbbb520ca1a631f2d64
+EBUILD gajim-1.8.4.ebuild 3012 BLAKE2B 59b7c17fd46b660e3359417b3a43b1256afc983eda3b2a417f3dfa192a15b033c4ae2a3c2e9d8104c22f9f33de5b6a1e7456bb4b1aaba828cf5be51c60795228 SHA512 a848e69a0c9be9d32327ff209465c9b2bbdae4bd731e11b42bd82933b94b1778fb38d398131189a3fc986fafc9e8ef29398b9f74af26bbbbb520ca1a631f2d64
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.8.4.ebuild b/net-im/gajim/gajim-1.8.4.ebuild
new file mode 100644
index 000000000000..03dbc2058313
--- /dev/null
+++ b/net-im/gajim/gajim-1.8.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="sqlite,xml(+)"
+DISTUTILS_USE_PEP517=standalone
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+# KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+# Gajim depends now on omemo-dr. Add KEYWORDS again,
+# when https://bugs.gentoo.org/912285 is fixed.
+
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/gtksourceview:4[introspection]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/pkgconfig
+	>=x11-libs/pango-1.5.0
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		>=dev-python/nbxmpp-4.2.2[${PYTHON_USEDEP}]
+		<dev-python/nbxmpp-5.0.0[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup:3.0[introspection]
+		media-libs/gsound[introspection]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+		dev-python/python-axolotl[${PYTHON_USEDEP}]
+		dev-python/qrcode[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/omemo-dr[${PYTHON_USEDEP}]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd:0[introspection] )
+	')"
+
+python_compile() {
+	distutils-r1_python_compile
+	./pep517build/build_metadata.py -o dist/metadata
+}
+
+python_install() {
+	distutils-r1_python_install
+	./pep517build/install_metadata.py dist/metadata --prefix="${D}/usr"
+
+	gzip -d "${ED}"/usr/share/man/man1/*.gz || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 66bdbf2ee42a..a99c05019f8e 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index acaf314832dd..27ed559a4d1e 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -6,6 +6,6 @@ AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c35
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
 EBUILD quassel-0.14.0-r1.ebuild 5236 BLAKE2B 4ac450a87d393d19cd1b3407b44a133572b1323a53ed98c3c9da296289cdf74428fbc199c8cb29d4a5a2ba2feeb9e2721918cc8edb9d48208da7ab849a5c51ae SHA512 5df9f0934cb2179ffe1f44286449783091f9b0860b2f3719160d76aa914830d67e4a54a2df169a412c6385af03cf6f50a827b58bab86b9dba639d13817360776
-EBUILD quassel-0.14.0-r2.ebuild 5064 BLAKE2B d87b71ebbe360f9f7ccbeaf4373c39414203b4f419f4d2e1615bc3c814761165e40cde85ff1107ff9fbe402126e4eb0a1a70469ec7ed3aff0e35789bb1bb4e6d SHA512 e9be1e7d5baf435a3fc9b2677b2e2b4e0abd2454264acbf2b4125d0e2132f9a4bb8cc14ee378e9f1423b7f18ed7e252391866397c5c84b5b9b36ee91b02d4bf9
+EBUILD quassel-0.14.0-r2.ebuild 5063 BLAKE2B c57e5ab4fcd0adf56a38a4a6fd7e93dceaae1e6c4da466bf652dc70e70a028611d6280ccda78ecd857cb92f9005227b6e047bfb5ca90f67b30f7dd1100ed7071 SHA512 6c93ced2a15c006e57e334eab1cb7924dd59f9cfc5760ece00cf55b2226a6f21fa250dd41198c41a549a49f54e8aed5a76b9e9c0bfbf96334e3327ec6ed02946
 EBUILD quassel-9999.ebuild 4963 BLAKE2B 6bcdf1bdbfacbc6986ce221c52623ce9abbf85c94003098be9d4eedbd024e975f8c0d117782e8e286442109026b286418bf60d50100253ab99e552d8102436a5 SHA512 eb41f9e0913ce96fa93ed4e225486c740e3abad1543866ce1783cfee2a96f82399fca4b074101b0eb04ef89624d8c746e20a59f19bd476b160c70b1c37e18375
 MISC metadata.xml 1809 BLAKE2B e558111a5dfa2f4c9604c52db07fff9fa578e7f7d6c238ae53a894201eca4234260bb9f5e98f473ebc919ca4d6288e0b40564040f6d0db87c031ffe5b760cfff SHA512 43a6895c64e1464fce3e1ea654633994f272eb26aeec016cf244ee69e1856a0028f7979a7a424746ec98a11602a5b8017f43b06b55b26f364c7e3b38e5944e25
diff --git a/net-irc/quassel/quassel-0.14.0-r2.ebuild b/net-irc/quassel/quassel-0.14.0-r2.ebuild
index 3999b4b556c4..e0ce1c5cdfce 100644
--- a/net-irc/quassel/quassel-0.14.0-r2.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
 		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	else
 		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-		KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
+		KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux"
 	fi
 	S="${WORKDIR}/${MY_P}"
 else
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e5e415b5064f..4f08648f9981 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 6cad2c0925e4..6298055b1554 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,8 +3,10 @@ DIST grpc-1.52.1.tar.gz 8686340 BLAKE2B 0076ddd4a2840892f4ad11885e18f782b6a64533
 DIST grpc-1.55.1.tar.gz 9272441 BLAKE2B b2788d8deeb9791f04073294caa82c10e2cfe6376d09f396b51508a52f809e7f9f48d50ad5a62b2add652633b5c2d3b1ba07857b81111fa810202106251f440d SHA512 ecfa3a5affe33f160032f2ce42a9b44344d217359f68ee99305162ccabc911f44bc22512401183de74347e86add2ce20ec89da87ba6c14ab69874eb0835145d1
 DIST grpc-1.56.1.tar.gz 11750628 BLAKE2B 52ea088d3d19fa7c1d1dc44899cd67bfd0132df2fd37690d855194d3196e4c26cfdd6fe589b5e4f802cdf88e70aad6c33b3ee98c1bd1bc47356d0dee9cdc706d SHA512 2bf9619edb60a6cec4cdaa89ee3c470c52b9745ea954bfe205aef6eb29bb55949de02e8c2afc7352eacdcd33fe4000861fd16fda9e5f66c87222674b17d6322a
 DIST grpc-1.57.0.tar.gz 17337863 BLAKE2B 10c6fb35f606806aeb25cd55dd993d9af168eb8b1db64b4515830e2144dc44f35ce8f8329316a38d933b8032a0eff386591a0ddb87f2e405c5deaba012db2824 SHA512 b323de7c1f35b9de3fb7bf02ff4db6993abb0eee6860bbf2082818dda405fbe3a19fad91c5b48565cb65c6318de739bb91e47b5095801c078c6cbf3e8c73600c
+DIST grpc-1.60.0.tar.gz 17442762 BLAKE2B 35cc0ea938deb848ca91e3d5f8879b85b80f94ac09b582600f05fee1f55c162ae98f2f744480f69d78e78da0c0f2d9e198f812101daaa1f1959869f26ba7d97a SHA512 91c2406ed4198509ac0d5360b3da6898fa4f40f459eb6fff541faa44cc238eed98fd7489e7ef7a80a6f4a318bc5b9130eaa0ba1beaa358d1c074fc82825648ff
 EBUILD grpc-1.52.1.ebuild 2815 BLAKE2B ac0c2cedb3c4cc1f9a2cb6e090172ea7cac5bca2f93f178383367498b51724fc81dfe69752de1f6952c0d7ea32be25793db480efdabeea7b5ff03d1341be7b4c SHA512 f7feb1a7e0b3c4afc55e581425feb3ca584298a43a06d623067ce4d4acd815e780198025b180635851449427b88218c682323e2205aa3ce155b2769a55ad2819
 EBUILD grpc-1.55.1.ebuild 2815 BLAKE2B cf51f13634413558b287a47bff342c6fe35a7071e4ee5e2282e65c90b217127066b5abe93f96d74141489988db30defa9a219b19573ede90e5ef34612120f432 SHA512 45ad6402ea36c980fd076fd7d9728d9cea32d1441a1af6a96a1ddde3971ca1e449f3861b9366045bec00524e4b1261acd6dbf1a42351ee5457da162a54eda01d
 EBUILD grpc-1.56.1.ebuild 2817 BLAKE2B ae411c8ea15067f2c3e8562b5f5b67580d203db2327994d9b7f34606f676308d7a13031920c2639575ad9c13c0802c0f99dbb60f1343c3f48f56c58b8864dbf8 SHA512 c0ccfd6b0af3d81d6966a45a238d02d5f733b7a51a2550dff9d98f592b93d28dc89769b13164f4ab22345bbd2cb80be9dbf429894aeea98bdcd26d4c1f728026
 EBUILD grpc-1.57.0-r1.ebuild 2971 BLAKE2B 24cb8f5def17951a7fb02739c5201df84885ae8212010b6745dcb1b51939812954e20ef4b361310e1367bcf7b7d19717073f8d394144fee668deff3dd82e33c4 SHA512 fb936428bdc91a58e0722967026b782782c2b21dd62a144d6550fd2ebb6a4621802a8aefc0e32d823245e6a9301c5445e7d61db68e15b56cc51f7701b6f89ca5
+EBUILD grpc-1.60.0.ebuild 2927 BLAKE2B 80ae3abc33b3d734d65e6691ac3cc21ed608fabc1fd69549819dd9e3e8333b04c7e40f41d42ae948f5732d65addf596116d56d72b8032679be95d01e8ec36400 SHA512 b32ec9075252f44fa3200bedae368d40373b64b234657cad93b03fe727a3efe05399079f93f2653ce80a597a68bed01eecfb488ed25fd062bc40e5a866cb5c52
 MISC metadata.xml 564 BLAKE2B b28a7f5775062d33662cb139c3aec628dff54f720e6a47fb205cccb4527d21ad17460638038ac3c4534e76f1f2033078fbe8195f103428375129ec85ca21eda5 SHA512 50b7b91a7f97eb7507c523580bbe4bcbce421987826ac22d8e2fac47de69f30731cb9d5a3a1931e9caccba94066ef874e47934c053965e233f8e302a7d7e6d1e
diff --git a/net-libs/grpc/grpc-1.60.0.ebuild b/net-libs/grpc/grpc-1.60.0.ebuild
new file mode 100644
index 000000000000..4a22cee5664a
--- /dev/null
+++ b/net-libs/grpc/grpc-1.60.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PV="${PV//_pre/-pre}"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="https://www.grpc.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+# format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
+SLOT="0/37.160"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc examples test systemd"
+
+# look for submodule versions in third_party dir
+RDEPEND="
+	=dev-cpp/abseil-cpp-20230802.0*:=
+	>=dev-libs/re2-0.2021.11.01:=
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
+	>=dev-libs/protobuf-23.3:=
+	dev-libs/xxhash
+	>=net-dns/c-ares-1.15.0:=
+	sys-libs/zlib:=
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gflags
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+# requires sources of many google tools
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+)
+
+soversion_check() {
+	local core_sover cpp_sover
+	# extract quoted number. line we check looks like this: 'set(gRPC_CPP_SOVERSION    "1.37")'
+	core_sover="$(grep 'set(gRPC_CORE_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	cpp_sover="$(grep 'set(gRPC_CPP_SOVERSION ' CMakeLists.txt  | sed '/.*\"\(.*\)\".*/ s//\1/')"
+	# remove dots, e.g. 1.37 -> 137
+	core_sover="${core_sover//./}"
+	cpp_sover="${cpp_sover//./}"
+	[[ ${core_sover} -eq $(ver_cut 2 ${SLOT}) ]] || die "fix core sublot! should be ${core_sover}"
+	[[ ${cpp_sover} -eq $(ver_cut 3 ${SLOT}) ]] || die "fix cpp sublot! should be ${cpp_sover}"
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode libdir
+	sed -i "s@/lib@/$(get_libdir)@" cmake/pkg-config-template.pc.in || die
+
+	# suppress network access, package builds fine without the submodules
+	mkdir "${S}/third_party/opencensus-proto/src" || die
+
+	soversion_check
+}
+
+src_configure() {
+	# https://github.com/grpc/grpc/issues/29652
+	filter-lto
+
+	local mycmakeargs=(
+		-DgRPC_INSTALL=ON
+		-DgRPC_ABSL_PROVIDER=package
+		-DgRPC_BACKWARDS_COMPATIBILITY_MODE=OFF
+		-DgRPC_CARES_PROVIDER=package
+		-DgRPC_INSTALL_CMAKEDIR="$(get_libdir)/cmake/${PN}"
+		-DgRPC_INSTALL_LIBDIR="$(get_libdir)"
+		-DgRPC_PROTOBUF_PROVIDER=package
+		-DgRPC_RE2_PROVIDER=package
+		-DgRPC_SSL_PROVIDER=package
+		-DgRPC_ZLIB_PROVIDER=package
+		-DgRPC_BUILD_TESTS=$(usex test)
+		-DCMAKE_CXX_STANDARD=17
+		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex !systemd)
+		$(usex test '-DgRPC_BENCHMARK_PROVIDER=package' '')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples; then
+		find examples -name '.gitignore' -delete || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	if use doc; then
+		find doc -name '.gitignore' -delete || die
+		local DOCS=( AUTHORS CONCEPTS.md README.md TROUBLESHOOTING.md doc/. )
+	fi
+
+	einstalldocs
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index da08424ba8cf..bd9644ca8a81 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -4,7 +4,7 @@ DIST webkitgtk-2.42.4.tar.xz 32059260 BLAKE2B 3a8cd0818e0d989ab778cda63dd873d7e1
 EBUILD webkit-gtk-2.42.3-r410.ebuild 7959 BLAKE2B 20d3c04fd3e38baf7fc4cb58197a35602fca3461ba45eee167ac5db576744b9d420c5803f2bd29ddadb47e84c561048e63b190a3f856c2af01ff12a0ce14b77f SHA512 134a7cb44a1c485701f87b1f71a4a0fd589d6aaf1cc9b40671a15138c33a711e08f589aa11f3520b7201e1d2bd4f509a8ae41639c5897e1d0bc57e646cb78592
 EBUILD webkit-gtk-2.42.3-r600.ebuild 7856 BLAKE2B f382d54913428dd2d3493127714af06fa30c3e69aacd507fa45716281cc609f38055a98d3a66b18857e32441b282645134a106010f56de074d138947f918da87 SHA512 d10887e426344c796e1ad55642773e82f354e671a0d318f91aab8279194568fcc3c1e7751b88dfd133b908d005a5843255d2b0a761efb44bb7956cf418353bbe
 EBUILD webkit-gtk-2.42.3.ebuild 7685 BLAKE2B 063d5987d1aaa20a0193cd9400552af4f54c41836d37aa7d4e4fd4717e0f18fbca8f4aecb1a40f9e81a82ddb6812be3ab90de29efa3ada2ac840f4734ac7cb4d SHA512 177ccbda50b48b7c7e8a46d239331065732af42d01d5d2ad393ea84b17b26812f6b8e5d88936bb46f6fcd6e691a41c9bc5e28825f00eb9b54bf5150452ef6ba5
-EBUILD webkit-gtk-2.42.4-r410.ebuild 7963 BLAKE2B 7f250ed46a8b7f6f7b9e1e6188f3a42f2e7325c62eb67292f2978cf5bb2d6878eb3449d951c62830f6129a56b676d9daf50b913240aa01063093c5a4e3b08022 SHA512 4ab294f1d1b585898aafde95cedea2b5168017ce9fd86c1a2ac6c5a91d871309330ad62fb9248f01a6b19644cfdf6a3ae223998ef93e8644e4736c817485ab88
-EBUILD webkit-gtk-2.42.4-r600.ebuild 7860 BLAKE2B f68bceac243b8968182cd33946e037c55c141f0604f8fb6b2c6c778c18aa966999bfaef6640ac995b604c08b92b4a3af0d69b3b5e699081bfa880115a32aba19 SHA512 c131597fb71e466b27c31a2261b6bb69d3b3ff59588512e0a49af6e8a03a2981652ef14aa685d06727aff29fa8316d5d385206dff83bfbbbb1bcb84a134600f6
-EBUILD webkit-gtk-2.42.4.ebuild 7689 BLAKE2B 85de5e03988ca172db707ff135c3e50336ce4678899f17694860a91f1521faacfedb49d379871f4ddbdf3a9f53178bfe50260ef055f9e054697e4dcd7ae1bcd0 SHA512 f415988b35a2874727f691d9087b3c3ed7cb3f6cb96879f7c09a8f616718b9610598ffac6bf63f95b5e9a872232b3fd083d42492a05884701d0b6ae442916ecc
+EBUILD webkit-gtk-2.42.4-r410.ebuild 7962 BLAKE2B 7203a5225c28e545d11ef93c216508078656bd3090b46e1e697c5b40e637ffb6ba40e356c7dc080671aa1f0c23a5ccb99fc9b8f2bab640034711b5f1bbdfed7a SHA512 0e9b7cff4eec29d89e106a285515de452e949ca710becd681aa6eac21e036ba14575f474404726d175a60e8ad465e2249a1903f348fd2bb902f21088be673c8d
+EBUILD webkit-gtk-2.42.4-r600.ebuild 7859 BLAKE2B 97253d56609be6537df5cc63d6ec685b3a43954f2ac491866890f6b09de165c61581b3b75ea64605219a56eafae8ae3f7c6f5c40c063deba1007af175057086c SHA512 0f43313c58fcd0db372a11042b587164cb84d87d7774fcb136db5c816822f8a6f8477efea3c4e1c74b5e402987f0c77a49720ee70c4d742048450c550857f346
+EBUILD webkit-gtk-2.42.4.ebuild 7688 BLAKE2B 8ed8a5d918f1859aac18e5878fea67fd2299e8f2eda2dc90768cc09bab67d7277b6abfe106deb58241bf6eeb4fc558fedca956c5b6fe74a4e917efebc2ae21c1 SHA512 766f3fe68f4268f34a8eb8b4bb5dbf5e40ea18a92f6ae2045e253210dfff4f9dd18f6345ccfcbf5604cc8e80b6eecb2f8fe9dfb85c3d4adc441040d3dbe82fa4
 MISC metadata.xml 615 BLAKE2B 5527ca0439e337193601d221df1b5f9b85c6f4ea0b0867fe8ac0548307672de45fe956fe61c0044b778644c8079271eba565854ab041ce45738dd98a9b3db39e SHA512 4681816de7821ede7c252e62a4cb29ee5c6e88f1799972a7325b40ed1998f9462835ca38c42dc65eeac4c0bcb0d672593af857fcf442cced865bdfdefe063eb1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
index 39cb654fda97..a774fc6a22fb 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4.1/0" # soname version of libwebkit2gtk-4.1
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
index 47abf5077de8..2e18e53fad45 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="6/0" # soname version of libwebkit2gtk-6.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
index 72316262a3b3..8cb298ca32a8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
 
 IUSE="aqua avif examples gamepad keyring +gstreamer +introspection pdf +jpeg2k jpegxl +jumbo-build lcms seccomp spell systemd wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index af2681ba6813..ac15ca0e581a 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/amphetadesk/Manifest b/net-news/amphetadesk/Manifest
index b815ce9b52fc..162acfbdab2a 100644
--- a/net-news/amphetadesk/Manifest
+++ b/net-news/amphetadesk/Manifest
@@ -1,5 +1,5 @@
 AUX amphetadesk.initd 205 BLAKE2B e9ee39be2d044fe7e5278feff8c30bf4ecd77adda5a3465dcaec9dd189841823ed20fdedf6c5798ccb7dc8dd0ff8631fd3a38adedc9b1c80bf135a7ea01b3363 SHA512 67e0f6005c13b8a61924c31143a15c119b1ee2cbed04f203df452562b3b9779aa0108535c5979797f41140ebadf7dc80104e8a21cb93a5ac91090447a106997c
 DIST amphetadesk-src-v0.93.1.tar.gz 853503 BLAKE2B f107cbfed4ab8aa767b2d29f4e249d895ff94d1ab29117564e2d9ea376bec149b3717684bb2910d724d011388bdb005ac6c2c02da9d5dc3547d6f949a8c437e1 SHA512 10e6c1b0227872c064a090aa72f95e7fe57b0f6cf71f8c31935c12fde4d127636eeea4f148218ebbc4a08ee4b4f653c793264cf8102e1d070d3b4c6a2e7c7793
 EBUILD amphetadesk-0.93.1-r1.ebuild 1340 BLAKE2B 04ad964d387811b4d50eeb1d989222c1425ae38432f5897f6e8134f20bea6eb1c8e89c73a96cceb75ce583eb785e614b938163c177cb765f11f8c43070750476 SHA512 4f90bfa374b64dc247ab355d10ad2a5d9e87158927c3d2d112224dc19533162475371154ecd485ea789a4d97d693f0fee5bca075a8f5d60e820666d901d8538d
-EBUILD amphetadesk-0.93.1-r2.ebuild 1363 BLAKE2B c65245ad91f72a29d5bd6ef51e9336991f3428c74189616414292bd5c110fc9284693dc1b83566cbbc336eeb6b2f3d822b3d4249d09893e0cca07745d1a64092 SHA512 03a93f7f8fd21ea1ac8b80ea95d1ab210e143ebac860f1f1648d507d9ae0ba6efdafb2e760bfb3bcb9d4dacf9628ff4ee10b97eaffba577ab4035fb94b836b06
+EBUILD amphetadesk-0.93.1-r2.ebuild 1362 BLAKE2B 69e98d170601e2e2d71eaa38d755f2970fe48a6183069d9e77ce74db6116d7d3f7cadbd86fde64600b7cb8c20c2466ece9a0c7a03e3934253016da3d47465c18 SHA512 f6f72495c13b2c10b0ec5de2d600a9d3731f81a8b5da2aff95139711b1e210df8ffb6b4ba7a3889067c1e9dce55eef1f0d9932ace870317f6e64f650e9288c17
 MISC metadata.xml 249 BLAKE2B 8519fe7b0a641b0e1ee3272e44b7704bc9e971e7ce073ce4166405b8e3418f3ed54941b7a50405e9aa7e64955271c4cac243f2c1e446e3469398aca228828956 SHA512 bb54c53d52ca003dd1d9d64e9336041406ee341935bf4540c41ecaf57db3f7e9373cafcc061f2d35ab5b64264519786392d411a73c3e63f90e2f1fcaa0549c01
diff --git a/net-news/amphetadesk/amphetadesk-0.93.1-r2.ebuild b/net-news/amphetadesk/amphetadesk-0.93.1-r2.ebuild
index b8c1b2dc5c80..e2c93b33672b 100644
--- a/net-news/amphetadesk/amphetadesk-0.93.1-r2.ebuild
+++ b/net-news/amphetadesk/amphetadesk-0.93.1-r2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}-src-v${PV}"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="dev-lang/perl
 	dev-perl/libwww-perl
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index a58b0d0ec725..5b94c631e746 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index d6d4931d9bbf..fa976d8bbdbb 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -2,13 +2,9 @@ AUX frpc.service 283 BLAKE2B 9ed07bc1296c8bc2b24df3787e0bc5f6d955ba4ceebc84b4e10
 AUX frpc_at_.service 279 BLAKE2B 6285f0ff4c91696cc662426d47d61b52bf3e9374a48463de411b4eb89106b3b614c88426a1f4cdc6d0a5c4dec3e33baf80d1b3c08881a9d410874330e5efb997 SHA512 97602e6d0e1390cf3e6a23e74500f93661251de3525c620085e82fba5d765e3a782bf01b46924080ab052e29557dae1e0edd3b426cd990f0ed9501f9da8c8831
 AUX frps.service 230 BLAKE2B 7bc291cf644898a0fe4ffd8761e9474a598dd9e9a39f5afc52d8319917b62ac7e75c962c1038c3d132bb19d78f77bb40abf515e5de6ce13563ac36f41dab2a0b SHA512 58f97b93cf5b15976ed6600cdd0d32fd4c0203c4ad718d010c205d81f25a00608a0082721330629beb251e157733b388b09d3dc5d1e104e5bc6fa95972130794
 AUX frps_at_.service 228 BLAKE2B e6464ef7fd71bf87f82101dd80b6633708d5d4b336515e0aace4f8a5107c2ce1b1930ffa3586da622163d1477246828eb7ec76b3f631da9f608e57dc414b880a SHA512 8a1d94cc14e133290b0ac20b0c1cb532fbf41136f1f1cba3b4dafb971bdaa63cbec8fadf51e94adf7730b8952072457a8567996eca3d904911652535e29586f4
-DIST frp-0.42.0-deps.tar.xz 40716624 BLAKE2B 60f8f1486c0c83627954f45d55fff6e42564549950557ffdf0bed6f4ee752670547a6968ec19bd7ce04ebd259480d9f665d6b93fc3550e0830fbc9e5bee55f80 SHA512 ddab5192b9399dab54b521fa35c38c6e6cf293737b8677d384f3d991255aa49ed6c6ccb3e4ff686f4946b30e7d84499c4d5564e327ef19aa3fdf465d85b15a49
-DIST frp-0.42.0.tar.gz 1280863 BLAKE2B 5377aeb7ef83ace3a36772bf56ab671a91688da6d6b54ce23833221cc7cadee1107a3a5d1ad8a615bb7b4e6cc6eca214888449481ad18584ca03f1b0bc484be2 SHA512 b61786a1023a09d9f854e09c406ac241c4a8684fb903511b70adc7527c44d80df92b2d3493fe49e9e04d19dbd994b8fe866285862c88ff89f090860c3bda1987
-DIST frp-0.43.0.tar.gz 1282855 BLAKE2B d2e60e89de8823ae129f91aa2cf50fe5101bcc3c42d63fde48febf89cb2511e5ecabaf799803cf6ba0042b523ef1a3de19fb7d027a34074df0ccb40ba8393b86 SHA512 e6ccbf98d9d8fb714f37784ca582684b9f27994cf3f74b7081043285394243a8e9114b65f0918b64207a99064422312d700d01adaed085175314ad0ae238eb8f
-DIST frp-0.44.0.tar.gz 1284095 BLAKE2B 35464acd0dcdf3eeeb326c612eeef457baad5a8a7eb36a28183fd3dd1f1eb585914ed290a0897928244ac1319f45358c0b19ae3606cb149501c7ead79ba2e26e SHA512 6a5d0f4985075e260bc7970031391b457a3c7b8ea05628f17b551ea9afc0f2454db76caaad49250a2aecdd7ca26abc8ff74ee705a4c44319d33a92e5c055fd56
 DIST frp-0.45.0-vendor.tar.gz 5301832 BLAKE2B 23198a326678f3ec5357ce1bd6c7abff26a27dce6810653ef0262fb3f5c68165481ec75218ded64c90a357fafefba11b0a9c0afc4dc7e3a229ad8cc245a76fc3 SHA512 b94dd5adec82ae940044d448ec4551ca24ec3c8f1a9d870327a76a9a7d3b39e7dc567199a999b85879637dca3d46df65f8f46d11c3dbe10653a20f2eb7521f9a
-EBUILD frp-0.42.0.ebuild 867 BLAKE2B 5cf05d20c378625fdba349796b2a84ade9c58fc180b7cf94f9710f00843471b7a9486db0fb48063e46fce7f661985a0a1f4176a76fd4c63a4a8dde512b1d621b SHA512 e61f2e1721b0afbcb1777f26559ba426b6d7330d359a20db09c68e3d393ea808bdc689132cd8b71e9b9e31aa6885a10388cf906deae433e7423ca00da2eda7d2
-EBUILD frp-0.43.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
-EBUILD frp-0.44.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
+DIST frp-0.53.2-deps.tar.xz 55621188 BLAKE2B 35e14b82bbc3a3386f2901a274969e7650cf6ce529ae17dd7ab0a7f759f355da7b7d64d0945e22d3a741d75ff3e21bd17ccf708d2184605c9303b35dc63f1b88 SHA512 c173d1d1918afc5549d99ac575eadd2b408220625c773ec5f5cce4e00a648c19d9a3cfbfce51a86e0e8425edb7a1a72a9d798a37f4bf37b38c0d4d031bc27dae
+DIST frp-0.53.2.tar.gz 1023383 BLAKE2B bad6aee65d5386ba14a0c4679514e17e1643b703292a4bb0811ff1f9a76b95833358993fdfb13b1e4224d7cf8c0035c2aabfdcd74a14003dff90c3e569fa5d12 SHA512 c1f0acff002dbdef001d04c3dcd5ca138c33a36b8e5ad119a555f0dd05f4e6200c915e1481eab58c02e650a058f0b3f75310b9a50ad4756087f69f9fe74377b4
 EBUILD frp-0.45.0.ebuild 997 BLAKE2B 519a565bf6394a54913452b47851abc2f76576fb86c1ba47ecce0e2f4f9da72d455800149f94c8f9f0c96f269c8117a6e4cfc22a0d8347b8e4309c8d6bd95437 SHA512 9fec0eaefe68478aae96303c42be94159fca5f6df56e114d49a7f238a3701481524e467975d84934f0e504743fe74416c8d4ab2c59fa453ba4310787b2276a41
-MISC metadata.xml 322 BLAKE2B 8438877d202ce024eb32c6ba8196e1d6bf14b2e29179be7a0c92fb521f110b2501f29f8961752b5bfe07e2c5ddbaae6f1ea087713259c26c3255e985003d56a5 SHA512 3204b6e7ff9565b4677ffa681e88c440e12fea53936d31cd6617f6e86180f92729e5f28f7b81419b131150a89fec364a073249047cf1a36066199b76e5c174ab
+EBUILD frp-0.53.2.ebuild 1753 BLAKE2B b0c4c1d5d0aca891f636d7474e96344b26578571325338ee53a16db201a06b6b26cedabcc7e6bbc38bcc8a11a3d97f80eac01b8e7e240f5e4388b6031066916f SHA512 d69026d92e7706d98fa67889ead520de6b853b78f12d73f1e9a5335dca0c8ceb638dae550432025baf97d49584375a1039c7a628033e8bbf82a414df995c991e
+MISC metadata.xml 467 BLAKE2B a4b1a8611d1ab87bed87c5b40ac24a2dd64d4f2f2482351fd159f5826f77988c7c5e625614dc7c1c040b623a2b0b4452fc798af96115318a46f9d00a83766e9f SHA512 44e7c4e144789e64b2e373fae969e840928e2d618db695c008c07156037841175f51c19ed7f42b63f115319c24aa26701c94bb83f581c06143689bb5237bb965
diff --git a/net-vpn/frp/frp-0.42.0.ebuild b/net-vpn/frp/frp-0.42.0.ebuild
deleted file mode 100644
index e4c19833ef66..000000000000
--- a/net-vpn/frp/frp-0.42.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
-HOMEPAGE="https://github.com/fatedier/frp"
-SRC_URI="https://github.com/fatedier/frp/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-src_prepare() {
-	# patch LDFLAGS to preserve symbol table #792408
-	sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
-	default
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	local x
-	dobin bin/{frpc,frps}
-	dodoc README*.md
-	systemd_dounit conf/systemd/*
-	insinto /etc/frp
-	for x in conf/*.ini; do mv "${x}"{,.example}; done
-	doins conf/*.example
-}
diff --git a/net-vpn/frp/frp-0.43.0.ebuild b/net-vpn/frp/frp-0.43.0.ebuild
deleted file mode 100644
index a9d8f761c7f8..000000000000
--- a/net-vpn/frp/frp-0.43.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
-HOMEPAGE="https://github.com/fatedier/frp"
-SRC_URI="https://github.com/fatedier/frp/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-src_prepare() {
-	# patch LDFLAGS to preserve symbol table #792408
-	sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
-	default
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	local x
-	dobin bin/{frpc,frps}
-	dodoc README*.md
-	systemd_dounit "${FILESDIR}"/frp{c,s}.service
-	systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service
-	systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service
-	insinto /etc/frp
-	for x in conf/*.ini; do mv "${x}"{,.example}; done
-	doins conf/*.example
-}
diff --git a/net-vpn/frp/frp-0.44.0.ebuild b/net-vpn/frp/frp-0.44.0.ebuild
deleted file mode 100644
index a9d8f761c7f8..000000000000
--- a/net-vpn/frp/frp-0.44.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
-HOMEPAGE="https://github.com/fatedier/frp"
-SRC_URI="https://github.com/fatedier/frp/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE=""
-
-src_prepare() {
-	# patch LDFLAGS to preserve symbol table #792408
-	sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
-	default
-}
-
-src_compile() {
-	emake all
-}
-
-src_install() {
-	local x
-	dobin bin/{frpc,frps}
-	dodoc README*.md
-	systemd_dounit "${FILESDIR}"/frp{c,s}.service
-	systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service
-	systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service
-	insinto /etc/frp
-	for x in conf/*.ini; do mv "${x}"{,.example}; done
-	doins conf/*.example
-}
diff --git a/net-vpn/frp/frp-0.53.2.ebuild b/net-vpn/frp/frp-0.53.2.ebuild
new file mode 100644
index 000000000000..e391ce1b9d6a
--- /dev/null
+++ b/net-vpn/frp/frp-0.53.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd shell-completion
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/fatedier/frp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~riscv"
+IUSE="+client +server"
+REQUIRED_USE="|| ( client server )"
+
+DEPEND="${RDEPEND}"
+RDEPEND=""
+BDEPEND="dev-lang/go"
+
+src_compile() {
+	mkdir -pv completions || die
+
+	if use client; then
+		ego build -trimpath -ldflags "-w" -o frpc ./cmd/frpc
+		./frpc completion bash > completions/frpc || die
+		./frpc completion fish > completions/frpc.fish || die
+		./frpc completion zsh > completions/_frpc || die
+	fi
+
+	if use server; then
+		ego build -trimpath -ldflags "-w" -o frps ./cmd/frps
+		./frps completion bash > completions/frps || die
+		./frps completion fish > completions/frps.fish || die
+		./frps completion zsh > completions/_frps || die
+	fi
+}
+
+src_install() {
+	if use client; then
+		dobin frpc
+		dobashcomp completions/frpc
+		systemd_dounit "${FILESDIR}/frpc.service"
+		systemd_newunit "${FILESDIR}/frpc_at_.service" frpc@.service
+
+		for x in conf/frpc*.toml; do mv "${x}"{,.example}; done
+	fi
+
+	if use server; then
+		dobin frps
+		dobashcomp completions/frps
+		systemd_dounit "${FILESDIR}/frps.service"
+		systemd_newunit "${FILESDIR}/frps_at_.service" frps@.service
+
+		for x in conf/frps*.toml; do mv "${x}"{,.example}; done
+	fi
+
+	insinto /etc/frp
+	doins conf/*.example
+
+	dofishcomp completions/*.fish
+	dozshcomp completions/_*
+}
diff --git a/net-vpn/frp/metadata.xml b/net-vpn/frp/metadata.xml
index f8c537b68111..29fb056dd278 100644
--- a/net-vpn/frp/metadata.xml
+++ b/net-vpn/frp/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<use>
+		<flag name="client">Build and install frp client (frpc)</flag>
+		<flag name="server">Build and install frp server (frps)</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">fatedier/frp</remote-id>
 	</upstream>
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index 8327fff9aa95..2e07b777ef0e 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo 316 BLAKE2B 9c962395e49a2eff8411e7fb3996d99e504b0023712151acdd6bee43755be89d52c970cbf7e5aae62c0adfb33ff7ad072578b88a40857bffb359a3d2c8571947 SHA512 6ca305c710562c0f9a3f0cba07760adf300ea166c8baa47e8872719190d779fb63d4dd6c9193fb60ddb51015138790aaa93935668423e0f861f05496d22ce660
 AUX tor-0.2.7.4-torrc.sample.patch 1341 BLAKE2B c6b398d6fd417e9029196046529109ed52c7c5dd6bd38505261116e15d1516a6e200583b480fe50b6e971d2ab4336673f9e75effa9dc8d3858c6248fbe31a69b SHA512 4a6b855734717416b6615fbd76bb75a54731767a74d3ade8c58fe52f4a42ee51c93ff8d591943343f319018e18d65b768bbe8fe936200ad829ab1e262c5e9b0f
 AUX tor-0.4.7.13-libressl.patch 7513 BLAKE2B 99bc969d24fed1c6652b572f9a9b27121a92bac67d46409b15e6a6e9f9f8d1a09851b91101461d0c8dc1d2792f5226ef33c5697009f6e65edac7297531cdd348 SHA512 72e005b0e1b2bd62321865c07080bb6f19d0144e0ec630796e75efb645c4dccf0dc200e5ad05ecc5c4522faeb3c4c0caf72cb6462aa3736c3bd0c17a38206c54
+AUX tor-0.4.7.16-arm64-sandbox.patch 11942 BLAKE2B 761ca6ee26d0e39c90fb0713fc36ecdb3ff349e40795c0124bfa4f0a72c51430e3ce65df82386a1e8b1d531460fe910629a1c702234712f1a061a8e9f93e4b20 SHA512 127755058ca29fc92a02fef820dd7c43994debc1554a4624bd4cae05e4bc3970da594ad865555d0bb2a847a151e093383ac19f83d5fa44b94588f8fb58c09a47
 AUX tor.confd 44 BLAKE2B 70df86a361c7b735283c5699e4d8d8a054a84629c749adb4dc57c196d49df4492471cb8b21dde43d668b31171ee2dfae81562a70367c72801ae60046908b022e SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660
 AUX tor.initd-r9 942 BLAKE2B 1008ed981e1e7040b098f5c8c509e6a5de89e94b6fa110998c50b0521b99cb80e9b793a78de3de0e0e89d56553c32f3a6566015dd2c4fd77c812577f6f637d7a SHA512 fa3a6f52dc733d27f954299cfb32fc813ef731e1d124096450f7b53f0e4fce9f41cf48b66651d1f5383c18bdca8a87d6bbe03c65dc8a5f9a58660bb8db0040a1
 AUX tor.service 1050 BLAKE2B 7f6553b9f4b928f0c924d73ee6f9df8a99ee75ec1801f6b865a7d8e40ff30290bf836907b561586d0f429b7ddf05286ab51974d207906a0fe52cb2fbcc8e160f SHA512 786481b20d7cab9696656c5136ff74c9c2aaa73ca3d63b163a294b9b3c4b628da387cb5ec3ada81277ca81cff16ead5162f3b4d64cb0d773c22f2e4607c3194b
@@ -19,6 +20,7 @@ DIST tor-0.4.8.10.tar.gz.sha256sum 86 BLAKE2B 1410a5e7e486c7c33b6b217a53d250bc3e
 DIST tor-0.4.8.10.tar.gz.sha256sum.asc 716 BLAKE2B 0154ef1defa1a8227813ef3589f1fd4215f5bd305447fec1404f7950c0b89e6d9fcb6686900e4819d0f1a635d3b08e60cdc9c96a4f74e603185afb6eb1e29279 SHA512 aaeee664c9342a6cddaacfeea6e6974ce374d746153a28943dee1db3db48a8e08f36a076856358819cae8ea2f8b7d912d0e6dc2dc772465dba3283b553f43b91
 EBUILD tor-0.4.7.13-r1.ebuild 3754 BLAKE2B 7f74903deadf5f2e3c24328a5f047144e107dd48702bc6a411df3cf8b64072a6d717e2f02938d10b5aefa15d7ba43b0477f0ead8083e7a9b45622dea57722254 SHA512 b60da829bd21e4ae3bb44886cbe8dc598a68904808d356499c54618cc31418c5d35d120a527bb96a10025ffe761aaf9018f622acbb6ee1181dacd2fa6870ff6a
 EBUILD tor-0.4.7.14.ebuild 3913 BLAKE2B 1f2a8c13e9d82e8aaba5393570542c85e0477a769bed71e73a73379657f5425d407dee0520373959ac17ba26c02276c4363baae8ae54b0bb4fd0c1df11ae1732 SHA512 fc3e7c1f3dc339be7b0773fce16c56b92cafb437540e6f59c22f6e61268ed9522f2de9a677c49781bae3442bc741a6272643d16b10f9d6b6b9f31c6b31443fad
+EBUILD tor-0.4.7.16-r1.ebuild 3891 BLAKE2B d60319499bd332009a5baa4e603589c0e074a101c33d547d6468552a8048713074360ad032cfeb7a834481ee33bc103e8f7f9e6cbf654d59ff9fa8ecb241c0c5 SHA512 8ebb315dbb9918d6fc31a221215476d1bfbe4345cb014603685256fb94e279eead88e838d757dca745b0580c8b1bb7c97e3b3a45ed37dec8128cd22f3d46078c
 EBUILD tor-0.4.7.16.ebuild 3848 BLAKE2B 055aedeb3699510785c8584261144648af057e861257c7aa70d212cc91f98decbafb7451c27452b5fb42f7da201c783ded2dc0c9d76ebf6ac107965efe270100 SHA512 1838b05d4e023e4e09c8e5b185cec464f2c26e8fcd48d4dc5645402667dd3afddb79a7727cc457d3c4c6b40ca2b18f8b79a9e3b8aa7c434f727ab27f9c48088d
 EBUILD tor-0.4.8.10.ebuild 4301 BLAKE2B 223c26c7e8b70f06dedc56f2e90b4e37e66345c0b2886c75f11fc2b31d54e1383b4ebb9ad6cf2bf94095add9914a5c55995d96c19d51896a996c69b79a5f2795 SHA512 440ee0ce19e6203c4e4195568cd2c74ef67b00ef4ae23ca43563d3cde8426e795a4e2f22f7aa64ae7bf244b96b8583854ca4fd2dc6aa36b6be235e9ebf2a8281
 EBUILD tor-9999.ebuild 4301 BLAKE2B 223c26c7e8b70f06dedc56f2e90b4e37e66345c0b2886c75f11fc2b31d54e1383b4ebb9ad6cf2bf94095add9914a5c55995d96c19d51896a996c69b79a5f2795 SHA512 440ee0ce19e6203c4e4195568cd2c74ef67b00ef4ae23ca43563d3cde8426e795a4e2f22f7aa64ae7bf244b96b8583854ca4fd2dc6aa36b6be235e9ebf2a8281
diff --git a/net-vpn/tor/files/tor-0.4.7.16-arm64-sandbox.patch b/net-vpn/tor/files/tor-0.4.7.16-arm64-sandbox.patch
new file mode 100644
index 000000000000..2b473bf981b6
--- /dev/null
+++ b/net-vpn/tor/files/tor-0.4.7.16-arm64-sandbox.patch
@@ -0,0 +1,337 @@
+From https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/574
+Gentoo Bug: https://bugs.gentoo.org/920063
+From: Pierre Bourdon <delroth@gmail.com>
+Date: Sat, 30 Apr 2022 11:52:59 +0200
+Subject: [PATCH 1/4] sandbox: fix openat filtering on AArch64
+
+New glibc versions not sign-extending 32 bit negative constants seems to
+not be a thing on AArch64. I suspect that this might not be the only
+architecture where the sign-extensions is happening, and the correct fix
+might be instead to use a proper 32 bit comparison for the first openat
+parameter. For now, band-aid fix this so the sandbox can work again on
+AArch64.
+--- a/src/lib/sandbox/sandbox.c
++++ b/src/lib/sandbox/sandbox.c
+@@ -518,7 +518,12 @@ libc_uses_openat_for_opendir(void)
+ static int
+ libc_negative_constant_needs_cast(void)
+ {
++#if defined(__aarch64__) && defined(__LP64__)
++  /* Existing glibc versions always sign-extend to 64 bits on AArch64. */
++  return 0;
++#else
+   return is_libc_at_least(2, 27);
++#endif
+ }
+ 
+ /** Allow a single file to be opened.  If <b>use_openat</b> is true,
+-- 
+GitLab
+
+
+From 8fd13f7a7bfd4efc02d888ce9d10bcb6a80a03c8 Mon Sep 17 00:00:00 2001
+From: Pierre Bourdon <delroth@gmail.com>
+Date: Sat, 30 Apr 2022 13:02:16 +0200
+Subject: [PATCH 2/4] sandbox: filter {chown,chmod,rename} via their *at
+ variant on Aarch64
+
+The chown/chmod/rename syscalls have never existed on AArch64, and libc
+implements the POSIX functions via the fchownat/fchmodat/renameat
+syscalls instead.
+
+Add new filter functions for fchownat/fchmodat/renameat, not made
+architecture specific since the syscalls exists everywhere else too.
+However, in order to limit seccomp filter space usage, we only insert
+rules for one of {chown, chown32, fchownat} depending on the
+architecture (resp. {chmod, fchmodat}, {rename, renameat}).
+--- a/src/lib/sandbox/sandbox.c
++++ b/src/lib/sandbox/sandbox.c
+@@ -614,6 +614,32 @@ sb_chmod(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+   return 0;
+ }
+ 
++static int
++sb_fchmodat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
++{
++  int rc;
++  sandbox_cfg_t *elem = NULL;
++
++  // for each dynamic parameter filters
++  for (elem = filter; elem != NULL; elem = elem->next) {
++    smp_param_t *param = elem->param;
++
++    if (param != NULL && param->prot == 1 && param->syscall
++        == SCMP_SYS(fchmodat)) {
++      rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fchmodat),
++          SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++          SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value));
++      if (rc != 0) {
++        log_err(LD_BUG,"(Sandbox) failed to add fchmodat syscall, received "
++            "libseccomp error %d", rc);
++        return rc;
++      }
++    }
++  }
++
++  return 0;
++}
++
+ #ifdef __i386__
+ static int
+ sb_chown32(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+@@ -666,6 +692,32 @@ sb_chown(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+ }
+ #endif /* defined(__i386__) */
+ 
++static int
++sb_fchownat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
++{
++  int rc;
++  sandbox_cfg_t *elem = NULL;
++
++  // for each dynamic parameter filters
++  for (elem = filter; elem != NULL; elem = elem->next) {
++    smp_param_t *param = elem->param;
++
++    if (param != NULL && param->prot == 1 && param->syscall
++        == SCMP_SYS(fchownat)) {
++      rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fchownat),
++          SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++          SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value));
++      if (rc != 0) {
++        log_err(LD_BUG,"(Sandbox) failed to add fchownat syscall, received "
++            "libseccomp error %d", rc);
++        return rc;
++      }
++    }
++  }
++
++  return 0;
++}
++
+ /**
+  * Function responsible for setting up the rename syscall for
+  * the seccomp filter sandbox.
+@@ -697,6 +749,39 @@ sb_rename(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+   return 0;
+ }
+ 
++/**
++ * Function responsible for setting up the renameat syscall for
++ * the seccomp filter sandbox.
++ */
++static int
++sb_renameat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
++{
++  int rc;
++  sandbox_cfg_t *elem = NULL;
++
++  // for each dynamic parameter filters
++  for (elem = filter; elem != NULL; elem = elem->next) {
++    smp_param_t *param = elem->param;
++
++    if (param != NULL && param->prot == 1 &&
++        param->syscall == SCMP_SYS(renameat)) {
++
++      rc = seccomp_rule_add_4(ctx, SCMP_ACT_ALLOW, SCMP_SYS(renameat),
++            SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++            SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value),
++            SCMP_CMP_NEG(2, SCMP_CMP_EQ, AT_FDCWD),
++            SCMP_CMP_STR(3, SCMP_CMP_EQ, param->value2));
++      if (rc != 0) {
++        log_err(LD_BUG,"(Sandbox) failed to add renameat syscall, received "
++            "libseccomp error %d", rc);
++        return rc;
++      }
++    }
++  }
++
++  return 0;
++}
++
+ /**
+  * Function responsible for setting up the openat syscall for
+  * the seccomp filter sandbox.
+@@ -1317,7 +1402,9 @@ static sandbox_filter_func_t filter_func[] = {
+ #else
+     sb_chown,
+ #endif
++    sb_fchownat,
+     sb_chmod,
++    sb_fchmodat,
+     sb_open,
+     sb_openat,
+     sb_opendir,
+@@ -1325,6 +1412,7 @@ static sandbox_filter_func_t filter_func[] = {
+     sb_ptrace,
+ #endif
+     sb_rename,
++    sb_renameat,
+ #ifdef __NR_fcntl64
+     sb_fcntl64,
+ #endif
+@@ -1592,10 +1680,24 @@ new_element(int syscall, char *value)
+ 
+ #ifdef __i386__
+ #define SCMP_chown SCMP_SYS(chown32)
++#elif defined(__aarch64__) && defined(__LP64__)
++#define SCMP_chown SCMP_SYS(fchownat)
+ #else
+ #define SCMP_chown SCMP_SYS(chown)
+ #endif
+ 
++#if defined(__aarch64__) && defined(__LP64__)
++#define SCMP_chmod SCMP_SYS(fchmodat)
++#else
++#define SCMP_chmod SCMP_SYS(chmod)
++#endif
++
++#if defined(__aarch64__) && defined(__LP64__)
++#define SCMP_rename SCMP_SYS(renameat)
++#else
++#define SCMP_rename SCMP_SYS(rename)
++#endif
++
+ #ifdef __NR_stat64
+ #define SCMP_stat SCMP_SYS(stat64)
+ #else
+@@ -1633,7 +1735,7 @@ sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file)
+ {
+   sandbox_cfg_t *elem = NULL;
+ 
+-  elem = new_element(SCMP_SYS(chmod), file);
++  elem = new_element(SCMP_chmod, file);
+ 
+   elem->next = *cfg;
+   *cfg = elem;
+@@ -1659,7 +1761,7 @@ sandbox_cfg_allow_rename(sandbox_cfg_t **cfg, char *file1, char *file2)
+ {
+   sandbox_cfg_t *elem = NULL;
+ 
+-  elem = new_element2(SCMP_SYS(rename), file1, file2);
++  elem = new_element2(SCMP_rename, file1, file2);
+ 
+   elem->next = *cfg;
+   *cfg = elem;
+-- 
+GitLab
+
+
+From eb0749d64917fee6ff74c3810dbec8cd063f546c Mon Sep 17 00:00:00 2001
+From: Pierre Bourdon <delroth@gmail.com>
+Date: Wed, 4 May 2022 07:19:40 +0200
+Subject: [PATCH 3/4] sandbox: replace SCMP_CMP_NEG with masked equality checks
+
+For some syscalls the kernel ABI uses 32 bit signed integers. Whether
+these 32 bit integer values are sign extended or zero extended to the
+native 64 bit register sizes is undefined and dependent on the {arch,
+compiler, libc} being used. Instead of trying to detect which cases
+zero-extend and which cases sign-extend, this commit uses a masked
+equality check on the lower 32 bits of the value.
+--- a/src/lib/sandbox/sandbox.c
++++ b/src/lib/sandbox/sandbox.c
+@@ -141,10 +141,12 @@ static sandbox_cfg_t *filter_dynamic = NULL;
+  * the high bits of the value might get masked out improperly. */
+ #define SCMP_CMP_MASKED(a,b,c) \
+   SCMP_CMP4((a), SCMP_CMP_MASKED_EQ, ~(scmp_datum_t)(b), (c))
+-/* For negative constants, the rule to add depends on the glibc version. */
+-#define SCMP_CMP_NEG(a,op,b) (libc_negative_constant_needs_cast() ? \
+-                              (SCMP_CMP((a), (op), (unsigned int)(b))) : \
+-                              (SCMP_CMP_STR((a), (op), (b))))
++/* Negative constants aren't consistently sign extended or zero extended.
++ * Different compilers, libc, and architectures behave differently. For cases
++ * where the kernel ABI uses a 32 bit integer, this macro can be used to
++ * mask-compare only the lower 32 bits of the value. */
++#define SCMP_CMP_LOWER32_EQ(a,b) \
++  SCMP_CMP4((a), SCMP_CMP_MASKED_EQ, 0xFFFFFFFF, (unsigned int)(b))
+ 
+ /** Variable used for storing all syscall numbers that will be allowed with the
+  * stage 1 general Tor sandbox.
+@@ -513,19 +515,6 @@ libc_uses_openat_for_opendir(void)
+          (is_libc_at_least(2, 15) && !is_libc_at_least(2, 22));
+ }
+ 
+-/* Return true if we think we're running with a libc that needs to cast
+- * negative arguments like AT_FDCWD for seccomp rules. */
+-static int
+-libc_negative_constant_needs_cast(void)
+-{
+-#if defined(__aarch64__) && defined(__LP64__)
+-  /* Existing glibc versions always sign-extend to 64 bits on AArch64. */
+-  return 0;
+-#else
+-  return is_libc_at_least(2, 27);
+-#endif
+-}
+-
+ /** Allow a single file to be opened.  If <b>use_openat</b> is true,
+  * we're using a libc that remaps all the opens into openats. */
+ static int
+@@ -533,7 +522,7 @@ allow_file_open(scmp_filter_ctx ctx, int use_openat, const char *file)
+ {
+   if (use_openat) {
+     return seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat),
+-                              SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++                              SCMP_CMP_LOWER32_EQ(0, AT_FDCWD),
+                               SCMP_CMP_STR(1, SCMP_CMP_EQ, file));
+   } else {
+     return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(open),
+@@ -627,7 +616,7 @@ sb_fchmodat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+     if (param != NULL && param->prot == 1 && param->syscall
+         == SCMP_SYS(fchmodat)) {
+       rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fchmodat),
+-          SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++          SCMP_CMP_LOWER32_EQ(0, AT_FDCWD),
+           SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value));
+       if (rc != 0) {
+         log_err(LD_BUG,"(Sandbox) failed to add fchmodat syscall, received "
+@@ -705,7 +694,7 @@ sb_fchownat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+     if (param != NULL && param->prot == 1 && param->syscall
+         == SCMP_SYS(fchownat)) {
+       rc = seccomp_rule_add_2(ctx, SCMP_ACT_ALLOW, SCMP_SYS(fchownat),
+-          SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++          SCMP_CMP_LOWER32_EQ(0, AT_FDCWD),
+           SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value));
+       if (rc != 0) {
+         log_err(LD_BUG,"(Sandbox) failed to add fchownat syscall, received "
+@@ -767,9 +756,9 @@ sb_renameat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+         param->syscall == SCMP_SYS(renameat)) {
+ 
+       rc = seccomp_rule_add_4(ctx, SCMP_ACT_ALLOW, SCMP_SYS(renameat),
+-            SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++            SCMP_CMP_LOWER32_EQ(0, AT_FDCWD),
+             SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value),
+-            SCMP_CMP_NEG(2, SCMP_CMP_EQ, AT_FDCWD),
++            SCMP_CMP_LOWER32_EQ(2, AT_FDCWD),
+             SCMP_CMP_STR(3, SCMP_CMP_EQ, param->value2));
+       if (rc != 0) {
+         log_err(LD_BUG,"(Sandbox) failed to add renameat syscall, received "
+@@ -799,7 +788,7 @@ sb_openat(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
+     if (param != NULL && param->prot == 1 && param->syscall
+         == SCMP_SYS(openat)) {
+       rc = seccomp_rule_add_3(ctx, SCMP_ACT_ALLOW, SCMP_SYS(openat),
+-          SCMP_CMP_NEG(0, SCMP_CMP_EQ, AT_FDCWD),
++          SCMP_CMP_LOWER32_EQ(0, AT_FDCWD),
+           SCMP_CMP_STR(1, SCMP_CMP_EQ, param->value),
+           SCMP_CMP(2, SCMP_CMP_EQ, O_RDONLY|O_NONBLOCK|O_LARGEFILE|O_DIRECTORY|
+               O_CLOEXEC));
+-- 
+GitLab
+
+
+From 42034ae9da2866c67ce8cb8522d6a619d8b21170 Mon Sep 17 00:00:00 2001
+From: Pierre Bourdon <delroth@gmail.com>
+Date: Wed, 4 May 2022 07:31:06 +0200
+Subject: [PATCH 4/4] changes: add entry for MR !574
+
+--- /dev/null
++++ b/changes/aarch64_sandbox
+@@ -0,0 +1,5 @@
++  o Minor bugfixes (sandbox):
++    - Fix sandbox support on AArch64 systems. More "*at" variants of syscalls
++      are now supported. Signed 32 bit syscall parameters are checked more
++      precisely, which should lead to lower likelihood of breakages with future
++      compiler and libc releases. Fixes bug 40599; bugfix on 0.4.4.3-alpha.
+-- 
+GitLab
+
diff --git a/net-vpn/tor/tor-0.4.7.16-r1.ebuild b/net-vpn/tor/tor-0.4.7.16-r1.ebuild
new file mode 100644
index 000000000000..1c40fca5fb09
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.7.16-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/torproject.org.asc
+inherit edo python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="https://www.torproject.org/ https://gitlab.torproject.org/tpo/core/tor/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://gitlab.torproject.org/tpo/core/tor"
+	inherit autotools git-r3
+else
+	SRC_URI="
+		https://www.torproject.org/dist/${MY_PF}.tar.gz
+		https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
+		verify-sig? (
+			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum
+			https://dist.torproject.org/${MY_PF}.tar.gz.sha256sum.asc
+		)
+	"
+
+	S="${WORKDIR}/${MY_PF}"
+
+	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
+	fi
+
+	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
+fi
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/libevent-2.1.12-r1:=[ssl]
+	dev-libs/openssl:=[-bindist(-)]
+	sys-libs/zlib
+	caps? ( sys-libs/libcap )
+	man? ( app-text/asciidoc )
+	lzma? ( app-arch/xz-utils )
+	scrypt? ( app-crypt/libscrypt )
+	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+	systemd? ( sys-apps/systemd:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="
+	acct-user/tor
+	acct-group/tor
+	${DEPEND}
+	selinux? ( sec-policy/selinux-tor )
+"
+DEPEND+="
+	test? (
+		${DEPEND}
+		${PYTHON_DEPS}
+	)
+"
+
+DOCS=()
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+	"${FILESDIR}"/${P}-arm64-sandbox.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		if use verify-sig; then
+			cd "${DISTDIR}" || die
+			verify-sig_verify_detached ${MY_PF}.tar.gz.sha256sum{,.asc}
+			verify-sig_verify_unsigned_checksums \
+				${MY_PF}.tar.gz.sha256sum sha256 ${MY_PF}.tar.gz
+			cd "${WORKDIR}" || die
+		fi
+
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Running shellcheck automagically isn't useful for ebuild testing.
+	echo "exit 0" > scripts/maint/checkShellScripts.sh || die
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	use doc && DOCS+=( README.md ChangeLog ReleaseNotes doc/HACKING )
+
+	export ac_cv_lib_cap_cap_init=$(usex caps)
+	export tor_cv_PYTHON="${EPYTHON}"
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var"
+		--disable-all-bugs-are-fatal
+		--enable-system-torrc
+		--disable-android
+		--disable-coverage
+		--disable-html-manual
+		--disable-libfuzzer
+		--enable-missing-doc-warnings
+		--disable-module-dirauth
+		--enable-pic
+		--disable-restart-debugging
+
+		$(use_enable man asciidoc)
+		$(use_enable man manpage)
+		$(use_enable lzma)
+		$(use_enable scrypt libscrypt)
+		$(use_enable seccomp)
+		$(use_enable server module-relay)
+		$(use_enable systemd)
+		$(use_enable tor-hardening gcc-hardening)
+		$(use_enable tor-hardening linker-hardening)
+		$(use_enable test unittests)
+		$(use_enable zstd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	local skip_tests=(
+		# Fails in sandbox
+		:sandbox/open_filename
+		:sandbox/openat_filename
+	)
+
+	# The makefile runs these by parallel by chunking them with a script
+	# but that means we lose verbosity and can't skip individual tests easily
+	# either.
+	edo ./src/test/test --verbose "${skip_tests[@]}"
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	newconfd "${FILESDIR}"/tor.confd tor
+	newinitd "${FILESDIR}"/tor.initd-r9 tor
+	systemd_dounit "${FILESDIR}"/tor.service
+
+	keepdir /var/lib/tor
+
+	fperms 750 /var/lib/tor
+	fowners tor:tor /var/lib/tor
+
+	insinto /etc/tor/
+	newins "${FILESDIR}"/torrc-r2 torrc
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2f0d5eeb473e..d65f1f3222be 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index d5ef89015717..3f81f69355f4 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -22,10 +22,6 @@ dev-util/cmake gui
 # dev-util/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # matoro <matoro_gentoo@matoro.tk> (2023-06-29)
 # Test failures in dev-libs/weston, although not as bad as big-endian
 # (2 at the time of this writing)
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 4e0c62f2b699..c23f44cf5f97 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -22,10 +22,6 @@
 sys-kernel/gentoo-kernel generic-uki
 sys-kernel/gentoo-kernel-bin generic-uki
 
-# Matt Turner <mattst88@gentoo.org> (2023-10-30)
-# libei not stable yet
-x11-base/xwayland libei
-
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been stabalized on this arch yet
 dev-db/spatialite rttopo
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 6b239c3e3948..615da88ec98f 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -6,10 +6,6 @@
 sys-kernel/gentoo-kernel generic-uki
 sys-kernel/gentoo-kernel-bin generic-uki
 
-# Matt Turner <mattst88@gentoo.org> (2023-10-30)
-# libei not stable yet
-x11-base/xwayland libei
-
 # Michał Górny <mgorny@gentoo.org> (2023-04-22)
 # Needs unkeyworded dev-python/sympy
 dev-python/nbval test
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 75a41035f51b..7c0ca5725eff 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
 # NOTE: When masking a USE flag due to missing keywords, please file a keyword
 # request bug for the hppa arch.
 
+# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
+# sys-apps/xdg-desktop-portal not keyworded here yet
+x11-base/xwayland libei
+
 # James Le Cuirot (2023-12-12)
 # USE=bpf depends on sys-devel/clang which is not keyworded on hppa
 media-libs/libv4l bpf
@@ -38,10 +42,6 @@ app-doc/doxygen gui
 # Qt 6 not keyworded here.
 dev-util/cmake gui
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # Sam James <sam@gentoo.org> (2023-09-18)
 # x11-libs/gtksourceview:4 not keyworded here
 media-gfx/inkscape sourceview
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 27fa5b9c4228..9ebfd0d4c6e1 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
+# sys-apps/xdg-desktop-portal not keyworded here yet
+x11-base/xwayland libei
+
 # James Le Cuirot (2023-12-12)
 # USE=bpf depends on sys-devel/clang which is not keyworded on ia64
 media-libs/libv4l bpf
@@ -25,10 +29,6 @@ app-doc/doxygen gui
 # Qt 6 not keyworded here.
 dev-util/cmake gui
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # Rich Freeman <rich0@gentoo.org> (2023-09-13)
 # Tests require shellcheck which is not currently available
 sys-process/systemd-cron test
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index f731dde3acfe..e993f73c2bc0 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -55,10 +55,6 @@ app-i18n/ibus gtk4
 # dev-util/samurai is not keyworded here.
 app-alternatives/ninja samurai
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # matoro <matoro_gentoo@matoro.tk> (2023-06-18)
 # app-i18n/fcitx:4 not keyworded here
 media-libs/libsdl2 fcitx4
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index e97b014ff723..17d41c196326 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -34,10 +34,6 @@ sys-apps/openrc s6
 # https://github.com/openjdk/jdk17u-dev/commit/5b29c6ec93372b20016565b84d449860b7233d6c
 dev-java/openjdk:17 systemtap
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # Jon Janzen <jon@jonjanzen.com> (2023-09-11)
 # librttopo has not been tested on this arch
 dev-db/spatialite rttopo
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index c1a95c0efa09..779a136c1b95 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -17,6 +17,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
+# Libei not stable here yet
+x11-base/xwayland libei
+
 # Sam James <sam@gentoo.org> (2023-07-28)
 # media-libs/libffado not marked stable here
 media-video/pipewire ieee1394
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 480b487757a7..3cebaa1e8f68 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
+# sys-apps/xdg-desktop-portal not keyworded here yet
+x11-base/xwayland libei
+
 # James Le Cuirot (2023-12-12)
 # USE=bpf depends on sys-devel/clang which is not keyworded on s390
 media-libs/libv4l bpf
@@ -27,10 +31,6 @@ app-doc/doxygen gui
 # Qt 6 not keyworded here.
 dev-util/cmake gui
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # Sam James <sam@gentoo.org> (2023-06-18)
 # Qt 5 not keyworded here
 app-text/ansifilter gui
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index ce2c7c51f114..94e90a480ac6 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
+# sys-apps/xdg-desktop-portal not keyworded here yet
+x11-base/xwayland libei
+
 # Rolf Eike Beer <eike@sf-mail.de> (2023-12-22)
 # media-video/rav1e isn't keyworded here
 media-libs/libavif rav1e
@@ -38,10 +42,6 @@ sys-apps/openrc s6
 # Qt 6 not keyworded here.
 dev-util/cmake gui
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2023-09-20)
-# Libei not keyworded here yet
-x11-base/xwayland libei
-
 # Rich Freeman <rich0@gentoo.org> (2023-09-13)
 # Tests require shellcheck which is not currently available
 sys-process/systemd-cron test
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index e2bf1b094c19..f2ea6348296f 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -22,10 +22,6 @@
 sys-kernel/gentoo-kernel generic-uki
 sys-kernel/gentoo-kernel-bin generic-uki
 
-# Matt Turner <mattst88@gentoo.org> (2023-10-30)
-# libei not stable yet
-x11-base/xwayland libei
-
 # Arthur Zamarin <arthurzam@gentoo.org> (2023-06-03)
 # Destabilizing x86 keywords on sci-*/* packages
 app-metrics/collectd collectd_plugins_gps collectd_plugins_sigrok
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index 78fe1d963e7a..8519cb16b030 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -40,3 +40,4 @@ move games-action/minetest games-engines/minetest
 move app-laptop/tuxedo-keyboard app-laptop/tuxedo-drivers
 move dev-libs/clhpp dev-cpp/clhpp
 move games-puzzle/ksokoban games-puzzle/skladnik
+move dev-python/python-sense-hat dev-python/sense-hat
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3de67f1d51b8..ae8f7878a873 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6795,6 +6795,8 @@ net-voip/yate:wpcard - Enable Wanpipe card driver
 net-voip/yate:zaptel - Enable Zaptel driver
 net-vpn/eduvpn-common:openvpn - enable support for OpenVPN
 net-vpn/eduvpn-common:wireguard - enable support for WireGuard
+net-vpn/frp:client - Build and install frp client (frpc)
+net-vpn/frp:server - Build and install frp server (frps)
 net-vpn/i2pd:i2p-hardening - Compile with hardening on vanilla compilers/linkers
 net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
 net-vpn/networkmanager-sstp:gtk4 - Use gui-libs/gtk for GUI support.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index bb18f91004be..1896cd64312d 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
index 749d26f39fc4..7049fa136f39 100644
--- a/sci-libs/kissfft/Manifest
+++ b/sci-libs/kissfft/Manifest
@@ -1,3 +1,4 @@
+AUX kissfft-131.1.0-cross.patch 877 BLAKE2B 507173b39368d597d65edbd53da7abbbb4f35e5f7a5587b04a1fd4af9d36a779e1e9c3ffcf3dcede3fd9fb4a4251a6670ceb660e0a7484fc202b1bd5c9b59c2e SHA512 afc92391929c2cabd122a2b121c43d0f496ee0c4dbb31c1bc9895b98ae52c781a88db8129a7fcbcbd33828f0d4b27852a7026b16264baae2b2171620eca08807
 DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
 EBUILD kissfft-131.1.0.ebuild 1382 BLAKE2B 691644e507bb2023084ed1557348a68c3eeab08303bf4d2da5af77ac5d754777dce2799683ccd78709f53b64fbea47366bd479dfe1e6489062f0983425434377 SHA512 e5d4ba145ec4951bd26bd59bece1fc90f3439b32755ee50e131c5422244815af8df93ccb0fff4f5731fb23cfe5066e7d27af9e9a54e432b99493824a106df126
 EBUILD kissfft-9999.ebuild 1383 BLAKE2B 466bcf1812b9275857fc032b2289fdd1545884347885de77ec3e1915b9dfe9fb6855c7c649dbd8b4701bb527653ede7ec878c0ef6cd09269e824fd3dbe3d8450 SHA512 55f2c78325a9eb276a3c2c0320e54b45df2c7c38d4e08bb5732cd85615f140781d4312aa479390d403b89dcfe1f776c56316fade856194222b63300e05a72272
diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch
new file mode 100644
index 000000000000..137a5a939872
--- /dev/null
+++ b/sci-libs/kissfft/files/kissfft-131.1.0-cross.patch
@@ -0,0 +1,30 @@
+From 8b308c28e5c3684ac002289b0eebc64500bbed1c Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 24 Dec 2023 16:37:38 +0000
+Subject: [PATCH] GNUInstallDirs is not supposed to be used conditionally
+
+Always include it to fix cross-compiling. This should not break Windows.
+
+Closes: https://github.com/mborgerding/kissfft/issues/65
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0213798..c4d7d3e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,9 +105,7 @@ endif()
+ # Add GNUInstallDirs for GNU infrastructure before target)include_directories
+ #
+ 
+-if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING)
+-    include(GNUInstallDirs)
+-endif()
++include(GNUInstallDirs)
+ 
+ #
+ # Declare PKGINCLUDEDIR for kissfft include path
+-- 
+2.43.0
+
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2afc68be353c..095d8b64c0a7 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 3cc0c36567a2..85eeb59b6b6e 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,11 +1,6 @@
-DIST genpatches-6.5-11.base.tar.xz 690272 BLAKE2B b647ad0ef234e1470b72e4cefc091b48bc81b0591fa41d3741d25360d6c92d6b47cafe35a06c5246806072d11ec4839f76bca382f8cf38d0e76ddde9f4fa3bb0 SHA512 53da072920619acf21afa89f3df7b24c27c1798a1244aef3f21f76bcdcb38ad1ad79d07e3aba62b44773af57162c89bb77eb4c19b7056e0806926ec5951d149f
-DIST genpatches-6.5-11.extras.tar.xz 3704 BLAKE2B 21929f8a381175f9c33ac9df5f17388eb2f99adb00fac7783c612a2712db1d4b2f179b2fa6ac548b77a1d0e4c9c9d88e32cb393531c7e6ca680f9c98a037927a SHA512 f3643139bd6b2b324c477998b69418b80e40ae675dbef9bb34e26f138a10244ffcaf551de7c49623b8aa797ed7b9ba82e680a62b7996ed1bd1f8002b29b09cb4
-DIST genpatches-6.6-5.base.tar.xz 392288 BLAKE2B e6a9bf0886ad85754ec963185fa9204967b35c30450316ebde163c3376106db0aa75f44aac0e66fddfd487371cb37a2c5ec70bbf14bd7006369a73d1360d7880 SHA512 13833e3963fbd1ebd246c9290cfdf15dd9d62869cdcde7fb03688eba9260d2a0b8729c153d5eebd886f6e5c3b555f20764c8f8aaa36826f2823f1b97f1a8dd21
-DIST genpatches-6.6-5.extras.tar.xz 3704 BLAKE2B 739d6f239b679f80f74475f10ae3a9e613558f93275b745cbc0d8f912e00d6b9a5753ad62193b20fb4401806c315782dd1ee33336434058e4fe0f5e7b90a124d SHA512 149c0eaadc4575c839517dc8e42a5fbc91b896b22e43f21c057ea91240b05936ea7c32e2f8b9bd7c4d7d2bf2dd11abcd41185869837c160e7f8953dd7b3c150d
-DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
+DIST genpatches-6.6-10.base.tar.xz 603340 BLAKE2B cc3220f1df9406c393605942e1a6fdaaf8ab46da53bc2fe6d001c9608a55ae2e5073d94805eb233183142e81bcea9bab1ed4700e298fc32c16c033597219f9ad SHA512 1f0149759b98fa099bda28aa1c4913719f0b5c0c715a72f6c0b13d3faf317a8935ce10508cd3459c50e39a7759feb44e7cf43fd49b87bd5ccd6d42a5dfc531d1
+DIST genpatches-6.6-10.extras.tar.xz 3704 BLAKE2B 8b5e1453dd7bbbb7ee6dd02aef5e25e95f09a12a46d9dc014d71fe8fda96b94770f3cee75fa6f1db6bc9bdb67b39d272f8f887fc2986a17769237768bf6a382f SHA512 6ca7a360dc217684b1a06f869223a52772f267d48088d5e286dd27056faf34e9c4b4d575aa771c5f9b972febd4c656e32f470c4499feecd47716b07cc13ab933
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
-DIST linux-v6.5.9-zen1.patch.zst 151682 BLAKE2B 60d12bd6bb97cf2b12a68f541f8fe2270ee07e225864b7a43c990a177a5bee9b13a0db6cab6c3d3acabb25907b1c29af2aa0ae111edda314e5dbefe039a71d9f SHA512 0071fd6f87563ae1404d5b779aacec66f42beb158d8d3cc9fd7648c3b61aec3bc426850cef1358dc082ff9d429fe9c2113cfdd55bf7481ea45eb375e53e80d89
-DIST linux-v6.6.3-zen1.patch.zst 146603 BLAKE2B 042bca3bc915bbc509961ff71569dbdef7ea2fb06776b15a299481c696d11ccc15883210ac42ec3be11160e4fea3b7e29fe772ac31a92bf680e19ff93e27f935 SHA512 1ed461180aa6ee0e0a08c72e4c4b37eca9adcfd88e3ff4cc2ad304727c139911201b4cba1661191c81b5c41e752f775b4a5b111e9460c510587d49955596ba51
-EBUILD zen-sources-6.5.9.ebuild 1395 BLAKE2B 4eec001768ca6a207a746053433b78ac9bfc11829976f54801a603e9b7ab0aa626e7f0a3da5ebb614020105fed49232163fca8e35be2e009294d37cd69ca83a0 SHA512 ced29fec5dd07d6f0ba9ac8da208ccc84eb73063605949b91ab2737d42236a3b56ab89d06ab1c3ee0027b95c50c4e00df3bf6e7e653accd5a8e1b9116e0a5af7
-EBUILD zen-sources-6.6.3.ebuild 1394 BLAKE2B 79bfe3b51a3d4a481dd690b9bab4bebf543ab94f796fadaccc2d9e8f8ba79105da3f21957cac24e2461f48eb38fe729be71d4815f024defa0cc25f8db81e3e71 SHA512 c36c6a58983a43793a19033babe3629edf6ac136728ba986549d19e443ac3ef45073959c0feaf957df792d488be3c8b0d3c840da1205a8b1902c956cc895e544
+DIST linux-v6.6.8-zen1.patch.zst 145913 BLAKE2B b43bea249615fd8ebce9303fa9c889d4e4fd3310b0949c66aaa4ba026bd4b3bed871ef452536aaf891e33a5cf0b427d96da04146e8aa8e2e61f36afc203efcab SHA512 24456f18f7e6ca632fbf6e028747b4c2256146644f6788a084ef1754eee5b30dd2284340cdd1738c9e80352ec7798264467bd782e89ab6375c9674c555a4acfd
+EBUILD zen-sources-6.6.8.ebuild 1395 BLAKE2B c83c242fbc9fb02ae4da674879a92683d2a54729f195e0ce47bdf40434ba93e44803a6a381f34d016a04bbf54322976b7a2ff69109302f2311ab31071db6629e SHA512 81bcae430e71c5f8b43e11eb1c3b4459291d41e954926514f47030d576e3ff7ec5b1e7a89dba3bec59cb95f67fca57e917a937f31e392369feb457c8292e084b
 MISC metadata.xml 404 BLAKE2B 1836329a9cab0f03e4ee80056d5db141d5721875794ef39844c014c0426fd558b3a2bc6f1a7bbcb72d99ad81f4a071f451da9adc4a6fdb380e8c7bd7bb10ed2d SHA512 2c48e149eb08a53121a799256eec33895daa0dce32ea5325f5f3b055c3a661de8294e21f114f6c7ad609818215261c57c53d124fc0d3679f87168039905a9516
diff --git a/sys-kernel/zen-sources/zen-sources-6.6.3.ebuild b/sys-kernel/zen-sources/zen-sources-6.6.3.ebuild
deleted file mode 100644
index 6e49911ccf9d..000000000000
--- a/sys-kernel/zen-sources/zen-sources-6.6.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-K_SECURITY_UNSUPPORTED="1"
-K_NOSETEXTRAVERSION="1"
-
-inherit kernel-2 unpacker
-detect_version
-detect_arch
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-HOMEPAGE="https://github.com/zen-kernel"
-IUSE=""
-
-# Needed for zstd compression of the patch
-BDEPEND="$(unpacker_src_uri_depends)"
-
-DESCRIPTION="The Zen Kernel Live Sources"
-
-ZEN_URI="https://github.com/zen-kernel/zen-kernel/releases/download/v${PV}-zen1/linux-v${PV}-zen1.patch.zst"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${ZEN_URI}"
-
-UNIPATCH_LIST="${WORKDIR}/linux-v${PV}-zen1.patch"
-UNIPATCH_STRICTORDER="yes"
-
-K_EXTRAEINFO="For more info on zen-sources, and for how to report problems, see: \
-${HOMEPAGE}, also go to #zen-sources on oftc"
-
-src_unpack() {
-	unpacker "linux-v${PV}-zen1.patch.zst"
-	kernel-2_src_unpack
-}
-
-pkg_setup() {
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the zen developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-src_install() {
-	rm "${WORKDIR}/linux-v${PV}-zen1.patch" || die
-	kernel-2_src_install
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/zen-sources/zen-sources-6.5.9.ebuild b/sys-kernel/zen-sources/zen-sources-6.6.8.ebuild
index f6f08de7d3a6..478bdf29b174 100644
--- a/sys-kernel/zen-sources/zen-sources-6.5.9.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-6.6.8.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="11"
+K_GENPATCHES_VER="10"
 K_SECURITY_UNSUPPORTED="1"
 K_NOSETEXTRAVERSION="1"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b1a7bdd7d045..ebc2b29ed56e 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 63edc16dfb8a..5ccf5182e287 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -31,7 +31,6 @@ DIST glibc-2.36.tar.xz 18610836 BLAKE2B f8375e084043f032609e66fd98c234249df57a59
 DIST glibc-2.37-patches-10.tar.xz 72768 BLAKE2B 20501519a570a5d277a3c1460373edea4131602b07037a81d855f1dcbc5b8d40fa6edae500a9f30e9541389dc1b4a7406cbee8e8a85a3131932e23f807e1b211 SHA512 f1e3791befa98ec5a83c919f6563c4c0c9e7bb2bf53bd0adf9235344d914a8d127f2da595a6850fd75b6828a81914241f8964bf004070888fbc77795f0f727cc
 DIST glibc-2.37-patches-11.tar.xz 74472 BLAKE2B 25d17b1720b9ee955d176f3f42315ff386e706291fec3d7fe7910d428b878fca5986906b848755ffe74e7d108ac5aad836f403e40290ebae50a103691cb7ed66 SHA512 d5483fe1506cd1bd094e433177209ce2e8639081618582930538b3064ac1a72886074e4c0f10bf7beca2b871404f3d4c61e8f6aa2ba8c4166acfca65cc7a9af7
 DIST glibc-2.37.tar.xz 18674604 BLAKE2B 8139cd977b2ed3bfdbde5ffb1cda8f759763dbb83071167272fef798cfbdc0d17cfd1ec893d126c52c91511b7961f3ad12eed34534b99412dfa04a1cdd5b4ea3 SHA512 4fc5932f206bb1b8b54828a28af1a681616b838bbab60c81c82155f3629cbfe1301d271af65511ed917f4c6949a025429221fe6035753282f15346919f15b90c
-DIST glibc-2.38-patches-6.tar.xz 49680 BLAKE2B 2f929aaeebc06164ae6b1fa81ce149beb8467e3928a35f667c2b489c96de346d24020cf017c9e1a6942aa57c177f34637ca5bfe3aee7641702bb6c589b4b6283 SHA512 18d7f6216721c9ca75a3e759e30aa0429c57e296a1223b2a5a5bbdd26edf523a6bf509437d913b9c2b95ca1e41543a904b72a89afa444606d3b3949311341958
 DIST glibc-2.38-patches-7.tar.xz 49276 BLAKE2B ef86c88540018bc7347ee57cc60138f010dd95e749f3c1c4ca196a9a707188851345fa41d00dacf25d7ed424486f75020af430e61b0a9bb74714976156bb35ae SHA512 5bad7ee804a2a0e31517c23f6a5eca82f00a695edccb3af81309ace8b441f1e2be704568660c87e8f4770f8d63cde272875d789c6fcbef61da534f7573851831
 DIST glibc-2.38-patches-9.tar.xz 56716 BLAKE2B 07d814a0715561995495d27164fe40155e4bf424a52e571005669a148cfc23cee136a439c3a8d441b67062f169b4b4f67df76549c922f2c5d87def07de067561 SHA512 a33c65a9fb56fab39a1656e4bf359525d52a26ffcf6648f60a72e94c1b6b569eb25b3c46502f43a7aabfbb6507c9ce24def3ebd7069e23d583a029c91f0984e7
 DIST glibc-2.38.tar.xz 18913712 BLAKE2B f9b039f0ef98a7dd8e1cba228ed10286b9e4fbe4dd89af4d26fa5c4e4cf266f19c2746b44d797ce54739d86499e74cf334aaf311bcf6e30120fd7748453e653f SHA512 a6dd5e42dcd63d58e2820c783522c8c895890b6e8c8e6c83b025553de0cc77cdf227e7044e431ead98c89c68a9ce4dd63509b47e647775fb2075f011849c1900
@@ -50,8 +49,7 @@ EBUILD glibc-2.35-r11.ebuild 50188 BLAKE2B 7877e71cb62608e79ac5e2a7751f453aa9d14
 EBUILD glibc-2.36-r8.ebuild 52466 BLAKE2B fc59a2935c5e9487585449477ae7a0db2b005467071d4fae7b23169a1c309b716771d9dec01920deeea5eab1dfbc363817612e560cf49be1306c0691d0badd86 SHA512 9510470fa442309ca0df07ff2f0f0ac664cecd3b11080a1aa765aa6307057bf28a35742bedbd83b7d77fec63a67886bb109b5841cdafdec3e374d7df73bb2016
 EBUILD glibc-2.37-r7.ebuild 52827 BLAKE2B 34910a55ba94e09fed6c8f9decd963c56c4a19b46bf0e6ba2fdcd82b9b382af64232321c8b7691ba7a969d55b72e2707d83a88954c1a3d5397ea94eecd7c21f6 SHA512 468a7bb03b3c90e384a4c1f321647c01cfc8f34e214b2e9a1d1e16d4ff7c8b91a5b39f0e29c6072e66beaa908f58c6e441119d16a043f7308a1596c083c5c364
 EBUILD glibc-2.37-r8.ebuild 52835 BLAKE2B 7a0e03ec445a7daac652e12c35cfb4951727ba900e5b30430be7e262e1d4ab2c0bfc25af89bec1d37f09aee51e19ae986f769fd1edfa533bf937635fa13a8f28 SHA512 cfe2b77be90907c43419c11808821a2bfda68ef89633a7599a26572d2c914f09d2683b0ade2f7fa469f2b025ddf78ddf1cc371d2e521265b1b0ec4d58cb3b75d
-EBUILD glibc-2.38-r6.ebuild 53926 BLAKE2B e510812ab5aab0796d8382175538881ff84e5df29a1f37a6ad78d1601b204c571422eca04b4618fac0494e52adf813f28e3d05c051d56b4857b474350371556e SHA512 f5e365348f74dbf494f6693bc95127b139989e95e068fd10221dc8b7076ce34065b1cb063bf2085bffee77b37d4f4aa128d9c4652728f34d1726564ab8cc39ff
 EBUILD glibc-2.38-r7.ebuild 54065 BLAKE2B 284b71e90960020677ca3909e65079b793e893b3133adcd0eac5b9bf47cadc35848a3038ee85328ad459d8fac69ee470f23bf679bb21d7c20259dc12e22c22c5 SHA512 115b0926399f9ebb12d89fad41cebc93a0cecf1dcff8e582a8f1e354e5e0424e2eafde6430a39bcd8ab9b4e18e22a519679c2772854b94c11b8c7df10739081d
-EBUILD glibc-2.38-r8.ebuild 54132 BLAKE2B 7ee4a9e40e92d2b30be9bdeedfa618a144d05325e3ef90d20dfbcc2f6170c26b013b7f7d88cbf2952babb2f365cd83fc25d51ac4054005a36ce9eba948d30ec4 SHA512 b347a6dca60c0435932044c21fa49d60a7284da3e0b7f054c911e8e3e2d6a4eeaf736c545d7d435577e15e709f9ba308fd16f9d9e5e37f1b7bb8bc0dbcfb1c81
+EBUILD glibc-2.38-r8.ebuild 54130 BLAKE2B 4cf3a62d6eeee440f100c63aae99a680fa4f064aa6c8c89a2e982635cfb77e72fcb685da273df38a7f6be479debeba223fe64e967373d89d79194f2ee1978700 SHA512 6214abbcb03647e816d144ead6658bae1152d84c0bb32773307014994d9d2bd3c08b67b6c53da8b7dca228c97b56c54a7539f1d69f31a613108186bbe145c095
 EBUILD glibc-9999.ebuild 54132 BLAKE2B 1d095575d3c7d3b72e7a2efe858d1cc9c6540c8e4695c53b11909472282b64bedea6d052a59c8fe946ea995137623cf1d0b05eb5e4aaff15852bd64fe1a7a767 SHA512 58af6312c0be0f108ce8c7e1fa20eb7ddaea5f96f28502d2ffd5bc2d0e744a3c61c44e6804324918168fad3400fc02a4e4d9cc36fd01a046b28f1014361ba1f4
 MISC metadata.xml 2142 BLAKE2B 765ba540eb10afccd1bade4de56f0c13ce269225500a62d1d17328194de69e7fa15d359a14eac6bfa8a36df45344db3d52f5e1811b174cf1fa2bfb95ad7760a7 SHA512 2f4a148c076a0967663d14e76b85a698ddae7093ff299b0dc95a6c3b00957c9bf73443f2bace9670eb62a45465efbcca892bb52b6aac8577acb2bc5f74a7397c
diff --git a/sys-libs/glibc/glibc-2.38-r6.ebuild b/sys-libs/glibc/glibc-2.38-r6.ebuild
deleted file mode 100644
index 0dbe82eee65b..000000000000
--- a/sys-libs/glibc/glibc-2.38-r6.ebuild
+++ /dev/null
@@ -1,1706 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Bumping notes: https://wiki.gentoo.org/wiki/Project:Toolchain/sys-libs/glibc
-# Please read & adapt the page as necessary if obsolete.
-
-PYTHON_COMPAT=( python3_{9..12} )
-TMPFILES_OPTIONAL=1
-
-inherit python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig \
-	multilib systemd multiprocessing tmpfiles
-
-DESCRIPTION="GNU libc C library"
-HOMEPAGE="https://www.gnu.org/software/libc/"
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-SLOT="2.2"
-
-EMULTILIB_PKG="true"
-
-# Gentoo patchset (ignored for live ebuilds)
-PATCH_VER=6
-PATCH_DEV=dilfridge
-
-# gcc mulitilib bootstrap files version
-GCC_BOOTSTRAP_VER=20201208
-
-# systemd integration version
-GLIBC_SYSTEMD_VER=20210729
-
-# Minimum kernel version that glibc requires
-MIN_KERN_VER="3.2.0"
-
-# Minimum pax-utils version needed (which contains any new syscall changes for
-# its seccomp filter!). Please double check this!
-MIN_PAX_UTILS_VER="1.3.3"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
-fi
-
-SRC_URI+=" multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-SRC_URI+=" systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz )"
-
-IUSE="audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd perl profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla"
-
-# Here's how the cross-compile logic breaks down ...
-#  CTARGET - machine that will target the binaries
-#  CHOST   - machine that will host the binaries
-#  CBUILD  - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-#  CBUILD = CHOST = CTARGET    - native build/install
-#  CBUILD != (CHOST = CTARGET) - cross-compile a native build
-#  (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-#  CBUILD != CHOST != CTARGET  - cross-compile a libc for a cross-compiler
-# For install paths:
-#  CHOST = CTARGET  - install into /
-#  CHOST != CTARGET - install into /usr/CTARGET/
-#
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-# Note [Disable automatic stripping]
-# Disabling automatic stripping for a few reasons:
-# - portage's attempt to strip breaks non-native binaries at least on
-#   arm: bug #697428
-# - portage's attempt to strip libpthread.so.0 breaks gdb thread
-#   enumeration: bug #697910. This is quite subtle:
-#   * gdb uses glibc's libthread_db-1.0.so to enumerate threads.
-#   * libthread_db-1.0.so needs access to libpthread.so.0 local symbols
-#     via 'ps_pglobal_lookup' symbol defined in gdb.
-#   * 'ps_pglobal_lookup' uses '.symtab' section table to resolve all
-#     known symbols in 'libpthread.so.0'. Specifically 'nptl_version'
-#     (unexported) is used to sanity check compatibility before enabling
-#     debugging.
-#     Also see https://sourceware.org/gdb/wiki/FAQ#GDB_does_not_see_any_threads_besides_the_one_in_which_crash_occurred.3B_or_SIGTRAP_kills_my_program_when_I_set_a_breakpoint
-#   * normal 'strip' command trims '.symtab'
-#   Thus our main goal here is to prevent 'libpthread.so.0' from
-#   losing it's '.symtab' entries.
-# As Gentoo's strip does not allow us to pass less aggressive stripping
-# options and does not check the machine target we strip selectively.
-
-# We need a new-enough binutils/gcc to match upstream baseline.
-# Also we need to make sure our binutils/gcc supports TLS,
-# and that gcc already contains the hardened patches.
-# Lastly, let's avoid some openssh nastiness, bug 708224, as
-# convenience to our users.
-
-IDEPEND="
-	!compile-locales? ( sys-apps/locale-gen )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	sys-devel/bison
-	compile-locales? ( sys-apps/locale-gen )
-	doc? (
-		dev-lang/perl
-		sys-apps/texinfo
-	)
-	test? (
-		dev-lang/perl
-		>=net-dns/libidn2-2.3.0
-	)
-"
-COMMON_DEPEND="
-	gd? ( media-libs/gd:2= )
-	nscd? ( selinux? (
-		audit? ( sys-process/audit )
-		caps? ( sys-libs/libcap )
-	) )
-	suid? ( caps? ( sys-libs/libcap ) )
-	selinux? ( sys-libs/libselinux )
-	systemtap? ( dev-util/systemtap )
-"
-DEPEND="${COMMON_DEPEND}
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
-	perl? ( dev-lang/perl )
-"
-
-RESTRICT="!test? ( test )"
-
-if [[ ${CATEGORY} == cross-* ]] ; then
-	BDEPEND+=" !headers-only? (
-		>=${CATEGORY}/binutils-2.27
-		>=${CATEGORY}/gcc-6.2
-	)"
-	[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
-	BDEPEND+="
-		>=sys-devel/binutils-2.27
-		>=sys-devel/gcc-6.2
-	"
-	DEPEND+=" virtual/os-headers "
-	RDEPEND+="
-		>=net-dns/libidn2-2.3.0
-		vanilla? ( !sys-libs/timezone-data )
-	"
-	PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-# Ignore tests whitelisted below
-GENTOO_GLIBC_XFAIL_TESTS="${GENTOO_GLIBC_XFAIL_TESTS:-yes}"
-
-# The following tests fail due to the Gentoo build system and are thus
-# executed but ignored:
-XFAIL_TEST_LIST=(
-	# buggy test, assumes /dev/ and /dev/null on a single filesystem
-	# 'mount --bind /dev/null /chroot/dev/null' breaks it.
-	# https://sourceware.org/PR25909
-	tst-support_descriptors
-
-	# The following tests fail only inside portage
-	# https://bugs.gentoo.org/831267
-	tst-system
-	tst-strerror
-	tst-strsignal
-)
-
-XFAIL_NSPAWN_TEST_LIST=(
-	# These tests need to be adapted to handle EPERM/ENOSYS(?) properly
-	# upstream, as systemd-nspawn's default seccomp whitelist is too strict.
-	# https://sourceware.org/PR30603
-	test-errno-linux
-	tst-bz21269
-	tst-mlock2
-	tst-ntp_gettime
-	tst-ntp_gettime-time64
-	tst-ntp_gettimex
-	tst-ntp_gettimex-time64
-	tst-pkey
-	tst-process_mrelease
-	tst-adjtime
-	tst-adjtime-time64
-	tst-clock2
-	tst-clock2-time64
-
-	# These fail if --suppress-sync and/or low priority is set
-	tst-sync_file_range
-	tst-sched1
-	test-errno
-)
-
-#
-# Small helper functions
-#
-
-dump_build_environment() {
-	einfo ==== glibc build environment ========================================================
-	local v
-	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CXX CPP LD {AS,C,CPP,CXX,LD}FLAGS MAKEINFO NM AR AS STRIP RANLIB OBJCOPY STRINGS OBJDUMP READELF; do
-		einfo " $(printf '%15s' ${v}:)   ${!v}"
-	done
-	einfo =====================================================================================
-}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-
-# This prefix is applicable to CHOST when building against this
-# glibc. It is baked into the library at configure time.
-host_eprefix() {
-	is_crosscompile || echo "${EPREFIX}"
-}
-
-# This prefix is applicable to CBUILD when building against this
-# glibc. It determines the destination path at install time.
-build_eprefix() {
-	is_crosscompile && echo "${EPREFIX}"
-}
-
-# We need to be able to set alternative headers for compiling for non-native
-# platform. Will also become useful for testing kernel-headers without screwing
-# up the whole system.
-alt_headers() {
-	echo ${ALT_HEADERS:=$(alt_prefix)/usr/include}
-}
-
-alt_build_headers() {
-	if [[ -z ${ALT_BUILD_HEADERS} ]] ; then
-		ALT_BUILD_HEADERS="$(host_eprefix)$(alt_headers)"
-		if tc-is-cross-compiler ; then
-			ALT_BUILD_HEADERS=${SYSROOT}$(alt_headers)
-			if [[ ! -e ${ALT_BUILD_HEADERS}/linux/version.h ]] ; then
-				local header_path=$(echo '#include <linux/version.h>' | $(tc-getCPP ${CTARGET}) ${CFLAGS} 2>&1 | grep -o '[^"]*linux/version.h')
-				ALT_BUILD_HEADERS=${header_path%/linux/version.h}
-			fi
-		fi
-	fi
-	echo "${ALT_BUILD_HEADERS}"
-}
-
-alt_libdir() {
-	echo $(alt_prefix)/$(get_libdir)
-}
-alt_usrlibdir() {
-	echo $(alt_prefix)/usr/$(get_libdir)
-}
-
-builddir() {
-	echo "${WORKDIR}/build-${ABI}-${CTARGET}-$1"
-}
-
-do_compile_test() {
-	local ret save_cflags=${CFLAGS}
-	CFLAGS+=" $1"
-	shift
-
-	pushd "${T}" >/dev/null
-
-	rm -f glibc-test*
-	printf '%b' "$*" > glibc-test.c
-
-	# We assume CC is already set up.
-	nonfatal emake glibc-test
-	ret=$?
-
-	popd >/dev/null
-
-	CFLAGS=${save_cflags}
-	return ${ret}
-}
-
-do_run_test() {
-	local ret
-
-	if [[ ${MERGE_TYPE} == "binary" ]] ; then
-		# ignore build failures when installing a binary package #324685
-		do_compile_test "" "$@" 2>/dev/null || return 0
-	else
-		if ! do_compile_test "" "$@" ; then
-			ewarn "Simple build failed ... assuming this is desired #324685"
-			return 0
-		fi
-	fi
-
-	pushd "${T}" >/dev/null
-
-	./glibc-test
-	ret=$?
-	rm -f glibc-test*
-
-	popd >/dev/null
-
-	return ${ret}
-}
-
-setup_target_flags() {
-	# This largely mucks with compiler flags.  None of which should matter
-	# when building up just the headers.
-	just_headers && return 0
-
-	case $(tc-arch) in
-		x86)
-			# -march needed for #185404 #199334
-			# TODO: When creating the first glibc cross-compile, this test will
-			# always fail as it does a full link which in turn requires glibc.
-			# Probably also applies when changing multilib profile settings (e.g.
-			# enabling x86 when the profile was amd64-only previously).
-			# We could change main to _start and pass -nostdlib here so that we
-			# only test the gcc code compilation.  Or we could do a compile and
-			# then look for the symbol via scanelf.
-			if ! do_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-				local t=${CTARGET_OPT:-${CTARGET}}
-				t=${t%%-*}
-				filter-flags '-march=*'
-				export CFLAGS="-march=${t} ${CFLAGS}"
-				einfo "Auto adding -march=${t} to CFLAGS #185404"
-			fi
-			# For compatibility with older binaries at slight performance cost.
-			use stack-realign && export CFLAGS+=" -mstackrealign"
-		;;
-		amd64)
-			# -march needed for #185404 #199334
-			# TODO: See cross-compile issues listed above for x86.
-			if [[ ${ABI} == x86 ]]; then
-				if ! do_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n'; then
-					local t=${CTARGET_OPT:-${CTARGET}}
-					t=${t%%-*}
-					# Normally the target is x86_64-xxx, so turn that into the -march that
-					# gcc actually accepts. #528708
-					[[ ${t} == "x86_64" ]] && t="x86-64"
-					filter-flags '-march=*'
-					# ugly, ugly, ugly.  ugly.
-					CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")
-					export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
-					einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
-				fi
-				# For compatibility with older binaries at slight performance cost.
-				use stack-realign && export CFLAGS_x86+=" -mstackrealign"
-
-				# Workaround for bug #823780.
-				# Need to save/restore CC because earlier on, we stuff it full of CFLAGS, and tc-getCPP doesn't like that.
-				CC_mangled=${CC}
-				CC=${glibc__GLIBC_CC}
-				if tc-is-gcc && (($(gcc-major-version) == 11)) && (($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
-					export CFLAGS_x86="${CFLAGS_x86} -mno-avx512f"
-					einfo "Auto adding -mno-avx512f to CFLAGS_x86 for buggy GCC version (bug #823780) (ABI=${ABI})"
-				fi
-				CC=${CC_mangled}
-			fi
-		;;
-		mips)
-			# The mips abi cannot support the GNU style hashes. #233233
-			filter-ldflags -Wl,--hash-style=gnu -Wl,--hash-style=both
-		;;
-		ppc|ppc64)
-			# Many arch-specific implementations do not work on ppc with
-			# cache-block not equal to 128 bytes. This breaks memset:
-			#   https://sourceware.org/PR26522
-			#   https://bugs.gentoo.org/737996
-			# Use default -mcpu=. For ppc it means non-multiarch setup.
-			filter-flags '-mcpu=*'
-		;;
-		sparc)
-			# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-			filter-flags "-fcall-used-g7"
-			append-flags "-fcall-used-g6"
-
-			local cpu
-			case ${CTARGET} in
-			sparc64-*)
-				cpu="sparc64"
-				case $(get-flag mcpu) in
-				v9)
-					# We need to force at least v9a because the base build doesn't
-					# work with just v9.
-					# https://sourceware.org/bugzilla/show_bug.cgi?id=19477
-					append-flags "-Wa,-xarch=v9a"
-					;;
-				esac
-				;;
-			sparc-*)
-				case $(get-flag mcpu) in
-				v8|supersparc|hypersparc|leon|leon3)
-					cpu="sparcv8"
-					;;
-				*)
-					cpu="sparcv9"
-					;;
-				esac
-			;;
-			esac
-			[[ -n ${cpu} ]] && CTARGET_OPT="${cpu}-${CTARGET#*-}"
-		;;
-	esac
-}
-
-setup_flags() {
-	# Make sure host make.conf doesn't pollute us
-	if is_crosscompile || tc-is-cross-compiler ; then
-		CHOST=${CTARGET} strip-unsupported-flags
-	fi
-
-	# Store our CFLAGS because it's changed depending on which CTARGET
-	# we are building when pulling glibc on a multilib profile
-	CFLAGS_BASE=${CFLAGS_BASE-${CFLAGS}}
-	CFLAGS=${CFLAGS_BASE}
-	CXXFLAGS_BASE=${CXXFLAGS_BASE-${CXXFLAGS}}
-	CXXFLAGS=${CXXFLAGS_BASE}
-	ASFLAGS_BASE=${ASFLAGS_BASE-${ASFLAGS}}
-	ASFLAGS=${ASFLAGS_BASE}
-
-	# Allow users to explicitly avoid flag sanitization via
-	# USE=custom-cflags.
-	if ! use custom-cflags; then
-		# Over-zealous CFLAGS can often cause problems.  What may work for one
-		# person may not work for another.  To avoid a large influx of bugs
-		# relating to failed builds, we strip most CFLAGS out to ensure as few
-		# problems as possible.
-		strip-flags
-		# Lock glibc at -O2; we want to be conservative here.
-		filter-flags '-O?'
-		append-flags -O2
-	fi
-
-	strip-unsupported-flags
-	filter-lto
-	filter-flags -m32 -m64 '-mabi=*'
-
-	# glibc aborts if rpath is set by LDFLAGS
-	filter-ldflags '-Wl,-rpath=*'
-
-	# ld can't use -r & --relax at the same time, bug #788901
-	# https://sourceware.org/PR27837
-	filter-ldflags '-Wl,--relax'
-
-	# Flag added for cross-prefix, but causes ldconfig to segfault. Not needed
-	# anyway because glibc already handles this by itself.
-	filter-ldflags '-Wl,--dynamic-linker=*'
-
-	# some weird software relies on sysv hashes in glibc, bug 863863, bug 864100
-	# we have to do that here already so mips can filter it out again :P
-	if use hash-sysv-compat ; then
-		append-ldflags '-Wl,--hash-style=both'
-	fi
-
-	# #492892
-	filter-flags -frecord-gcc-switches
-
-	# #898098
-	filter-flags -fno-builtin
-
-	# #829583
-	filter-lfs-flags
-
-	unset CBUILD_OPT CTARGET_OPT
-	if use multilib ; then
-		CTARGET_OPT=$(get_abi_CTARGET)
-		[[ -z ${CTARGET_OPT} ]] && CTARGET_OPT=$(get_abi_CHOST)
-	fi
-
-	setup_target_flags
-
-	if [[ -n ${CTARGET_OPT} && ${CBUILD} == ${CHOST} ]] && ! is_crosscompile; then
-		CBUILD_OPT=${CTARGET_OPT}
-	fi
-
-	# glibc's headers disallow -O0 and fail at build time:
-	#  include/libc-symbols.h:75:3: #error "glibc cannot be compiled without optimization"
-	# https://sourceware.org/glibc/wiki/FAQ#Why_do_I_get:.60.23error_.22glibc_cannot_be_compiled_without_optimization.22.27.2C_when_trying_to_compile_GNU_libc_with_GNU_CC.3F
-	replace-flags -O0 -O1
-
-	# glibc handles this internally already where it's appropriate;
-	# can't always have SSP when we're the ones setting it up, etc
-	filter-flags '-fstack-protector*'
-
-	# Similar issues as with SSP. Can't inject yourself that early.
-	filter-flags '-fsanitize=*'
-
-	# See end of bug #830454; we handle this via USE=cet
-	filter-flags '-fcf-protection=*'
-
-	# When bootstrapping, we may have a situation where
-	# CET-enabled gcc from seed is used to build CET-disabled
-	# glibc. As such, gcc implicitly enables CET if no
-	# -fcf-protection flag is passed. For a typical package it
-	# should not be a problem, but for glibc it matters as it is
-	# dealing with CET in ld.so. So if CET is supposed to be
-	# disabled for glibc, be explicit about it.
-	if (use amd64 || use x86) && ! use cet; then
-		append-flags '-fcf-protection=none'
-	fi
-}
-
-use_multiarch() {
-	# Allow user to disable runtime arch detection in multilib.
-	use multiarch || return 1
-	# Make sure binutils is new enough to support indirect functions,
-	# #336792. This funky sed supports gold and bfd linkers.
-	local bver nver
-	bver=$($(tc-getLD ${CTARGET}) -v | sed -n -r '1{s:[^0-9]*::;s:^([0-9.]*).*:\1:;p}')
-	case $(tc-arch ${CTARGET}) in
-	amd64|x86) nver="2.20" ;;
-	arm)       nver="2.22" ;;
-	hppa)      nver="2.23" ;;
-	ppc|ppc64) nver="2.20" ;;
-	# ifunc support was added in 2.23, but glibc also needs
-	# machinemode which is in 2.24.
-	s390)      nver="2.24" ;;
-	sparc)     nver="2.21" ;;
-	*)         return 1 ;;
-	esac
-	ver_test ${bver} -ge ${nver}
-}
-
-# Setup toolchain variables that had historically been defined in the
-# profiles for these archs.
-setup_env() {
-	# silly users
-	unset LD_RUN_PATH
-	unset LD_ASSUME_KERNEL
-
-	if is_crosscompile || tc-is-cross-compiler ; then
-		multilib_env ${CTARGET_OPT:-${CTARGET}}
-
-		if ! use multilib ; then
-			MULTILIB_ABIS=${DEFAULT_ABI}
-		else
-			MULTILIB_ABIS=${MULTILIB_ABIS:-${DEFAULT_ABI}}
-		fi
-
-		# If the user has CFLAGS_<CTARGET> in their make.conf, use that,
-		# and fall back on CFLAGS.
-		local VAR=CFLAGS_${CTARGET//[-.]/_}
-		CFLAGS=${!VAR-${CFLAGS}}
-		einfo " $(printf '%15s' 'Manual CFLAGS:')   ${CFLAGS}"
-	fi
-
-	setup_flags
-
-	export ABI=${ABI:-${DEFAULT_ABI:-default}}
-
-	if just_headers ; then
-		# Avoid mixing host's CC and target's CFLAGS_${ABI}:
-		# At this bootstrap stage we have only binutils for
-		# target but not compiler yet.
-		einfo "Skip CC ABI injection. We can't use (cross-)compiler yet."
-		return 0
-	fi
-
-	# Glibc does not work with gold (for various reasons) #269274.
-	tc-ld-disable-gold
-
-	if use doc ; then
-		export MAKEINFO=makeinfo
-	else
-		export MAKEINFO=/dev/null
-	fi
-
-	# Reset CC and CXX to the value at start of emerge
-	export CC=${glibc__ORIG_CC:-${CC:-$(tc-getCC ${CTARGET})}}
-	export CXX=${glibc__ORIG_CXX:-${CXX:-$(tc-getCXX ${CTARGET})}}
-
-	# and make sure glibc__ORIG_CC and glibc__ORIG_CXX is defined now.
-	export glibc__ORIG_CC=${CC}
-	export glibc__ORIG_CXX=${CXX}
-
-	if tc-is-clang && ! use custom-cflags && ! is_crosscompile ; then
-		export glibc__force_gcc=yes
-		# once this is toggled on, it needs to stay on, since with CPP manipulated
-		# tc-is-clang does not work correctly anymore...
-	fi
-
-	if [[ ${glibc__force_gcc} == "yes" ]] ; then
-		# If we are running in an otherwise clang/llvm environment, we need to
-		# recover the proper gcc and binutils settings here, at least until glibc
-		# is finally building with clang. So let's override everything that is
-		# set in the clang profiles.
-		# Want to shoot yourself into the foot? Set USE=custom-cflags, that's always
-		# a good start into that direction.
-		# Also, if you're crosscompiling, let's assume you know what you are doing.
-		# Hopefully.
-		# Last, we need the settings of the *build* environment, not of the
-		# target environment...
-
-		local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
-		local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
-		einfo "Overriding clang configuration, since it won't work here"
-
-		export CC="${current_gcc_path}/gcc"
-		export CPP="${current_gcc_path}/cpp"
-		export CXX="${current_gcc_path}/g++"
-		export LD="${current_binutils_path}/ld.bfd"
-		export AR="${current_binutils_path}/ar"
-		export AS="${current_binutils_path}/as"
-		export NM="${current_binutils_path}/nm"
-		export STRIP="${current_binutils_path}/strip"
-		export RANLIB="${current_binutils_path}/ranlib"
-		export OBJCOPY="${current_binutils_path}/objcopy"
-		export STRINGS="${current_binutils_path}/strings"
-		export OBJDUMP="${current_binutils_path}/objdump"
-		export READELF="${current_binutils_path}/readelf"
-		export ADDR2LINE="${current_binutils_path}/addr2line"
-
-		# do we need to also do flags munging here? yes! at least...
-		filter-flags '-fuse-ld=*'
-		filter-flags '-D_FORTIFY_SOURCE=*'
-
-	else
-
-		# this is the "normal" case
-
-		export CC="$(tc-getCC ${CTARGET})"
-		export CXX="$(tc-getCXX ${CTARGET})"
-
-		# Always use tuple-prefixed toolchain. For non-native ABI glibc's configure
-		# can't detect them automatically due to ${CHOST} mismatch and fallbacks
-		# to unprefixed tools. Similar to multilib.eclass:multilib_toolchain_setup().
-		export NM="$(tc-getNM ${CTARGET})"
-		export READELF="$(tc-getREADELF ${CTARGET})"
-
-	fi
-
-	# We need to export CFLAGS with abi information in them because glibc's
-	# configure script checks CFLAGS for some targets (like mips).  Keep
-	# around the original clean value to avoid appending multiple ABIs on
-	# top of each other. (Why does the comment talk about CFLAGS if the code
-	# acts on CC?)
-	export glibc__GLIBC_CC=${CC}
-	export glibc__GLIBC_CXX=${CXX}
-
-	export glibc__abi_CFLAGS="$(get_abi_CFLAGS)"
-
-	# CFLAGS can contain ABI-specific flags like -mfpu=neon, see bug #657760
-	# To build .S (assembly) files with the same ABI-specific flags
-	# upstream currently recommends adding CFLAGS to CC/CXX:
-	#    https://sourceware.org/PR23273
-	# Note: Passing CFLAGS via CPPFLAGS overrides glibc's arch-specific CFLAGS
-	# and breaks multiarch support. See 659030#c3 for an example.
-	# The glibc configure script doesn't properly use LDFLAGS all the time.
-	export CC="${glibc__GLIBC_CC} ${glibc__abi_CFLAGS} ${CFLAGS} ${LDFLAGS}"
-
-	# Some of the tests are written in C++, so we need to force our multlib abis in, bug 623548
-	export CXX="${glibc__GLIBC_CXX} ${glibc__abi_CFLAGS} ${CFLAGS}"
-
-	if is_crosscompile; then
-		# Assume worst-case bootstrap: glibc is built for the first time
-		# with ${CTARGET}-g++ not available yet. We avoid
-		# building auxiliary programs that require C++: bug #683074
-		# It should not affect final result.
-		export libc_cv_cxx_link_ok=no
-		# The line above has the same effect. We set CXX explicitly
-		# to make build logs less confusing.
-		export CXX=
-	fi
-}
-
-foreach_abi() {
-	setup_env
-
-	local ret=0
-	local abilist=""
-	if use multilib ; then
-		abilist=$(get_install_abis)
-	else
-		abilist=${DEFAULT_ABI}
-	fi
-	local -x ABI
-	for ABI in ${abilist:-default} ; do
-		setup_env
-		einfo "Running $1 for ABI ${ABI}"
-		$1
-		: $(( ret |= $? ))
-	done
-	return ${ret}
-}
-
-glibc_banner() {
-	local b="Gentoo ${PVR}"
-	[[ -n ${PATCH_VER} ]] && ! use vanilla && b+=" (patchset ${PATCH_VER})"
-	echo "${b}"
-}
-
-# The following Kernel version handling functions are mostly copied from portage
-# source. It's better not to use linux-info.eclass here since a) it adds too
-# much magic, see bug 326693 for some of the arguments, and b) some of the
-# functions are just not provided.
-
-g_get_running_KV() {
-	uname -r
-	return $?
-}
-
-g_KV_major() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	echo "${KV%%.*}"
-}
-
-g_KV_minor() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.}
-	echo "${KV%%.*}"
-}
-
-g_KV_micro() {
-	[[ -z $1 ]] && return 1
-	local KV=$@
-	KV=${KV#*.*.}
-	echo "${KV%%[^[:digit:]]*}"
-}
-
-g_KV_to_int() {
-	[[ -z $1 ]] && return 1
-	local KV_MAJOR=$(g_KV_major "$1")
-	local KV_MINOR=$(g_KV_minor "$1")
-	local KV_MICRO=$(g_KV_micro "$1")
-	local KV_int=$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))
-
-	# We make version 2.2.0 the minimum version we will handle as
-	# a sanity check ... if its less, we fail ...
-	if [[ ${KV_int} -ge 131584 ]] ; then
-		echo "${KV_int}"
-		return 0
-	fi
-	return 1
-}
-
-g_int_to_KV() {
-	local version=$1 major minor micro
-	major=$((version / 65536))
-	minor=$(((version % 65536) / 256))
-	micro=$((version % 256))
-	echo ${major}.${minor}.${micro}
-}
-
-eend_KV() {
-	[[ $(g_KV_to_int $1) -ge $(g_KV_to_int $2) ]]
-	eend $?
-}
-
-get_kheader_version() {
-	printf '#include <linux/version.h>\nLINUX_VERSION_CODE\n' | \
-	$(tc-getCPP ${CTARGET}) -I "$(build_eprefix)$(alt_build_headers)" - | \
-	tail -n 1
-}
-
-# We collect all sanity checks here. Consistency is not guranteed between
-# pkg_ and src_ phases, so we call this function both in pkg_pretend and in
-# src_unpack.
-sanity_prechecks() {
-	# Prevent native builds from downgrading
-	if [[ ${MERGE_TYPE} != "buildonly" ]] && \
-	   [[ -z ${ROOT} ]] && \
-	   [[ ${CBUILD} == ${CHOST} ]] && \
-	   [[ ${CHOST} == ${CTARGET} ]] ; then
-
-		# The high rev # is to allow people to downgrade between -r#
-		# versions. We want to block 2.20->2.19, but 2.20-r3->2.20-r2
-		# should be fine. Hopefully we never actually use a r# this
-		# high.
-		if has_version ">${CATEGORY}/${P}-r10000" ; then
-			eerror "Sanity check to keep you from breaking your system:"
-			eerror " Downgrading glibc is not supported and a sure way to destruction."
-			[[ ${I_ALLOW_TO_BREAK_MY_SYSTEM} = yes ]] || die "Aborting to save your system."
-		fi
-
-		if ! do_run_test '#include <unistd.h>\n#include <sys/syscall.h>\nint main(){return syscall(1000)!=-1;}\n' ; then
-			eerror "Your old kernel is broken. You need to update it to a newer"
-			eerror "version as syscall(<bignum>) will break. See bug 279260."
-			die "Old and broken kernel."
-		fi
-	fi
-
-	if [[ ${CTARGET} == i386-* ]] ; then
-		eerror "i386 CHOSTs are no longer supported."
-		eerror "Chances are you don't actually want/need i386."
-		eerror "Please read https://www.gentoo.org/doc/en/change-chost.xml"
-		die "Please fix your CHOST"
-	fi
-
-	if [[ -e /proc/xen ]] && [[ $(tc-arch) == "x86" ]] && ! is-flag -mno-tls-direct-seg-refs ; then
-		ewarn "You are using Xen but don't have -mno-tls-direct-seg-refs in your CFLAGS."
-		ewarn "This will result in a 50% performance penalty when running with a 32bit"
-		ewarn "hypervisor, which is probably not what you want."
-	fi
-
-	# ABI-specific checks follow here. Hey, we have a lot more specific conditions that
-	# we test for...
-	if ! is_crosscompile ; then
-		if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
-			ebegin "Checking that IA32 emulation is enabled in the running kernel"
-			echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"
-			local STAT
-			if ${CC-${CHOST}-gcc} ${CFLAGS_x86} "${T}/check-ia32-emulation.c" -o "${T}/check-ia32-emulation.elf32"; then
-				"${T}/check-ia32-emulation.elf32"
-				STAT=$?
-			else
-				# Don't fail here to allow single->multi ABI switch
-				# or recover from breakage like bug #646424
-				ewarn "Failed to compile the ABI test. Broken host glibc?"
-				STAT=0
-			fi
-			rm -f "${T}/check-ia32-emulation.elf32"
-			eend $STAT
-			[[ $STAT -eq 0 ]] || die "CONFIG_IA32_EMULATION must be enabled in the kernel to compile a multilib glibc."
-		fi
-
-	fi
-
-	# When we actually have to compile something...
-	if ! just_headers && [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if [[ -d "${ESYSROOT}"/usr/lib/include ]] ; then
-			# bug #833620, bug #643302
-			eerror "Found ${ESYSROOT}/usr/lib/include directory!"
-			eerror "This is known to break glibc's build."
-			eerror "Please backup its contents then remove the directory."
-			die "Found directory (${ESYSROOT}/usr/lib/include) which will break build (bug #833620)!"
-		fi
-
-		if [[ ${CTARGET} == *-linux* ]] ; then
-			local run_kv build_kv want_kv
-
-			run_kv=$(g_get_running_KV)
-			build_kv=$(g_int_to_KV $(get_kheader_version))
-			want_kv=${MIN_KERN_VER}
-
-			if ! is_crosscompile && ! tc-is-cross-compiler ; then
-				# Building fails on an non-supporting kernel
-				ebegin "Checking running kernel version (${run_kv} >= ${want_kv})"
-				if ! eend_KV ${run_kv} ${want_kv} ; then
-					echo
-					eerror "You need a kernel of at least ${want_kv}!"
-					die "Kernel version too low!"
-				fi
-			fi
-
-			# Do not run this check for pkg_pretend, just pkg_setup and friends (if we ever get used there).
-			# It's plausible (seen it in the wild) that Portage will (correctly) schedule a linux-headers
-			# upgrade before glibc, but because pkg_pretend gets run before any packages are merged at all (not
-			# just glibc), the whole emerge gets aborted without a good reason. We probably don't
-			# need to run this check at all given we have a dependency on the right headers,
-			# but let's leave it as-is for now.
-			if [[ ${EBUILD_PHASE_FUNC} != pkg_pretend ]] ; then
-				ebegin "Checking linux-headers version (${build_kv} >= ${want_kv})"
-				if ! eend_KV ${build_kv} ${want_kv} ; then
-					echo
-					eerror "You need linux-headers of at least ${want_kv}!"
-					die "linux-headers version too low!"
-				fi
-			fi
-		fi
-	fi
-}
-
-upgrade_warning() {
-	is_crosscompile && return
-
-	if [[ ${MERGE_TYPE} != buildonly && -n ${REPLACING_VERSIONS} && -z ${ROOT} ]]; then
-		local oldv newv=$(ver_cut 1-2 ${PV})
-		for oldv in ${REPLACING_VERSIONS}; do
-			if ver_test ${oldv} -lt ${newv}; then
-				ewarn "After upgrading glibc, please restart all running processes."
-				ewarn "Be sure to include init (telinit u) or systemd (systemctl daemon-reexec)."
-				ewarn "Alternatively, reboot your system."
-				ewarn "(See bug #660556, bug #741116, bug #823756, etc)"
-				break
-			fi
-		done
-	fi
-}
-
-#
-# the phases
-#
-
-# pkg_pretend
-
-pkg_pretend() {
-	upgrade_warning
-}
-
-# pkg_setup
-
-pkg_setup() {
-	# see bug 682570
-	[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
-}
-
-# src_unpack
-
-src_unpack() {
-	setup_env
-
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-
-	use multilib-bootstrap && unpack gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz
-
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/glibc-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patches || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack glibc-${PV}-patches-${PATCH_VER}.tar.xz
-	fi
-
-	cd "${WORKDIR}" || die
-	use systemd && unpack glibc-systemd-${GLIBC_SYSTEMD_VER}.tar.gz
-}
-
-# src_prepare
-
-src_prepare() {
-	local patchsetname
-	if ! use vanilla ; then
-		if [[ ${PV} == 9999* ]] ; then
-			patchsetname="from git master"
-		else
-			patchsetname="${PV}-${PATCH_VER}"
-		fi
-		einfo "Applying Gentoo Glibc patchset ${patchsetname}"
-		eapply "${WORKDIR}"/patches
-		einfo "Done."
-	fi
-
-	default
-
-	gnuconfig_update
-
-	cd "${WORKDIR}" || die
-	find . -name configure -exec touch {} +
-
-	# Fix permissions on some of the scripts.
-	chmod u+x "${S}"/scripts/*.sh
-
-	cd "${S}" || die
-}
-
-# src_configure
-
-glibc_do_configure() {
-	dump_build_environment
-
-	local myconf=()
-
-	# Use '=strong' instead of '=all' to protect only functions
-	# worth protecting from stack smashes.
-	myconf+=( --enable-stack-protector=$(usex ssp strong no) )
-
-	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
-	# is not robust enough to detect proper support:
-	#    https://bugs.gentoo.org/641216
-	#    https://sourceware.org/PR22634#c0
-	case $(tc-arch ${CTARGET}) in
-		# Keep whitelist of targets where autodetection mostly works.
-		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390|riscv|loong) ;;
-		# Blacklist everywhere else
-		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
-	esac
-
-	# Enable Intel Control-flow Enforcement Technology on amd64 if requested
-	case ${CTARGET} in
-		x86_64-*) myconf+=( $(use_enable cet) ) ;;
-		*) ;;
-	esac
-
-	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
-
-	myconf+=( --enable-kernel=${MIN_KERN_VER} )
-
-	# Since SELinux support is only required for nscd, only enable it if:
-	# 1. USE selinux
-	# 2. only for the primary ABI on multilib systems
-	# 3. Not a crosscompile
-	if ! is_crosscompile && use selinux ; then
-		if use multilib ; then
-			if is_final_abi ; then
-				myconf+=( --with-selinux )
-			else
-				myconf+=( --without-selinux )
-			fi
-		else
-			myconf+=( --with-selinux )
-		fi
-	else
-		myconf+=( --without-selinux )
-	fi
-
-	# Force a few tests where we always know the answer but
-	# configure is incapable of finding it.
-	if is_crosscompile ; then
-		export \
-			libc_cv_c_cleanup=yes \
-			libc_cv_forced_unwind=yes
-	fi
-
-	myconf+=(
-		--disable-werror
-		--enable-bind-now
-		--enable-fortify-source
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		$(use_enable profile)
-		$(use_with gd)
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		--sysconfdir="$(host_eprefix)/etc"
-		--localstatedir="$(host_eprefix)/var"
-		--libdir='$(prefix)'/$(get_libdir)
-		--mandir='$(prefix)'/share/man
-		--infodir='$(prefix)'/share/info
-		--libexecdir='$(libdir)'/misc/glibc
-		--with-bugurl=https://bugs.gentoo.org/
-		--with-pkgversion="$(glibc_banner)"
-		$(use_enable crypt)
-		$(use_multiarch || echo --disable-multi-arch)
-		$(use_enable systemtap)
-		$(use_enable nscd)
-
-		# /usr/bin/mtrace has a Perl shebang. Gentoo Prefix QA checks fail if
-		# Perl hasn't been installed inside the prefix yet and configure picks
-		# up a Perl from outside the prefix instead. configure will fail to
-		# execute Perl during configure if we're cross-compiling a prefix, but
-		# it will just disable mtrace in that case.
-		# Note: mtrace is needed by the test suite.
-		ac_cv_path_PERL="$(usex perl "${EPREFIX}"/usr/bin/perl $(usex test "${EPREFIX}"/usr/bin/perl $(usex doc "${EPREFIX}"/usr/bin/perl no)))"
-
-		# locale data is arch-independent
-		# https://bugs.gentoo.org/753740
-		libc_cv_complocaledir='${exec_prefix}/lib/locale'
-
-		# On aarch64 there is no way to override -mcpu=native, and if
-		# the current cpu does not support SVE configure fails.
-		# Let's boldly assume our toolchain can always build SVE instructions.
-		libc_cv_aarch64_sve_asm=yes
-
-		${EXTRA_ECONF}
-	)
-
-	# We rely on sys-libs/timezone-data for timezone tools normally.
-	myconf+=( $(use_enable vanilla timezone-tools) )
-
-	# These libs don't have configure flags.
-	ac_cv_lib_audit_audit_log_user_avc_message=$(usex audit || echo no)
-	ac_cv_lib_cap_cap_init=$(usex caps || echo no)
-
-	# There is no configure option for this and we need to export it
-	# since the glibc build will re-run configure on itself
-	export libc_cv_rootsbindir="$(host_eprefix)/sbin"
-	export libc_cv_slibdir="$(host_eprefix)/$(get_libdir)"
-
-	local builddir=$(builddir nptl)
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-	set -- "${S}"/configure "${myconf[@]}"
-	echo "$@"
-	"$@" || die "failed to configure glibc"
-
-	# ia64 static cross-compilers are a pita in so much that they
-	# can't produce static ELFs (as the libgcc.a is broken).  so
-	# disable building of the programs for those targets if it
-	# doesn't work.
-	# XXX: We could turn this into a compiler test, but ia64 is
-	# the only one that matters, so this should be fine for now.
-	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
-		sed -i '1i+link-static = touch $@' config.make
-	fi
-
-	# If we're trying to migrate between ABI sets, we need
-	# to lie and use a local copy of gcc.  Like if the system
-	# is built with MULTILIB_ABIS="amd64 x86" but we want to
-	# add x32 to it, gcc/glibc don't yet support x32.
-	#
-	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib-bootstrap ; then
-		echo 'int main(void){}' > "${T}"/test.c || die
-		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
-			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
-		fi
-	fi
-}
-
-glibc_headers_configure() {
-	export ABI=default
-
-	local builddir=$(builddir "headers")
-	mkdir -p "${builddir}"
-	cd "${builddir}"
-
-	# if we don't have a compiler yet, we can't really test it now ...
-	# hopefully they don't affect header generation, so let's hope for
-	# the best here ...
-	local v vars=(
-		ac_cv_header_cpuid_h=yes
-		libc_cv_{386,390,alpha,arm,hppa,ia64,mips,{powerpc,sparc}{,32,64},sh,x86_64}_tls=yes
-		libc_cv_asm_cfi_directives=yes
-		libc_cv_broken_visibility_attribute=no
-		libc_cv_c_cleanup=yes
-		libc_cv_compiler_powerpc64le_binary128_ok=yes
-		libc_cv_forced_unwind=yes
-		libc_cv_gcc___thread=yes
-		libc_cv_mlong_double_128=yes
-		libc_cv_mlong_double_128ibm=yes
-		libc_cv_ppc_machine=yes
-		libc_cv_ppc_rel16=yes
-		libc_cv_predef_fortify_source=no
-		libc_cv_target_power8_ok=yes
-		libc_cv_visibility_attribute=yes
-		libc_cv_z_combreloc=yes
-		libc_cv_z_execstack=yes
-		libc_cv_z_initfirst=yes
-		libc_cv_z_nodelete=yes
-		libc_cv_z_nodlopen=yes
-		libc_cv_z_relro=yes
-		libc_mips_abi=${ABI}
-		libc_mips_float=$([[ $(tc-is-softfloat) == "yes" ]] && echo soft || echo hard)
-		# These libs don't have configure flags.
-		ac_cv_lib_audit_audit_log_user_avc_message=no
-		ac_cv_lib_cap_cap_init=no
-	)
-
-	einfo "Forcing cached settings:"
-	for v in "${vars[@]}" ; do
-		einfo " ${v}"
-		export ${v}
-	done
-
-	local headers_only_arch_CPPFLAGS=()
-
-	# Blow away some random CC settings that screw things up. #550192
-	if [[ -d ${S}/sysdeps/mips ]]; then
-		pushd "${S}"/sysdeps/mips >/dev/null
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=32:' mips32/Makefile mips64/n32/Makefile || die
-		sed -i -e '/^CC +=/s:=.*:= -D_MIPS_SZPTR=64:' mips64/n64/Makefile || die
-
-		# Force the mips ABI to the default.  This is OK because the set of
-		# installed headers in this phase is the same between the 3 ABIs.
-		# If this ever changes, this hack will break, but that's unlikely
-		# as glibc discourages that behavior.
-		# https://crbug.com/647033
-		sed -i -e 's:abiflag=.*:abiflag=_ABIO32:' preconfigure || die
-
-		popd >/dev/null
-	fi
-
-	case ${CTARGET} in
-	riscv*)
-		# RISC-V interrogates the compiler to determine which target to
-		# build.  If building the headers then we don't strictly need a
-		# RISC-V compiler, so the built-in definitions that are provided
-		# along with all RISC-V compiler might not exist.  This causes
-		# glibc's RISC-V preconfigure script to blow up.  Since we're just
-		# building the headers any value will actually work here, so just
-		# pick the standard one (rv64g/lp64d) to make the build scripts
-		# happy for now -- the headers are all the same anyway so it
-		# doesn't matter.
-		headers_only_arch_CPPFLAGS+=(
-			-D__riscv_xlen=64
-			-D__riscv_flen=64
-			-D__riscv_float_abi_double=1
-			-D__riscv_atomic=1
-		) ;;
-	esac
-
-	local myconf=()
-	myconf+=(
-		--disable-sanity-checks
-		--enable-hacker-mode
-		--disable-werror
-		--enable-bind-now
-		--build=${CBUILD_OPT:-${CBUILD}}
-		--host=${CTARGET_OPT:-${CTARGET}}
-		--with-headers=$(build_eprefix)$(alt_build_headers)
-		--prefix="$(host_eprefix)/usr"
-		$(use_enable crypt)
-		${EXTRA_ECONF}
-	)
-
-	# Nothing is compiled here which would affect the headers for the target.
-	# So forcing CC/CFLAGS is sane.
-	local headers_only_CC=$(tc-getBUILD_CC)
-	local headers_only_CFLAGS="-O1 -pipe"
-	local headers_only_CPPFLAGS="-U_FORTIFY_SOURCE ${headers_only_arch_CPPFLAGS[*]}"
-	local headers_only_LDFLAGS=""
-	set -- "${S}"/configure "${myconf[@]}"
-	echo \
-		"CC=${headers_only_CC}" \
-		"CFLAGS=${headers_only_CFLAGS}" \
-		"CPPFLAGS=${headers_only_CPPFLAGS}" \
-		"LDFLAGS=${headers_only_LDFLAGS}" \
-		"$@"
-	CC=${headers_only_CC} \
-	CFLAGS=${headers_only_CFLAGS} \
-	CPPFLAGS=${headers_only_CPPFLAGS} \
-	LDFLAGS="" \
-	"$@" || die "failed to configure glibc"
-}
-
-do_src_configure() {
-	if just_headers ; then
-		glibc_headers_configure
-	else
-		glibc_do_configure nptl
-	fi
-}
-
-src_configure() {
-	foreach_abi do_src_configure
-}
-
-# src_compile
-
-do_src_compile() {
-	emake -C "$(builddir nptl)"
-}
-
-src_compile() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi do_src_compile
-}
-
-# src_test
-
-glibc_src_test() {
-	cd "$(builddir nptl)"
-
-	local myxfailparams=""
-	if [[ "${GENTOO_GLIBC_XFAIL_TESTS}" == "yes" ]] ; then
-		local virt=$(systemd-detect-virt 2>/dev/null)
-		if [[ ${virt} == systemd-nspawn ]] ; then
-			ewarn "Skipping extra tests because in systemd-nspawn container"
-			XFAIL_TEST_LIST+=( "${XFAIL_NSPAWN_TEST_LIST[@]}" )
-		fi
-
-		for myt in ${XFAIL_TEST_LIST[@]} ; do
-			myxfailparams+="test-xfail-${myt}=yes "
-		done
-	fi
-
-	# sandbox does not understand unshare() and prevents
-	# writes to /proc/, which makes many tests fail
-
-	# we give the tests a bit more time to avoid spurious
-	# bug reports on slow arches
-
-	SANDBOX_ON=0 LD_PRELOAD= TIMEOUTFACTOR=32 emake ${myxfailparams} check
-}
-
-src_test() {
-	if just_headers ; then
-		return
-	fi
-
-	foreach_abi glibc_src_test || die "tests failed"
-}
-
-# src_install
-
-run_locale_gen() {
-	# if the host locales.gen contains no entries, we'll install everything
-	local root="$1"
-	local inplace=""
-
-	if [[ "${root}" == "--inplace-glibc" ]] ; then
-		inplace="--inplace-glibc"
-		root="$2"
-	fi
-
-	local locale_list="${root%/}/etc/locale.gen"
-
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-		[[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
-		locale_list="${root%/}/usr/share/i18n/SUPPORTED"
-	fi
-
-	# bug 736794: we need to be careful with the parallelization... the number of
-	# processors saved in the environment of a binary package may differ strongly
-	# from the number of processes available during postinst
-	local mygenjobs="$(makeopts_jobs)"
-	if [[ "${EMERGE_FROM}" == "binary" ]] ; then
-		mygenjobs="$(nproc)"
-	fi
-
-	set -- locale-gen ${inplace} --jobs "${mygenjobs}" --config "${locale_list}" \
-		--destdir "${root}"
-	echo "$@"
-	"$@"
-
-	popd >/dev/null
-}
-
-glibc_do_src_install() {
-	local builddir=$(builddir nptl)
-	cd "${builddir}"
-
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install
-
-	# This version (2.26) provides some compatibility libraries for the NIS/NIS+ support
-	# which come without headers etc. Only needed for binary packages since the
-	# external net-libs/libnsl has increased soversion. Keep only versioned libraries.
-	find "${D}" -name "libnsl.a" -delete
-	find "${D}" -name "libnsl.so" -delete
-
-	# Normally upstream_pv is ${PV}. Live ebuilds are exception, there we need
-	# to infer upstream version:
-	# '#define VERSION "2.26.90"' -> '2.26.90'
-	local upstream_pv=$(sed -n -r 's/#define VERSION "(.*)"/\1/p' "${S}"/version.h)
-
-	# Avoid stripping binaries not targeted by ${CHOST}. Or else
-	# ${CHOST}-strip would break binaries build for ${CTARGET}.
-	is_crosscompile && dostrip -x /
-
-	# gdb thread introspection relies on local libpthreads symbols. stripping breaks it
-	# See Note [Disable automatic stripping]
-	dostrip -x $(alt_libdir)/libpthread-${upstream_pv}.so
-
-	if [[ -e ${ED}/$(alt_usrlibdir)/libm-${upstream_pv}.a ]] ; then
-		# Move versioned .a file out of libdir to evade portage QA checks
-		# instead of using gen_usr_ldscript(). We fix ldscript as:
-		# "GROUP ( /usr/lib64/libm-<pv>.a ..." -> "GROUP ( /usr/lib64/glibc-<pv>/libm-<pv>.a ..."
-		sed -i "s@\(libm-${upstream_pv}.a\)@${P}/\1@" "${ED}"/$(alt_usrlibdir)/libm.a || die
-		dodir $(alt_usrlibdir)/${P}
-		mv "${ED}"/$(alt_usrlibdir)/libm-${upstream_pv}.a "${ED}"/$(alt_usrlibdir)/${P}/libm-${upstream_pv}.a || die
-	fi
-
-	# We configure toolchains for standalone prefix systems with a sysroot,
-	# which is prepended to paths in ld scripts, so strip the prefix from these.
-	# Before: GROUP ( /foo/lib64/libc.so.6 /foo/usr/lib64/libc_nonshared.a  AS_NEEDED ( /foo/lib64/ld-linux-x86-64.so.2 ) )
-	# After: GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
-	if [[ -n $(host_eprefix) ]] ; then
-		local file
-		grep -lZIF "ld script" "${ED}/$(alt_usrlibdir)"/lib*.{a,so} 2>/dev/null | while read -rd '' file ; do
-			sed -i "s|$(host_eprefix)/|/|g" "${file}" || die
-		done
-	fi
-
-	# We'll take care of the cache ourselves
-	rm -f "${ED}"/etc/ld.so.cache
-
-	# Everything past this point just needs to be done once ...
-	is_final_abi || return 0
-
-	# Make sure the non-native interp can be found on multilib systems even
-	# if the main library set isn't installed into the right place.  Maybe
-	# we should query the active gcc for info instead of hardcoding it ?
-	local i ldso_abi ldso_name
-	local ldso_abi_list=(
-		# x86
-		amd64   /lib64/ld-linux-x86-64.so.2
-		x32     /libx32/ld-linux-x32.so.2
-		x86     /lib/ld-linux.so.2
-		# mips
-		o32     /lib/ld.so.1
-		n32     /lib32/ld.so.1
-		n64     /lib64/ld.so.1
-		# powerpc
-		ppc     /lib/ld.so.1
-		# riscv
-		ilp32d  /lib/ld-linux-riscv32-ilp32d.so.1
-		ilp32   /lib/ld-linux-riscv32-ilp32.so.1
-		lp64d   /lib/ld-linux-riscv64-lp64d.so.1
-		lp64    /lib/ld-linux-riscv64-lp64.so.1
-		# s390
-		s390    /lib/ld.so.1
-		s390x   /lib/ld64.so.1
-		# sparc
-		sparc32 /lib/ld-linux.so.2
-		sparc64 /lib64/ld-linux.so.2
-	)
-	case $(tc-endian) in
-	little)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64.so.1
-			# ELFv2 (glibc does not support ELFv1 on LE)
-			ppc64   /lib64/ld64.so.2
-		)
-		;;
-	big)
-		ldso_abi_list+=(
-			# arm
-			arm64   /lib/ld-linux-aarch64_be.so.1
-			# ELFv1 (glibc does not support ELFv2 on BE)
-			ppc64   /lib64/ld64.so.1
-		)
-		;;
-	esac
-	if [[ ${SYMLINK_LIB} == "yes" ]] && [[ ! -e ${ED}/$(alt_prefix)/lib ]] ; then
-		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) $(alt_prefix)/lib
-	fi
-	for (( i = 0; i < ${#ldso_abi_list[@]}; i += 2 )) ; do
-		ldso_abi=${ldso_abi_list[i]}
-		has ${ldso_abi} $(get_install_abis) || continue
-
-		ldso_name="$(alt_prefix)${ldso_abi_list[i+1]}"
-		if [[ ! -L ${ED}/${ldso_name} && ! -e ${ED}/${ldso_name} ]] ; then
-			dosym ../$(get_abi_LIBDIR ${ldso_abi})/${ldso_name##*/} ${ldso_name}
-		fi
-	done
-
-	# In the LSB 5.0 definition, someone had the excellent idea to "standardize"
-	# the runtime loader name, see also https://xkcd.com/927/
-	# Normally, in Gentoo one should never come across executables that require this.
-	# However, binary commercial packages are known to adhere to weird practices.
-	# https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-AMD64/LSB-Core-AMD64.html#BASELIB
-	local lsb_ldso_name native_ldso_name lsb_ldso_abi
-	local lsb_ldso_abi_list=(
-		# x86
-		amd64	ld-linux-x86-64.so.2	ld-lsb-x86-64.so.3
-	)
-	for (( i = 0; i < ${#lsb_ldso_abi_list[@]}; i += 3 )) ; do
-		lsb_ldso_abi=${lsb_ldso_abi_list[i]}
-		native_ldso_name=${lsb_ldso_abi_list[i+1]}
-		lsb_ldso_name=${lsb_ldso_abi_list[i+2]}
-		has ${lsb_ldso_abi} $(get_install_abis) || continue
-
-		if [[ ! -L ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} && ! -e ${ED}/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name} ]] ; then
-			dosym ${native_ldso_name} "$(alt_prefix)/$(get_abi_LIBDIR ${lsb_ldso_abi})/${lsb_ldso_name}"
-		fi
-	done
-
-	# With devpts under Linux mounted properly, we do not need the pt_chown
-	# binary to be setuid.  This is because the default owners/perms will be
-	# exactly what we want.
-	if ! use suid ; then
-		find "${ED}" -name pt_chown -exec chmod -s {} +
-	fi
-
-	#################################################################
-	# EVERYTHING AFTER THIS POINT IS FOR NATIVE GLIBC INSTALLS ONLY #
-	#################################################################
-
-	# Make sure we install some symlink hacks so that when we build
-	# a 2nd stage cross-compiler, gcc finds the target system
-	# headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		# We need to make sure that /lib and /usr/lib always exists.
-		# gcc likes to use relative paths to get to its multilibs like
-		# /usr/lib/../lib64/.  So while we don't install any files into
-		# /usr/lib/, we do need it to exist.
-		keepdir $(alt_prefix)/lib
-		keepdir $(alt_prefix)/usr/lib
-
-		dosym usr/include $(alt_prefix)/sys-include
-		return 0
-	fi
-
-	# Files for Debian-style locale updating
-	dodir /usr/share/i18n
-	sed \
-		-e "/^#/d" \
-		-e "/SUPPORTED-LOCALES=/d" \
-		-e "s: \\\\::g" -e "s:/: :g" \
-		"${S}"/localedata/SUPPORTED > "${ED}"/usr/share/i18n/SUPPORTED \
-		|| die "generating /usr/share/i18n/SUPPORTED failed"
-
-	cd "${S}" || die
-
-	# Install misc network config files
-	insinto /etc
-	doins posix/gai.conf
-
-	if use systemd ; then
-		doins "${WORKDIR}/glibc-systemd-${GLIBC_SYSTEMD_VER}/gentoo-config/nsswitch.conf"
-	else
-		doins nss/nsswitch.conf
-	fi
-
-	# Gentoo-specific
-	newins "${FILESDIR}"/host.conf-1 host.conf
-
-	if use nscd ; then
-		doins nscd/nscd.conf
-
-		newinitd "$(prefixify_ro "${FILESDIR}"/nscd-1)" nscd
-
-		local nscd_args=(
-			-e "s:@PIDFILE@:$(strings "${ED}"/usr/sbin/nscd | grep nscd.pid):"
-		)
-
-		sed -i "${nscd_args[@]}" "${ED}"/etc/init.d/nscd
-
-		use systemd && systemd_dounit nscd/nscd.service
-		newtmpfiles nscd/nscd.tmpfiles nscd.conf
-	fi
-
-	echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00glibc
-	doenvd "${T}"/00glibc
-
-	for d in BUGS ChangeLog CONFORMANCE FAQ NEWS NOTES PROJECTS README* ; do
-		[[ -s ${d} ]] && dodoc ${d}
-	done
-	dodoc -r ChangeLog.old
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f "${ED}"/etc/localtime
-
-	# Generate all locales if this is a native build as locale generation
-	if use compile-locales && ! is_crosscompile ; then
-		run_locale_gen --inplace-glibc "${ED}/"
-	fi
-}
-
-glibc_headers_install() {
-	local builddir=$(builddir "headers")
-	cd "${builddir}"
-	emake install_root="${D}/$(build_eprefix)$(alt_prefix)" install-headers
-
-	insinto $(alt_headers)/gnu
-	doins "${S}"/include/gnu/stubs.h
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	dosym usr/include $(alt_prefix)/sys-include
-}
-
-src_install() {
-	if just_headers ; then
-		export ABI=default
-		glibc_headers_install
-		return
-	fi
-
-	foreach_abi glibc_do_src_install
-
-	if ! use static-libs ; then
-		einfo "Not installing static glibc libraries"
-		find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
-	fi
-}
-
-# Simple test to make sure our new glibc isn't completely broken.
-# Make sure we don't test with statically built binaries since
-# they will fail.  Also, skip if this glibc is a cross compiler.
-#
-# If coreutils is built with USE=multicall, some of these files
-# will just be wrapper scripts, not actual ELFs we can test.
-glibc_sanity_check() {
-	cd / #228809
-
-	# We enter ${ED} so to avoid trouble if the path contains
-	# special characters; for instance if the path contains the
-	# colon character (:), then the linker will try to split it
-	# and look for the libraries in an unexpected place. This can
-	# lead to unsafe code execution if the generated prefix is
-	# within a world-writable directory.
-	# (e.g. /var/tmp/portage:${HOSTNAME})
-	pushd "${ED}"/$(get_libdir) >/dev/null
-
-	# first let's find the actual dynamic linker here
-	# symlinks may point to the wrong abi
-	local newldso=$(find . -maxdepth 1 -name 'ld*so.?' -type f -print -quit)
-
-	einfo Last-minute run tests with ${newldso} in /$(get_libdir) ...
-
-	local x striptest
-	for x in cal date env free ls true uname uptime ; do
-		x=$(type -p ${x})
-		[[ -z ${x} || ${x} != ${EPREFIX}/* ]] && continue
-		striptest=$(LC_ALL="C" file -L ${x} 2>/dev/null) || continue
-		case ${striptest} in
-		*"statically linked"*) continue;;
-		*"ASCII text"*) continue;;
-		esac
-		# We need to clear the locale settings as the upgrade might want
-		# incompatible locale data.  This test is not for verifying that.
-		LC_ALL=C \
-		${newldso} --library-path . ${x} > /dev/null \
-			|| die "simple run test (${x}) failed"
-	done
-
-	popd >/dev/null
-}
-
-pkg_preinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	einfo "Checking general environment sanity."
-	sanity_prechecks
-
-	# prepare /etc/ld.so.conf.d/ for files
-	mkdir -p "${EROOT}"/etc/ld.so.conf.d
-
-	# Default /etc/hosts.conf:multi to on for systems with small dbs.
-	if [[ $(wc -l < "${EROOT}"/etc/hosts) -lt 1000 ]] ; then
-		sed -i '/^multi off/s:off:on:' "${ED}"/etc/host.conf
-		einfo "Defaulting /etc/host.conf:multi to on"
-	fi
-
-	[[ -n ${ROOT} ]] && return 0
-	[[ -d ${ED}/$(get_libdir) ]] || return 0
-	[[ -z ${BOOTSTRAP_RAP} ]] && glibc_sanity_check
-
-	if [[ -L ${EROOT}/usr/lib/locale ]]; then
-		# Help portage migrate this to a directory
-		# https://bugs.gentoo.org/753740
-		rm "${EROOT}"/usr/lib/locale || die
-	fi
-
-	# Keep around libcrypt so that Perl doesn't break when merging libxcrypt
-	# (libxcrypt is the new provider for now of libcrypt.so.{1,2}).
-	# bug #802207
-	if ! use crypt && has_version "${CATEGORY}/${PN}[crypt]" && ! has preserve-libs ${FEATURES}; then
-		PRESERVED_OLD_LIBCRYPT=1
-		cp -p "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" "${T}/libcrypt$(get_libname 1)" || die
-	else
-		PRESERVED_OLD_LIBCRYPT=0
-	fi
-}
-
-glibc_refresh_ldconfig() {
-	if [[ ${MERGE_TYPE} == buildonly ]]; then
-		return
-	fi
-
-	# Version check could be added to avoid unnecessary work, but ldconfig
-	# should finish quickly enough to not matter.
-	ebegin "Refreshing ld.so.cache"
-	ldconfig -i
-	if ! eend $?; then
-		ewarn "Failed to refresh the ld.so.cache for you. Some programs may be broken"
-		ewarn "before you manually do so (ldconfig -i)."
-	fi
-}
-
-pkg_postinst() {
-	# nothing to do if just installing headers
-	just_headers && return
-
-	if ! tc-is-cross-compiler && [[ -x ${EROOT}/usr/sbin/iconvconfig ]] ; then
-		# Generate fastloading iconv module configuration file.
-		"${EROOT}"/usr/sbin/iconvconfig --prefix="${ROOT}/"
-	fi
-
-	if ! is_crosscompile && [[ -z ${ROOT} ]] ; then
-		# glibc-2.38+ on loong has ldconfig support added, but the ELF e_flags
-		# handling has changed as well, which means stale ldconfig auxiliary
-		# cache entries and failure to lookup libgcc_s / libstdc++ (breaking
-		# every C++ application) / libgomp etc., among other breakages.
-		#
-		# To fix this, simply refresh the ld.so.cache without using the
-		# auxiliary cache if we're natively installing on loong. This should
-		# be done relatively soon because we want to minimize the breakage
-		# window for the affected programs.
-		use loong && glibc_refresh_ldconfig
-
-		use compile-locales || run_locale_gen "${EROOT}/"
-	fi
-
-	upgrade_warning
-
-	# Check for sanity of /etc/nsswitch.conf, take 2
-	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
-		local entry
-		for entry in passwd group shadow; do
-			if grep -E -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
-				ewarn ""
-				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
-				ewarn "removed from glibc and is now provided by the package"
-				ewarn "  sys-auth/libnss-nis"
-				ewarn "Install it now to keep your NIS setup working."
-				ewarn ""
-			fi
-		done
-	fi
-
-	if [[ ${PRESERVED_OLD_LIBCRYPT} -eq 1 ]] ; then
-		cp -p "${T}/libcrypt$(get_libname 1)" "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1)" || die
-		preserve_old_lib_notify /$(get_libdir)/libcrypt$(get_libname 1)
-
-		elog "Please ignore a possible later error message about a file collision involving"
-		elog "${EROOT}/$(get_libdir)/libcrypt$(get_libname 1). We need to preserve this file for the moment to keep"
-		elog "the upgrade working, but it also needs to be overwritten when"
-		elog "sys-libs/libxcrypt is installed. See bug 802210 for more details."
-	fi
-}
diff --git a/sys-libs/glibc/glibc-2.38-r8.ebuild b/sys-libs/glibc/glibc-2.38-r8.ebuild
index 6443166a7e06..e9a58b8e1293 100644
--- a/sys-libs/glibc/glibc-2.38-r8.ebuild
+++ b/sys-libs/glibc/glibc-2.38-r8.ebuild
@@ -39,7 +39,7 @@ MIN_PAX_UTILS_VER="1.3.3"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
author	V3n3RiX <venerix@koprulu.sector>	2023-12-26 01:33:45 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-12-26 01:33:45 +0000
commit	15bb7733ddb1f16a0e3936969282ecc42419829a (patch)
tree	56c720cc03bec3e9758966b4083b5916feca6962
parent	026061ba423025e6713112920f290759cdee03c4 (diff)