gentoo auto-resync : 01:10:2023 - 17:44:07

122 files changed, 871 insertions, 1221 deletions

diff --git a/Manifest b/Manifest
index 7bce39444cf5..9626ce4e4431 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29324 BLAKE2B 82b15a2f5bbd1b1c6e09d4c4e53093feae08b5b41aa24a2806d9e3ab62d04d4fc40fb82da5df12577aaa5b9d7230b2c182144985f0c11e26b96d8cbecccb24f0 SHA512 764c29faf55345a29fde688d419b21f4a6ddea880e43d58decfecb7514751348a997d0332c410b74c8edcdd218b0e1f7357859d8019a7dad617f98b54b128757
-TIMESTAMP 2023-10-01T10:10:09Z
+MANIFEST Manifest.files.gz 29309 BLAKE2B 7543289acbb7a13b7cab5eadfa92bfc3a79fe1a9b487d3d4eb8431c620b738b88b866c647f4d438ddca1edf3b945b4695c0cb348763bd6e01d9ca7af9f3179e8 SHA512 e26b67741892daf0ad9ad9004d9d3a62eba8a902a0240cc2db7ad01915bfb38a13f188c0d41294d18b14573e2c7f4e0d0dded4e8758222eb5b4ded961bf421b4
+TIMESTAMP 2023-10-01T16:10:06Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZRYFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZmd5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDsDxAAnjUgZKMQlwqqwL0dXPYD4gzgvw33MHLq3zH084TqucqQwdyPDsKNHAfM
-5zlHthjSaQF+Oy7c5GG3l4AVdEKwazZ9kkQMbFGGIPU1tb0ZIYFxLuvjyWhtGIo6
-D1zFfn58GVFhUbQhASyBtsyZQoU1aMw65W1xzMnfD/0N14pybqpXmStu3dcr1kho
-uBVfyhi3/nVGfslUkdy6fEDEjRxirhVryU7d5RPrkRj8HwbqE7PpaIrGF36q+4vi
-LbH7vGaSbD2jRHd1h5j2S1jWBxMGVfK3HuQPUj2DcHc+Jv2eQi3cbrXIGven9B2l
-jB49pVOhPRUUveTrY+fDmq2A158LY8x+6w5eJOjH/Bn/qpQGl/nRTdH6koc3A4ga
-SiACx0q1z7tDSQYYMYUHo25HWw3tyE2yBz8K4zvE2/DMnF7+4u29xGpNZLf2L2wK
-h2LsWuSX0ONGB3qH5ETAMUG80sOC3Yc7FkdyEqYAdtIf+Id3adoFzuehdCruColL
-qKuk6kjTEby69BM9OESY3iuSe47ojmNEuYdnWJRL/DqfD8+47CA5IGHEWWe+//ZQ
-lBv6m5KNicvPx7cfdPp686OVfAS4a36KZpkcNfsLn1AGBfb3x/i1qVys2zR5gxph
-Gmh3IiiobstG3h/ZXCf3PSbpXF/Tv/8ivtRNh7PtAyHhphocxgk=
-=K1UK
+klBFVQ//QD3wjWykSHnKkOnyIgu1CVC3YpoTvH+tScuqzEgi4QtL4jd3+UlSJ0uT
+rUx3ndU0aG9DyTc+qDb5pg/Xu0Q62BoSHi4qP8in93XTKvCZw46+i8ADBSqrD9gc
+X9Mwntudjeo6XS7WisiJNEsNWT+ofERMJqXlxeerYkp90nu1eBn+lb9VVwlwsSc2
+l3H+g9AMj9eyqf6SLbDh0qnN1b5MspDnDxgr7P/Q0Egq6msEACg0yg8Ng8hPkpcz
+awr1RUQwxBUvjD0wR7lbqQcpXoUwkKX+xOU3KIb5UsE7Wth3oyp1U706JcjwBStU
+5dEYJIXLQ2MQBBhvLvbik/1ujkUsNA2IiskVApPV+DilKdue9GNdWyl1Sj2XCQgU
+wKlKgmoUZQwFmvHokcz05Hkw/x4zLyRjtuXfieEjvKc2VhD1tQQCBmptpleftZPs
+3saJBLBJK64z7/fgUnQjvkz/Ymy6y46L+zY53KnEGHO3Tz33yiy5+lce1Y/gGtoN
+Q7XiD8CUPuO/CIl4O5LWVSA9ltmB5NC4eH3Vkq7lCfahoMsQtZqqYVOEcvlCnHUv
+yo4NwfyB311GAEkYbn8vWSS5Ao4/igoj+Mg5pRlWnh52XaKyXlBXZXFfa8qD66wC
+c1t6hMk4K8WLQFE49kAD+/UjufOfYHx9lMABcy5Iw17Ysu3mZ/M=
+=o4Jr
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1ca5f8b749d3..00d2c538a64d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 90bf4f50cce3..d2e39f34dfb4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index 9e0b7e3ca8b3..4a58871c1cdb 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -1,5 +1,5 @@
 DIST mkosi-15.1.tar.gz 120606 BLAKE2B 36171c08c18dd3ba3c2e54c8a3374fad2a9b008f8253e6cd57cedf7b7e8216b6610b30f9f46aa634de62ebf257d1e8eff94a83b07c027708e4875e24bc0a8305 SHA512 3b65c6b964aa2bde12117b7b2c3e4be0ac72036a92a115f1e93e7be0b3b0aa0bd3adb753ee49865723a9bc677bc4492416caafff4fec3ffd942de78357c11608
 DIST mkosi-17.1.tar.gz 133505 BLAKE2B 96824568dd53cd83a1f8b95072c750e1a0bbd06356df19c62ea9799a5d8f1b2e55f108a3ec3cf171f5dfdefcc1ac5bc86785a60d80def38a5e1817b91f1d9486 SHA512 59988a6a81c0456df6fa9673032d1e25c5cc382b45fd0299c974559d573279c4c38f5600b4e14a71ecdaa013d9b97b90cc815b3b601a7dd061924519cd8b76bf
 EBUILD mkosi-15.1.ebuild 812 BLAKE2B fefc2c83f3d08049c09662b065768b0cb425593710e10a5a0bdd8cafa63f542481c4ea9d9b290036276ca3f0bc9ff9326dc5d11cc576ecac9729558f293fc641 SHA512 c1b6fadb5fd335d3b8525034dc5f417cb86cadbb9421d25961765f6ab9e922b18b9f851bf41b38cb3bad4cfd1069a2f880cecc63acc1b37f5ac2df4f527f3478
-EBUILD mkosi-17.1.ebuild 812 BLAKE2B fefc2c83f3d08049c09662b065768b0cb425593710e10a5a0bdd8cafa63f542481c4ea9d9b290036276ca3f0bc9ff9326dc5d11cc576ecac9729558f293fc641 SHA512 c1b6fadb5fd335d3b8525034dc5f417cb86cadbb9421d25961765f6ab9e922b18b9f851bf41b38cb3bad4cfd1069a2f880cecc63acc1b37f5ac2df4f527f3478
+EBUILD mkosi-17.1-r1.ebuild 818 BLAKE2B 54acb5f1829076770e02c46232bd80bd6a8f9d9d8ca22aec06018282a613eb2c643b029c4abe1a1d8748efbe52704ed5136c0b2129717caed540966456b02a4b SHA512 cfa1835e40a9fce04c251cb043c1f1a5ff1bc201b9266b7ca116df9d812c14c18d9286dcea01484f875670184afbecbf2384000d307a2ef810b0fea1861d6355
 MISC metadata.xml 479 BLAKE2B 3921ab722bcee7cc126528e3b204251ef5fddb5abb333ef3317e8e5fb0a596eced1619ce8bb3670aa8c78f60987d59fc7f6992dc5b14c407f2be3b16581389de SHA512 d02e7a8f4e9295ea13e9bd8a451f1b87463c7d15cb49529e348aa483350fb0553b5a4485999abd876d40a658b457b4de46d3e7561ff3b512f9c1865b1b901e35
diff --git a/app-admin/mkosi/mkosi-17.1.ebuild b/app-admin/mkosi/mkosi-17.1-r1.ebuild
index 16874bb99315..a01776550dcf 100644
--- a/app-admin/mkosi/mkosi-17.1.ebuild
+++ b/app-admin/mkosi/mkosi-17.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	app-emulation/qemu
 	sys-apps/bubblewrap
-	sys-apps/systemd
+	>=sys-apps/systemd-254
 	sys-firmware/edk2-ovmf"
 BDEPEND="virtual/pandoc"
 
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 449bd4140136..96d7c929bb96 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,13 +1,6 @@
-AUX 0001-__init__.py-Make-NetworkX-dep-optional.patch 2242 BLAKE2B 63815b66a6b5051ca084fcb265a6eb573f4738288376dada16c86c04ae3dbf4d58ff33583ff323d1096b321f0d410ae3b956b9e82caf710f78baf82db1a769fb SHA512 eac87e9335643b5e2f0de05b6e03c03d250c799e994edd52368b3a50e201beeebfbf40b7bf016200648fadf9c3d5c3708ac94ff158ea327cf2ea73f773ac8653
-AUX setools-4.4.0-remove-gui.patch 1015 BLAKE2B f81872b140107337466e1d57bfd3c1935adca838756a0c1a2c4f2d0f42b7ae0ecb60d5c6db0889998bca96d46c08979d03e989a79461bb6ceb3c7bd4ee6fa56f SHA512 6e2b3d0dafbb4b0966f04cd592fc14800755ea4f585ab4d1bf0516cd25f16185b0923045762ce88df47f7264481fb9dd6588efc38d7280e14b5f015192f12924
 AUX setools-4.4.1-cython3.patch 1853 BLAKE2B 7a7d5ae303d135cf69be3dfac99cace7afdb345835338f47570629c0cb31be8878abe042e010a18d73313b71035b7b2c77a9b57921a4a5600f1fd1c41a141ad1 SHA512 4892b69a14e0f45c89c397f1840af88b79903ccf50aa7e51c4d6dda9be0a2572e21de40f5f44071ab2a61cf0bba9bc8f5a0a8fba9e84c013db4812bab5257df3
 AUX setools-4.4.2-remove-gui.patch 1131 BLAKE2B 54f1258b4b8318f02fd8ef14c4377eacb42254a406b4b9f339b94b0958da352bda028b4b49871ebcdaf1dfc4e37e51f5a0dd346c288270c149d828981c2b5413 SHA512 a827c435072f4a35c165a2492f18c4689144f352ff8fa84ca840dd4b31c59dbd4d4e7c249ad54fb60616e00daad5bc245604041c710141650f80cba01c9cecb0
-DIST setools-4.4.0.tar.bz2 275218 BLAKE2B f716a78dd628e0309d3802f2155ef3a045dd8ebee7dec42be9f8b5fc0069b0df4e3d827b0a0cc03f7f02f5a3dff1d7ab7e4eee0d83d6cf4c87af82fe756a9321 SHA512 2ec92d7a6e30261549b6a8d2f17175d4a7d8313ef0cd81f4a19a91c53fe0107bac9a89c19dd67a4c534ee51ec520590795b4312f9e03e69fdf1763b0c35291f8
-DIST setools-4.4.1.tar.bz2 262328 BLAKE2B 328a54b8efd570fad03b27a9e52b7c573e0afb6fe23a245ad248fe8931dd737729aac5d9b6371c163d1939043a777b69cf78091cde8c33e5ef7670110615285e SHA512 af1844f7f7232729eb7e93f6680775818cda93532c62524c5385a4ac7437c51bdb58ebd970a9f61f6e1b018367853d35303d3c5ee1cc087e0e26e893be42d559
 DIST setools-4.4.2.tar.bz2 261962 BLAKE2B 7c8e47d8c15f1eb72d93da5d3ae1a64e857ed0a75e1a47bbad9e4b0d11180581d9e4705ebe942e460acbc4d68261f06f9b03a8c4af1516cc388c201e30dca75e SHA512 4e8cba61ca28459387d862136a2d8ee0914c4bcd254a6d39792cbfcbbf7e58cb82223c05d66c114b08aebbd75c11cef11517c51f674ddb3c1913dc85414546c1
-EBUILD setools-4.4.0-r3.ebuild 1531 BLAKE2B ebccb7eb8569d94c4d8ae698187b9aee2d408dd46c6567660b1bee18413f0facb189a6570eaed3648635da8c8f618717c6fd3f2971b003c6cde8e609a67ff527 SHA512 08644fdd5cb3b58c3851ea8a768a72999dc52bed1fdc2dafd5405f2c20c82f7af94395dba526b5dbdf2d4151d37050ec2c3924ec9833d19feb4238f521046131
-EBUILD setools-4.4.1-r1.ebuild 1606 BLAKE2B f424a9dcd2a6f81c20fbcbcf8cf9ed0952bed261aec4e181a36a4e5b745cf495e6715dfe0b8d20a5acd42ef8d9169fef8cb4035a5b8c4029b0ff314446985884 SHA512 01784528d02358e203ceb84cd933d785d72da993b5417f59fef876d62a718c34a2168c1e027c8b963b83821b23484f190d69e14ff22a5efcbd2358d7e5471d1d
-EBUILD setools-4.4.1.ebuild 1556 BLAKE2B dc1b91a3b87d1c87b723c406e08019c9c81332dfec3ab33aac3d0c337955b5d0152cca4c1dceb9dfa2a1832314b3f17bc2600473b796d71477625a317e93df6d SHA512 cf77f52a1530aea3f2fd771c9eb0c6ecfc7814bf8296fe81ac5cfd9fdee48571d877d672559529a52bbe8392bc0b8e4498ffcc429c570251ab7b7aca5cdfb4c0
 EBUILD setools-4.4.2.ebuild 1408 BLAKE2B 14733f327fc1e9c6d7b9c351b4575b7965a8d4d64d3852ba013b6c3b78a62f017bb90c3153c6d3460961f6ba93444f323bf78d5ef70d3adcea78ec648683d22d SHA512 8820db660d9ebda0aaa7290c4ce65768c9635237433e9a2741a0f21e0f5598960903442b39fb064d3e13783c840601973df33f86e95591228d8f32591e75cb17
 EBUILD setools-9999.ebuild 1358 BLAKE2B 4a31ac9f1ef8527c1758f48785d69e871deb6ee44090fbdbd6328b9c1e6311eb841adb834ecc999de599a4a99750216c010be8d455b6da8833232ea10bab54bb SHA512 2eb6d7d003bf9522aab274bcf32043c4459e1d3c97e0cc3f85ea2bb9cc11e8bd6946b6b1879f8dbb26337ba8abf83cdec42041fe60085b5a21725ba9912d6ecf
-MISC metadata.xml 440 BLAKE2B 5ff05dac3cb6a27d99c7ebb2e4425afaef2275aaff5e109feff6870e2e51c55c27dd8baa3d6ad3a2a9a292a20ece18dfb2f0ad61e30cd1dc7b74afaf20d0104c SHA512 f61bdc193e411a635c35e7244fad44b68061c56fa26a1b995f79fb46784d09f52bd85bcbc8caec5043390a72d8548fb4ac0dd84cd4a613dbbdb5fd49e3efa71f
+MISC metadata.xml 335 BLAKE2B 81a7604472415bdf249d90f69e80a7a7c66f23597cba3005fc1fc825012ffdeb29bcb3f8f8b028ee35e0a076fe4863c25d79077718b28d5f658e68df2a703c5b SHA512 9115e12f13e78b8f63ec90a2ed71c5c731781415a77c2fd06bba358240261bf83183f14f2d38e5e9ffcafaee56de4df224b517afceb536d8e1e6af6f1eaa0938
diff --git a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch b/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
deleted file mode 100644
index 3137f1a89f9a..000000000000
--- a/app-admin/setools/files/0001-__init__.py-Make-NetworkX-dep-optional.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 32eed2ae8fcd868179a317d48cfd61d828c834df Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Sun, 19 Sep 2021 14:12:44 +0200
-Subject: [PATCH] __init__.py: Make NetworkX dep optional
-
-selinux commit ba23ba068364ab11ff51f52bd1e20e3c63798a62
-"python: Import specific modules from setools for less deps"
-Makes userspace tools only need specific parts of setools so that the
-NetworkX dep can be dropped for minimal installations.
-Unfortunately the __init__ still imports the parts which require
-NetworkX. Wrap them in try except to guard for missing NetworkX.
-
-$ semanage export
-Traceback (most recent call last):
-  File "/usr/lib/python-exec/python3.9/semanage", line 29, in <module>
-    import seobject
-  File "/usr/lib/python3.9/site-packages/seobject.py", line 33, in <module>
-    import sepolicy
-  File "/usr/lib/python3.9/site-packages/sepolicy/__init__.py", line 15, in <module>
-    from setools.boolquery import BoolQuery
-  File "/usr/lib/python3.9/site-packages/setools/__init__.py", line 94, in <module>
-    from .infoflow import InfoFlowAnalysis
-  File "/usr/lib/python3.9/site-packages/setools/infoflow.py", line 24, in <module>
-    import networkx as nx
-ModuleNotFoundError: No module named 'networkx'
-
-Bug: https://bugs.gentoo.org/809038
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- setools/__init__.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/setools/__init__.py b/setools/__init__.py
-index d72d343..e583737 100644
---- a/setools/__init__.py
-+++ b/setools/__init__.py
-@@ -91,11 +91,20 @@ from .pcideviceconquery import PcideviceconQuery
- from .devicetreeconquery import DevicetreeconQuery
- 
- # Information Flow Analysis
--from .infoflow import InfoFlowAnalysis
-+try:
-+    from .infoflow import InfoFlowAnalysis
-+except ImportError:
-+    # NetworkX is optional
-+    pass
-+
- from .permmap import PermissionMap, RuleWeight, Mapping
- 
- # Domain Transition Analysis
--from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
-+try:
-+    from .dta import DomainTransitionAnalysis, DomainEntrypoint, DomainTransition
-+except ImportError:
-+    # NetworkX is optional
-+    pass
- 
- # Policy difference
- from .diff import PolicyDifference
--- 
-2.32.0
-
diff --git a/app-admin/setools/files/setools-4.4.0-remove-gui.patch b/app-admin/setools/files/setools-4.4.0-remove-gui.patch
deleted file mode 100644
index 01b40adb29db..000000000000
--- a/app-admin/setools/files/setools-4.4.0-remove-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/setup.py	2021-03-17 22:56:42.016632635 +0000
-+++ b/setup.py	2021-03-17 23:02:33.625713629 +0000
-@@ -139,10 +139,10 @@ setup(name='setools',
-       author_email='pebenito@ieee.org',
-       url='https://github.com/SELinuxProject/setools',
-       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
--      packages=['setools', 'setools.checker', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
--      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
-+      packages=['setools', 'setools.checker', 'setools.diff'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta', 'sechecker'],
-       data_files=installed_data,
--      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+      package_data={'setools': ['perm_map']},
-       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
-                             annotate=cython_annotate,
-                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 9e77647c601c..2367a4105f5c 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -5,9 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<use>
-		<flag name="infoflow">Depend on <pkg>dev-python/networkx</pkg> to use seinfoflow</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">SELinuxProject/setools</remote-id>
 	</upstream>
diff --git a/app-admin/setools/setools-4.4.0-r3.ebuild b/app-admin/setools/setools-4.4.0-r3.ebuild
deleted file mode 100644
index 7281dedc3904..000000000000
--- a/app-admin/setools/setools-4.4.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
-else
-	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="test infoflow X"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${PN}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-3.2:=
-	>=sys-libs/libselinux-3.2:=
-	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="<dev-python/cython-3[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
-		die "failed to set lib_dirs"
-
-	local PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
-	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.4.1-r1.ebuild b/app-admin/setools/setools-4.4.1-r1.ebuild
deleted file mode 100644
index b47388f73018..000000000000
--- a/app-admin/setools/setools-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_EXT=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="test infoflow X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-3.2:=
-	>=sys-libs/libselinux-3.2:=
-	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
-		sys-apps/checkpolicy
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch
-	"${FILESDIR}"/${P}-cython3.patch
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
-		die "failed to set lib_dirs"
-
-	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/setools/setools-4.4.1.ebuild b/app-admin/setools/setools-4.4.1.ebuild
deleted file mode 100644
index 52dcc404d73c..000000000000
--- a/app-admin/setools/setools-4.4.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="test infoflow X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-3.2:=
-	>=sys-libs/libselinux-3.2:=
-	infoflow? ( >=dev-python/networkx-2.0[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-python/cython-0.27[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
-		die "failed to set lib_dirs"
-
-	PATCHES=( "${FILESDIR}"/0001-__init__.py-Make-NetworkX-dep-optional.patch )
-	use X || PATCHES+=( "${FILESDIR}"/setools-4.4.0-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 1af40ebaa1cd..9585ff792d38 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index 28c431cfb59f..87de28c9d08f 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -1,5 +1,5 @@
 DIST dar-2.7.10.tar.gz 2418752 BLAKE2B 31365e900cdcd89c297f78953e82d7288cec524cc3f01a71f659a4e0238797d72c0c629d6fcfad00fa7bdaae1b846d86daa50c7857b13cac0ffac9e98bc398ef SHA512 3b75f06013d13f315280625b3ebf147e833b91164646f271ff81aa0961b788eb12a4dc6a743bbd8de4c7347bad03f2372fd8f5c038d0a83d45f3479cdba4cece
-DIST dar-2.7.12.tar.gz 2421683 BLAKE2B 3dc5fc362dbdc47acef33a57c07b21bb2e1cd197bb3475ecf27cf2cb8b54f13a962a386a8e472fc53e3069bbc6acc549e66fadafd1572cbba93eb41f1d493661 SHA512 55b4215da23ca63de479ab34f0d50e4eeb13548891e537702971ec6fc6e6a19e44282a6a711549f468abd507bc1d67f9df08fb76b4b5208c6e8843b3042d5ad2
+DIST dar-2.7.13.tar.gz 2425559 BLAKE2B 321a43b04553505279de6f6b27e332883f4209bbe81e24c418188f028b7ba7a794d4e0f510f2c6a22a57fbdbc0501d4fcf7201aadb8cca3e65c6649bff7cfedf SHA512 e7a4bd89ccefaca1d9251d05c39e80f9861b8154f414cd578ba98c3cf3a9f945738c6225fd007b5e73c2d7c2e4abe547e9a2e2deec2cb7e0ec5860603add64fb
 EBUILD dar-2.7.10.ebuild 2288 BLAKE2B a2116d8ec41d1dc7ea15e57509cb5b02e1f597c4b3e94298b9ce089043574fbf6f5afe0ea518b654f491ab33e59f2ceb4e226e1db975c411ff51c5fab2bb2058 SHA512 f36966ab6bb6c9dca8b1576733acc0c8232725dc87a94a28364f33abd792e50be11e7bea8c8d783c9f648fab7398016796d6571ab600265b3985f1d199e3949d
-EBUILD dar-2.7.12.ebuild 2292 BLAKE2B fad7a901244d5c64b8cc3fbb2f9c48906ca72f155b0679d5666dfdcf644b52d5991ce79410aaece620b5951f10f2af9a2a5de95d24052bada11fa6f9baa93b01 SHA512 c3cf9615ad174363cf81bb32f8331c4014c0d05b02d8eeb1b6a30d6423d5bab6af96672ebd20a36f8dc3940a598340d132a0a264713ac9c17a257a904cf522cb
+EBUILD dar-2.7.13.ebuild 2316 BLAKE2B 31f0ed243e57adf1601f5f8f081d358a31d68856fa7c6b37801d939c7cddd96c1b095e1d63b07304ac4aa9657b024d0350a5e7b5726901ba1eddf7634a7fec6e SHA512 19307683d3a2ed156cfc83ebe3d42c4f2704310fe913cf7752ac5d63eb800ed2a5b77ce343db9f635d92417d26588a448af4eeb48bb55e9046c0db3499b35832
 MISC metadata.xml 1180 BLAKE2B d978c1b969e7aeb013862c6b76ceb7b466af7b0a16d334bfbaafcdb49e13b4f07727073ff8a24da0f0422161f48805310b8ed7c0cc97b07190b241ad77cec254 SHA512 f8107b5f81d0d00a1873089b084250c98094625274b9c01f8ca11f6dcfa890278ec89d039849c203ccccc8115d54ee3f9365d9f6afc38cb3411f6292c62c11c0
diff --git a/app-backup/dar/dar-2.7.12.ebuild b/app-backup/dar/dar-2.7.13.ebuild
index e6bca3c7f42f..f1fd127a9c8d 100644
--- a/app-backup/dar/dar-2.7.12.ebuild
+++ b/app-backup/dar/dar-2.7.13.ebuild
@@ -34,7 +34,10 @@ RDEPEND="
 		dev-libs/libgcrypt:0=
 		dev-libs/libgpg-error
 	)
-	gpg? ( app-crypt/gpgme:= )
+	gpg? (
+		app-crypt/gpgme:=
+		dev-libs/libassuan
+	)
 	lz4? ( app-arch/lz4:= )
 	lzo? ( dev-libs/lzo:2 )
 	nls? ( virtual/libintl )
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7bc69aee1fb0..4232ce661105 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 0b449851a7bf..a3e6baf7055c 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -11,6 +11,6 @@ DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5ce
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
 EBUILD dxvk-1.10.3-r1.ebuild 4795 BLAKE2B 625a38411040ac49cb8545516e2296b92f6a4e78ea2390bd17d48bea9fd15cf0d7ef86fcb81d04fdc93e6df5f9e0eb7f787496db441cabee6607e7b1a93646fb SHA512 54399cf3cac6c57ea602a4a0d19ec9a6a146032a38a3c6402986bef38345557b44906c16637b1b5a94739a8b03cbafe1c8c49c58f1ab4b4ab5912e074720999f
 EBUILD dxvk-2.2-r1.ebuild 6392 BLAKE2B ffe854e9a7f4fd8d42a25c5f0354e04e9cc47f398a7adf9fc35f3d996bd6b24df00bc41a6e16d4b3df164695d9d23328ca4e2dc34ecdad8a4d86b10fda72fd27 SHA512 0698426cfbee73cff28a9fc4f34cae702dfbbf5143599783851501f39d291e7835260fc3b4b0619cf42a0408e0ae3e399cdf1033aedb471a8be7a43c57f9930f
-EBUILD dxvk-2.3.ebuild 6394 BLAKE2B f7902dc124a755e651dba9bb33f3ccac7480d679aeb2967bd3d4458ed17a8979519c9d017bf91971e833d1d9da5a09dc4c0f80e7cc5d3c7f79e3c2531540916f SHA512 46589a46e34939b6847db415df6e2e429fa6edf8bd6694a0eb757e5dea4074a3947f659c19a5185691ebcdf3195ddfb6bcc326410d5ade9e5a31ad8616bf8847
+EBUILD dxvk-2.3.ebuild 6392 BLAKE2B 165cbd1722ad9528961fb106699493d519aafc7d702ff7615555462133317bcbb5f45acf2a0cf463027c032b6381cf14303b42818b86b960efbc6cfba051304d SHA512 5ecca3c03ab765c9247713659721f60b0bcfba4e7d0be701943286ae8d788d02b54deafd9bef38ae96359360f38822daa3b1f20cb46f844bfc43ef1afc1dec68
 EBUILD dxvk-9999.ebuild 6394 BLAKE2B 35b7323ac83bf26e7048c2246e89b675959b3f028a99893561f0d9f3cd15f63fa7e4d894b490928991de698e2c4bb349c39a82b2d6aaca0b423ef488fd106371 SHA512 50c059821b5ba1a484002a7ee373c6a34eef5683c19c3482842ffd290e5d4ff219b52d6271a8f52494248957370dc18668ed02a4e9f99a3b0bc189b73ccb27c9
 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b
diff --git a/app-emulation/dxvk/dxvk-2.3.ebuild b/app-emulation/dxvk/dxvk-2.3.ebuild
index cb316e1bb60b..92af875703e3 100644
--- a/app-emulation/dxvk/dxvk-2.3.ebuild
+++ b/app-emulation/dxvk/dxvk-2.3.ebuild
@@ -28,7 +28,7 @@ else
 		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
 			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
 		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 # setup_dxvk.sh is no longer provided, fetch old until a better solution
 SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 1e92034c8a24..811587ec5225 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 8242855ff0df..07d860014400 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -37,7 +37,7 @@ DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f
 DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236
 DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
-EBUILD openjfx-11.0.11_p1-r1.ebuild 6602 BLAKE2B abd5e2d7757b5ada08f8e5998e64c8cd1e2ca5d92cf41d5e8d17b4385d31359d1147fc77586d32825ae3fc58cf898078b461143bc2e2c8f2721cb28d49617ad6 SHA512 7fd2faea34f8e99ff83baf57eaf15ef95c1d7556bbd354c85dfeac3e3563b4b04ddfcd7a444e8aaf8241541dc7831276fda3d19f92c5a2a356c964de04796b59
-EBUILD openjfx-11.0.9_p0-r1.ebuild 6568 BLAKE2B 42d0eb52bc6844bff3215597ff061e2baacf497261b37559f1a824b12a247c2cd3583888dff6a9165c4cf21564b64a505842ba84972759ef6ed0b99df89bc4b3 SHA512 73a4a8a453825a28b72f0e05861d7c8b0f0f66ccf459e1fd3f49f470231850a2baa0851c25f0826d3c7883b5dfb3916cdd7e211845607fe1fdcc6af568666cf8
+EBUILD openjfx-11.0.11_p1-r1.ebuild 6572 BLAKE2B 0ef177a2b7de0722455433cc89535bc9a0f5c25be7260488e6e08859f375ade524b56469881b15cdb4a8359b5b23b2eef0b526c0a28b25ed04d7d67a29153f86 SHA512 65827cc97c0b6c56a7e4e186321542229bf9de5ff673309beb2ee7b4d37e004b07628eb0bdd251f9b8eee4f70e15eaec3b0a7724c3dfe47ab03372d4a9eb22ce
+EBUILD openjfx-11.0.9_p0-r1.ebuild 6538 BLAKE2B 06a23d77d9190f339d4d52f918328c2d8cbfc6d113e06f700110fe0a04b305e913fe2557cb3efadacbeddc7ba69fa05f87c3198d05065e50c6d48cacf637bfed SHA512 a7b77c4f065a121b22874eb613e101d3708037776b85134ba411f07c25c1c160e7b0d55b057676e94e11f70a89944dc8587c2a1f453c1a32f1699b951fc12ee3
 EBUILD openjfx-8.1000-r1.ebuild 5583 BLAKE2B 14e6cfe9ecf3d0a8d80593a7ef99b5f4fe0122270dd94fc4e01d868ddc2b6879b071fcd85f16a82af4efde828858bc2e8de8986639fc218e475a1a8186ed2167 SHA512 47ee853dc65f892c087ace044ff40d0d13b133fcfc3129835c8a710ac90eb903bbba523ea60b71e6d0c4e8cb8751d9c5e3b0fa674d595658baed469a26c68600
 MISC metadata.xml 679 BLAKE2B 6197810f33cab61e844a41acb183754f4034020116507ae07db6ab81cf91e9088a4359b6c37d85de9130d835ad12f33da597f514248d6abe000ab2f5a1127627 SHA512 81e44c868178fb48e8182bc7b4eae21abd43ac561f0d819617d8fb1b5ed69d2cc02c2b97790ac957a3c9c07083c3ad93744294b52b971955a521596eb2421b0b
diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
index 3263c68c1c08..34f91df33673 100644
--- a/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.11_p1-r1.ebuild
@@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 "
 
+S="${WORKDIR}/rt-${MY_PV}"
+
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="-* ~amd64 ~ppc64"
-
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -68,8 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
 PATCHES=(
 	"${FILESDIR}"/11/disable-buildSrc-tests.patch
 	"${FILESDIR}"/11/glibc-compatibility.patch
@@ -82,8 +82,6 @@ PATCHES=(
 	"${FILESDIR}"/11/ffmpeg5.patch
 )
 
-S="${WORKDIR}/rt-${MY_PV}"
-
 egradle() {
 	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
 	local gradle="${GRADLE_HOME}/bin/gradle"
@@ -128,14 +126,13 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version -b dev-java/openjdk:${SLOT}; then
 		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 		export JDK_HOME="${JAVA_HOME}"
 		export ANT_RESPECT_JAVA_HOME=true
-
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -183,7 +180,7 @@ src_configure() {
 	# build is very sensetive to doc presense, take extra steps
 	if use doc; then
 		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+		if has_version -b dev-java/openjdk:${SLOT}[doc]; then
 			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
diff --git a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
index 7fca74112cfd..0f4c3e85b629 100644
--- a/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
+++ b/dev-java/openjfx/openjfx-11.0.9_p0-r1.ebuild
@@ -24,10 +24,12 @@ SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.b
 	https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 "
 
+S="${WORKDIR}/rt-${MY_PV}"
+
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="-* ~amd64 ~ppc64"
-
 IUSE="cpu_flags_x86_sse2 debug doc source +media"
+REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -68,8 +70,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-
 PATCHES=(
 	"${FILESDIR}"/11/disable-buildSrc-tests.patch
 	"${FILESDIR}"/11/glibc-compatibility.patch
@@ -82,8 +82,6 @@ PATCHES=(
 	"${FILESDIR}/11/${PV}-version.patch"
 )
 
-S="${WORKDIR}/rt-${MY_PV}"
-
 egradle() {
 	local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
 	local gradle="${GRADLE_HOME}/bin/gradle"
@@ -128,14 +126,13 @@ pkg_setup() {
 		fi
 	done
 
-	if has_version --host-root dev-java/openjdk:${SLOT}; then
+	if has_version -b dev-java/openjdk:${SLOT}; then
 		export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
 		export JDK_HOME="${JAVA_HOME}"
 		export ANT_RESPECT_JAVA_HOME=true
-
 	else
 		if [[ ${MERGE_TYPE} != "binary" ]]; then
-			JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
+			JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT})
 			[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
 			JDK_HOME=${JDK_HOME#*/}
 			JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
@@ -183,7 +180,7 @@ src_configure() {
 	# build is very sensetive to doc presense, take extra steps
 	if use doc; then
 		local jdk_doc
-		if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
+		if has_version -b dev-java/openjdk:${SLOT}[doc]; then
 			jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
 		fi
 		[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e7ef2acc3f3a..eeb84b89ad7b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a5be506632b6..8b37bf5e2a05 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -26,6 +26,7 @@ DIST python-gentoo-patches-3.12.0rc1_p5.tar.xz 348764 BLAKE2B 8f71d6172ca4e557c1
 DIST python-gentoo-patches-3.12.0rc1_p6.tar.xz 349384 BLAKE2B 975aae449a01a31c459b287a47bd4d1a2d8b0b39e594a1c976371acc4948765bcb4733dd9e10b70c87dfb9409d4db6b2492004841db61577576852634a40365c SHA512 f262d1a9291867e1bdc8f92c682338369b1b52f210d6db0c648c3bbabea68c6b596dfd8d13507f6d65de37d1b83beb336be3abff239d2a588054794b5bebeb81
 DIST python-gentoo-patches-3.12.0rc2_p1.tar.xz 5168 BLAKE2B 399ad4854c46e0a2bdc7c3028cc5ad1807a1d6566654a1a85bf9a8a1b205aa7b57ab1706d8ae478b93f0938a9c205374b291aaac0c3356c05d99c5955633f541 SHA512 61ac3191e0dabbc9eeef54595e4071523205def60dca9c86fdb58d72971423d6d4b37a0875562b8f1ec8627230062aea765c07b771a9ce002a1026cdaacd507e
 DIST python-gentoo-patches-3.12.0rc3.tar.xz 5168 BLAKE2B 66f132bb26c5ce36823897a6938c0f7018afd8f3c53cf738656929a944604de2764263c437c6ee4f81b617f02a33ef154d354998d14fcaef358b19b867da2937 SHA512 72fb6371871bb41ba59ddf711444fa17524fc7ac185db0ac762f6664c61cf086c73d13df10c0346094f603ed2d783bae201ee79de8d7d4cc339b74b26bd0a2f6
+DIST python-gentoo-patches-3.12.0rc3_p1.tar.xz 9700 BLAKE2B e87bc56dcf82dc0ba598ac68ffda4dbd4dd8dac4b1e9d2bc092f4ef05b9045a41270dffc7b727bcc4e82df302ee923d29dae9c18ebf97494a016c30c2f3073ac SHA512 5d9eb94ab0ffe1fba81362c448dabcd771f89e0a8576a72e7d5748831b9b8bb858942ed6c2eee3306be2a42fe4ed01f971269969c0fd6279c32d390a3a8f7cd8
 DIST python-gentoo-patches-3.8.18.tar.xz 32424 BLAKE2B 2e0b6e1c8e3df666934ba283214ca1577b01140dea00513f6420b0255650002e4bc4cb142076620227cd430bc2547123fd392883285886e543ef72ca466f8ea6 SHA512 b005f1054b726fc8c82a50b006309de64fb7858fe5c22cc7b160687d059a7859ec9388706b74a0e6c1f42301bed071dc639eb8cfae0d7c5eef2f565c63cc2d29
 DIST python-gentoo-patches-3.9.18.tar.xz 25044 BLAKE2B 1d9ace5c5a0f1c15bc23595cc51d64b4c2b416552cdaaa960c3e34360aba3e7029a06e2a077212c68fa7aee4fd20f649a3b0926bd4ebb10e529e8350ab051e63 SHA512 bc180c3346dfae60a7db221d114146ee83409bc42092171eb05c83de528bf5f0e5654d1441f40ba839d0a98e866a5b43452fb7a72047c837497620a12097b8f5
 EBUILD python-2.7.18_p16-r1.ebuild 8603 BLAKE2B 13c654aad809e8f999fa36e63f4a4eec5c2804644fab92c6f1a5c8ef75b20bde8509c34358e32350d7ddcbf8a309b9c5c008a9f9ab83c7d208434bd7efab0467 SHA512 88de339a316876a5a71560842cd879ba96b522f7dc4e409e6a22109639a538cb38abdc1a3d6c8ef468476841d1fe6014327197e8e2b0dd2d357ecde34bf8993a
@@ -37,6 +38,7 @@ EBUILD python-3.12.0_rc1_p6.ebuild 15037 BLAKE2B 0a12685727c7b54f442e6f5bad91a7f
 EBUILD python-3.12.0_rc2_p1-r1.ebuild 14681 BLAKE2B 9cdf429936b069e99782907e013fe94f4c80253103b30266a42cd1c74a4f0844f83f92cc679cba0199e99c4e5935d866fd9a5e39b90077bb1bf420f1fd8287cb SHA512 d179af9d4244b450177f6f1053c0650998c4d41ebd7b8d99f3d417e1354e4290dfdc0b2e57bf22d3be7e14963408fcaf4a4a34c9aef6652701e1aa6074bb622b
 EBUILD python-3.12.0_rc2_p1.ebuild 15064 BLAKE2B 757229ebd88aaae7397a28ae19e2998efb23332aa4155da8b84153ccc12a6f489b1122409661fd765593a56f1e7e3a87320acd018d2697f949b3210110398474 SHA512 a7421e7d9d70f92f5ff84917d79d6eaec046de54d7ddeb671238f29b7743edd071cb5d2d570fafd6f29d3e3961a52546802fe105ade6abb2cb9887d6457e305e
 EBUILD python-3.12.0_rc3.ebuild 14681 BLAKE2B 9cdf429936b069e99782907e013fe94f4c80253103b30266a42cd1c74a4f0844f83f92cc679cba0199e99c4e5935d866fd9a5e39b90077bb1bf420f1fd8287cb SHA512 d179af9d4244b450177f6f1053c0650998c4d41ebd7b8d99f3d417e1354e4290dfdc0b2e57bf22d3be7e14963408fcaf4a4a34c9aef6652701e1aa6074bb622b
+EBUILD python-3.12.0_rc3_p1.ebuild 14681 BLAKE2B 9cdf429936b069e99782907e013fe94f4c80253103b30266a42cd1c74a4f0844f83f92cc679cba0199e99c4e5935d866fd9a5e39b90077bb1bf420f1fd8287cb SHA512 d179af9d4244b450177f6f1053c0650998c4d41ebd7b8d99f3d417e1354e4290dfdc0b2e57bf22d3be7e14963408fcaf4a4a34c9aef6652701e1aa6074bb622b
 EBUILD python-3.8.18.ebuild 12365 BLAKE2B f186fea669f32e250e044d575690418ba81dc0f9389c9c1c61a91ce09261277028042a80daefdc5b4946d88fbf4ea159d68896d27d1d981502f8a32fb76b010d SHA512 4b7cc3ab54d43c0eebfa72b3e7b41755d391b6d9076fd56a155dd28b18f8e8c5d67a6472d03913e1b766f030152ae158e40edab1dc2a4a6c9f8251d7e44fc8c9
 EBUILD python-3.9.18.ebuild 13866 BLAKE2B 06ebd3752ef075f85633b74c8237537bdc551de1e6fa20ffe5a914cedfd5186678b4e9bd3d5e46539607c317e18f3e03e671a19ffb065767a7d32811d9c543fe SHA512 886622cf89cc87ad7490a94775e01d02305953be1caf3de5c771fb7d926db33a69961c1048428f8c07dde7670d1be05dbd81822cc50ad348ad07a5ebfb005deb
 MISC metadata.xml 1436 BLAKE2B fd5ebcef153bc74aae02f8930dba67736ce44b1dd23418448e7d5bd22391845f5edf0ba8cdf3f43af9254c68734b95fbac9ee891f09c4584c9272ac4233eede6 SHA512 124a1e743cef7236f7936aa843d3aae739a420b1b6173f02c2ef787745616891142724446320d887aeecb95fac09e3620a9666e8e3e32085d79019fe71ff7da5
diff --git a/dev-lang/python/python-3.12.0_rc3_p1.ebuild b/dev-lang/python/python-3.12.0_rc3_p1.ebuild
new file mode 100644
index 000000000000..1a53a9eb0e9f
--- /dev/null
+++ b/dev-lang/python/python-3.12.0_rc3_p1.ebuild
@@ -0,0 +1,532 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+WANT_LIBTOOL="none"
+
+inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
+inherit python-utils-r1 toolchain-funcs verify-sig
+
+MY_PV=${PV/_rc/rc}
+MY_P="Python-${MY_PV%_p*}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-${MY_PV}"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="
+	https://www.python.org/
+	https://github.com/python/cpython/
+"
+SRC_URI="
+	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+	verify-sig? (
+		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
+	)
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="
+	bluetooth build debug +ensurepip examples gdbm libedit lto
+	+ncurses pgo +readline +sqlite +ssl test tk valgrind
+"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="
+	app-arch/bzip2:=
+	app-arch/xz-utils:=
+	app-crypt/libb2
+	>=dev-libs/expat-2.1:=
+	dev-libs/libffi:=
+	dev-python/gentoo-common
+	>=sys-libs/zlib-1.1.3:=
+	virtual/libcrypt:=
+	virtual/libintl
+	ensurepip? ( dev-python/ensurepip-pip )
+	gdbm? ( sys-libs/gdbm:=[berkdb] )
+	kernel_linux? ( sys-apps/util-linux:= )
+	ncurses? ( >=sys-libs/ncurses-5.2:= )
+	readline? (
+		!libedit? ( >=sys-libs/readline-4.1:= )
+		libedit? ( dev-libs/libedit:= )
+	)
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? ( >=dev-libs/openssl-1.1.1:= )
+	tk? (
+		>=dev-lang/tcl-8.0:=
+		>=dev-lang/tk-8.0:=
+		dev-tcltk/blt:=
+		dev-tcltk/tix
+	)
+"
+# bluetooth requires headers from bluez
+DEPEND="
+	${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? (
+		app-arch/xz-utils[extra-filters(+)]
+		dev-python/ensurepip-pip
+		dev-python/ensurepip-setuptools
+		dev-python/ensurepip-wheel
+	)
+	valgrind? ( dev-util/valgrind )
+"
+# autoconf-archive needed to eautoreconf
+BDEPEND="
+	sys-devel/autoconf-archive
+	app-alternatives/awk
+	virtual/pkgconfig
+	verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 )
+"
+RDEPEND+="
+	!build? ( app-misc/mime-types )
+"
+if [[ ${PV} != *_alpha* ]]; then
+	RDEPEND+="
+		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
+	"
+fi
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
+
+# large file tests involve a 2.5G file being copied (duplicated)
+CHECKREQS_DISK_BUILD=5500M
+
+QA_PKGCONFIG_VERSION=${PYVER}
+# false positives -- functions specific to *BSD
+QA_CONFIG_IMPL_DECL_SKIP=( chflags lchflags )
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+	fi
+	default
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat and libffi are not used.
+	# TODO: Makefile has annoying deps on expat headers
+	#rm -r Modules/expat || die
+
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+
+	default
+
+	# force the correct number of jobs
+	# https://bugs.gentoo.org/737660
+	sed -i -e "s:-j0:-j$(makeopts_jobs):" Makefile.pre.in || die
+
+	eautoreconf
+}
+
+build_cbuild_python() {
+	# Hack to workaround get_libdir not being able to handle CBUILD, bug #794181
+	local cbuild_libdir=$(unset PKG_CONFIG_PATH ; $(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libffi)
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	#
+	# -fno-lto to avoid bug #700012 (not like it matters for mini-CBUILD Python anyway)
+	local -x CFLAGS_NODIST="${BUILD_CFLAGS} -fno-lto"
+	local -x LDFLAGS_NODIST=${BUILD_LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+	local -x BUILD_CFLAGS="${CFLAGS_NODIST}"
+	local -x BUILD_LDFLAGS=${LDFLAGS_NODIST}
+
+	# We need to build our own Python on CBUILD first, and feed it in.
+	# bug #847910
+	local myeconfargs_cbuild=(
+		"${myeconfargs[@]}"
+
+		--prefix="${BROOT}"/usr
+		--libdir="${cbuild_libdir:2}"
+
+		# Avoid needing to load the right libpython.so.
+		--disable-shared
+
+		# As minimal as possible for the mini CBUILD Python
+		# we build just for cross to satisfy --with-build-python.
+		--without-lto
+		--without-readline
+		--disable-optimizations
+	)
+
+	mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+	pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+
+	# Avoid as many dependencies as possible for the cross build.
+	mkdir Modules || die
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		_dbm _gdbm
+		_sqlite3
+		_hashlib _ssl
+		_curses _curses_panel
+		readline
+		_tkinter
+		pyexpat
+		zlib
+		# We disabled these for CBUILD because Python's setup.py can't handle locating
+		# libdir correctly for cross. This should be rechecked for the pure Makefile approach,
+		# and uncommented if needed.
+		#_ctypes _crypt
+	EOF
+
+	ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+	# Unfortunately, we do have to build this immediately, and
+	# not in src_compile, because CHOST configure for Python
+	# will check the existence of the --with-build-python value
+	# immediately.
+	emake
+	popd &> /dev/null || die
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	if ! use bluetooth; then
+		local -x ac_cv_header_bluetooth_bluetooth_h=no
+	fi
+
+	append-flags -fwrapv
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/700012
+	if is-flagq -flto || is-flagq '-flto=*'; then
+		append-cflags $(test-flags-CC -ffat-lto-objects)
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	# PKG_CONFIG needed for cross.
+	tc-export CXX PKG_CONFIG
+
+	local dbmliborder=
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	if use pgo; then
+		local profile_task_flags=(
+			-m test
+			"-j$(makeopts_jobs)"
+			--pgo-extended
+			-u-network
+
+			# We use a timeout because of how often we've had hang issues
+			# here. It also matches the default upstream PROFILE_TASK.
+			--timeout 1200
+
+			-x test_gdb
+			-x test_dtrace
+
+			# All of these seem to occasionally hang for PGO inconsistently
+			# They'll even hang here but be fine in src_test sometimes.
+			# bug #828535 (and related: bug #788022)
+			-x test_asyncio
+			-x test_httpservers
+			-x test_logging
+			-x test_multiprocessing_fork
+			-x test_socket
+			-x test_xmlrpc
+
+			# Hangs (actually runs indefinitely executing itself w/ many cpython builds)
+			# bug #900429
+			-x test_tools
+		)
+
+		if has_version "app-arch/rpm" ; then
+			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
+			profile_task_flags+=(
+				-x test_distutils
+			)
+		fi
+		local -x PROFILE_TASK="${profile_task_flags[*]}"
+	fi
+
+	local myeconfargs=(
+		# glibc-2.30 removes it; since we can't cleanly force-rebuild
+		# Python on glibc upgrade, remove it proactively to give
+		# a chance for users rebuilding python before glibc
+		ac_cv_header_stropts_h=no
+
+		--enable-shared
+		--without-static-libpython
+		--enable-ipv6
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-platlibdir=lib
+		--with-pkg-config=yes
+		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with debug assertions)
+		$(use_with lto)
+		$(use_enable pgo optimizations)
+		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
+	)
+	# Force-disable modules we don't want built.
+	# See Modules/Setup for docs on how this works. Setup.local contains our local deviations.
+	cat > Modules/Setup.local <<-EOF || die
+		*disabled*
+		nis
+		$(usev !gdbm '_gdbm _dbm')
+		$(usev !sqlite '_sqlite3')
+		$(usev !ssl '_hashlib _ssl')
+		$(usev !ncurses '_curses _curses_panel')
+		$(usev !readline 'readline')
+		$(usev !tk '_tkinter')
+	EOF
+
+	# disable implicit optimization/debugging flags
+	local -x OPT=
+
+	if tc-is-cross-compiler ; then
+		build_cbuild_python
+		myeconfargs+=(
+			# Point the imminent CHOST build to the Python we just
+			# built for CBUILD.
+			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
+		)
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+		eerror "configure has detected that the sem_open function is broken."
+		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+		die "Broken sem_open function (bug 496328)"
+	fi
+
+	# install epython.py as part of stdlib
+	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+	export PYTHONSTRICTEXTENSIONBUILD=1
+
+	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
+	# end up writing bytecode & violating sandbox.
+	# bug #831897
+	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
+
+	if use pgo ; then
+		# bug 660358
+		local -x COLUMNS=80
+		local -x PYTHONDONTWRITEBYTECODE=
+
+		addpredict "/usr/lib/python${PYVER}/site-packages"
+	fi
+
+	# also need to clear the flags explicitly here or they end up
+	# in _sysconfigdata*
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Restore saved value from above.
+	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# this just happens to skip test_support.test_freeze that is broken
+	# without bundled expat
+	# TODO: get a proper skip for it upstream
+	local -x LOGNAME=buildbot
+
+	local test_opts=(
+		-u-network
+		-j "$(makeopts_jobs)"
+
+		# fails
+		-x test_gdb
+	)
+
+	if use sparc ; then
+		# bug #788022
+		test_opts+=(
+			-x test_multiprocessing_fork
+			-x test_multiprocessing_forkserver
+		)
+	fi
+
+	# workaround docutils breaking tests
+	cat > Lib/docutils.py <<-EOF || die
+		raise ImportError("Thou shalt not import!")
+	EOF
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite "/usr/lib/python${PYVER}/site-packages"
+
+	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local ret=${?}
+
+	rm Lib/docutils.py || die
+
+	[[ ${ret} -eq 0 ]] || die "emake test failed"
+}
+
+src_install() {
+	local libdir=${ED}/usr/lib/python${PYVER}
+
+	# the Makefile rules are broken
+	# https://github.com/python/cpython/issues/100221
+	mkdir -p "${libdir}"/lib-dynload || die
+
+	# -j1 hack for now for bug #843458
+	emake -j1 DESTDIR="${D}" altinstall
+
+	# Fix collisions between different slots of Python.
+	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax-kernel]; then
+		pax-mark E "${ED}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED}/usr/bin/${abiver}"
+	fi
+
+	rm -r "${libdir}"/ensurepip/_bundled || die
+	if ! use ensurepip; then
+		rm -r "${libdir}"/ensurepip || die
+	fi
+	if ! use sqlite; then
+		rm -r "${libdir}/"sqlite3 || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}/usr/bin/idle${PYVER}" || die
+		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+	fi
+
+	ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die
+
+	dodoc Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		docinto examples
+		find Tools -name __pycache__ -exec rm -fr {} + || die
+		dodoc -r Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(
+		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
+		emake --no-print-directory -s -f - 2>/dev/null
+	)
+	newins Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	local EPYTHON=python${PYVER}
+	local scriptdir=${D}$(python_get_scriptdir)
+	mkdir -p "${scriptdir}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${scriptdir}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${scriptdir}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
+	# 2to3, pydoc
+	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
+	fi
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
+			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
+			ewarn "installed previously are no longer valid and will be regenerated"
+			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
+			ewarn "when installing some packages and checksum mismatches when removing"
+			ewarn "old versions.  To actively prevent this, rebuild all packages"
+			ewarn "installing Python 3.11 modules, e.g. using:"
+			ewarn
+			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
+		fi
+	done
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 724e334d8cd9..a753defcec9c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libgee/Manifest b/dev-libs/libgee/Manifest
index 36ae81d71076..f510ad9a31f5 100644
--- a/dev-libs/libgee/Manifest
+++ b/dev-libs/libgee/Manifest
@@ -1,3 +1,3 @@
 DIST libgee-0.20.6.tar.xz 690436 BLAKE2B cdb88719e0e1bceccefd6a824823e6e514bf1f4d6b8cf5330d6d83f781649312b23554c7dfc4a6b4eeb3bbcd81ca42843666d596b85634ff95fc90e90fea44bd SHA512 05176b221274b2a0512b018b93ae730ca750482bbc7a4951376eb868c0a388950371e80a438b5af792ebe4a64b6a38e0c94ca52ebd0fc4539f0fe233e0be5903
-EBUILD libgee-0.20.6.ebuild 687 BLAKE2B 763a4d704d0b5908482f6eec3370f86b043a71947109be77e1045d72ab94058f32091f2a242eb048a16fd5f8a7bbdfe39178ac55caa7b1776ed9a41fde15a55a SHA512 ca3f1452ecb1e1c543c37d0d86a395be961a7ae435b2ce34b4632512c67f3e13d1b4642f7961fc250fcac9862900cc7b7cf6188a518b7e8afada1f6f5a07a1fc
+EBUILD libgee-0.20.6.ebuild 698 BLAKE2B fd01d8294672ad071b8e5326656e88ea084faf92387ee4166a4b2397cd09d555ee2ec29c301a287ae90658c4dc49d91032d3a67aa02cf5dd376ee4316d2abbf0 SHA512 b428084d36a3d9d8e3908183f6fa1fcadee8f46b3162f8a5162f3358d4fc7716d5fb816ee882dc9e59bf0f01659c541b5201149e7aab6b9241d7db20f883bd04
 MISC metadata.xml 347 BLAKE2B c0d6f55760dc3a10dca3c4d56e1833da7bb94a048d5f1c44c4275685b441eeea003e0a858a0544d720b165e8ed0c9162dffe205b9a526b40fb428caa275899ad SHA512 93d4276fb984fb4bfd9959ceb26b88acaffdec1da9e8c4b6fe62a0c5abbfb89b1707de6d392e026d23846feb17147d3ca6baaa336cd3127747c92d778467120f
diff --git a/dev-libs/libgee/libgee-0.20.6.ebuild b/dev-libs/libgee/libgee-0.20.6.ebuild
index d04df6b84520..31ae5bb1cead 100644
--- a/dev-libs/libgee/libgee-0.20.6.ebuild
+++ b/dev-libs/libgee/libgee-0.20.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit gnome2 vala
+inherit gnome2
 
 DESCRIPTION="GObject-based interfaces and classes for commonly used data structures"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libgee"
@@ -22,8 +22,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	vala_setup
-
 	gnome2_src_configure \
-		$(use_enable introspection)
+		$(use_enable introspection) \
+		VALAC="$(type -P false)"
 }
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 78b5eeb24124..490ffde9795f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 0a7367f79a3a..41420986599f 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -2,10 +2,8 @@ AUX httpbin-0.7.0-brotlicffi.patch 1362 BLAKE2B 524973fe131181c6601ea7b973c25e55
 AUX httpbin-0.7.0-optional-raven.patch 1218 BLAKE2B 010a13db882711af3cd74175b87371d0c9c6e279168653836ce4a445357f4ca3fbd77fc262a57de5cbfccbc4da514e1e89253595b4fdab03553ed9adffddbc57 SHA512 2feb379c4b888560f825f5fce0130999705bfe83cff190da1651ffb9842243036ecb28d1f54cc92d7a855f73b45f0cf5164df75732f4ac2c9035b583941a9560
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 AUX httpbin-0.7.0-werkzeug-2.1.patch 1158 BLAKE2B 7343f4dbe9886fd54fc8187bc48ed8bd016c03057c4e5de81a46c2389b8d9fdd381f687855dc8ded1d8133a47fb8f09f4ec6c8eae739ca1c157945af97a633c5 SHA512 3d9ed7ab76dc0a33d69cf973e16be7358daa0af0a48d5ac24e0ad6ea8d73a68a796b4c8526ad764c0ed09997448f744f205b909261c32405ff166b359be1fb8b
-DIST httpbin-0.10.0.tar.gz 103729 BLAKE2B 1daff5bd9eba62c224d4fd6030e3c3378f849365d0e94f04e890fe555537580841bb4bc6868d04c0b64599aa09bf697f331b091f6a4c0450f23bf047fd0da887 SHA512 4fae4fe22cb1870acd31f51c25c1bbe946cfe9be88a63f0ba8d7078d2c48089d794726e86290fc41fa38dcf72f8573f054286cb47ab7518e953b7aafa4518215
 DIST httpbin-0.10.1.tar.gz 107058 BLAKE2B a46732946fc3454e2ae71c4eec4f88521e190b736445c54f555021a273a75f57acbc9234237e6973a21fc3bf8f71d8c8b51d6422d719f03546ecd6887a20fe1b SHA512 e3b851253c347893a80e866e7d0188c572f2a87a540125de3d9cbe0b8c3f1ddfab2c60ee3ffde3fd7274fc662294c978c39b1b52acfd92c52fd552966da203be
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.10.0.ebuild 942 BLAKE2B e8c39c88fa05c542a18b0524e663d978355792d509a7e0be24e7a15b8392cb9d540f4eb5cb5e58801831352aeec894969523df693e2bfaa20416d0a77a640d22 SHA512 c2f759e92e9ff1ac093f27ffd8f916990b6ec38e80bd63bb0522af03fc6cd8365b0ad6ee942052e38e01eede9f072d869540bb4de813716e360ca421b19089d2
 EBUILD httpbin-0.10.1-r1.ebuild 855 BLAKE2B 4b8363e6cee1761e0ed5d7cae6fde2b04b10fa458a160fc2d8487a50950378f7473083ad4e51094e502b3c6ac445be842b518ce0bd71c455662740e14869cb68 SHA512 1fbfd7a6f58cce71d119256e1ecf737dc56f029d2e68765b2f475d10fb25a1ff1f2b4f59fd29f871d4d64da863feddb439a221c787a971fe098e24378399ab39
-EBUILD httpbin-0.7.0-r5.ebuild 1609 BLAKE2B c5fd5012488a88bcd5a31dfc74a8c776b18e125c957bbad894b42f61d11fb7309f3a80c16a0fb434232884759c05750e5d07549bf0f737ae5bb3f877c9ecaced SHA512 740d37a2f314e8233d492b1cc472a5a2be90a48c80b9197d7056d9928fa03637a5a40b920f82d380684ec1ae8b2f6393bba5e8451992843d29c436fbdf2b0988
+EBUILD httpbin-0.7.0-r6.ebuild 1651 BLAKE2B f3cb3c948f2d194179a553e9c9f8a10707e55f59e97c196fb50a840c6e7ac70af1c54d0dd2485e9fd65c38e128b433c9213542e1039167cc4bf20da4bb7d4205 SHA512 056f6766ba972195cef3498219e8505f850b78ced28dcc42c9d3cc31f2bf6c667836f90a0c8fdd125d5819a78e5710df2534d2493e04cb4cc4d15707599d3521
 MISC metadata.xml 445 BLAKE2B c577334830bc0d51f9df221e224c231c254b3db9129e4028d53cbd96a4481728e3b721b44f569c243deeecfb38e8dc81a7566a0b7ccd665d51b1a69a3687eb18 SHA512 fcdbd0c24e12d91df89af24befa6c9600f28083c3fe38e88ebec9856f4fb5c4c137c3b85f2271422c513bbd7c31a457f8290ebc2dd755d9117d57aa42883eec8
diff --git a/dev-python/httpbin/httpbin-0.10.0.ebuild b/dev-python/httpbin/httpbin-0.10.0.ebuild
deleted file mode 100644
index 488246720918..000000000000
--- a/dev-python/httpbin/httpbin-0.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="HTTP Request and Response Service"
-HOMEPAGE="
-	https://github.com/psf/httpbin/
-	https://pypi.org/project/httpbin/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~riscv ~s390 ~sparc"
-
-RDEPEND="
-	dev-python/brotlicffi[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/flasgger[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	[[ ${PV} != 0.10.0 ]] && die "Remove find_packages hack!"
-	sed -i -e '/find_packages(/d' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild b/dev-python/httpbin/httpbin-0.7.0-r6.ebuild
index 1199c113d762..b905561d50cc 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r5.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r6.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-python/itsdangerous[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/werkzeug-3[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 62581018737a..d774e7bf0230 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-gcrypt/Manifest b/dev-scheme/guile-gcrypt/Manifest
index 2ef655edd18f..b2d858335a22 100644
--- a/dev-scheme/guile-gcrypt/Manifest
+++ b/dev-scheme/guile-gcrypt/Manifest
@@ -1,5 +1,3 @@
-DIST guile-gcrypt-0.3.0.tar.gz 55022 BLAKE2B 20d0948df250637c38a9e583ed9b8e0f4fd6d6142a60b4cceddab9a6a5c3062ffc7a0c8bc61187a1e942a137186ccc6e3cbc44b86d3c64f8cea91c67ae46cb08 SHA512 036017bbf10247bf474f41bb23fa0e824ed17241f169d0b36da5b20753502050bf6b14fa3a584076521e8f076732b75fe3f5e0ec9fb9ffeaf142319a98d36ae9
 DIST guile-gcrypt-0.4.0.tar.gz 56915 BLAKE2B 0b1ca0b23531f1dd28422798f235d15898ec67dd77fa08b52f9ccbfc9b9c1ed55abd1ec7cd15c9a129444e9d7411e24ef5b73ebc8547ca9e0408e7e5a552a200 SHA512 5dbb5ca9f00a607200c600d438f5d96db271a5e889f4e92d361793073ef618b1f731c3bc31dc39c7b939c2e9111da7905ed68845f55fe7fd24b064496e9d2677
-EBUILD guile-gcrypt-0.3.0.ebuild 986 BLAKE2B 13c689ef770d811f999b8a7eccd4b9fd7fcb70ba1fa3a060f147cab756bf3a5ccebc0d49aa7a04f3bdc1c2f2d27d34b43563a3168ed2c8843cf3cc44c67a0a89 SHA512 31de611d06a635ee98e99c00edc7b4929e72c07decf386c19e0702bb9565749231dd1c93ac4a73f6af7fefc728450345da415febaf60206549a1f5c4a0e6ba0c
 EBUILD guile-gcrypt-0.4.0.ebuild 986 BLAKE2B 13c689ef770d811f999b8a7eccd4b9fd7fcb70ba1fa3a060f147cab756bf3a5ccebc0d49aa7a04f3bdc1c2f2d27d34b43563a3168ed2c8843cf3cc44c67a0a89 SHA512 31de611d06a635ee98e99c00edc7b4929e72c07decf386c19e0702bb9565749231dd1c93ac4a73f6af7fefc728450345da415febaf60206549a1f5c4a0e6ba0c
 MISC metadata.xml 354 BLAKE2B bfe98c34fd1d916fab0de0b611ffe99c1c12acbd27549ec4fbe2dda90ef1e66b970e4df253c3c1ae878472c20fff522f23771eb2bfbd115e51130b1b4e9a8c14 SHA512 a1f5eccd97377c4e1c44f435322d786335c9eadb1d8e2cd7fe39bb695aa62b40879634c9dc0e3968cf51eeec50f596472f882fdc5daf81eb9a4715f8a7ca24da
diff --git a/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild b/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild
deleted file mode 100644
index 925cd6308503..000000000000
--- a/dev-scheme/guile-gcrypt/guile-gcrypt-0.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Guile bindings of libgcrypt"
-HOMEPAGE="https://notabug.org/cwebber/guile-gcrypt"
-SRC_URI="https://notabug.org/cwebber/guile-gcrypt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.11:=
-	dev-libs/libgcrypt:0=
-"
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# upstream tag on top of source tree. has no autogenerated files
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-gi/Manifest b/dev-scheme/guile-gi/Manifest
index 0a1835dd9d74..4a5183434a10 100644
--- a/dev-scheme/guile-gi/Manifest
+++ b/dev-scheme/guile-gi/Manifest
@@ -1,6 +1,4 @@
-DIST guile-gi-0.3.1.tar.gz 345440 BLAKE2B 17c4ecda48951244d427098767072621278750614919f13d1b03b7ecda5f06b2274c7db50c4288b4bfe581cd852e80cd1d4137b5ccc0e18d0e23866e1eba323a SHA512 b866df95946069cad606bc8f7e7c988665029482bcb986109d652728023151a5e60ee39e86635b9f0b9f0d4d3a9cd72f39b65ee983438f71dff186994e3af197
 DIST guile-gi-0.3.2.tar.gz 350346 BLAKE2B 8680891e3a0854b2741a26847ad0f75262d83ba240caa6afc38765445477cd3d9b4abfecf0c2dc68b05c61efe6cdbde633c16d98cbb6db49e2727adfb83004c3 SHA512 88a58ac8c97a2bb0c9304183423b77831365706aafb9a98185a555b19783247aaf7bf80963a3b75090a9774a8360b3767583e8cdd8416fdad0d3c23973fb37c6
-EBUILD guile-gi-0.3.1-r2.ebuild 1316 BLAKE2B d75815e8d5852b18273c2258401c100d717577f6057135d54b54ee50242f31046cbdc226d6fe9adb56092393611b1eef6732725f8fea35b956b0e367931f1b14 SHA512 2c3bdb1cade95ff05302a364ddc27ecb9b45bf1f04ab6eef77cddd49152112650b4da6d81de4f86628a256a0885bb99925514c1b72160af317a654f4191209cf
 EBUILD guile-gi-0.3.2-r2.ebuild 1326 BLAKE2B 3de6889f185415946490ebc8d47d6143ac31db9c934f405144bf50e0a55563cc3110418c31b1a08eabcf75692c761e12c2612b3ba6703745a865f548dffab8db SHA512 791ca984a2c37941538de9091ac9b24ffc51f8cf3e79b46aa8d7d00ae3194ecd2c8d45d8b0a16210258ffa5c00daae389774b3e6efd49c6ca4e68c84ee50ba5a
 EBUILD guile-gi-9999.ebuild 1326 BLAKE2B 3de6889f185415946490ebc8d47d6143ac31db9c934f405144bf50e0a55563cc3110418c31b1a08eabcf75692c761e12c2612b3ba6703745a865f548dffab8db SHA512 791ca984a2c37941538de9091ac9b24ffc51f8cf3e79b46aa8d7d00ae3194ecd2c8d45d8b0a16210258ffa5c00daae389774b3e6efd49c6ca4e68c84ee50ba5a
 MISC metadata.xml 930 BLAKE2B 6a48602d7421f891f2c6596b1e39725218febc0b49f00f9e1aa4c5b7b362505a050ccc6adfaf324d5122d11d0f890b6240d4bf6f3aa4c9428ee12cc9811b172a SHA512 c48c0021ccdd9e0e17c13f98c170986866a120bf70f56e74db19df99fca7cdfa245a264c92d017dbe259927e90d344fb28a9da4235403618e6970444a712df1e
diff --git a/dev-scheme/guile-gi/guile-gi-0.3.1-r2.ebuild b/dev-scheme/guile-gi/guile-gi-0.3.1-r2.ebuild
deleted file mode 100644
index 77813d0f30d8..000000000000
--- a/dev-scheme/guile-gi/guile-gi-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Bindings for GObject Introspection and libgirepository for Guile"
-HOMEPAGE="https://spk121.github.io/guile-gi/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/spk121/${PN}.git"
-else
-	SRC_URI="https://github.com/spk121/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"  # Tests fail
-
-DEPEND="
-	>=dev-scheme/guile-2.0.9:=
-	dev-libs/gobject-introspection
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-apps/texinfo"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static --enable-introspection=yes
-}
-
-src_install() {
-	default
-
-	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections. Bug https://bugs.gentoo.org/905898
-	dostrip -x /usr/$(get_libdir)/guile
-}
diff --git a/dev-scheme/guile-gnutls/Manifest b/dev-scheme/guile-gnutls/Manifest
index 30128818247a..60fb8285fb6e 100644
--- a/dev-scheme/guile-gnutls/Manifest
+++ b/dev-scheme/guile-gnutls/Manifest
@@ -1,7 +1,3 @@
-DIST guile-gnutls-3.7.11.tar.gz 684772 BLAKE2B 518d46fdc6f24cae03216205ffd010e45a9c38c6f8d0f6b7021df74308bb24706772174b6e8078057d20b06f7c81a4fe42b388c309ce463ad044f194ea33cbc6 SHA512 bdd7e0dc97939ef792facde0038062ffc4f6a8d2495eb57d08b774b774a4edd7259de46d3a86de2a36c0ed5027889ffa91f2edce2289e5932f16a421870693d7
-DIST guile-gnutls-3.7.12.tar.bz2 159199 BLAKE2B 1d44344d98231d2dcceedc87f8959c301024a1cb20a7e055dcf477e79b166405673d2447080e6579022435c546f8f34223320718d03ecc3612f9c6c10607dcac SHA512 c75ed619fd2eb79718ac5634c24a589308e371f83cac941fafcec297ea2877cb793760c4bfa0ca9f7396ca591daa781aebc0622636fc904f58f544193a655e3d
 DIST guile-gnutls-3.7.14.tar.bz2 176631 BLAKE2B 9d21a90e066d4360a329b5bd8f4375856b90fd0c262250064fa8ec92a76372b2c8cb746c10c5d8465353e49d1e8dae0a5897eba4831e1f947b9102b72b05b756 SHA512 7f690ea7c09e5017eef2a660f9db022d627fd562b90d1ce663915e5f28c38cafd3c8fdb459afe98a6ae973cc25283ec5dac00e590ba674f4af2f955abdb75ae7
-EBUILD guile-gnutls-3.7.11-r1.ebuild 1070 BLAKE2B 685dfdbbcef1f3936932fab306c98279c11db2ed02d4ffe8a7b8059229f0cc238202f0eb2521416f2e727a99f5b27d46a87a43ddc50fc41bd805dac85cb0939f SHA512 890d60b8dbd883803b045519a60b5a105eda4b8a3952c66a7c50c55ca4c63161a88e68c2918708afc75db31a9dacac1ef8aaf9b84d0cf748ce370a69a2345d15
-EBUILD guile-gnutls-3.7.12.ebuild 1133 BLAKE2B e15aae52022b4e21c44dfb6e59ea38b6c89b1169d0ebcda2a67ccce631fcdd2f561ff534ca6a830b325a8056851e1bc8f7695c5ab3d4c352e64384068ffcd37c SHA512 19b37729546cde2ca5f9d2218a445c1e453410dec7723770f7fedbe029efc6348077e9a1435688dc3636bff0937e73b8520fbf766bb2cb169c36f3dc082dbce6
 EBUILD guile-gnutls-3.7.14.ebuild 1133 BLAKE2B e15aae52022b4e21c44dfb6e59ea38b6c89b1169d0ebcda2a67ccce631fcdd2f561ff534ca6a830b325a8056851e1bc8f7695c5ab3d4c352e64384068ffcd37c SHA512 19b37729546cde2ca5f9d2218a445c1e453410dec7723770f7fedbe029efc6348077e9a1435688dc3636bff0937e73b8520fbf766bb2cb169c36f3dc082dbce6
 MISC metadata.xml 463 BLAKE2B a94ab7691c343e2d12f8f4efece84c4848d1b85fcdb598a2cb4b451cea6a628631857eaa5eb57e73dda4589d72f24efacd99dd74ae9bbf0823eb5f2024f5e321 SHA512 9194a577fd0a60cf1fd795b9b73d3f638673f0ae4f48aad152c72c6f37072493b7c342637d2f37f1d516a86083ed10e99f90a12d73f1fd9eb458b8d1f1260957
diff --git a/dev-scheme/guile-gnutls/guile-gnutls-3.7.11-r1.ebuild b/dev-scheme/guile-gnutls/guile-gnutls-3.7.11-r1.ebuild
deleted file mode 100644
index 6ab4195e2beb..000000000000
--- a/dev-scheme/guile-gnutls/guile-gnutls-3.7.11-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Guile-GnuTLS provides Guile bindings for the GnuTLS library"
-HOMEPAGE="https://gnutls.gitlab.io/guile/manual/
-	https://gitlab.com/gnutls/guile/"
-SRC_URI="https://gitlab.com/gnutls/guile/uploads/56e18069ab63ca67d61aecb6b2697ec1/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/gnutls:=[-guile(-)]
-"
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-}
-
-src_configure() {
-	econf --disable-srp-authentication  # bug #894050
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild b/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild
deleted file mode 100644
index 2ddce6cbaeee..000000000000
--- a/dev-scheme/guile-gnutls/guile-gnutls-3.7.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Guile-GnuTLS provides Guile bindings for the GnuTLS library"
-HOMEPAGE="https://gnutls.gitlab.io/guile/manual/
-	https://gitlab.com/gnutls/guile/"
-SRC_URI="https://gitlab.com/gnutls/guile/-/archive/v${PV}/guile-v${PV}.tar.bz2
-	-> ${P}.tar.bz2"
-S="${WORKDIR}"/guile-v${PV}
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/gnutls:=[-guile(-)]
-"
-DEPEND="${RDEPEND}"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-srp-authentication  # bug #894050
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-ncurses/Manifest b/dev-scheme/guile-ncurses/Manifest
index e7a4186a6dbb..b7903bc86449 100644
--- a/dev-scheme/guile-ncurses/Manifest
+++ b/dev-scheme/guile-ncurses/Manifest
@@ -1,6 +1,4 @@
 AUX guile-ncurses-3.0-slibtool.patch 1593 BLAKE2B ffabe52966b527e6d27da9a7d5518d48db875b5cf1dbbb1c435d990ced5011c41a2d81e9c0a8dc1dc7e2cb042643989777262e9c856c02aaaa8887494859b4c1 SHA512 9c7b1419c21525c6abc91d5b9c9b00ad3ae64a97fd6f1f1bc05dd80f77603706f702def71af5f0bbc85cd5eb4beed4c35b14cadbb289c726d14aedb4e2bda897
-DIST guile-ncurses-3.0.tar.gz 910030 BLAKE2B e7bfa1e7c7ff8fd4e8b653a5bcada99f8f047142322e4abb946cd42b27bd1d2014f904b5a73d5356ad95bec1c394d0b76ad06204a7d117ab4c2e9a3181633fa2 SHA512 6f36ec57b1835dc90f6691243e3b627e067522c78ea620fc109bf270016034842a933c2d9e09c1a3998a740ae17cb1b7ae291d3e4c578c54128eae4c88a450ac
 DIST guile-ncurses-3.1.tar.gz 921257 BLAKE2B 26ee97ac62ae7877ecf4cce9d798f7afadc98cbba914da1c802321bf83572e5bfe9775e6e3739bbe849cde9843998aca001b6753bde9d5fbb48c4d70133740f9 SHA512 c43264cfb0cc9fe658f7ddd53bb3dfc6c7636ecaf9b8f3f416d449e6463e38061faf419b43d91775dd9642a904055122e7992c16dea1532de6229fcfa68e292f
-EBUILD guile-ncurses-3.0-r3.ebuild 1650 BLAKE2B 8d7dfbe71a7a51981b88ab8822536a39187b6d59252f10e4695e48dbb6d3d4d75031491b5aabaab70e2c3e6adef64168cf1e9db01c74ea831c9dc53047a547c9 SHA512 b355472b5cab9883572cdbc7b1d092ddd77b5c666952181971dec6be940bd86ef4ba88292e79dc59925897ace861f3aa933ac6091f4670b1097d8fe7e548630d
 EBUILD guile-ncurses-3.1.ebuild 1680 BLAKE2B 7330a7fa422096e723b0fffb0123577b196e53f0f27ff52c3b94a192434640a42daefa13deacde874eb7de8beb1ff37f198d803e134d496f24d5e56bed86b70a SHA512 f993f85b8ca02ce4943b31dbfb45257af05c7ad2ae98e601573023675930c21f88003d0f5eb51a169138e7e92dbab819d406d961d64e860167f4d07595b8bb6f
 MISC metadata.xml 630 BLAKE2B b0867d55ccfe84db33d8dc2675a4a8928d253f1e616d0a8d3836130c466dcc822bd78a432d3ba11257e0c77d3281dbb9e6db41a5a5f34056ce3f086da47d207b SHA512 4471f1852f73f9bc1654c333092e1e230c3395e705cc5cbb5a3a3c1eb3db1ddfa124f4efe020cd1eaef168150a9de6f8c2b35585d7c13de7d4d76717c6c0f4f2
diff --git a/dev-scheme/guile-ncurses/guile-ncurses-3.0-r3.ebuild b/dev-scheme/guile-ncurses/guile-ncurses-3.0-r3.ebuild
deleted file mode 100644
index fb61958b58df..000000000000
--- a/dev-scheme/guile-ncurses/guile-ncurses-3.0-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Guile FFI to ncurses library for text-based console UI"
-HOMEPAGE="https://www.gnu.org/software/guile-ncurses/"
-SRC_URI="mirror://gnu/guile-ncurses/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	sys-libs/ncurses:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/texinfo"
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch" # 843416
-)
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	# Remove bad tests
-	# > In procedure list-ref: Wrong type argument in position 1: #f
-	local bad_tests=(
-		curs_attr_attr_off_underline
-		curs_attr_attr_on_blink
-		curs_attr_attr_on_bold
-		curs_attr_attr_on_dim
-		curs_attr_attr_on_invis
-		curs_attr_attr_on_protect
-		curs_attr_attr_on_reverse
-		curs_attr_attr_on_standout
-		curs_attr_attr_on_underline
-		curs_attr_attr_set
-		curs_attr_attr_set_normal
-		curs_attr_standend
-		curs_attr_standout
-		curs_bkgd_bkgd
-		curs_bkgd_bkgdset
-	)
-	local bad_test
-	for bad_test in "${bad_tests[@]}" ; do
-		echo "#t" > test/${bad_test}.scm || die
-	done
-
-	eautoreconf  # 843560
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-ssh/Manifest b/dev-scheme/guile-ssh/Manifest
index e77f22c896e0..1e2ac923745a 100644
--- a/dev-scheme/guile-ssh/Manifest
+++ b/dev-scheme/guile-ssh/Manifest
@@ -1,9 +1,5 @@
 AUX guile-ssh-0.16.0-tests.patch 360 BLAKE2B 53d3669dd31a78bd0203b872a28cefc1362a5282a31e575a68e44e631bad43b4113969d8fc481cd3b7f042a0f38b0c0466889550ce84ef9e817c94b0df09a21b SHA512 b77b466743e603c0c33f4e38a11b396110379a032307c05dafa5a9290589f6f49e758fc93a50fd22881df0fa5b4f08ffe765d164455b879121de2560e21bffa5
 AUX guile-ssh-0.16.2-tests.patch 295 BLAKE2B 6935922a090f542773bf7c9a910bcb5c09648553677745faa29e46e9383981a65324e4895cb2b4e89e795b00a42e866e78e1924e97de393a43f4f99c512e9232 SHA512 b5014323f972b423864631299986bc8ccaaec49f70d5394ab90f9b72a1d3efa81ebe886e02858b517db77b0496561761546279ddee285601a3dd04083eca5863
-DIST guile-ssh-0.16.0.tar.gz 522003 BLAKE2B dfa6011bb8b220b9a365fde832434eca0c26b58361a919b36228a95a7b042eb68ef7a0d5aa4b0360119983dc63fe65175ae67fe74da38e90ca19a3914f3d6b07 SHA512 195d763e49fd2506c50fea25606ec1873e3c950851f0be0f91fd73842acb9104c89baa1c69daccc7b28b6504a4aa1648a4c049991a63ecf7336c03c48d23e570
-DIST guile-ssh-0.16.2.tar.gz 523528 BLAKE2B 1cf513a5c77f5ea622c80ce96f8a8b3b2a83e371f1d44bb236a65a6b50e3edfd1096a1b2971a45a1df35bb90d611104214caae49f70ec4c5d96a137d66a28d37 SHA512 7a8143e408c91779591b32a50f2fceb3348bcdf92e810cf6dd70e0e9777229277bb26ba87b0a1f79590ed136aedb06661ce77bad577fb56187af324d209a552d
 DIST guile-ssh-0.16.3.tar.gz 524546 BLAKE2B e8cbe500493d80962f31b1d9ab97f5dc45c2e3612f419244528676b6cc3cf517a7dd84022b84356b0da456cdca404cca3ee25bef1762da9f0e126e086f34a721 SHA512 7b66dd5a29d47f3f7beaefb6576f74f62fe30736ddf97870a72612b44a608d61edd5ba9bc520e577b6f19a9de9044743e880601bae26b9645dafbef2c3134609
-EBUILD guile-ssh-0.16.0-r1.ebuild 1133 BLAKE2B 2af3f28c439a665b23ea6d69fba5cd55546174a3697153706e7cd8c2c43d7e3ca04da5f224730013a8412a79ea3a96f0a6e40901fdbfcaa0ed03612d544e9960 SHA512 db2f68fa0d211f16276e8b8b9dc0e243bc4d83259f63b5ea19bf9f18858a4df998d67f95ce7bfa7d2923b27de7b05cf70589879abb89b1d584f8ff3b7bf73bba
-EBUILD guile-ssh-0.16.2.ebuild 1133 BLAKE2B 2af3f28c439a665b23ea6d69fba5cd55546174a3697153706e7cd8c2c43d7e3ca04da5f224730013a8412a79ea3a96f0a6e40901fdbfcaa0ed03612d544e9960 SHA512 db2f68fa0d211f16276e8b8b9dc0e243bc4d83259f63b5ea19bf9f18858a4df998d67f95ce7bfa7d2923b27de7b05cf70589879abb89b1d584f8ff3b7bf73bba
 EBUILD guile-ssh-0.16.3.ebuild 1141 BLAKE2B 2a25d17ee39d004b1b2098de9643d7b9e093b38619b59272a0451a863585fd052a726e7925e42a2e7b43ce162e350967cb1093ecfad064289a4895791e27edf9 SHA512 021e9295348361e90bb3078ddba3c82bb2564a16972330cf0c208d4118b2b0c799765019da9d2d23eb1dca4eaddbff04450dea6241a64de27ba7fde9691bb540
 MISC metadata.xml 431 BLAKE2B ffc50f05ec61ce0379d33825d3a8a6785160b534f958ee50baf65a4724780c116a92802c35d58af7303a161c77cb330e304e9a0d4c67e7ce5287f7f9c727c8f2 SHA512 54b85f6747b45a37e792aed4a4ded07c9f9bdae0e48fcc3f9ba249007f9027018bb5831a872912eee73d834d0e42cbd9c130fb101755d9691e0dc0948738b4f0
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
deleted file mode 100644
index 82787f9347f0..000000000000
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
-HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
-	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/libssh:0=[server,sftp]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild b/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
deleted file mode 100644
index 82787f9347f0..000000000000
--- a/dev-scheme/guile-ssh/guile-ssh-0.16.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing access to the SSH protocol for GNU Guile"
-HOMEPAGE="https://memory-heap.org/~avp/projects/guile-ssh/
-	https://github.com/artyom-poptsov/guile-ssh/"
-SRC_URI="https://github.com/artyom-poptsov/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-scheme/guile-2.0.0:=
-	net-libs/libssh:0=[server,sftp]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-# guile generates ELF files without use of C or machine code
-# It's a portage's false positive. bug #677600
-QA_PREBUILT='*[.]go'
-
-src_prepare() {
-	default
-
-	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
-	find "${S}" -name "*.scm" -exec touch {} + || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# Workaround llvm-strip problem of mangling guile ELF debug
-	# sections: https://bugs.gentoo.org/905898
-	dostrip -x "/usr/$(get_libdir)/guile"
-}
diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest
index b27253c6c7a3..a8c3aec56167 100644
--- a/dev-scheme/racket/Manifest
+++ b/dev-scheme/racket/Manifest
@@ -1,13 +1,10 @@
 DIST racket-8.10-src-builtpkgs.tgz 156573576 BLAKE2B def6007fec5701a3ca399f3173f863155214521e95b8e655090a61506a8ecd8eae7ddc02785593d256e6a0e23f022997c18460130bdc72e9fcaad8de36030b7d SHA512 4a861b90ca03b252dae0b530ab39cf0fe67dd38e306cc639b6e24516b01d7d25918c0f7e1fb0a105ab51d3be802d349576b4f0ee7ef6ea26bb11fc16abada3dd
 DIST racket-8.6-src-builtpkgs.tgz 154505661 BLAKE2B ab788ae3e5175024ec75fa0c34297616ab4dcc1bb6f62d4ff4623dc2dd699d63eb9b24238407a854b03210f21fefd02680dc29931ed9d146920ae32472196e32 SHA512 c2948164463fb59a2d6f1b5188cee7634da190ea40bd19f5a88ef466ccdf07da03503b6a1f00e327a66c31b862048bcd5b047f7c586ea0d26e23397ee5ee7682
-DIST racket-8.7-src-builtpkgs.tgz 156337131 BLAKE2B a323683b6fd6d39473ab3eaeea24d175e12f8e36b9103849ec0730757b9c3d32f2e84ab8a9bde7fa834e2c6cf709e2531ab15e36e2694c5843b3b0bb41e909f8 SHA512 4c01001be49271e5536d24257c36bc57b16ff2cbf14eb59208b2939f4d14b5f58028cd1f643d49497eb8bffa84e5847f761171c951e006c278cf5d8ffafdd73e
 DIST racket-8.9-src-builtpkgs.tgz 157090283 BLAKE2B 515ad19f37a18decb52ea42ceff5b4570d311d39e15996eb0abd228d16ef5fcae971a87145faf7d27584dc0d6b54b1d94a77bb099e6c2dfd3fa5ddca0b3333b0 SHA512 0eb823600233746e9b5e054747fc5ee1c033a102fe6ab912cc2a15d4ad5b217e04c25124f1877ce04eada4f99c2d6b08cc58adf07535c3962f7d05a21dce8471
 DIST racket-minimal-8.10-src-builtpkgs.tgz 23128997 BLAKE2B 614cd3bdaf8852a5de1487c06e2b28968709fade25654684a4ba4f458a983783af23837996bbf163907312fc8e79b2fe22421983bcfe10ae391e0091ec60474d SHA512 aa16ee792b978fbef74b9b3a4af70eb264515bc16ed2109ade15ce54c658b0ccf9bffd9b07b71263298c0eb6eed768ad3d7e2c9e00df284ec1793b7fe0494f82
 DIST racket-minimal-8.6-src-builtpkgs.tgz 22396113 BLAKE2B e8c09da9aef52566746def36823e736e07990ba703d8440a3d067cbeeb43c8d026469c1d4b7d9ad2a423766692b81d6efa400c55512450621acd624d23b1b193 SHA512 695f9be11cab2cf84d1c16b322feb6c4552bf05edbfd901e91fa9532ef52339a6463d8327f4ae4c704cd2e8d67e69c2333bc13b1c862bbe565af00b407debee8
-DIST racket-minimal-8.7-src-builtpkgs.tgz 22795747 BLAKE2B 3f0194ffff3f3a9ea383ddd6c447a8d56d8cf4fb029c77bf9e8733570ca59244afd321541e7506ca11bc8b09f4c56dd3e26cd01d22caa7f3f36bd5af29c861a6 SHA512 b60472160b41a070a4aa74265e6319da4e80c6e58ac3152a30dfa3398f457c6579384de62b66dcb7a7ead68f72f787c41eae65325cdc1ae928b54a90d0a25f05
 DIST racket-minimal-8.9-src-builtpkgs.tgz 23084628 BLAKE2B 5e1e688dc600b700ed13acdbbafddaa2d6bf5a0e05db4a845b53f33e9448b277f342f5f615086f78db4762eeac11911c9b88cd102f05fbe165fcdff72a9ebcf3 SHA512 404aa01242eb68453e9db3cc14e38b99a02af9eb13b1dccce36e1de9c10d2ddd37bc6411abad7ab58045c71d25336e09d6e06f391cc3ee372097ca68fc497051
 EBUILD racket-8.10.ebuild 5617 BLAKE2B 9e68d997e30cc4068de840b7402f02f9d9393d72e02f83c15a4992eb83c353cb9a0d843c11a119753d3873c330edd555c523988f762a22179ed2c22251f95f18 SHA512 b8042dae0383851e8da4d6267adf7580c50d1658a0a7998261af6f1dd3aa70e66f3b1b14e5675457e39e4d2b684a0c5b40e37bd9fdb771ad0a07aa9bbe78920f
 EBUILD racket-8.6.ebuild 5484 BLAKE2B cb9663997df1de620f2be69315e37f5087beeb408aae89861196aeb540a2f7c43ced60f40f7ec2f1f6a57b364ea4e4760a15aeb4f09defffada7f6516b5b5d35 SHA512 323fc7030cba262a26cd92eb6f922956fa54542ece6a0e350d1a34d1f32023eb64e74115b8b7dbc2a05a77628b6f61b5d019dbaca24a8f8133173285054ee869
-EBUILD racket-8.7.ebuild 5526 BLAKE2B dda2ef897b3d9255fe3528b8991c90894368eff8afe1c37e301dbbd7f57cfbd695103fa6c3b349172819d8f764cb64191aa70d1f744872757fc211b875527a89 SHA512 c31310a2ec49f10cd7e4ef320a6e84e17f088b895754570fad2deb4289824c4a6354a1f7b1b554b749ed3efcde5964aa2f7dd64b9c83a97551931603f35325dd
 EBUILD racket-8.9.ebuild 5615 BLAKE2B 8b162df0dfc7d5a3e1a39358f97b0a1f7f408d3f0e0d897635dba17264aaed81a5624a207887899b77440cbb5e6b0c03a313d947c43c3c49a6501a8ed76d6163 SHA512 d30fe3a5f2ce10fe425a179156483c88bf612d8ec1229f457138f94104108066d8b8b00642d75dae50e84058423a53f2087605a813bd627682c0feef6ae98b35
 MISC metadata.xml 1885 BLAKE2B 0a77f8dc3d86ee5c4f12919b05893ad43c03f1eb21ace376552de1f0aaf071ddd15f27c59ef008f85cdb362e3ed316fbcb3a17ac2a3d4f18a38ad954df7bb338 SHA512 9510e5f9797419fb3da8799487c7dfc808eb9fc1fccfbbd8c225d04f617e00acd0e5b7a14ab6e05dc59b8cbc035a2d35a37dfe9459a42e5347d7ee499894fb5b
diff --git a/dev-scheme/racket/racket-8.7.ebuild b/dev-scheme/racket/racket-8.7.ebuild
deleted file mode 100644
index c1aa334b4e61..000000000000
--- a/dev-scheme/racket/racket-8.7.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="General purpose, multi-paradigm Lisp-Scheme programming language"
-HOMEPAGE="https://racket-lang.org/
-	https://github.com/racket/racket/"
-SRC_URI="
-	minimal? ( https://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz )
-	!minimal? ( https://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )
-"
-S="${WORKDIR}"/${P}/src
-
-# See https://blog.racket-lang.org/2019/11/completing-racket-s-relicensing-effort.html
-LICENSE="
-	|| ( MIT Apache-2.0 )
-	chez? ( Apache-2.0 )
-	!chez? ( LGPL-3 )
-"
-# Bytecode generated by Racket is not compatible between versions.
-# The bytecode version should be denoted by SLOT, in most cases
-# PV == SLOT but this has to be checked carefully and in cases
-# where we use _p, _pre, etc it will have to be set manually.
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="+chez +doc +futures iconv +jit minimal ncurses +places +threads"
-# See bug #809785 re chez/threads
-REQUIRED_USE="chez? ( futures places ) futures? ( jit threads ) places? ( threads )"
-
-RDEPEND="
-	!dev-tex/slatex
-	dev-db/sqlite:3
-	dev-libs/libffi:=
-	ncurses? ( sys-libs/ncurses:= )
-"
-DEPEND="${RDEPEND}"
-
-# "mred" and "mzscheme" are binaries generated by Racket, not CC
-QA_FLAGS_IGNORED="usr/bin/mred usr/bin/mzscheme"
-
-DOC_CONTENTS="
-If you wish to use sys-libs/readline instead of dev-libs/libedit
-for readline-like features in the Racket's REPL you can install
-the package 'readline-gpl' using raco, Racket's package manager
-https://pkgs.racket-lang.org/package/readline-gpl
-"
-
-# Package database files (for pkg_preinst & pkg_config)
-PKGDB=(
-	/usr/share/racket/info-cache.rktd
-	/usr/share/racket/links.rktd
-	/usr/share/racket/pkgs/pkgs.rktd
-)
-
-src_prepare() {
-	# Prepare the environment.
-	unset PLTADDONDIR PLTCOLLECTS PLTCONFIGDIR PLTUSERHOME
-
-	default
-
-	# Remove bundled libffi.
-	rm -r "${S}"/bc/foreign/libffi || die "failed to remove bundled libffi"
-}
-
-src_configure() {
-	# Compilation of Zuo does not respect the autoconf configuration.
-	tc-export CC
-
-	# Configure Zuo.
-	pushd "${S}"/zuo >/dev/null || die
-	econf
-	popd >/dev/null || die
-
-	# Configure Racket.
-	# Libtool:
-	#   According to vapier, we should use the bundled libtool
-	#   such that we don't preclude cross-compile.
-	#   Thus don't use --enable-lt=/usr/bin/libtool
-	# Backend:
-	#   --enable-bc builds Racket w/o chez backend
-	# C Libraries:
-	#   --enable-libs & --disable-shared is the way to build
-	#   .a files that are needed to embed Racket into programs
-	#   https://docs.racket-lang.org/inside/cs-embedding.html
-	local myconf=(
-		--disable-shared
-		--disable-strip
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--enable-libs
-		$(usex chez "--enable-cs --enable-csonly" "--enable-bc --enable-bconly")
-		$(use_enable doc docs)
-		$(use_enable iconv)
-		$(use_enable ncurses curses)
-	)
-	# Some options are togglable only for the BC version (are forced in CS)
-	! use chez && myconf+=(
-			--enable-float
-			--enable-foreign
-			--enable-gracket
-			--enable-libffi
-			$(use_enable futures)
-			$(use_enable jit)
-			$(use_enable places)
-			$(use_enable threads pthread)
-		)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# Compile Racket.
-	CC_FOR_BUILD="$(tc-getCC)" default
-
-	# Recompile Zuo with optimizations.
-	emake -C zuo
-}
-
-src_install() {
-	# Install Racket.
-	default
-
-	# Install Zuo.
-	emake -C zuo DESTDIR="${ED}" install
-
-	# raco needs decompressed files for packages doc installation, bug #662424
-	use doc && docompress -x /usr/share/doc/${PF}
-
-	# Create missing desktop files and icon.
-	if ! use minimal ; then
-		newicon "${ED}"/usr/share/racket/drracket-exe-icon.png racket.png
-		make_desktop_entry "gracket" "GRacket" "racket" "Development;Education;"
-		make_desktop_entry "plt-games" "PLT Games" "racket" "Education;Game;"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# If we are merging the same SLOT check if package
-	# database files exist and do not overwrite them
-	if has_version ${CATEGORY}/${PN}:${SLOT} ; then
-		echo "We are installing the same SLOT: ${SLOT}"
-		local rktd
-		for rktd in "${PKGDB[@]}" ; do
-			if [[ -f "${EROOT}"/${rktd} ]] && [[ -f "${ED}"/${rktd} ]] ; then
-				einfo "Keeping old file: ${rktd}"
-				mv "${ED}"/${rktd} "${ED}"/${rktd}.bak ||
-					die "failed to create a backup of ${rktd}"
-				cp "${EROOT}"/${rktd} "${ED}"/${rktd} ||
-					die "failed to create a copy of ${rktd}"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	# If we have any pkgs not included in Racket main distribution (outsiders),
-	# then we have to re-setup them or during installation other pkgs will want
-	# to recompile parts of "outsider" pkgs they depend upon (and fail).
-	local outsiders=( $(raco pkg show -i | grep 'link' | sed 's|link.*||g') )
-	if [[ -n "${outsiders[@]}" ]] ; then
-		ebegin "Running \"raco setup\" for outsider packages"
-		echo "Outsiders: ${outsiders[@]}"
-		raco setup --all-users --force --no-docs --no-user --pkgs "${outsiders[@]}"
-		eend 0  # do not fail
-	fi
-
-	optfeature "readline editing features in REPL" dev-libs/libedit
-	optfeature "generating PDF files using Scribble" dev-texlive/texlive-fontsextra
-
-	readme.gentoo_print_elog
-}
-
-pkg_config() {
-	einfo "Swapping package database backup files"
-
-	for rktd in "${PKGDB[@]}" ; do
-		mv "${EROOT}"/${rktd} "${EROOT}"/${rktd}.pkg_config
-		mv "${EROOT}"/${rktd}.bak "${EROOT}"/${rktd}
-		mv "${EROOT}"/${rktd}.pkg_config "${EROOT}"/${rktd}.bak
-	done
-}
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 18d7e2943868..1bdf3ada6a50 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index cff22cf3f349..5d4dc5eaa598 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,5 +1,5 @@
 DIST kdiff3-1.10.5.tar.xz 1119712 BLAKE2B ba2a2750db48e74d1668b8f39fb59bede65385fd9c9457881f90f4bb55bed20a96c1983ff43ac21896773cf9894ab171a8b2a4054cd11d9a115263caec2dd223 SHA512 567feae45f622fe07c33435949da2418b74a986afad72b25a53f1bf9d628e4a5dc2b2e915caec9ddeb02a57e0309ecde6554af100e38af3143f7601f9a8a12f2
-DIST kdiff3-1.10.6.tar.bz2 1330356 BLAKE2B 5953183ed599346ccc09b0ab112114fa18dbf7ec5d09e2492d850bdc0fba2e38eef6e3ffc399213931aefd6e4ed0ab54053ff96bebf9c5109dbdc487b18298f8 SHA512 104ff95d84e4fb81a4b8fcdb407030cb2123d466795e6c778d6645aba7ea2d9ffa4db286ad05966119e4fd64859ce12b38c351719e5a16dae06011ac9afdb966
+DIST kdiff3-1.10.6.tar.xz 1122552 BLAKE2B 381f9a579247d5b3b630a16a633beb99ce9d33d3a2ecca90d072654ab3705ac5911d207187dfc73a901ca78ce3d53d30573f7c7b411fe17c29e3272d96a48abc SHA512 86b6274acddd58ff80d6d1c83aa884987af05df1b820732394d52197c43adfb13258336de38ffa87203ed8700dd1b9725c96a8be67c48e1189ea776216152e7f
 EBUILD kdiff3-1.10.5.ebuild 1106 BLAKE2B 1681a3e68a5ea7c95bc7f051cd96a5ab6f39275d54675f057f9752b8f66575371ce80cb803201e6790930928faedc47c757201cc4044aa91031fd25fc3c61dba SHA512 5fd7ea10c33e4d2d62e2233abf932b406ed6db2bac70ba631ad0382e7cc26f561a053256c32f357d26cde2d83468b465a33f50ac2560c50dcd7d10908a8ab42c
-EBUILD kdiff3-1.10.6_pre0.ebuild 1173 BLAKE2B 46be9be3e34176020ab7143f4bf63c6ba6adcdcc617100160fe7b973d2639162a37dc3564c39208d8d52e7e75d89168e1758dfe58e5ec8fe547203dea46a1c7b SHA512 f33db78af47a0e216acec5a622164dc6b8dca3b7099913bde6f1ddddd1b5c41daabb116a2fa5bccc673cd8ac7a6947db530c5eac6150893cf33a49789d321b19
+EBUILD kdiff3-1.10.6.ebuild 1108 BLAKE2B 322e68d0830f4805332996cfab8bb7f292bf9b10059e77895010032091c3b3fed3d363cb144084ac604d238125af848fe0452d897545680b63c2da394c87a800 SHA512 b51af2da70926b606e196436423c97e14b90199bb1a144ddb34086f1de7c5e3d0314c9006fb72b67ff73798880d6ab5b515d03f8467093380a7481360913030f
 MISC metadata.xml 431 BLAKE2B 6848facdd79d1805d96f6b9c8b8fadd673ac7884eb14b31c854e7043d8474ef2702ca0b43b6ddb235ea70a25b41b5ad93a2616d5ce2b87a53a53bcd4c42839e1 SHA512 7f2f61311bf3f8f926d2f6538e3f693ffbc059068062e6c5313d4b48c0ad4e8155f9ccda52f79e65ffdcd529002c9b29f84dcf6b612e3984db9444177509bd0c
diff --git a/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
index 4dba975a3847..4c421ae349ce 100644
--- a/kde-misc/kdiff3/kdiff3-1.10.6_pre0.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.10.6.ebuild
@@ -10,8 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
 HOMEPAGE="https://apps.kde.org/kdiff3/ https://userbase.kde.org/KDiff3"
-SRC_URI="https://invent.kde.org/sdk/${PN}/-/archive/${PV/_pre0/}/${P/_pre0/}.tar.bz2"
-S="${WORKDIR}/${P/_pre0/}"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 9291278d1f9b..f5b61e265659 100644
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
diff --git a/media-fonts/lxgw-wenkai/Manifest b/media-fonts/lxgw-wenkai/Manifest
index 10bc56983331..9d0185d508c1 100644
--- a/media-fonts/lxgw-wenkai/Manifest
+++ b/media-fonts/lxgw-wenkai/Manifest
@@ -1,5 +1,5 @@
-DIST lxgw-wenkai-v1.250.tar.gz 61555569 BLAKE2B c1b98aa2c508f75cd83d88a24b9b69556745e527b95d908303715648d69ca09a2ef20360715def813c20e54a2756d054d3317586562954c4b1ae738c51c0cfb5 SHA512 c40f400d92890fadd6f625f2744a97df5206a0ef6b21a2d3642a97b97c39f6513f08f41daaa0c41c0367079becfcb6f7ecb7300c984b371e12cd2b37684caaa2
 DIST lxgw-wenkai-v1.300.tar.gz 62468087 BLAKE2B 1c33aec7e363781e2b65335869b54266a39b95e478216ddad819ef0db6631fbc46ae65d644b699d8ed3fea019f0a7cafd4a284d3099fdc9de6aed9fbee780ae4 SHA512 1a1de82b3c34b65b82bb1cc1726362da22f4a54c9bbf336adf455c695db07678c9fbbd5dbfae0b5f19d0a17b522a862f56fc759d27dfeec9297ad6ebf05381ed
-EBUILD lxgw-wenkai-1.250.ebuild 448 BLAKE2B e5e6265aff8c2f28f5098dd09b4043c8f4155e6584b0fa553474ed7b4c3929900f13c6ef3898c0e2fd4391191ba8eb41096a7d4a6c087d4a31c4c776f3dea1d3 SHA512 5c47d68d78fcedd2731ad748f02ee5f5f923babd59cd9e5817a74401b69aef90ed4c5844868a20c2e99b2af8fc3c76f099e82daa60a51917b410e656d360faa7
+DIST lxgw-wenkai-v1.310.tar.gz 63110288 BLAKE2B d68234995e8199b5c740d6d407171d0baa96b5fe9bd13c6e6f9bd9f16abd7e81664c26329647029e25a997260019ffdeac698c4084e5f7818a1ac3f83eb55fff SHA512 4b0985bde3257b07bb74a92d6519c8acd8403a2aa4f4ff4219a71f760bb9ce9e3e8c44209dde76b6c96c5962a41aa543cbb6924947f4ddebe6978a37b0e41d5f
 EBUILD lxgw-wenkai-1.300.ebuild 449 BLAKE2B ecb4a3c57e791e66361ca9292374baad761694321ce5bb6514171f4829041c6456055560bce1bf3a3aca8435f4256a7b8295abbf0d7c68b7cca5e56ce32dcf87 SHA512 24c383e38b5c95d75794ae27f5805760045a7f9b588847d592bea6ae09df5b17e3fb481ce4db36620bd3370891fea4d3bb1d47b4ed1216022fe9d9dba8713ff8
+EBUILD lxgw-wenkai-1.310.ebuild 449 BLAKE2B ecb4a3c57e791e66361ca9292374baad761694321ce5bb6514171f4829041c6456055560bce1bf3a3aca8435f4256a7b8295abbf0d7c68b7cca5e56ce32dcf87 SHA512 24c383e38b5c95d75794ae27f5805760045a7f9b588847d592bea6ae09df5b17e3fb481ce4db36620bd3370891fea4d3bb1d47b4ed1216022fe9d9dba8713ff8
 MISC metadata.xml 348 BLAKE2B a7f8fbcdda5892e434695f1c028d7905710e600b5f1c7f27be52aec577719e82aab6cb539b9a58f79cd73943b40a79f65f8d1fe4af6a79996abbf86d4470d92b SHA512 db60a9d3673530526ab61107452e38fcedc56eff19f082dfceda4d65e12893d76575daf30589d74ab50bf47bae0648a33771a16d694f9a168b6ab7e5575a1fe4
diff --git a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.310.ebuild
index 58a680ac7a77..e979d4d78470 100644
--- a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild
+++ b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.310.ebuild
@@ -14,6 +14,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~loong"
+KEYWORDS="~amd64 ~loong"
 
 FONT_SUFFIX="ttf"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f01f2e2a639c..5a474a3cd1e3 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 272847ca0a95..d6020e238574 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Oct 2023 10:10:05 +0000
+Sun, 01 Oct 2023 16:10:03 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0725ad594a64..7ccc02ec029c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 549143 BLAKE2B a22ba02cc8dd6e99745b4bf9665fd31ede4c7a9f7858402dcc10733f4379b39eb2b46414a0215d19a3e92fdf2a4a8edcafa50a7e2fab8928fb28fdb2a2ddc6c5 SHA512 dff106915559af2a3b9a9598542111eaa6559551fc8e315ee13b80b72381c1c8cede91a442e7800e758e8a4cbeabb47c418622deda467829666a2b973c53d917
-TIMESTAMP 2023-10-01T10:10:08Z
+TIMESTAMP 2023-10-01T16:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZRYBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZmd1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDtdw/+KbtMaR1aPUZ9Cy7jdP2ryRZGPEYzRcnx3J05RuGjPI2Qd0Ny4hbkVqT6
-1N48GKaHd2PgiexIeZAGo3iY0aeH/uOUU4fI+1fBLxPwumqI5lK0i3la1GcC8vh0
-kMXPCc64juTx2hLmRPVjNyLcxwqqVg2ZR2Le/A8faXTXJbqHZFMcyw+JLdQZ+X6e
-0140uW7NluipHyOfZBOAMHZfKHWIg5r7wSKklw3STv/3RfBrm8vIDk6HKEaEU6W/
-vFyAtk3Sj1aO/dQwQnz2s2+lOFCS6txni1baZOgM00KEYTB0w6xYE9q6pbiGMVvC
-y4wmxUdm73d9th9cus8f1+NqfT+NBqus21h3y1ypedpkz7rtpHCaE8KdTzP638/4
-0tw/4hiPNnIS8YCoXO9jHh4tY6biBczXU8cW/MEUKBs0wzK57RzqwxRe5UnDwDqu
-YlNlq5zqgaBTz/L11BXrn0tmS42NYG9eTvWY0qp6iJER0upModa6Q6dkDP7gsF2p
-uVwmTh8HO2hVObwfOGp6iZAwvBaR6eghwLxA94/kilFU6Yeq/PD0O3r7px1EVlmx
-IDsJcqVJTLZ3MVcHWrudX8Jr079kx7VCiA0TdjHeNLWbDJjc2dt4Hq9Pq5jdF5Wx
-rJEa7NgbFa5vGgCTz3qEKAiUdHliTFImPsMqHLutvHy2EvZWdKI=
-=+nTn
+klCBuQ//cIOQUu3ZFs+pNwBfzdHHvE5c6h+F59OLfeZxdgTANAC3SrfQRKD7kfJs
++QrcoS1MxDqy1hX8z8d36O84YMZX+t/g8DEpKn7Zn+fCjv+4aI0hK7EGLRwbA4oi
+Oipqw6KXh45G2Msp3ayYBBx60O8kk4iyIIKB7on+j7vwiPOIan6Yy8Z0gjcpHlUr
+eOqEybqlP7f+HI5gsoXTyucLLnHiU7sVgVgoPsJqZP1geB/90mn/hDjXE22MhzEc
+zrSM4v5ReSZxxN0z/cWJ9qeOc5+bRrH9+PbmCpllTe+tbPkYwbmSlUWhpnFyOaHT
+nwrIrmot2z3HQsH+RZRW5CK6XuvjqRRYzgd1MK33/aOY8akwCowd9mA4b9PpD+Yl
+2v/lx+V7gYJWon2W8MHw1bTwiaADfH5P26k5htMxX8BdfYKFlXckpvCk3/ycQPbF
+/GCFHYEmsfVk0z4lEqxnG1wQcwoufPQqq3a/8uUrT9WZmbhuvGPjTk8yxgepN0/J
+klnxJHK+DxXXAPM9MGsp1DVpv/yOjf6eqE5KS33tjk8AdZXScvRn7KfU9JSYCK+F
+zGoAnijKFBJCmyw3IqAvCuhIymH++g7SvwjYHW0EodUjVBUg4a192e0NBYJnDg0I
+Bl9EgH3cgwf3yr67+84kFkFznf3MMALuCOT41ADlUe+48G4hKzs=
+=labx
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 272847ca0a95..d6020e238574 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Oct 2023 10:10:05 +0000
+Sun, 01 Oct 2023 16:10:03 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 75a5686a3782..9513ed4293eb 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e32f1c94b554..4a7e8876f33f 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/mkosi-17.1 b/metadata/md5-cache/app-admin/mkosi-17.1-r1
index 4b2ba01fb8f9..72f34a3b63d1 100644
--- a/metadata/md5-cache/app-admin/mkosi-17.1
+++ b/metadata/md5-cache/app-admin/mkosi-17.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pandoc test? ( app-emulation/qemu sys-apps/bubblewrap sys-apps/systemd sys-firmware/edk2-ovmf >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=virtual/pandoc test? ( app-emulation/qemu sys-apps/bubblewrap >=sys-apps/systemd-254 sys-firmware/edk2-ovmf >=dev-python/pytest-7.3.1[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 ) >=dev-python/gpep517-13[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
 DESCRIPTION=Build Bespoke OS Images
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=app-emulation/qemu sys-apps/bubblewrap sys-apps/systemd sys-firmware/edk2-ovmf python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+RDEPEND=app-emulation/qemu sys-apps/bubblewrap >=sys-apps/systemd-254 sys-firmware/edk2-ovmf 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? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd/mkosi/archive/refs/tags/v17.1.tar.gz -> mkosi-17.1.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=ad1bb9fae6131129622cb80829643ccf
+_md5_=ac61973ad573f3b14a722df5809a47a6
diff --git a/metadata/md5-cache/app-admin/setools-4.4.0-r3 b/metadata/md5-cache/app-admin/setools-4.4.0-r3
deleted file mode 100644
index 3493d8e90af0..000000000000
--- a/metadata/md5-cache/app-admin/setools-4.4.0-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=<dev-python/cython-3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/checkpolicy ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=7
-HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
-INHERIT=distutils-r1
-IUSE=test infoflow X python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,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 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.0/setools-4.4.0.tar.bz2
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=42fad9513af05b6be19cf2453cdb34d0
diff --git a/metadata/md5-cache/app-admin/setools-4.4.1 b/metadata/md5-cache/app-admin/setools-4.4.1
deleted file mode 100644
index d4124d29d16c..000000000000
--- a/metadata/md5-cache/app-admin/setools-4.4.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/checkpolicy ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=7
-HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
-INHERIT=distutils-r1
-IUSE=test infoflow X python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,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 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.1/setools-4.4.1.tar.bz2
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=074adcff5ab2275a36f23e379c1243ea
diff --git a/metadata/md5-cache/app-admin/setools-4.4.1-r1 b/metadata/md5-cache/app-admin/setools-4.4.1-r1
deleted file mode 100644
index e3062094bc40..000000000000
--- a/metadata/md5-cache/app-admin/setools-4.4.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-python/cython-0.27[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-apps/checkpolicy ) test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,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 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,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 )
-DESCRIPTION=Policy Analysis Tools for SELinux
-EAPI=7
-HOMEPAGE=https://github.com/SELinuxProject/setools/wiki
-INHERIT=distutils-r1
-IUSE=test infoflow X test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sys-libs/libsepol-3.2:= >=sys-libs/libselinux-3.2:= infoflow? ( >=dev-python/networkx-2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) X? ( dev-python/PyQt5[gui,widgets,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 ) >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/setools/releases/download/4.4.1/setools-4.4.1.tar.bz2
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	eapi8-dosym	5ac4857ad078256d939c44f7c64197a9	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=c07d10d6887a85616e196e488ae0755c
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 2352ffac7651..14741aededc3 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/dar-2.7.12 b/metadata/md5-cache/app-backup/dar-2.7.13
index 6dcbfd2bbe70..452e632fe47c 100644
--- a/metadata/md5-cache/app-backup/dar-2.7.12
+++ b/metadata/md5-cache/app-backup/dar-2.7.13
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install
-DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
+DEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= dev-libs/libassuan ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
 DESCRIPTION=A full featured backup tool, aimed for disks
 EAPI=8
 HOMEPAGE=http://dar.linux.free.fr/
@@ -8,10 +8,10 @@ INHERIT=flag-o-matic
 IUSE=argon2 curl dar32 dar64 doc gcrypt gpg lz4 lzo nls rsync xattr
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils app-arch/zstd:= dev-libs/libthreadar sys-libs/libcap >=sys-libs/zlib-1.2.3:= argon2? ( app-crypt/argon2:= ) curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) gpg? ( app-crypt/gpgme:= dev-libs/libassuan ) lz4? ( app-arch/lz4:= ) lzo? ( dev-libs/lzo:2 ) nls? ( virtual/libintl ) rsync? ( net-libs/librsync:= ) xattr? ( sys-apps/attr )
 REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://downloads.sourceforge.net/project/dar/dar/2.7.12/dar-2.7.12.tar.gz
+SRC_URI=https://downloads.sourceforge.net/project/dar/dar/2.7.13/dar-2.7.13.tar.gz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=55bebe160c41116ce817b040190393d5
+_md5_=06a0e9f5c21199fbb5cb0494d7992d23
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 97869b52a40d..857f37bf9872 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/dxvk-2.3 b/metadata/md5-cache/app-emulation/dxvk-2.3
index 012eed6e4c91..a13d7903eeed 100644
--- a/metadata/md5-cache/app-emulation/dxvk-2.3
+++ b/metadata/md5-cache/app-emulation/dxvk-2.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/doitsujin/dxvk/
 INHERIT=flag-o-matic meson-multilib python-any-r1
 IUSE=+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 +dxgi +strip abi_x86_32 abi_x86_64
-KEYWORDS=-* ~amd64 ~x86
+KEYWORDS=-* amd64 x86
 LICENSE=ZLIB Apache-2.0 MIT
 REQUIRED_USE=|| ( d3d9 d3d10 d3d11 dxgi ) d3d10? ( d3d11 ) d3d11? ( dxgi ) || ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=https://github.com/doitsujin/dxvk/archive/refs/tags/v2.3.tar.gz -> dxvk-2.3.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/0bcc624926a25a2a273d07877fd25a6ff5ba1cfb.tar.gz -> dxvk-spirv-headers-0bcc624926.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/85c2334e92e215cce34e8e0ed8b2dce4700f4a50.tar.gz -> dxvk-vulkan-headers-85c2334e92.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/275e6459c7ab1ddd4b125f28d0440716e4888078/dxvk-libdisplay-info-275e6459c7.tar.bz2 https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	meson	08b7183c3f4811568ee93eb0f79a89fe	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	f5169813d1619761b459800587005fd2	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=6304762027ec3df50b26b5900793ceb9
+_md5_=c8948ffb4949a9f6c9e82bfe45e3c9da
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7d730c88003c..d63389e3dbab 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/openjfx-11.0.11_p1-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
index b4fc7b45c189..1c8029a4cbff 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.11_p1-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.11+1.tar.bz2 -> openjfx-11.0.11_p1.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=536541e5a1852b78fecc6882ce3c5643
+_md5_=dd48cef1bc56258f764678eac7aa28c4
diff --git a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1 b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
index c207dcc1e974..91d2cf8523c7 100644
--- a/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
+++ b/metadata/md5-cache/dev-java/openjfx-11.0.9_p0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=amd64? ( cpu_flags_x86_sse2 )
 SLOT=11
 SRC_URI=https://hg.openjdk.java.net/openjfx/11-dev/rt/archive/11.0.9+0.tar.bz2 -> openjfx-11.0.9_p0.tar.bz2 https://downloads.gradle.org/distributions/gradle-4.10.3-bin.zip https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	java-pkg-2	1794573de2f5124d88b64ee5dc9aabb4	java-utils-2	d051ecd608488854eb9252d64d396140	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=d70a0984f2a715eb43ce81a47503b5d8
+_md5_=63e7974b79d6738e69c54fd598cc4e9f
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a56620dfbb96..3c06b52bef4b 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/python-3.12.0_rc3_p1 b/metadata/md5-cache/dev-lang/python-3.12.0_rc3_p1
new file mode 100644
index 000000000000..85560bffa873
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_rc3_p1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/autoconf-archive app-alternatives/awk virtual/pkgconfig verify-sig? ( >=sec-keys/openpgp-keys-python-20221025 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
+DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] dev-python/ensurepip-pip dev-python/ensurepip-setuptools dev-python/ensurepip-wheel ) valgrind? ( dev-util/valgrind )
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=8
+HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
+INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
+IUSE=bluetooth build debug +ensurepip examples gdbm libedit lto +ncurses pgo +readline +sqlite +ssl test tk valgrind verify-sig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=PSF-2
+RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= dev-python/gentoo-common >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-pip ) gdbm? ( sys-libs/gdbm:=[berkdb] ) kernel_linux? ( sys-apps/util-linux:= ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_12(-)]
+RESTRICT=!test? ( test )
+SLOT=3.12
+SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0rc3_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0rc3.tar.xz.asc )
+_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	check-reqs	02ac7654b64f7acc7a8b1a35ad9d6ddc	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	verify-sig	06b4d23e3bacdf7164b1e7f9e059492a
+_md5_=3f70f5496748ac081dcb6df24482eb99
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index a5b7ff23c923..aa1cf6fd9f7b 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/libgee-0.20.6 b/metadata/md5-cache/dev-libs/libgee-0.20.6
index 045728cc621e..c1a261673be7 100644
--- a/metadata/md5-cache/dev-libs/libgee-0.20.6
+++ b/metadata/md5-cache/dev-libs/libgee-0.20.6
@@ -4,12 +4,12 @@ DEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-
 DESCRIPTION=GObject-based interfaces and classes for commonly used data structures
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgee
-INHERIT=gnome2 vala
+INHERIT=gnome2
 IUSE=+introspection
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 SLOT=0.8/2
 SRC_URI=mirror://gnome/sources/libgee/0.20/libgee-0.20.6.tar.xz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	vala	db97951caa799e73a831a5f48e717da8	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=d7883aa828b32c360c6fcbf7a99fed14
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=062e56a1ddb9c983f89e70a23c27c24e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8bb1e4e715f0..d8609d5c9a8b 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/httpbin-0.10.0 b/metadata/md5-cache/dev-python/httpbin-0.10.0
deleted file mode 100644
index 282ce3b5094b..000000000000
--- a/metadata/md5-cache/dev-python/httpbin-0.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flasgger[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=HTTP Request and Response Service
-EAPI=8
-HOMEPAGE=https://github.com/psf/httpbin/ https://pypi.org/project/httpbin/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~riscv ~s390 ~sparc
-LICENSE=MIT
-RDEPEND=dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flasgger[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/h/httpbin/httpbin-0.10.0.tar.gz
-_eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=fb7dc431d61a5ca561b5b4725c353253
diff --git a/metadata/md5-cache/dev-python/httpbin-0.7.0-r5 b/metadata/md5-cache/dev-python/httpbin-0.7.0-r6
index 5dd2589faf9b..d14d416ee6af 100644
--- a/metadata/md5-cache/dev-python/httpbin-0.7.0-r5
+++ b/metadata/md5-cache/dev-python/httpbin-0.7.0-r6
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+BDEPEND=test? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/werkzeug-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=HTTP Request and Response Service
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+RDEPEND=dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/decorator[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/markupsafe[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] <dev-python/werkzeug-3[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/werkzeug-2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/h/httpbin/httpbin-0.7.0.tar.gz
 _eclasses_=distutils-r1	24344aec2be39c69d9f279b5415298ce	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	12aa0037eb004139215ff04894d52b28	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=6acef5cc4bc8a47499a64dbc1624c267
+_md5_=99964b0ebb4a7be8d4e501be3d6ace49
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 2748d6e32017..f4a2e637aa06 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-gcrypt-0.3.0 b/metadata/md5-cache/dev-scheme/guile-gcrypt-0.3.0
deleted file mode 100644
index 7c341f79d3ee..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-gcrypt-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-scheme/guile-2.0.11:= dev-libs/libgcrypt:0=
-DESCRIPTION=Guile bindings of libgcrypt
-EAPI=8
-HOMEPAGE=https://notabug.org/cwebber/guile-gcrypt
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-scheme/guile-2.0.11:= dev-libs/libgcrypt:0=
-SLOT=0
-SRC_URI=https://notabug.org/cwebber/guile-gcrypt/archive/v0.3.0.tar.gz -> guile-gcrypt-0.3.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=57410a9934cde18596f4291b31c5b543
diff --git a/metadata/md5-cache/dev-scheme/guile-gi-0.3.1-r2 b/metadata/md5-cache/dev-scheme/guile-gi-0.3.1-r2
deleted file mode 100644
index a911eb8a324f..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-gi-0.3.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-scheme/guile-2.0.9:= dev-libs/gobject-introspection x11-libs/gtk+:3[introspection]
-DESCRIPTION=Bindings for GObject Introspection and libgirepository for Guile
-EAPI=8
-HOMEPAGE=https://spk121.github.io/guile-gi/
-INHERIT=autotools
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-scheme/guile-2.0.9:= dev-libs/gobject-introspection x11-libs/gtk+:3[introspection]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/spk121/guile-gi/archive/v0.3.1.tar.gz -> guile-gi-0.3.1.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=8f1528beed80e2a276fc3384977c017c
diff --git a/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.11-r1 b/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.11-r1
deleted file mode 100644
index fdc7447c0c03..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.11-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
-DESCRIPTION=Guile-GnuTLS provides Guile bindings for the GnuTLS library
-EAPI=8
-HOMEPAGE=https://gnutls.gitlab.io/guile/manual/ https://gitlab.com/gnutls/guile/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
-SLOT=0
-SRC_URI=https://gitlab.com/gnutls/guile/uploads/56e18069ab63ca67d61aecb6b2697ec1/guile-gnutls-3.7.11.tar.gz
-_md5_=3b8ce73856b1fe8849bd3ee291ffbf27
diff --git a/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12 b/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12
deleted file mode 100644
index be388afd6e61..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-gnutls-3.7.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
-DESCRIPTION=Guile-GnuTLS provides Guile bindings for the GnuTLS library
-EAPI=8
-HOMEPAGE=https://gnutls.gitlab.io/guile/manual/ https://gitlab.com/gnutls/guile/
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-scheme/guile-2.0.0:= net-libs/gnutls:=[-guile(-)]
-SLOT=0
-SRC_URI=https://gitlab.com/gnutls/guile/-/archive/v3.7.12/guile-v3.7.12.tar.bz2 -> guile-gnutls-3.7.12.tar.bz2
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=05241342e0a7bac324deb8a463337ab0
diff --git a/metadata/md5-cache/dev-scheme/guile-ncurses-3.0-r3 b/metadata/md5-cache/dev-scheme/guile-ncurses-3.0-r3
deleted file mode 100644
index a135123f8e62..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-ncurses-3.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/texinfo sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare test
-DEPEND=>=dev-scheme/guile-2.0.0:= sys-libs/ncurses:=
-DESCRIPTION=Guile FFI to ncurses library for text-based console UI
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/guile-ncurses/
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.0:= sys-libs/ncurses:=
-SLOT=0
-SRC_URI=mirror://gnu/guile-ncurses/guile-ncurses-3.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=ae104c8ace4de05913a9a062ec52d810
diff --git a/metadata/md5-cache/dev-scheme/guile-ssh-0.16.0-r1 b/metadata/md5-cache/dev-scheme/guile-ssh-0.16.0-r1
deleted file mode 100644
index bb8f7840d430..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-ssh-0.16.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-scheme/guile-2.0.0:= net-libs/libssh:0=[server,sftp]
-DESCRIPTION=Library providing access to the SSH protocol for GNU Guile
-EAPI=8
-HOMEPAGE=https://memory-heap.org/~avp/projects/guile-ssh/ https://github.com/artyom-poptsov/guile-ssh/
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.0:= net-libs/libssh:0=[server,sftp]
-SLOT=0
-SRC_URI=https://github.com/artyom-poptsov/guile-ssh/archive/v0.16.0.tar.gz -> guile-ssh-0.16.0.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=d3c85bddaf81cd453660cb52362b2b47
diff --git a/metadata/md5-cache/dev-scheme/guile-ssh-0.16.2 b/metadata/md5-cache/dev-scheme/guile-ssh-0.16.2
deleted file mode 100644
index 78fe3de3eb13..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-ssh-0.16.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-scheme/guile-2.0.0:= net-libs/libssh:0=[server,sftp]
-DESCRIPTION=Library providing access to the SSH protocol for GNU Guile
-EAPI=8
-HOMEPAGE=https://memory-heap.org/~avp/projects/guile-ssh/ https://github.com/artyom-poptsov/guile-ssh/
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-scheme/guile-2.0.0:= net-libs/libssh:0=[server,sftp]
-SLOT=0
-SRC_URI=https://github.com/artyom-poptsov/guile-ssh/archive/v0.16.2.tar.gz -> guile-ssh-0.16.2.tar.gz
-_eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=d3c85bddaf81cd453660cb52362b2b47
diff --git a/metadata/md5-cache/dev-scheme/racket-8.7 b/metadata/md5-cache/dev-scheme/racket-8.7
deleted file mode 100644
index 568a2c21aa85..000000000000
--- a/metadata/md5-cache/dev-scheme/racket-8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare
-DEPEND=!dev-tex/slatex dev-db/sqlite:3 dev-libs/libffi:= ncurses? ( sys-libs/ncurses:= )
-DESCRIPTION=General purpose, multi-paradigm Lisp-Scheme programming language
-EAPI=8
-HOMEPAGE=https://racket-lang.org/ https://github.com/racket/racket/
-INHERIT=desktop optfeature toolchain-funcs readme.gentoo-r1
-IUSE=+chez +doc +futures iconv +jit minimal ncurses +places +threads
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
-LICENSE=|| ( MIT Apache-2.0 ) chez? ( Apache-2.0 ) !chez? ( LGPL-3 )
-RDEPEND=!dev-tex/slatex dev-db/sqlite:3 dev-libs/libffi:= ncurses? ( sys-libs/ncurses:= )
-REQUIRED_USE=chez? ( futures places ) futures? ( jit threads ) places? ( threads )
-SLOT=0/8.7
-SRC_URI=minimal? ( https://download.racket-lang.org/installers/8.7/racket-minimal-8.7-src-builtpkgs.tgz ) !minimal? ( https://download.racket-lang.org/installers/8.7/racket-8.7-src-builtpkgs.tgz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=fd8d7ecaf7d8af0a8af2e5b24617e918
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 1e16beef59e9..c601d1eed921 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/kdiff3-1.10.6_pre0 b/metadata/md5-cache/kde-misc/kdiff3-1.10.6
index 8059a170cc69..ec69c45cdaae 100644
--- a/metadata/md5-cache/kde-misc/kdiff3-1.10.6_pre0
+++ b/metadata/md5-cache/kde-misc/kdiff3-1.10.6
@@ -11,6 +11,6 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.9:5 >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/kparts-5.106.0:5 >=kde-frameworks/ktextwidgets-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 sys-apps/diffutils || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=https://invent.kde.org/sdk/kdiff3/-/archive/1.10.6/kdiff3-1.10.6.tar.bz2
+SRC_URI=mirror://kde/stable/kdiff3/kdiff3-1.10.6.tar.xz
 _eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=317acc37ca56359eb6d9e55835670c17
+_md5_=35ffa8c2d03a1d4daa7e2deba6b09910
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 1e3f4bfc1b56..65908371f4f8 100644
--- a/metadata/md5-cache/media-fonts/Manifest.gz
+++ b/metadata/md5-cache/media-fonts/Manifest.gz
diff --git a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250 b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.310
index b659a33e2d00..8e6d6902c462 100644
--- a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250
+++ b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.310
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/lxgw/LxgwWenKai
 INHERIT=font
 IUSE=X
-KEYWORDS=amd64 ~loong
+KEYWORDS=~amd64 ~loong
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.250/lxgw-wenkai-v1.250.tar.gz
+SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.310/lxgw-wenkai-v1.310.tar.gz
 _eclasses_=font	aa113a3df9cd0a9693a1c1ee7c34a6eb
-_md5_=1e17ca254231fe42151eaf082ee2ada2
+_md5_=29d3f9feebcff462a7277402dd3dc871
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index f14df1e50fe2..afa0762175cf 100644
--- a/metadata/md5-cache/sci-astronomy/Manifest.gz
+++ b/metadata/md5-cache/sci-astronomy/Manifest.gz
diff --git a/metadata/md5-cache/sci-astronomy/kstars-3.6.7 b/metadata/md5-cache/sci-astronomy/kstars-3.6.7
new file mode 100644
index 000000000000..5509504aa2d1
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/kstars-3.6.7
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.106.0:5 ) dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-5.106.0:5
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdatavis3d-5.15.9:5 >=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 >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtsql-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwebsockets-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/knewstuff-5.106.0:5 >=kde-frameworks/knotifications-5.106.0:5 >=kde-frameworks/knotifyconfig-5.106.0:5 >=kde-frameworks/kplotting-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 sci-libs/cfitsio:= sci-libs/gsl:= >=sci-libs/indilib-2.0.2 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 sys-libs/zlib password? ( dev-libs/qtkeychain:=[qt5(+)] ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) dev-cpp/eigen:3 >=dev-qt/qtconcurrent-5.15.9:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DESCRIPTION=Desktop Planetarium
+EAPI=8
+HOMEPAGE=https://apps.kde.org/kstars/ https://edu.kde.org/kstars/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=ecm kde.org optfeature
+IUSE=+password raw wcs debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+
+RDEPEND=>=dev-qt/qtdatavis3d-5.15.9:5 >=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 >=dev-qt/qtprintsupport-5.15.9:5 >=dev-qt/qtsql-5.15.9:5 >=dev-qt/qtsvg-5.15.9:5 >=dev-qt/qtwebsockets-5.15.9:5 >=dev-qt/qtwidgets-5.15.9:5 >=kde-frameworks/kconfig-5.106.0:5 >=kde-frameworks/kconfigwidgets-5.106.0:5 >=kde-frameworks/kcoreaddons-5.106.0:5 >=kde-frameworks/kcrash-5.106.0:5 >=kde-frameworks/ki18n-5.106.0:5 >=kde-frameworks/kio-5.106.0:5 >=kde-frameworks/knewstuff-5.106.0:5 >=kde-frameworks/knotifications-5.106.0:5 >=kde-frameworks/knotifyconfig-5.106.0:5 >=kde-frameworks/kplotting-5.106.0:5 >=kde-frameworks/kwidgetsaddons-5.106.0:5 >=kde-frameworks/kxmlgui-5.106.0:5 sci-libs/cfitsio:= sci-libs/gsl:= >=sci-libs/indilib-2.0.2 sci-libs/libnova:= >=sci-libs/stellarsolver-2.2 sys-libs/zlib password? ( dev-libs/qtkeychain:=[qt5(+)] ) raw? ( media-libs/libraw:= ) wcs? ( sci-astronomy/wcslib:= ) >=dev-qt/qtgraphicaleffects-5.15.9:5 >=dev-qt/qtpositioning-5.15.9:5 >=dev-qt/qtquickcontrols-5.15.9:5 >=dev-qt/qtquickcontrols2-5.15.9:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RESTRICT=!test? ( test )
+SLOT=5
+SRC_URI=mirror://kde/stable/kstars/kstars-3.6.7.tar.xz
+_eclasses_=cmake	fc2f89084f590ac95c004ea95b0d2f80	ecm	582ef00537aa518e5a8ca3aa66bd9dc0	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	kde.org	411cb92019a6e2aa174d06896084bf57	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=034ff49380d8a652c671b1bda3167d88
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 83e5169e2945..7e55c8423e5c 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/binutils-2.40-r8 b/metadata/md5-cache/sys-devel/binutils-2.40-r9
index d78d059fa252..c9c9ee005dcd 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.40-r8
+++ b/metadata/md5-cache/sys-devel/binutils-2.40-r9
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.40
 SRC_URI=mirror://gnu/binutils/binutils-2.40.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.40.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.40.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.40-patches-7.tar.xz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=46992dbd26a4a7489d36e955a61e7019
+_md5_=a76bc620ff35625cb4e36d57d37b1229
diff --git a/metadata/md5-cache/sys-devel/binutils-2.41-r1 b/metadata/md5-cache/sys-devel/binutils-2.41-r2
index b3da7262f282..d5237252af07 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.41-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.41-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=2.41
 SRC_URI=mirror://gnu/binutils/binutils-2.41.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.41.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.41.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.41-patches-2.tar.xz
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=6675b2cd6f45819363d109b8b6a55417
+_md5_=729758f3b81a566a6bf5bd0fee7c48a4
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index a4a1ab0b3703..927622622a62 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -12,4 +12,4 @@ RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfut
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc
-_md5_=9c2633a99f7bc4b0028f852c1a8b51a0
+_md5_=9cdb483103419abf8568f2e255aa7bf9
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 9bd594e6b2f8..ae10a68d782a 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.5 b/metadata/md5-cache/sys-kernel/zen-sources-6.5.5
new file mode 100644
index 000000000000..aa21a81ef8e9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/zen-sources-6.5.5
@@ -0,0 +1,14 @@
+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.5
+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-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.5-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.5-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.5-7.extras.tar.xz https://github.com/zen-kernel/zen-kernel/releases/download/v6.5.5-zen1/linux-v6.5.5-zen1.patch.zst
+_eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	a3163a42392ff0db3797c69f4990c38f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fbbbc99d10168de2926e06da7169b8dc	unpacker	aa6a4e924009232d8b78b31e932c30b5
+_md5_=25c3497ebe73377168bb0bfad8a4cf04
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 2559a1f9f9e0..b5d78f77de9f 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15850 BLAKE2B f8a24ac4773896d3e2d3ac7daac96705bb587c68e5945981d4f8b934b213a0a634607e00cc3481f4c847f66ae537f4bfd1c12852438720d6cf5d711fe74f3237 SHA512 29367a48def7059bf0b6fab4e38cd0ba8266ac4b865394c346e798632efcf7c41364d99e462d98a52192ae8270db65e57b9f15ae208bef7ce4c3cfd98163dee1
-TIMESTAMP 2023-10-01T10:10:08Z
+TIMESTAMP 2023-10-01T16:10:05Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZRYBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmUZmd1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDMAQ//YlatoQKt00h1DxbkYtT+Wv5G1+hTRlReQf9jCZClwKLI+TjEs9KGyZhY
-XcAw44k3ARDPvxb4bSiAagBU7ZBoevRJknt5hHqE/aPFGRewk5uatO2s92ZkAwil
-rdK/r27itqrbnWtSDNyqcAMPZfaln+sogvIZXB4ZuHRrC0sGxdzYL4cVC7F/ysn6
-D/y0ruqZeuZWsCl3cXy3jgVsPJPDNSW278ZvE5IgDNWptu89uaXeEb0EYPuneMXX
-sOJHT5477fW6UKcWdzpFwYtId8aopWPWB0TU7pRccHdFZBvS2zNvx0ykvHVd7MG+
-et/2sG36SVGjo8+MbAdbYWQsFW2diqfSpel4poAWlpXlE0KA/WfzV89PeBV9u1wP
-NkZEXLfRZ4XjSs20zy3r7VJumo+Fa7preQqTVbCNRhAUfZaWTTy4Az2NBJsW0oKq
-qhNmzoVIH3TId4Ay1A9cFuFfvrjs+TeKD/xRKv34PNVVScGrXY1ey0z3OCULCgtX
-zrc5AZpnAg3phrsI0WKNay+3bUoD9KRx+cM6IYL0El2B22dO0TgrJC4xsuS7T0Xi
-FxYc/zJq/xQXKwzcpRSARNIliGznhMwy9uThGvmGFkBFJlGfhCLhgiA7uJlrgA1M
-/Zn4m52zC597AVZo1MXtjx7ffI3VRaP/9QG0vYeZQmfk1tadPrQ=
-=HStp
+klCsNQ/+PzZ+uAPAHUPs9R3oK2W0OZmStK2aqHm4XYIZpfXoK4jvLsze3tVII+zq
+9Xo3dNysQ2/WS2dPL2r4+ixM5Sog1qeM5DblYHOGySpzC3vQdou7tVw9e+96/qlQ
+cXZ7zSUtoLRYwrXf/SdJDOtWGO2MLmaLsZRwd2AFERyFUftqSOAtqnQDlv9R+tN5
+G+CEFEprwwESWgLnuJwZb9VCe+nov/BVzuSfUw2WTKZ1/2N4+pQpZiIVygxCTdoc
+YshdZeyK/F10yu9fXxw6qCGZPJEblEVpb5uA88n7MDNZkOl5kNAwM6j1jzIDXDaI
+GM2DxquhSTrczXSvv1KL2is+jd8imW6qpdrXDnIFTjZDBlQu8/1Qk7jaB2TCLmIm
+dUc+4eZtyjuzhe18jCKBFCeOs/zj01r04DBQQJdWvBfy+r8Cj0fUk0HyGBm4r4+J
+Dvtek8gVe/0cd2ImRebOGrxRsHmODIPoplK6yoDf1F1RVss2NndyP3ai9ylpD63E
+lv9UX+JFVs+y7Jm/BoEzYU2DfPlnqEwIJ5E39uNbRpgmVZavkd0e0r+0Ie7P9EDp
+1FnfFtVzYhKXenELn44EtlPu6RiTCODPyxAV68hOekGp70MVtDHd/r9+VNv/p+Ks
+s9azGrdfMngAhhUpgWRu08ZOv/aC9zq7cjPNt4IUCdDt9mqc4KY=
+=Ze2h
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 272847ca0a95..d6020e238574 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Oct 2023 10:10:05 +0000
+Sun, 01 Oct 2023 16:10:03 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2b7395643e16..8c32be6a7039 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Oct  1 10:10:05 AM UTC 2023
+Sun Oct  1 04:10:02 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d755d70660f5..8c63f18ed8ab 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Oct 2023 10:15:01 +0000
+Sun, 01 Oct 2023 16:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 06c9e76f709f..6052c31c2547 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-151c847ec2fd8417433af2d8b0ceed5b786d6ce0 1696152438 2023-10-01T09:27:18+00:00
+1f7253befacc77666d49f345e6ed3ed4943ec273 1696175742 2023-10-01T15:55:42+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index e80e802e28c3..ae6032a04834 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1696155001 Sun 01 Oct 2023 10:10:01 AM UTC
+1696176601 Sun 01 Oct 2023 04:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 272847ca0a95..d6020e238574 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 01 Oct 2023 10:10:05 +0000
+Sun, 01 Oct 2023 16:10:03 +0000
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ec38ba8dfcba..5cd3c80d9920 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3e0d4c124d43..5c3520b4f68a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -152,7 +152,6 @@ app-admin/salt:portage - Add support for package state enforcement using sys-app
 app-admin/salt:raet - Add support for the new RAET transport.
 app-admin/salt:redis - Support returning data to a redis database.
 app-admin/salt:zeromq - Add support for the zeromq transport.
-app-admin/setools:infoflow - Depend on dev-python/networkx to use seinfoflow
 app-admin/sudo:gcrypt - Use message digest functions from dev-libs/libgcrypt instead of sudo's
 app-admin/sudo:offensive - Let sudo print insults when the user types the wrong password
 app-admin/sudo:secure-path - Replace PATH variable with compile time secure paths
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index a7f0eafb329d..49976cedb153 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index dc6b1e0eef80..cf372418bb9e 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,4 +1,6 @@
 AUX kstars-3.6.6-missing-headers.patch 1076 BLAKE2B 6e69902dd3292954322d0b2a2c9dd4d1bec30dd28b4144982a89d25e490a14ac1baa59e40a5e215ee7832f49fd086efaad0a2e3f8e430e9ae749483f85147eee SHA512 d7fc53673dfc4b0dc0f24de3991b9008811c87c592962e82fa197e012d217c4640067ab3a7b2b5b4903c181ba00d048cb306f98fe28778ab4a1fe7a1a336aa6b
 DIST kstars-3.6.6.tar.xz 135870036 BLAKE2B 20a313b4df8c266cf406677ed062b8788b1840670c88c86043a84ef15947f16247d0733f2b91b623a951e53659fcd6e3bbd25b22c105a3ac3df3481fe57078a3 SHA512 ef2cbd12578cc336e46dda875e8d6b077922c9732b4afb35b7782ae1573c2a6ccd0337d1ba1206d2e5ac5922f8b9c91ddc45f59b6a487f22b779f8d1100b1636
+DIST kstars-3.6.7.tar.xz 138532496 BLAKE2B 173cea5d81b72a181dd7c17ea8159d739675fe60bfab3fb9ccd0a47b32a7f2e2231d5eaa26074eb6d2479b1f62a3c5236494763d82370d844dfaebbc14adc3a0 SHA512 bfefad8c3cd55a2b01e8be240ede7c2ea7cadf99d44c9558e56ac0b0d890c96c3392a6de4c062341f3aff994fc7e95b79a69454a436bc8bce760942cd42f80cd
 EBUILD kstars-3.6.6.ebuild 2812 BLAKE2B 79d1037d4409ecc54509d4f8d50ce3bb4bd1362d714485a438e499c59a67273e84dfccdefe3e102a29187af9c45ab48b9f3e42f91952a6c9160e74fdee599a64 SHA512 3afd3aaa05b176dcd8654c598188f3ed52b1372849121269ce68b13678626aed2ce21643c3c0b1f246b7ab76a57680e9c129bd204792988ef90b057e443ad300
+EBUILD kstars-3.6.7.ebuild 2527 BLAKE2B 82abbcc44608277d1373b8f88dae0945a19e36ed184096c8bb9e5fca6190fff6a02c5377606e3c1e2d13eb73cb945f3f7ca559209dc7300fd97930633efedd55 SHA512 84e2aef4099a752cb150469332ed70ab82cad367fe976c1d7804c0832f989416bb20aa93f28db194e289fa45d9971bbaefcb906c3fc627218703f08e85171b0f
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/kstars-3.6.7.ebuild b/sci-astronomy/kstars/kstars-3.6.7.ebuild
new file mode 100644
index 000000000000..9e64b0fcf4c7
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.6.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="+password raw wcs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	>=sci-libs/indilib-2.0.2
+	sci-libs/libnova:=
+	>=sci-libs/stellarsolver-2.2
+	sys-libs/zlib
+	password? ( dev-libs/qtkeychain:=[qt5(+)] )
+	raw? ( media-libs/libraw:= )
+	wcs? ( sci-astronomy/wcslib:= )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYKSTARS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 842768, test declared unstable by upstream
+	local myctestargs=(
+		-E "(TestKSPaths)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
+	fi
+	ecm_pkg_postinst
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e349fb43d392..9f44fb14bc25 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/alt-ergo/Manifest b/sci-mathematics/alt-ergo/Manifest
index a18954052284..5296c2c720b6 100644
--- a/sci-mathematics/alt-ergo/Manifest
+++ b/sci-mathematics/alt-ergo/Manifest
@@ -1,4 +1,3 @@
-AUX alt-ergo-2.4.2-dune.patch 366 BLAKE2B 4235894eac0760eb6d866a203a80c6c69d8bc6a1b4b70f67b865833f53391ca995a777c4e6e0ac64e918073e101eb35bf4f06824df7018e9630eaa75621dbcdf SHA512 64938a2f79889d67ca22d8153eaa3167ee752d13bfd0b9b6690293962a9170b208fa7f4f7375cb356d75e665cf9aa3cbf0c9d48247b9eb99573ba704b81a6a40
 AUX alt-ergo-2.4.3-dune.patch 136 BLAKE2B 7a8740fd14531be7dc595dd3dc3eef119c39943fbec98c9784f6a25dcc1947ebefacd079bcc95a48b07f8d94641ad66261e06efd18edc5cfe59783626b6bcf4d SHA512 016d80dc17436e469746822f62a1748a661a74e5ec2009a0f297a75a763b645cb95e564727ba03434602c494bf866f563adf558ff24f915d50fe198f9c9fe3c1
 DIST alt-ergo-2.4.3.tar.gz 2902450 BLAKE2B bb8931dc512e3745496c1801fe959ac0fc4758b03049462506689021508a4ea364f0aae8679c776d8154c9f86a09080801c9b822d23355c572a24bd8b0e38210 SHA512 88a26b138e41997516085dbbf279e1ce11d03c18c0464ba80d5403dc80ff0f8cb5cbd4ad1489a60ff2a3b9539f9c55e4274008b14eed47b6fd057ce0a94ef98f
 EBUILD alt-ergo-2.4.3.ebuild 1381 BLAKE2B 058af8ee21ec2c30a9f31c2b8b7704c1d6944506f851d8574a4d4320c935b8249d39fc28ec42f7f9b945b4624f23a58ab21994fa65ab98e910546449ad343282 SHA512 ab112811eaedbef1fcd0becfb154a4b3add1d30bee1c958c749489ffc9ed9f2ffe6589041e5d4a6d001ff8afe7664212ced4c05e583a37514cb70cccb90f6f17
diff --git a/sci-mathematics/alt-ergo/files/alt-ergo-2.4.2-dune.patch b/sci-mathematics/alt-ergo/files/alt-ergo-2.4.2-dune.patch
deleted file mode 100644
index 58bcbaa70257..000000000000
--- a/sci-mathematics/alt-ergo/files/alt-ergo-2.4.2-dune.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/dune
-+++ b/src/lib/dune
-@@ -21,7 +21,7 @@
- 
-   ; external dependencies
-   (libraries
--     seq unix num str zarith dynlink ocplib-simplex stdlib-shims)
-+     unix num str zarith dynlink ocplib-simplex stdlib-shims)
- 
-   ; .mli only modules *also* need to be in this field
-   (modules_without_implementation matching_types numbersInterface sig sig_rel)
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 7a82b5902562..75464eab9c05 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index fd8c7e46e3aa..0d8b54dd34df 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -3,7 +3,7 @@ AUX binutils-2.32-gcc-10.patch 321 BLAKE2B a16a525ac14a2ebc5ec8a463370c6917a5783
 AUX binutils-2.33-gcc-10.patch 815 BLAKE2B 84cf88e34afea70ea3728e2a78f0ba004e24934f57ff53d42694c3fe6f1afd6fb091b70ca114ff539ae6274699f0e3584decbf1355d1d1cd720bb4aca31bcb33 SHA512 8c0cd37738d2d172aadf1df875d028538d9edca35b681d7faa7dc3ab64e2c214d9c33862795a51c0cba9a61aaea9c5bbf5f9f9fb4a01762aa266f32c97eaafbd
 AUX binutils-2.35.1-cet.patch 2675 BLAKE2B b720e43514b25897a332648bfb15e16278f76606413991ce75c0233af27bbc434c36e85d36d4207339211382c0c5de5e9892f9e533e9d24b5257864939ac4874 SHA512 4fd4787c7ff2f7c2fed338ccc0f478b120d566959c0de5dde03cdcfdb37911bc22c5c11a124a000d84138a23c30ee3fa65c024eb72d1c924f926b04e079412a5
 AUX binutils-2.35.2-powerpc-tests.patch 6108 BLAKE2B 20f9664b0d23e17584a0de5b6e28b3ed18cd072683b760c8fa6c43185a59ab9e7310059a89e6643a7372897c3e903598e800310091ad5a5366800c1997e380c5 SHA512 113bc477103f410fbb8d8ae97963a5093574b10542c339a04474bc6e6e06dab2cf03648ec78ffa489acfd208fafbb33bf769000c32178558c4fc72c7f0649b2b
-AUX binutils-2.40-linker-search-path.patch 3075 BLAKE2B f1114f64856c2e6c4df4e29aa6fecd9f683598a0efa5b96356bb671e808d371797678c41ee9913de2daad8064661c115cface74b118abd7afc178fe68c80dc01 SHA512 a58468684e8f8760176b38d9967c440422f9f431e2a46997cf4da1c419d121e5bc72803f6da87bed0da96a865f4867fa98af0a56dacb3bc510157e309aac6363
+AUX binutils-2.40-linker-search-path.patch 1665 BLAKE2B d8cf8febae443855e2676004e6da0434b372522266bbbef131cf6c88138013b5a1d355f96f7b5466f3fb519d21155f9130dcd712cf50046fea2932c94ac33a08 SHA512 84aad18b9d6f6a221ce3bc4e0da4155bb361132e382ed2c4031dc4dde290065b2b828f97a44a94702c3f1143a68394307ee937799d27bffd60a8ffee7cc3e7d1
 AUX binutils-configure-LANG.patch 2082 BLAKE2B 5db7ce0626dee8f3d84547eaccc5a2808bbb55657dd22c890782446fc9fe3e84683277d8da675067d9fd494d99dd292883174e133e440ce6a90d22a9f1aa9142 SHA512 1caf25d5e332d7de313b6be73e753fdde7b02235af564a9c06517f5874127998eeed731388617b75f54be6fec21835b78a54ce6c7162a33e25411fe3c78efee7
 DIST binutils-2.32-patches-3.tar.xz 151372 BLAKE2B 70d5f78d9f3e3bf9ff096b6f24babcc35c63395a5e1155a981a5ceb4b7a5706ad2ee0c77c74e910fc0eefeaed19763113186deb9665eed538dc3b8e227bef12d SHA512 5e91eff63332c2aca86a82a287ca4959a6098065ed88078265a3d79a2c851abd113e9736b75d8102a208996ed1191b0e23569921217ece975f1d9005a55afd0d
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
@@ -35,7 +35,7 @@ EBUILD binutils-2.37_p1-r2.ebuild 13294 BLAKE2B ec26ea427eb05e6368b046b05eb45ee1
 EBUILD binutils-2.38-r2.ebuild 13672 BLAKE2B 84e1567892739e624554005600f8dbe123bcd524728bd1c06797fdfae2c91f39ddff5b6aac420c9571508f6f88b79a567c9144e5670f48c8fa4b7822e5ca5b02 SHA512 e7b6822f6482c3bbbab21292d19a267a711541e8757c7d1ea0c8b09cdfc71ba3beee98e53a56ab7d0789122bebca801e45d13d255b0051647dc1f89fa7a17680
 EBUILD binutils-2.39-r5.ebuild 14198 BLAKE2B 509de3eac65a306d0430ed50ee4c734a8f8bb73b71f4ec366a3fd573300f59d77acb05b1a7fe86983ad61cbd59fa2a561d23cb5eea247e2ad0a125137caef81e SHA512 a86d974eacdddcd528f539b57c6e22826340d9efa52568d5aeef35ff191ad564dea5a643e99688833e4f4913a17bf20b74a67c993aecb2e8080511f46e057aa5
 EBUILD binutils-2.40-r5.ebuild 14499 BLAKE2B 7cd15027992e9d9a9541903044eb3e8be9c4a42e0e40e7c058713a548e38275e7328e866b407eb77c2bdf1d20bc32b0634ff365501a3de9961d5244450c30345 SHA512 b972d5eddc2d0c3c905505cc3c660af2c40fd28174cabf37f13388b2f472a3941d79d93ea585a52874636d2e72a99c2d45b820337746c4dd8526c6a298757763
-EBUILD binutils-2.40-r8.ebuild 14655 BLAKE2B 787d3651accae7dcaa1087531c4ab33f84d39c2805bf3c43b684fcc11126b44bd5f9a5a2a3d8ddf352deb9a284567c7430c37513e00022ee3e783df7ba271631 SHA512 f514491d9d7da809e5dfee390af8be1977d680ec3c8331e01de2feaf25ab9c70f9a1cc563a57d819a4bf9aa0b7351c6c9c2aa12b61a57902a2b23b3a42850768
-EBUILD binutils-2.41-r1.ebuild 14985 BLAKE2B 2a0bc6b83f5d6cd939dffe24930bda9521627335b5d8cad88ab0e1b5e34619634bc304fb33883421e36fcfc5a76afe81bd94e7d39c96d8784217aaf8899ebd28 SHA512 8adb901fcd2a56fb8061e7fc207a00a1fb359e9fce700f9608269e541fb77b382a7ac92bb7e79f807b2f67c670de758b1389af7a5804beab6cba2e7e2363ad45
-EBUILD binutils-9999.ebuild 14986 BLAKE2B b9c60b13ff366fe5e6440d1d5c720139a0ca4c9312b6d3d1cb24daed5d25c3054b1673bf359a89dc89518e50d2358ce4e58a3528205ad3580643f08e55fb05f7 SHA512 3c90553e49991331820df8cd55c3c1b56786386f08668522f00aa42a10caec550da17d4eb4b086415ab904b67b0e5736bc3db92369c67d4cece7ff4057ff2325
+EBUILD binutils-2.40-r9.ebuild 14683 BLAKE2B 964d830feec9aa51d8e28f7bc8c0ef3bb9d7ac4631e2d72cb406b498473799372d1410e69e19ba927ab190f81f7373eaaf76c0d8014accfea71aedba7f8f333c SHA512 9f5391e10ee4f4b12ae766c1f1215688f2046c723608fd9a9d7a58cdb513f7c11ed8a709624d27307fc12108dcc94c734a23543e3a76ae5c3795af9dd05025a5
+EBUILD binutils-2.41-r2.ebuild 15013 BLAKE2B 0167047df0e0cd3d4e109a121265ea01436440b7866046fbc526692ce930000f7d79986d817f0504be601d5b031fa210beaa049cdf0fcaecdab0ac2c9c41f43d SHA512 15b4cc6f84b6024578aaea0f0b526efcadf3ec74bee24a878a810d2be888f307038b33e8da21d246e6299b5eaf551286bb38c5f83ebc7e700fb355479ec7ed3a
+EBUILD binutils-9999.ebuild 15014 BLAKE2B b1a188fad2939e979ced82da85b21871c11b539d00c31b23cc3f9909aa02331bb2fa51e152353d5bf5147e2e34d0760ac7c0927c6ec385bebaa61d715110ad89 SHA512 56ccd36410bc666c310058c1007e416d602c3a62337313d55f48dc793f076b81aa7fc6f5127096b8615fcb22eafc2df8265938da570063d108904654dd6e49ee
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-2.40-r8.ebuild b/sys-devel/binutils/binutils-2.40-r9.ebuild
index 789ad23b059c..b7fac9c0e71c 100644
--- a/sys-devel/binutils/binutils-2.40-r8.ebuild
+++ b/sys-devel/binutils/binutils-2.40-r9.ebuild
@@ -118,7 +118,9 @@ src_prepare() {
 
 			# This is applied conditionally for now just out of caution.
 			# It should be okay on non-prefix systems though. See bug #892549.
-			use prefix && eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			if is_cross || use prefix; then
+				eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			fi
 		fi
 	fi
 
diff --git a/sys-devel/binutils/binutils-2.41-r1.ebuild b/sys-devel/binutils/binutils-2.41-r2.ebuild
index eec1ecb1e001..de4cbac1dadd 100644
--- a/sys-devel/binutils/binutils-2.41-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.41-r2.ebuild
@@ -118,7 +118,9 @@ src_prepare() {
 
 			# This is applied conditionally for now just out of caution.
 			# It should be okay on non-prefix systems though. See bug #892549.
-			use prefix && eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			if is_cross || use prefix; then
+				eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			fi
 		fi
 	fi
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 11e84c53af1c..5d9cedc9c2b5 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -118,7 +118,9 @@ src_prepare() {
 
 			# This is applied conditionally for now just out of caution.
 			# It should be okay on non-prefix systems though. See bug #892549.
-			use prefix && eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			if is_cross || use prefix; then
+				eapply "${FILESDIR}"/binutils-2.40-linker-search-path.patch
+			fi
 		fi
 	fi
 
diff --git a/sys-devel/binutils/files/binutils-2.40-linker-search-path.patch b/sys-devel/binutils/files/binutils-2.40-linker-search-path.patch
index 7423f8d70556..bddfa1ec6eb5 100644
--- a/sys-devel/binutils/files/binutils-2.40-linker-search-path.patch
+++ b/sys-devel/binutils/files/binutils-2.40-linker-search-path.patch
@@ -36,39 +36,3 @@ libstdc++.so.6, while other linkers do not use this file at all.
  	      sprintf (filename, "%s/%s", search->name, l->name);
  	      nn.name = filename;
  	      if (ldelf_try_needed (&nn, force, is_linux))
-
-From 8afc65c8d8c0fff2f686ddd8eb9023c7ebabcca9 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 11 Feb 2023 15:18:58 +0000
-Subject: [PATCH 2/2] ldelf.c: Do not search for libraries using ld.so.conf
-
-Other linkers do not do this. It is problematic for Gentoo Linux,
-because crossdev installs libraries such as libstdc++.so.6 outside of
-the sysroot.
---- a/ld/ld.texi
-+++ b/ld/ld.texi
-@@ -2355,7 +2355,9 @@ For a linker for a Linux system, if the file @file{/etc/ld.so.conf}
- exists, the list of directories found in that file.  Note: the path
- to this file is prefixed with the @code{sysroot} value, if that is
- defined, and then any @code{prefix} string if the linker was
--configured with the @command{--prefix=<path>} option.
-+configured with the @command{--prefix=<path>} option. This has feature has
-+been disabled on Gentoo Linux to make it consistent with the other
-+linkers, which do not do this.
- @item
- For a native linker on a FreeBSD system, any directories specified by
- the @code{_PATH_ELF_HINTS} macro defined in the @file{elf-hints.h}
---- a/ld/ldelf.c
-+++ b/ld/ldelf.c
-@@ -1156,10 +1156,6 @@ ldelf_handle_dt_needed (struct elf_link_hash_table *htab,
- 	      if (is_freebsd
- 		  && ldelf_check_ld_elf_hints (l, force, elfsize))
- 		break;
--
--	      if (is_linux
--		  && ldelf_check_ld_so_conf (l, force, elfsize, prefix))
--		break;
- 	    }
- 
- 	  len = strlen (l->name);
-
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 2320493d7da4..c75ba6bbef23 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 21271867e7dc..82880236f73f 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,6 +1,11 @@
 DIST genpatches-6.3-1.base.tar.xz 4304 BLAKE2B 24ef2e99be1e444526f6786cae000cfb63ea8c0e1107cea066daf2bd7336f1bb968e59395163d3d6a816d92add61b07f58642c3d55ff4b8b341a88a574e57845 SHA512 b20adc8f05814eba47c1a088005e6b04135efd3a388db55693e88f1f039242b60a3749bbac9c5c84f99a1f8a9ac9f7cca0c2f67e9cac465781b43fa1e71db525
 DIST genpatches-6.3-1.extras.tar.xz 3808 BLAKE2B a96621ca57aabd030136a9541ce02b4a656516afbd8a629954b47a068b4f8846d533c95ea5cc95a9f345733fc56037c60f9e58eb6ac892917bed97cc186e68f3 SHA512 e519068234889706a4ae13b663733ec2882000b8c4968b1368280e3037ede75c55ac6b6c643897f4dee6d34901ddc5f7963af5389f6facc6db496e761cca9242
+DIST genpatches-6.5-7.base.tar.xz 428224 BLAKE2B 9038c1beda5e3778508a29ccb0f906520f93a505f9a45f7050c47814eaf2e474d46e3cb8760dcf5a3bfbc504c5c133f8dcd8b55261a3d0c824cb374a42d98801 SHA512 89942e28ec1c594401a4ecfd6ba240e334356be0f1f35e48dd9abb1f4ffd122a044a76079f214c534a6acada0db4b735a8fa8face05feeeba82e2b51231c0472
+DIST genpatches-6.5-7.extras.tar.xz 3696 BLAKE2B 0cba288c1d1c753e5a317e87432dbdc2e711635cd074b1daac3b40af683da939981eaa40b8d4291ad59d4abb92aba5fc97be134524e02b1c2c29653382d7f402 SHA512 ea3bcaffbf58f981388c2021baeea809a35a1b270cff6a0613dce2da8ff8431886612d22073c7a8d6462d20eb1f27d0c0518164c14e4af96b9393bb6a1a038e4
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
+DIST linux-v6.5.5-zen1.patch.zst 154750 BLAKE2B 45049e77772f5df11ddb9b664d79a47dbfb9f0c3124685ac0c935638fcd6e6dfb8a0f70e4a2f249a6f46d44e46ab6a397ce8a2759cf7fdbd3b28bbd14e341308 SHA512 0c71b00ce211cc2e6de8a961e341b688da83d8657a711eefbec78585b339b09eecef2da1d0eac5ad21defb4153572123707cbba064eb8b354c411deec0cb8c91
 DIST v6.3.9-zen1.patch.xz 864288 BLAKE2B d2ae4c0c24648ed72536f6e8834111ebf65293442d244c234648541921955fc2bb364599478b69ee07c83017adb5868fe1d8feee9db48bebfa84345c345beefe SHA512 c23d2847e53e0f213ddbd70b1733d705401dccc3a12c3b2d728059c3a55c851fcbe4e243e602fa52c66ce7e9c73297385e592b6002cb651116d5b66e31447916
 EBUILD zen-sources-6.3.9.ebuild 1125 BLAKE2B e5aa3a4382c56fffc1b943fc98cd83546d4b0b8faa2de7c80cf2fef63cfba99266adba4f036d623781f2d47c2265f2631b59238566650820ea1b3c771829c8d0 SHA512 87aa724c607fb9ac86156c504d840ff5354fdb64b108d0b32474bf973ff9f223051b5e85737e3b517ff54cedfd68922209dd56feadcc97bec71901f6cc305c5d
+EBUILD zen-sources-6.5.5.ebuild 1394 BLAKE2B 58c1088ed25218ca6d113ab64359d58c4cdc783414168f4ce7db4c6234374135e78e70b5d09e4ec422711bf068d2de2b552ba7e04cc74ae3662c436f97b74b1b SHA512 ad77a756632809e996ff8412c3eb12837cf51735529573866f81d970211d0ec894be62cc55d26e839fcb6dcdc900975b4207a812326495a4acb1b9f0e567ed5e
 MISC metadata.xml 404 BLAKE2B 1836329a9cab0f03e4ee80056d5db141d5721875794ef39844c014c0426fd558b3a2bc6f1a7bbcb72d99ad81f4a071f451da9adc4a6fdb380e8c7bd7bb10ed2d SHA512 2c48e149eb08a53121a799256eec33895daa0dce32ea5325f5f3b055c3a661de8294e21f114f6c7ad609818215261c57c53d124fc0d3679f87168039905a9516
diff --git a/sys-kernel/zen-sources/zen-sources-6.5.5.ebuild b/sys-kernel/zen-sources/zen-sources-6.5.5.ebuild
new file mode 100644
index 000000000000..13235aca9cda
--- /dev/null
+++ b/sys-kernel/zen-sources/zen-sources-6.5.5.ebuild
@@ -0,0 +1,55 @@
+# 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="7"
+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
+}