gentoo auto-resync : 21:08:2023 - 03:42:55

author: V3n3RiX <venerix@koprulu.sector> 2023-08-21 03:42:55 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2023-08-21 03:42:55 +0100
commit: 855f2ab2714a36dd2d3b757890b2449d3e9155f2 (patch)
tree: 21996677d9df011c406a514a9487ee25e7a5fe48
parent: 90a3be9d71a22834f9bc82c072f1b993f9a10e31 (diff)
151 files changed, 663 insertions, 3825 deletions
diff --git a/Manifest b/Manifest
index 04649e60a0a4..fc2c4566f974 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29284 BLAKE2B db8d9ea845507e64d09ce9b2e1685729a56b2b07061d2c5b2fe0bbcae61d08b7047db819efc51d9073340e8b47dcdbd5a5d5d2d1b6dab53c380b3d0f54d2674f SHA512 1b48901f5038e803b22b31e7d9e2c324212a3e980a8472ece65f9afbd19949ad650eded683af43f07925c4714c35c97e3c0090bf5e67ff216a3a51ce560c0b88
-TIMESTAMP 2023-08-20T20:10:16Z
+MANIFEST Manifest.files.gz 29304 BLAKE2B f2518255133a9e93723acf190c5e0a048b6a2ca51d367fb9cf4b5b409b8871e1bd2f4ee8971249bd22bada8908ae4245213fff6a7419fbdb0d88fbf50e333fb3 SHA512 eab7af115a67a5e34c91a2dee4d00702155d47469e738c77d43928836edd83f9e9fe8df26dbb53b7c0d61c00ea10284bc8956ee9980726bfe9c76e9608cb9941
+TIMESTAMP 2023-08-21T02:11:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTicyhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTix9NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCZaA//U0XSUmjCfYz0ZTSlc9jB2NequsA5/4DJS6herFIwltdV+mqwjg55NvLd
-Q0lvQSKJ8PhR6fJOR8KPH8uPqLylWpppD3N+IFlG3MnjpelESnjiVHEn2KDwATQ7
-OOBe/fRBneOgTKE9Ll9eIgWcrTZX5aPG5If4Qq8Qw6mK+fP0znjL5j7XSpZ28//m
-0gx5djEvIzlFTl8xRSH6IPisM0HnZgk0sryWSVKR1NNnOjPOdKi0gtt3w0q7h5Tq
-DTYCqb94d+2g9KhI662o02xRNkDa5hiJOXb9UarIPOkZopCSBzJpXr3LsphzVkG5
-LGL1Wpvtkn9AimB4b/qfUQxLj8Sztj3EHDHisoMbc3ziHdp63Um1k41g3O/TYd21
-xYI1EGtDcOA8B5ZcOXs7hw0pyIQtiGyBunp0+K3iVqFt8Zu+MvL0Jt4p1pEP4Y1u
-vR2c4Os0/iAm3/MJSaWpQ/d9EjXtCGu/M71Uf6O2MXcK+j39Ev5dk7007SbOGNCU
-vLr3TIt51RkfmRqN/75LoIxUGiHoxcaZBtTFejruOX/Jj7TVhlhRRrb+1XIf71Hr
-R15uLmIP0VQN+YqnSgbKnV328w5nkzK+sUZ/aHPcwCBxyKb140/x0XehNWsWuTW4
-54T08mq8FaY9fMvsZC+No/PBoqyWVQjovSqNpBag9KqOLWOEYnw=
-=DxGH
+klB4IA//baWGTix7NvKxMWjALaSKG7DTo+pijHuFf+VSSu2qnNzC2/E8SDzU6h4V
+Dm+mP4jJscFoBZxUQMpyg2uu1kXq9IUFnvBdxIKvZvhM8LJ/RzwH46NCbO77TQMJ
+i55YyZTi/X2xxoHrYiuGBkgSQL+EyNbtwwfexiEyTL4dIHXEWLkoSfiwplfbz099
+B5w0+hZAvCOIqNa1TAKYfg/L341IgHQfHcvXWtli6ljn6Ka4MuhCu0y0yZ5bf/o4
+Dchq7/11f96HCX/0ZSVWLjIrqlM6ry4u6UqcIvFZvj4q60Kd92eYezNRkIYmWZEu
+KcyY0WjeaHow4gjjy0tktCAx1QRxqW6JSe/I+z3AAgs4tZksRLNjXlO00s8kNFJr
+7Rq9uIThFeLQVj6QLfPxYzuMpBggbxzBHZwfh4haR8eLjhObMr2cL45R350jvZC3
+B6oVwdmmlVBpcwlVWFfGIuOZNrynxZj/anusy1HKiIyBwmWLdG5J+XVMi/1sTdQq
+//h6+wYUnSiPtuxuGyFxpPiAfDBbWpNzmmUmCUgqlWvE8CNtlJ8tMwy1XVMXzx8l
+0zv81BcSiid7GIztWBtGi/vbOEjmwTwNTgvpQ/w5QdcuKafcscl/2niiosikdGBX
+TyNbF+o0g5sXt1bbolRzhLmS2c3Zw4BqBEKZfOxfPn7AWrfQl+w=
+=faDK
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index c6e42fb09f00..7b6e1b98df32 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3843778b6a5a..32964640c49f 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/rg/Manifest b/app-emacs/rg/Manifest
index 570967380cfe..e28d2c4b7d87 100644
--- a/app-emacs/rg/Manifest
+++ b/app-emacs/rg/Manifest
@@ -1,6 +1,4 @@
 AUX 50rg-gentoo.el 66 BLAKE2B 51ca91eda1462dcbcd9ae5bd917ab44b5e1259afd72bfb5cb8eb884dacca545677d00e0feac5e7d90f8b49c5f308afc354f5df08d2cca275e78e008fa15b94a7 SHA512 84a87f247455cfeadd80335fa686c1bfee28b3a006249fc5894880c2e2848bbe4795c71dd212bfc2aae5e599755ae335653e5a78457d1e04324b8b5ca82ed2b3
-DIST rg-2.2.1.tar.gz 202686 BLAKE2B 43abfdc5d631d5551272788dc31f8767f2b638604f180dfd0cb96df8d142f97ec644482da660c279f1877ab77477e5f25810de3850439d0210be1e4040c77a98 SHA512 eac9c21db6a13299e24f3e6166ff45f378f44454bc02ad8c04b42580d03c67eb28fbaee17feaa53096b7dced2e4e7dbf64a50608c61fe9188530fa0102a0f240
 DIST rg-2.3.0.tar.gz 204996 BLAKE2B cc233f90a4bd56928053ebace2aa166c0210ddc9720b37b4e67e10e1082ed0ff744bef6d502666a8094d9c57c0afa2b9a32967b290443cc467f2865ea7b95330 SHA512 343626c35bdb26f2a300bac258af112230cf502900852456362f1adaa6bf6551d42d07ced59b8f864cab0663b559262f2e6f982f5b95cfffe1d04218fe6ebbbe
-EBUILD rg-2.2.1.ebuild 971 BLAKE2B 4a924baff9785630c479bd2f1cb84fa1ffe2b02c941944add93bce38d214d6d16429ce8f851c0a25a47f2d74c74bf27d63af15e70c0ad9bff5227547e2f9369c SHA512 c8cb15cd891712242ecf7330c9c0db32df100f982284bc096964e655d65c8c51a9afde74bd8b5d908caee333e37fe670c3ab24313a168e83094797aad11f41bc
 EBUILD rg-2.3.0.ebuild 971 BLAKE2B 4a924baff9785630c479bd2f1cb84fa1ffe2b02c941944add93bce38d214d6d16429ce8f851c0a25a47f2d74c74bf27d63af15e70c0ad9bff5227547e2f9369c SHA512 c8cb15cd891712242ecf7330c9c0db32df100f982284bc096964e655d65c8c51a9afde74bd8b5d908caee333e37fe670c3ab24313a168e83094797aad11f41bc
 MISC metadata.xml 1083 BLAKE2B aa777fe0b99335ca705401879d333e921bb480798c85a2213822461e4b60a5b8d660592d8dab7f1d81dff98dc2808aeff11992890842fc7657deee2516006288 SHA512 aca5ee92739a5e12ef60f539b74f2bb9449ec472d2ee2169528cb76cc716e0829427c9e3ddbb8ce7857266fc31a5143538a369afb59f5f00f26dd31e8af67d5c
diff --git a/app-emacs/rg/rg-2.2.1.ebuild b/app-emacs/rg/rg-2.2.1.ebuild
deleted file mode 100644
index e3cadd443056..000000000000
--- a/app-emacs/rg/rg-2.2.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="GNU Emacs search tool based on ripgrep"
-HOMEPAGE="https://rgel.readthedocs.io/
-	https://github.com/dajva/rg.el/"
-SRC_URI="https://github.com/dajva/rg.el/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-S="${WORKDIR}"/rg.el-${PV}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-emacs/transient
-	app-emacs/wgrep
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	sys-apps/ripgrep
-"
-BDEPEND="
-	${COMMON_DEPEND}
-	test? (
-		app-emacs/ert-runner
-		app-emacs/s
-		app-emacs/undercover
-	)
-"
-
-DOCS=( README.md )
-ELISP_REMOVE="test/rg.el-test.el test/rg-isearch.el-test.el"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	elisp_src_compile
-	elisp-make-autoload-file
-}
-
-src_test() {
-	ert-runner -L . -L test --reporter ert+duration --script test || die
-}
-
-src_install() {
-	elisp_src_install
-	doinfo rgel.info
-}
diff --git a/app-emacs/websocket/Manifest b/app-emacs/websocket/Manifest
index 03b229184ed9..63ac6672735b 100644
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@@ -1,3 +1,5 @@
 DIST websocket-1.14_p20230305.tar.gz 27340 BLAKE2B 32b55fdff4bed7893d02bcafc67e473442803a492c31e565ec1487dc0e7211e505a517e460ca05f5f1f2d28d0852bced91cfbe9da98bcd6ed1e4598fe6bc4eb6 SHA512 6c4574387f8cae7d17a3a8e618678e9dc8d96d0301f3d20e236dae1820cdb2c7bb49e2f5bfe816670e9bac6a7be24b85f8ec9f8ea2aa248c6b5af302f227ae43
+DIST websocket-1.15.tar.gz 27231 BLAKE2B 4dafdb9bc2b2b499ee335acc00c8bb0316275ec5f5d4d3440a4dd89a17ce7999c211d2ec2b9df0457ea17ca6d70f57d7804eb8f3b6ffa4bbf8ed362bcc66618a SHA512 c2881dcb956d7803b16bd451f21a1c2f62181f2b88c0d4e9e067b040df573ad90d047e7cb637190d193e185b651fef1e7559833a1dffe24097ddb07623133d6e
 EBUILD websocket-1.14_p20230305.ebuild 853 BLAKE2B b6b1dca73dc3610578b6ce59e4feee91b848739bc501dd2b85d74eb83897a6e30f9e472f66acedc4a5d63c03f4f464e9d62b25293d056ed2b1d3580928b3f6dd SHA512 405d5ab01f42409788ec2123a4f37a92312e7ace4b0605aa30adadbf1ee672a369301bf9ad72d96a32ac50581426235207a34e06e4a5d2caba4de91d7b4cd44c
+EBUILD websocket-1.15.ebuild 867 BLAKE2B 9379d88dc92cab2f7915f662648637f538ce55b4430d3993b8ccbe3c659eda486401d547e72c141712b85218f9763efa63cec4811c55201bbc41698de6785e22 SHA512 9fc9e6443347ac6cf96129c1bf9ac3e88ae5d0349f3d02fcab999cd5db32b7e242ef4af4fb7c0b8a3b55e59bd3f37533327ba61e0b9b3b7cfa9de346801d04f3
 MISC metadata.xml 385 BLAKE2B 63b7e67552098fb0e1f8da3df87ad993a042f4f19d317819f7a5faa263858674b48d9b9db5459732d73aa11b7d9190a3c4e035e64e7555639dface01d9aaca13 SHA512 f02effffd7cb072e3d1835768354df8d939248c7a10e54b75e590efbc2a9f8b67431c77050fbbf9c13c94c1d1b69b6f6049cc93ded163980214890e55c4cd382
diff --git a/app-emacs/websocket/websocket-1.15.ebuild b/app-emacs/websocket/websocket-1.15.ebuild
new file mode 100644
index 000000000000..9fb39e72393c
--- /dev/null
+++ b/app-emacs/websocket/websocket-1.15.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A websocket implementation in elisp"
+HOMEPAGE="https://github.com/ahyatt/emacs-websocket"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/ahyatt/emacs-websocket.git"
+	S="${WORKDIR}"/emacs-${P}
+else
+	[[ ${PV} == 1.15 ]] && COMMIT=40c208eaab99999d7c1e4bea883648da24c03be3
+
+	SRC_URI="https://github.com/ahyatt/emacs-${PN}/archive/${COMMIT}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}"/emacs-${PN}-${COMMIT}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+DOCS=( README.org )
+SITEFILE="50${PN}-gentoo.el"
+
+elisp-enable-tests ert "${S}"
+
+src_compile() {
+	elisp-compile ${PN}.el
+}
+
+src_install() {
+	elisp-install ${PN} websocket.{el,elc}
+	elisp-make-site-file "${SITEFILE}"
+
+	einstalldocs
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 202fcd2c4784..7ed1799a78f7 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index d1de176fc650..0a102289d05d 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,16 +1,10 @@
 AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4ba89a2ccc2c7a2ac3ff4994cd687191470f2d481f9a6e3a91aaaf705f92f7600118a9cda015a9554056520502df7ae6462e111665c7330 SHA512 d840ac343ef566e404dc84e908bead5a020dfd88b8c0432f17bceea8d710d435626dc72b4be6622dbcd683a149bca16e781320cf74fc3f2598f84d169c6f7faa
 AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2
 AUX crystal-1.7.2-extra-spec-flags.patch 1080 BLAKE2B 3054e38d4e7d114f1b0a08b367f9a5b366bbe269c75b9195abf9dc39231b32428a108c4254abd0bdb29b2ac6a94d6d256eccc68ca69f80a273cd17e0c0115fc7 SHA512 3c3fd6a42b291a42f76ec76101d669011eb02d4d17f35c8ad31c5a49aa3655a2315999e2401af7f3bc26445f74f432430a44b021846238d345d9c14b1009fdc5
-DIST crystal-1.7.3-1-linux-x86_64.tar.gz 41098689 BLAKE2B 38ff4e7bf0c6aeb8364fb18ed877ee000ae51ac274fb55a0f8ac60637ad20ecb53a95e3e9304b228bd20c00f30be14aed4d19e7146998b73d908bf0c7e60bf95 SHA512 c2fbdc455c8555cb03409a8a6ec0de9d0376d7bd5ebaba97d14f6642f0cf0d90f09479e1d1a1a3a3e80c0d81393e2915e12201e1682cc1b84cc8e3b27386d88e
-DIST crystal-1.7.3.tar.gz 3122395 BLAKE2B 5ccb18fe9d24f655d7210e99d81593d177063f8f9fb278ebdad6bb3c418684462178b754a9ed9d84423e8c3682eddf56360def4f2c29dde22eebfe34c503f499 SHA512 97efff14523207d5939a6fb92c648c0d1160d968a359b505e916ce438b71797539498a6b90da5bb9474d509a13b313622f6e3520523378342e099ad1e6d9c5a5
-DIST crystal-1.8.2-1-linux-x86_64.tar.gz 46319920 BLAKE2B 3e95516e97718304cc686b7d5d2ddeee1d37da9e9a2f7e4baa36afe33d13d2f1856e51cd25b0c0f3c50c74fe948647bff20d9107619f7deea2e6689d6e0e873b SHA512 6e6413aa506a80dc1adbf745651aa9d8b39dfeea2e550b8bef7f1444c5e39e89c6e21e52e80f67ae24e0ce3a9944a9494a1818f112a518511a0fe144ae7b8de1
-DIST crystal-1.8.2.tar.gz 3171583 BLAKE2B 0ac88384e0d5a04ad397d1756eec5505614fa53fa7bf9f9f2c4bf32796374c2ec5d0c2731e7c0eb0128bb93dd7cfb20b9ca7d1fedeb76bd2f429b87208672f2c SHA512 99135dabd7e63dc2dd2b55375115cd668168a2e2618a2c74808800b678bd962294850364c523225d1db043aca4bd24d2b85dd5949dbf1498647f7f45d32f7433
 DIST crystal-1.9.0-1-linux-x86_64.tar.gz 46172258 BLAKE2B 6291d0106dc6965ad3366169c6dd1c234309a891f2ce03020c8eea21e8d7ba66d018f4947717fcb191c5a9a13a476a36bcab113853cf1373b9d4844ceb50c495 SHA512 082c6aed3bb6035c030b39b2a0be305c5243c207f97caffa1e92bb763648fd732243a2f36d4f972b079c8c88d59562d2a7bc03d52e6be044ab340faa7246f1a9
 DIST crystal-1.9.0.tar.gz 3246261 BLAKE2B 4bb8027b07456847a55eaccfd91c075462ab9162bf0632ae159758c3eba42fcdef50c50811ca2fc8d9c0c148eca449763003edf28ead6a08785c71218de2784c SHA512 ec30f8d95f1e6c0d837e286a8ca6664f84c6f467b6a0d167d3019110f17a7c94207f9e3e68fdb0fd42134f224408234fafc96be63b5ad5a8cbda9fbbeb1d619b
 DIST crystal-1.9.2-1-linux-x86_64.tar.gz 46171732 BLAKE2B b664207f2994a16e8e05cfc72d5e4e3cf9ec1e8b8a41869a56fc03b0946b7439f1528ec78c0affd32bf07a67d3329a644f5ba7f1270982723697071266a6ab7f SHA512 bce18bf48c5c746aa1ee8aa9a34b5ec2f104aed95f3a74070229df4bf73a0ac9297af79a873d965c9631196b6f1103059a015c4f68cea800a779936aef9389d0
 DIST crystal-1.9.2.tar.gz 3245770 BLAKE2B 76795f79f305863aed9fd8b5de8fe7edcb512e7a64e2368a606fe38171cc4653a126dba71c071cffb1a6a26426a5eeb3c5bc458800cbc95f083c8895d962d7e2 SHA512 9356b7e267bfa2183af2184e633cd91ef23487e46e73db33f4363ce4fcf5515349555dfd5c056a0616855e49cff4bbab07d1eeed84e087ae469bfc0eb49b63b1
-EBUILD crystal-1.7.3.ebuild 2609 BLAKE2B bce6be752cfff6e36a80fbe8406de447f9458f5759e8a7bb6d55fab1e76e39b7822263ca09dbd358c509245b36efdcd340ad92b369cb5ead9d8b861633eafa1a SHA512 5282fc72614dd33d258c3789e35ca70ecf842fbb3ebc5b921c10a3f40817ae689a35d965997da7c22eb5150f70fc4019c8aa0077aa789dbd225da753dcd9d6c5
-EBUILD crystal-1.8.2.ebuild 2609 BLAKE2B d547df0e56e87ce3216598c2c1706cbe80b56d15c9bbff20029357a7bbdb9511201528b088f8384174d6ae154f71c3720f38e6d23b662d3e22c0aba0c801c345 SHA512 7bbe939ca8ae4a6386f50375e78c4b90103a72d93453a3a98ee0f86ae1e9b342b2acfee0d67ab519628dd0f5aa3f45b6754c283b6a44d7af80bc558daf755d1b
-EBUILD crystal-1.9.0.ebuild 2609 BLAKE2B d547df0e56e87ce3216598c2c1706cbe80b56d15c9bbff20029357a7bbdb9511201528b088f8384174d6ae154f71c3720f38e6d23b662d3e22c0aba0c801c345 SHA512 7bbe939ca8ae4a6386f50375e78c4b90103a72d93453a3a98ee0f86ae1e9b342b2acfee0d67ab519628dd0f5aa3f45b6754c283b6a44d7af80bc558daf755d1b
-EBUILD crystal-1.9.2.ebuild 2610 BLAKE2B 7faa282a9a3ae761db424d2eacc273220e115b87c384a07ebcc091859757f41b1b1690142c6705d5124fd860c15505c80dfad7c4ab9b0dd28a763f2469320cf4 SHA512 fbf996572071e4859846d5d5cc78ed663966182d9bbc404bf64054b3a03504c2c05098860aa7807b329e3123f6ef85845679acd03088666f7444f69592fa5d3b
+EBUILD crystal-1.9.0-r1.ebuild 2609 BLAKE2B 88cb14b4138e53c2bae5dcc6b3698221e68c9b687c59bca053af8535d96e2e46b9d4ad9947bc198b6400fb9b77aca07fb89361aaf79e49461eecfdbe79dc8ab7 SHA512 35bf8e60a176fabe4e12cb614a20b2309efb23d0c15d6d756a3488e251a03d7a7463d765b8c85a58cc66e6ce36c21e8e70d9735d3033395a8ed4109bb42789e6
+EBUILD crystal-1.9.2-r1.ebuild 2610 BLAKE2B cfad5fec105f76f392d28487dd8e12ea2b139f6c151e6af2bc161bc704774929271f31b38184086d311f4ebe1b3615938bd7be1aa1dd5514af94a3a8e7409ed2 SHA512 e2176464f4a573263644882a530448de9d6fbae319d28ba2e22e29514641c48a4ad5d4b62fc694aaf9915f77e2f01dfd1f029d8d51217fd9670fe7a33d50015e
 MISC metadata.xml 762 BLAKE2B 591f38c882318a6564501cc61abe6222264b65adeaffaf3b23d959ee86b83bae33eaf99029229705f92070fa539fd6d63d8242afc38475904483a9a0b997effd SHA512 ea223d568a3c336a43b183efc61bd1f1a9d1e5e0e8d963275e0b23ee879551bc7d8aae797b1e2edba49d119ad306692599eb535c5d164ebee0c6721dfeab78dc
diff --git a/dev-lang/crystal/crystal-1.8.2.ebuild b/dev-lang/crystal/crystal-1.8.2.ebuild
deleted file mode 100644
index 8ceb5a40846b..000000000000
--- a/dev-lang/crystal/crystal-1.8.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-LLVM_MAX_SLOT=15
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org/
-	https://github.com/crystal-lang/crystal/"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc debug llvm-libunwind"
-
-# Upstream test suite not reliable
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops:=
-	dev-libs/libevent:=
-	dev-libs/libpcre:=
-	dev-libs/pcl:=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libyaml
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-extra-spec-flags.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_configure() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]] ; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	# crystal uses 'LLVM_TARGETS' to override default list of targets
-	unset LLVM_TARGETS
-
-	MY_EMAKE_COMMON_ARGS=(
-		$(usex debug "" release=1)
-		progress=true
-		stats=1
-		threads=$(makeopts_jobs)
-		verbose=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		PATH="${bootstrap_path}:${PATH}"
-		CRYSTAL_PATH="${S}"/src
-		CRYSTAL_CONFIG_VERSION=${PV}
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	)
-}
-
-src_compile() {
-	emake "${MY_EMAKE_COMMON_ARGS[@]}"
-
-	use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}"
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake std_spec \
-		"${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-
-	exeinto /usr/bin
-	doexe .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	dodoc -r samples
-	doman man/${PN}.1
-	newbashcomp etc/completion.bash ${PN}
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-}
diff --git a/dev-lang/crystal/crystal-1.7.3.ebuild b/dev-lang/crystal/crystal-1.9.0-r1.ebuild
index ad8d1fd21905..805f363fca45 100644
--- a/dev-lang/crystal/crystal-1.7.3.ebuild
+++ b/dev-lang/crystal/crystal-1.9.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 BV=${PV}-1
 BV_AMD64=${BV}-linux-x86_64
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=16
 
 inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
 
diff --git a/dev-lang/crystal/crystal-1.9.0.ebuild b/dev-lang/crystal/crystal-1.9.0.ebuild
deleted file mode 100644
index 8ceb5a40846b..000000000000
--- a/dev-lang/crystal/crystal-1.9.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-BV=${PV}-1
-BV_AMD64=${BV}-linux-x86_64
-LLVM_MAX_SLOT=15
-
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-
-DESCRIPTION="The Crystal Programming Language"
-HOMEPAGE="https://crystal-lang.org/
-	https://github.com/crystal-lang/crystal/"
-SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
-	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc debug llvm-libunwind"
-
-# Upstream test suite not reliable
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops:=
-	dev-libs/libevent:=
-	dev-libs/libpcre:=
-	dev-libs/pcl:=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	!llvm-libunwind? ( sys-libs/libunwind:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libyaml
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.2-extra-spec-flags.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch
-	"${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch
-)
-
-src_configure() {
-	local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
-	if [[ ! -d ${bootstrap_path} ]] ; then
-		eerror "Binary tarball does not contain expected directory:"
-		die "'${bootstrap_path}' path does not exist."
-	fi
-
-	# crystal uses 'LLVM_TARGETS' to override default list of targets
-	unset LLVM_TARGETS
-
-	MY_EMAKE_COMMON_ARGS=(
-		$(usex debug "" release=1)
-		progress=true
-		stats=1
-		threads=$(makeopts_jobs)
-		verbose=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
-		PATH="${bootstrap_path}:${PATH}"
-		CRYSTAL_PATH="${S}"/src
-		CRYSTAL_CONFIG_VERSION=${PV}
-		CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
-	)
-}
-
-src_compile() {
-	emake "${MY_EMAKE_COMMON_ARGS[@]}"
-
-	use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}"
-}
-
-src_test() {
-	# EXTRA_SPEC_FLAGS is useful to debug individual tests
-	# as part of full build:
-	#    USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal
-	emake std_spec \
-		"${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crystal
-	doins -r src/.
-
-	exeinto /usr/bin
-	doexe .build/crystal
-
-	insinto /usr/share/zsh/site-functions
-	newins etc/completion.zsh _crystal
-
-	dodoc -r samples
-	doman man/${PN}.1
-	newbashcomp etc/completion.bash ${PN}
-
-	if use doc ; then
-		docinto api
-		dodoc -r docs/.
-	fi
-}
diff --git a/dev-lang/crystal/crystal-1.9.2.ebuild b/dev-lang/crystal/crystal-1.9.2-r1.ebuild
index 25200cbd691a..a650efd69f36 100644
--- a/dev-lang/crystal/crystal-1.9.2.ebuild
+++ b/dev-lang/crystal/crystal-1.9.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 BV=${PV}-1
 BV_AMD64=${BV}-linux-x86_64
-LLVM_MAX_SLOT=15
+LLVM_MAX_SLOT=16
 
 inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
 
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 6a72d72db6ff..6662b4437923 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1,5 +1,7 @@
 DIST vala-0.56.11.tar.xz 3999424 BLAKE2B 9b8734c87f92cc57c5d6d2269146d4cb97adf9c49ec396a8ecf74e8561e6cc3a296a771010882b4d2a137d24da7dde5bd7865b9e54fee5ec2da9ba7bba1e1c84 SHA512 509da611bde061f86d1694719c38ea253fcd19adf9abe1301e729a054e916b92c5627215e6ed4524f9f0a5a25a071933a7b791385821dc3c1f364ab7e7ff6f1c
+DIST vala-0.56.12.tar.xz 4000224 BLAKE2B 01c9aa6fa69648a6720944336a60f1349b6936436c58dd78ab689acd3633aaa574d5c4381d320c92f6bfb7830285572b6f0003462cb094eb6ab5c2ea688db2c2 SHA512 360f243fb5a7ba3fdd9cfe1d03249059f9a70275cc8f1419f1e443cff0ac4337bc5f08f16e9870c757eed682ff18d209bb9e47238bc81549858da639e1f48df9
 DIST vala-0.56.8.tar.xz 3994328 BLAKE2B 4d68b102838a854b870865c6223dfb6cf56741db2cf918d393a4c279cc63a5e7af3464d256ef9a7c90eb5a8773812613315815c64a1b11e5b3fce86ac52278b6 SHA512 152a7378c42602296c5797d0425e51c2f9d2c65449f035158ef7f8dbf48f3a6a09e7c9028d196c967d8a9dfcdbd5f5deaa09ffcde5e2a335872e9740cd79ba41
 EBUILD vala-0.56.11.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
+EBUILD vala-0.56.12.ebuild 1006 BLAKE2B 4ac9f323be68e3f2c12345912e0b17e8cb953388dbbd66d327ec30a94cc9e440af99bcf3afcd539f945198749ac43fdb2e763c8c2d73513a657951ca671ab148 SHA512 defb58a986337f7c80b1e23374a6bd47293cbabf27d381941a0e53e316705947a66f252ebddc76eb533780dec8540e3a7f17de53d1b2969dfb692f7382b36b4d
 EBUILD vala-0.56.8.ebuild 999 BLAKE2B 4a53efef87d29147dda03ac4f8e0fe1daefdf1c716b6c2112070f9b617ba6b85341678cc1258583a34bab49bed3773812c6ad835686bab7ca8385e11a6bd090b SHA512 cec6905a1b4967d3c7a3dd1c784b89393fa32e8473b0c123ab69a189882563c4489c6495db9fdeffdac09ab238dd6b57c90e2029f23ac3d87c6abeddd92ca807
 MISC metadata.xml 441 BLAKE2B a67ac153219c809b992ad569958248e09fe402e33526f2c9a8e5ef4908a5496a0018894605f2d649e191bb84db59294526bb14a06e59f4cfca335dcbf18e15f8 SHA512 97774503c4e5cbce834f11865cea98e45b244566373d8a7efca73d18346d425b49a3b96cda02a61484a8c906d9f27d735c2a9899701b95d0a5f62b9df12365f9
diff --git a/dev-lang/vala/vala-0.56.12.ebuild b/dev-lang/vala/vala-0.56.12.ebuild
new file mode 100644
index 000000000000..70072f140f0d
--- /dev/null
+++ b/dev-lang/vala/vala-0.56.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.56"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.0:2
+	>=dev-libs/vala-common-${PV}
+	valadoc? ( >=media-gfx/graphviz-2.16 )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/dbus-glib
+		>=dev-libs/glib-2.26:2
+		dev-libs/gobject-introspection
+	)
+"
+BDEPEND="
+	dev-libs/libxslt
+	sys-devel/flex
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+src_configure() {
+	# weasyprint enables generation of PDF from HTML
+	gnome2_src_configure \
+		--disable-unversioned \
+		$(use_enable valadoc) \
+		VALAC=: \
+		WEASYPRINT=:
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0ea5d6d70673..7913b99e39cf 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index bc64f8bd0f84..58beb2bf3120 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -14,7 +14,6 @@ DIST mpfr-4.2.0.tar.xz 1477532 BLAKE2B dd88ae3a6a910ad8faeb791b49c3b1085de5d0d4c
 DIST mpfr-4.2.0.tar.xz.asc 228 BLAKE2B b281a11528a69418739b0122b4130d9cf212569f9ded8def685b31afe700ea776dd40ac0de7aa6de1bbd5d03a1dc9726ed4278cc6cccfacd1147681a6de27f70 SHA512 ce64346cce89bc38fee161a5e01c349c97c69b626547e54a522b741949cb27bba1668d123143fd03b015f9bdd692bcba08c7b85cf4d4cea9f7834383e04d4bbc
 DIST mpfr-4.2.1-rc1.tar.xz 1487292 BLAKE2B 6e5a8e4355085858cce6553b12ca8e98ae44d0351701a7ba3e48b1f3233eb14261629e32d871d94bb766bae16bcea32fa8e0378f0f4a139d67e26bce84d89257 SHA512 bf3ae8f6e6b63ae929aaf7bab891c75f46b4f2ccc1bbc63f7589034616d6f7df48dba0396f9181d974cbe197c2e1718099ac7ec8e596f105e079b73774bc825b
 DIST mpfr-4.2.1-rc1.tar.xz.asc 228 BLAKE2B 7e9508c63f0e43a70072f812a453fd742d6dc39be9e36b8d3f68e34d69bf218a2ab829d3e0040b04ea32dc7607248d76fde1f119ca2d0c37680f63f6b125d154 SHA512 ebaa8e75b5df43abef640c2fb5ee3733576ed6dece2b2f164ff83c249d529582a9cf0d198e121eaf1420171e8386ab531609de67db3fb7dec49687fa03ab4d64
-EBUILD mpfr-4.2.0_p12.ebuild 3158 BLAKE2B 86a7fcf91c203f87c62b039f609592e2f4ce0f199a89d35d30d5b143ce254938686339cbb0c1b45a17a56c8a159d95bb3517354dfcfb2458d441647e104ed269 SHA512 8c8dfb2424f043372ef058ac7fedea442b5de3733b56497cd96deeee52998247c6872096926c430b78ffc41542e986903d9d6972fbf676f9309f7d4757212f6c
-EBUILD mpfr-4.2.0_p9.ebuild 3158 BLAKE2B 86a7fcf91c203f87c62b039f609592e2f4ce0f199a89d35d30d5b143ce254938686339cbb0c1b45a17a56c8a159d95bb3517354dfcfb2458d441647e104ed269 SHA512 8c8dfb2424f043372ef058ac7fedea442b5de3733b56497cd96deeee52998247c6872096926c430b78ffc41542e986903d9d6972fbf676f9309f7d4757212f6c
-EBUILD mpfr-4.2.1_rc1.ebuild 3166 BLAKE2B 7435f63692a319663ed64ff6ddb6c938f78ac0681a4d8b990825a50e3c4ea2c3b47a43fb0631b7e242438b77e07f2a2851879e72fb88b96a17b4899ad01c6d4f SHA512 b96d7c2bf7a37d235790017b92ddac9c990c4f4be40b3e5dac74bb96ec076ad010c8bd66f1473021263b25529743400e1b09df637df295c91f0851a09d811d86
+EBUILD mpfr-4.2.0_p12.ebuild 3157 BLAKE2B 563aef88842b971be3b0035da265c74e171c7850d8ab711a93c01f26f8405c6175c01443985cdf3321bdfc9a49f111201f96c7533dacd42174d0707281b12647 SHA512 622d731ef3b9fab56f63126fffc8c7515e5fe3a1e82cdca6ff6c3cb3906d9bfe1053021e76bfefda9d3609c0582bfa37baeb61f89f82fc9b464fec3cb6f17c3d
+EBUILD mpfr-4.2.1_rc1.ebuild 3165 BLAKE2B 67399a2b114d339e1688ca587cddd978ec3646b48b2f96f7764208e22a3ac38269ac07fbcce072949966742642298208e336c46262b8de11685f97ef51394575 SHA512 6b8643bf0224382cebedac0b1047e74538abe421639927c16b6107e22c3d4a50ced57d9a3faba8ee2da4f4148defb271b372943efc4753fe71f20ea0b9874431
 MISC metadata.xml 344 BLAKE2B b7a0bcfbcf945ce2b6d58a9a2078c823c12de5ef8261ec009612b58a833deecb7caaf864f0b55e0c46aac004c58feb7a1f88f6d78b584c2e25c403cfb1de96a0 SHA512 8b8b5ae00a4f9ba76c193c5d84f27cce973963f4db109219394efccba3a8e8bebb7f241658a0b682331e34c66ee99332f871d826abf6ec5a4ced4f3dce381fe9
diff --git a/dev-libs/mpfr/mpfr-4.2.0_p12.ebuild b/dev-libs/mpfr/mpfr-4.2.0_p12.ebuild
index 2d6a6826dd43..09e59e3b748a 100644
--- a/dev-libs/mpfr/mpfr-4.2.0_p12.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.0_p12.ebuild
@@ -43,7 +43,7 @@ fi
 
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-3+"
 # This is a critical package; if SONAME changes, bump subslot but also add
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
diff --git a/dev-libs/mpfr/mpfr-4.2.0_p9.ebuild b/dev-libs/mpfr/mpfr-4.2.0_p9.ebuild
deleted file mode 100644
index 2d6a6826dd43..000000000000
--- a/dev-libs/mpfr/mpfr-4.2.0_p9.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vincentlefevre.asc
-inherit multilib-minimal verify-sig
-
-# Upstream distribute patches before a new release is made
-# See https://www.mpfr.org/mpfr-current/#bugs for the latest version (and patches)
-
-# Check whether any patches touch e.g. manuals!
-# https://archives.gentoo.org/gentoo-releng-autobuilds/message/c2dd39fc4ebc849db6bb0f551739e2ed
-MY_PV=${PV%%_p*}
-MY_PATCH=$(ver_cut 5-)
-MY_PATCHES=()
-MY_P=${PN}-${MY_PV/_/-}
-
-DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/ https://gitlab.inria.fr/mpfr"
-SRC_URI="https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://www.mpfr.org/${PN}-$(ver_cut 1-3)/${MY_P}.tar.xz.asc )"
-
-if [[ ${PV} == *_p* ]] ; then
-	# If this is a patch release, we have to download each of the patches:
-	# -_pN = N patches
-	# - patch file names are like: patch01, patch02, ..., patch10, patch12, ..
-	#
-	# => name the ebuild _pN where N is the number of patches on the 'bugs' page.
-	patch_url_base="https://www.mpfr.org/${MY_P}"
-	my_patch_index=
-
-	for ((my_patch_index=1; my_patch_index <= MY_PATCH ; my_patch_index++)) ; do
-		printf -v mangled_patch_ver "patch%02d" "${my_patch_index}"
-
-		SRC_URI+=" ${patch_url_base}/${mangled_patch_ver} -> ${MY_P}-${mangled_patch_ver}.patch"
-
-		MY_PATCHES+=( "${DISTDIR}"/${MY_P}-${mangled_patch_ver}.patch )
-	done
-
-	unset patch_url_base my_patch_index mangled_patch_ver
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-# This is a critical package; if SONAME changes, bump subslot but also add
-# preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
-SLOT="0/6" # libmpfr.so version
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-vincentlefevre )"
-
-PATCHES=(
-	# Apply the upstream patches released out-of-band; generated above
-	"${MY_PATCHES[@]}"
-
-	# Additional patches
-)
-
-HTML_DOCS=( doc/FAQ.html )
-
-src_unpack() {
-	use verify-sig && verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-
-	# Avoid src_unpack noise from patches
-	unpack ${MY_P}.tar.xz
-}
-
-src_prepare() {
-	default
-
-	# 4.1.0_p13's patch10 patches a .texi file *and* the corresponding
-	# info file. We need to make sure the info file is newer, so the
-	# build doesn't try to run makeinfo. Won't be needed on next release.
-	#touch "${S}/doc/mpfr.info" || die
-}
-
-multilib_src_configure() {
-	# bug #476336#19
-	# Make sure mpfr doesn't go probing toolchains it shouldn't
-	ECONF_SOURCE="${S}" \
-		user_redefine_cc=yes \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-
-	if ! use static-libs ; then
-		find "${ED}"/usr -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/mpfr/mpfr-4.2.1_rc1.ebuild b/dev-libs/mpfr/mpfr-4.2.1_rc1.ebuild
index 3436f7912a8f..f2bf38b86762 100644
--- a/dev-libs/mpfr/mpfr-4.2.1_rc1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.1_rc1.ebuild
@@ -43,7 +43,7 @@ fi
 
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-3+"
 # This is a critical package; if SONAME changes, bump subslot but also add
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 989555356243..6fdefffadb40 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,7 @@
 DIST vala-0.56.11.tar.xz 3999424 BLAKE2B 9b8734c87f92cc57c5d6d2269146d4cb97adf9c49ec396a8ecf74e8561e6cc3a296a771010882b4d2a137d24da7dde5bd7865b9e54fee5ec2da9ba7bba1e1c84 SHA512 509da611bde061f86d1694719c38ea253fcd19adf9abe1301e729a054e916b92c5627215e6ed4524f9f0a5a25a071933a7b791385821dc3c1f364ab7e7ff6f1c
+DIST vala-0.56.12.tar.xz 4000224 BLAKE2B 01c9aa6fa69648a6720944336a60f1349b6936436c58dd78ab689acd3633aaa574d5c4381d320c92f6bfb7830285572b6f0003462cb094eb6ab5c2ea688db2c2 SHA512 360f243fb5a7ba3fdd9cfe1d03249059f9a70275cc8f1419f1e443cff0ac4337bc5f08f16e9870c757eed682ff18d209bb9e47238bc81549858da639e1f48df9
 DIST vala-0.56.8.tar.xz 3994328 BLAKE2B 4d68b102838a854b870865c6223dfb6cf56741db2cf918d393a4c279cc63a5e7af3464d256ef9a7c90eb5a8773812613315815c64a1b11e5b3fce86ac52278b6 SHA512 152a7378c42602296c5797d0425e51c2f9d2c65449f035158ef7f8dbf48f3a6a09e7c9028d196c967d8a9dfcdbd5f5deaa09ffcde5e2a335872e9740cd79ba41
 EBUILD vala-common-0.56.11.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d
+EBUILD vala-common-0.56.12.ebuild 696 BLAKE2B 6f2e9998804c827aa65daa006a6f69bf9e78e5f11b882926fba70bdf1167b2244d668045b98a4ae1b695569b025cda2234e9729611b804b8adab79b0344cb4d4 SHA512 b2dba932b10631795c727a31e7cf03d924b5f738bc9ca17cccdc702970bac339474469b0f490d0a425f9fe777e9d6d455c8f9ac5876ef8fe0fa4acf17887784d
 EBUILD vala-common-0.56.8.ebuild 688 BLAKE2B 43035d0285a4fc8cc360969b0cea254660cc6d1645499258c1ff9171797a522a0d8f3ae4736a3c33ed39c3788a5bdd750b6063958b60cc21b21a20823b55f27b SHA512 b030fde9c0945ac51e18acae0504fe7d7c2188a1972ac72c30227e38956f5abc106b07cc1dff66a1cd02d819d40426dfcd3e11bd42656c01a687519eec6dfb9b
 MISC metadata.xml 426 BLAKE2B 5d4ef5f9505178faae0cd5ea94378517ca8fbf2304e3fa77880dceb4194f520bb62ac4c61e5c9b0f2125194fc9470cbe97ecf9708494031ef4d0f222de58c6b1 SHA512 f3fe4cdff9d1ac255e1c4f565edab3b01d569c93b77179bc1efe8de2843bb5e031bc442e76fd1bfe775fbaaadab87b0fec8f1839ade2bdc6c1d2eac08565834e
diff --git a/dev-libs/vala-common/vala-common-0.56.12.ebuild b/dev-libs/vala-common/vala-common-0.56.12.ebuild
new file mode 100644
index 000000000000..cd0ecf1d538a
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.56.12.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/aclocal
+	doins vala.m4 vapigen/vapigen.m4
+	insinto /usr/share/vala
+	doins vapigen/Makefile.vapigen
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ae0d06398d82..2e284fc56b56 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/omemo-dr/Manifest b/dev-python/omemo-dr/Manifest
index 4b2beb6d304b..8dacd715a6e2 100644
--- a/dev-python/omemo-dr/Manifest
+++ b/dev-python/omemo-dr/Manifest
@@ -1,3 +1,3 @@
 DIST omemo-dr-1.0.0.tar.gz 152784 BLAKE2B c239d22cda3aab247ad2d5c706f2f15d22529ff9348564e55aa0c780a1c93b169f1cd4c2f8d6ac0fcf69f3d5d8c190627870363d168432e3a2247b7091bc4d64 SHA512 ad1d43936f94d47a01b1f4f3a8e31bf81d16132714b29f6ef5aac84a907a8bec3fd1014330cdc0169cfa02e64f7815d11ff4ec8a2aa3aecd9141748d2ec469b1
-EBUILD omemo-dr-1.0.0.ebuild 550 BLAKE2B ba2e41044a944500f610846989ea05efe3f7f15c6ac9db32e71f0ef4a665d6a12ef790521525aad1d18cdd5379fccd2e43e21d2d8cfdb5909dee3560df8853fc SHA512 c4d981c320a0e8f6de189b57200495542d7b7860004d028214d6cdc8da907ae2246f82bfe76eec8bb2fc578d6538db7b45ef7767b55779ba0a00e80251e889d6
+EBUILD omemo-dr-1.0.0.ebuild 557 BLAKE2B 9c86582ebfdebe68a7c9c61db97fb8d573626db31d317d17612659542d09624056200da827c8ee02e688c43293031f3b3229bbc0ed31f731115a12f55f7580a0 SHA512 d8fd7ccd77df83f3547c81fdbb7614be72f19d799b94b66a932da72d54e0baf44eed2c30804bae9040b340a0a56cbdce1946ef104e2cb23bf6c8f2a5b5ada5b5
 MISC metadata.xml 312 BLAKE2B 5f4e3484489b8cdd211c411903657954f40770f2e2a787439c5214502deae9f9e3dec062f6708ff92cc00aaae9a2f2ad91480f5c174dafe00dba48008e8f989f SHA512 e5864f030b211faf2a2f95cae0123750697fcd5785883da1c7c37c86a9bd4dfa075a75e4c26e08a959f6e26b0998cc9d1aedaa98edd43329624cfa40a4929935
diff --git a/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild b/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
index dceacee96eb0..86d2c5eda91d 100644
--- a/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
+++ b/dev-python/omemo-dr/omemo-dr-1.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 284692722b3f..f93e20e64bc1 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,5 +1,3 @@
 DIST pillow-10.0.0.gh.tar.gz 50537667 BLAKE2B f0ce48e947363c16c0bb08881b42dcf845a142fe7d2162154f5ddce47bf909fc4c829dcb4365ee363680a41c247cea28eef37c879d22959ef69c9dc5adce91f4 SHA512 a963ae8398c609569e1b23d2362f6382cd888698492ba2349f9c931a04c463fbdc27a43e53d1dee8bbb1b5e88c0d5eb655f6f5e9df7d489c206b6acda0adec3a
-DIST pillow-9.5.0.gh.tar.gz 50491974 BLAKE2B 663c14b89ddd1e2d49872994033a04e500d0b6eccbb8d6ce094f58ae1aaf3f215e9984f2afeb43fb83e0c3c93af1150beeb7d5f0abb77c59087901b53fd24e37 SHA512 da0c7a1bde4741ced168c013fdc7afa8af1100bba878bdaeeb9804fed4dcf70c07ed62004ab2c73694eae3d28e2d72d46c155f78b540075aafb36c8e7a5649ff
 EBUILD pillow-10.0.0.ebuild 3501 BLAKE2B 9f690f40ca87ce944906fd315fa702735587500b2c3948431206803aad95a09895920819eb5a44f39c2b12c01de7400042743e516fbf5c86615c39d62b067d16 SHA512 ae4ddcfdf4e60fe86eb2643f839e3a0d72dcb1e7b2d78ce6a9f476945e81d673d1b2319b09d1f69bfd6d1f27b6ed693355e1fd85536f51d6b2220484f65bdeb5
-EBUILD pillow-9.5.0.ebuild 3379 BLAKE2B 24be0608c1dbac735e4bf9b8fe01069cd1ccc4aad532bc2073c6832f06abfc6b982362f0c2a71d4dec5381f7f3b10712693b016680189495b2a5eeb69d622f21 SHA512 623bed259f3371bbd3ac6b106cd309620a31f59db736ca8f00a34d02ae1878d5b262ffec6c4d34eee3704fccea99bb3efd45dbf9ff0f1ac18962356cc42511e6
 MISC metadata.xml 480 BLAKE2B b42e6b01b1572a0688ef93025a0baaa95b9fd0c3a5eabcddcea7145dd880a95f11859b255ae24a376ca792559ffcf940c67da1b19f2f579dbc6ef6de68903749 SHA512 b98a33136aef4498051370bce3295b000687ddb80b4d909b26b32af61b4e4638d07269f7924ae039420af63236aa74b51e23d2feae1c83349683073c69714582
diff --git a/dev-python/pillow/pillow-9.5.0.ebuild b/dev-python/pillow/pillow-9.5.0.ebuild
deleted file mode 100644
index f398c31bc70e..000000000000
--- a/dev-python/pillow/pillow-9.5.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 toolchain-funcs virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="
-	https://python-pillow.org/
-	https://github.com/python-pillow/
-	https://pypi.org/project/Pillow/
-"
-SRC_URI="
-	https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
-REQUIRED_USE="test? ( jpeg jpeg2k lcms tiff truetype )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	imagequant? ( media-gfx/libimagequant:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2= )
-	tiff? ( media-libs/tiff:=[jpeg,zlib] )
-	truetype? ( media-libs/freetype:2= )
-	webp? ( media-libs/libwebp:= )
-	xcb? ( x11-libs/libxcb )
-	zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/olefile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		${RDEPEND}
-		dev-python/defusedxml[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		|| (
-			media-gfx/imagemagick[png]
-			media-gfx/graphicsmagick[png]
-		)
-	)
-"
-
-EPYTEST_DESELECT=(
-	# TODO; incompatible Qt version?
-	Tests/test_qt_image_qapplication.py::test_sanity
-)
-
-usepil() {
-	usex "${1}" enable disable
-}
-
-python_configure_all() {
-	# It's important that these flags are also passed during the install phase
-	# as well. Make sure of that if you change the lines below. See bug 661308.
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		disable_platform_guessing = True
-		$(usepil truetype)_freetype = True
-		$(usepil jpeg)_jpeg = True
-		$(usepil jpeg2k)_jpeg2000 = True
-		$(usepil lcms)_lcms = True
-		$(usepil tiff)_tiff = True
-		$(usepil imagequant)_imagequant = True
-		$(usepil webp)_webp = True
-		$(usepil webp)_webpmux = True
-		$(usepil xcb)_xcb = True
-		$(usepil zlib)_zlib = True
-	EOF
-
-	# setup.py won't let us add the right toolchain paths but it does
-	# accept additional ones from INCLUDE and LIB so set these. You
-	# wouldn't normally need these at all as the toolchain should look
-	# here anyway but it doesn't for this setup.py.
-	export \
-		INCLUDE="${ESYSROOT}"/usr/include \
-		LIB="${ESYSROOT}"/usr/$(get_libdir)
-
-	# We have patched in this env var.
-	tc-export PKG_CONFIG
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO (is clipboard unreliable in Xvfb?)
-		Tests/test_imagegrab.py::TestImageGrab::test_grabclipboard
-	)
-
-	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
-	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
-	epytest -p no:relaxed || die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	python_doheader src/libImaging/*.h
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto example
-		dodoc docs/example/*
-		docompress -x /usr/share/doc/${PF}/example
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index 530968adc504..0775169f5a41 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,6 +1,3 @@
-AUX pybind11-2.10.4_macOS-GCC.patch 867 BLAKE2B e74c330552e5c1c842d557a37cc6de7ae460d80baf933dc486745b492ae0faba532c6ce12a907c317e8ec15608b59f7441d66757522a5acb1b575f1d13bc515f SHA512 05ef16cfa228c1ea7ca28d432ad5e1680990e9bfd2095c88d0aad3b3a27b158a45f9b18517171310f56bd5076306d49d0221310c6b9d6914648f76b20a3e4fe4
-DIST pybind11-2.10.4.gh.tar.gz 740622 BLAKE2B 7b2d86e8262581b2cc6dd720b83336206e242ef8ca99b257b01a11141ed8b127d7f35d7d573bc763dd36f2fe8c8ac91766089deb63a76e9c10029c34eec2d6d3 SHA512 7970defbb6d057a44468ed707c80bfa6ef8c9578528fbc084b03aeea20a52dbd681581f82d55ff90af11ee89693379bd79e2ab6603239ba05b0aa8da29dd93c7
 DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95
-EBUILD pybind11-2.10.4.ebuild 1363 BLAKE2B 3eb66771750d56d7acee9208fd6dac13d95a83dbe81dd3a5e59f23d4323d1dee7eace4cb8925607843533a34aecf42fe0a6eae2c827879348265fece46fefee0 SHA512 9260291f7e30f4d0360bff665b29f76f5f99707e2ebdacd8f71a5c83007b5f18237fedb169bb0d13a8d22930be8fbda5d4ee3f6e961fc17d9f0d5ac916687774
 EBUILD pybind11-2.11.1.ebuild 1305 BLAKE2B 60bdb063e9efb295ac3d49497b199cd9b9dedd23e3891ec9c96c6e2867e89c1cee9c16f3a34a4772813a850c74484fefd9c2dd53a072a84025b894546a0b237c SHA512 524695d724d859ea333de8975c392792c4ed685212204ecf72020af767d1cff6fdc307ecbd8e433af3627a76b2c7a5a41e83b13e313041fdd474df73880fb19c
 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41
diff --git a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
deleted file mode 100644
index cbfcff84a684..000000000000
--- a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Break the toolchain assumption of LLVM on Prefix/macOS.
-
-At Prefix/macOS, the system compiler is GCC with libstdc++.
-
-Reference: https://github.com/pybind/pybind11/pull/4639
-
-Signed-off-by: Benda Xu <heroxbd@gentoo.org>
-
-Index: pybind11-2.10.4/pybind11/setup_helpers.py
-===================================================================
---- pybind11-2.10.4.orig/pybind11/setup_helpers.py
-+++ pybind11-2.10.4/pybind11/setup_helpers.py
-@@ -154,9 +154,6 @@ class Pybind11Extension(_Extension):  #
-             c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags)
-             if not any(opt.startswith("-g") for opt in c_cpp_flags):
-                 cflags += ["-g0"]
--            if MACOS:
--                cflags += ["-stdlib=libc++"]
--                ldflags += ["-stdlib=libc++"]
-         self._add_cflags(cflags)
-         self._add_ldflags(ldflags)
- 
diff --git a/dev-python/pybind11/pybind11-2.10.4.ebuild b/dev-python/pybind11/pybind11-2.10.4.ebuild
deleted file mode 100644
index cea97d04299f..000000000000
--- a/dev-python/pybind11/pybind11-2.10.4.ebuild
+++ /dev/null
@@ -1,69 +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_{9..11} pypy3 )
-
-inherit cmake distutils-r1
-
-DESCRIPTION="AST-based Python refactoring library"
-HOMEPAGE="
-	https://pybind11.readthedocs.io/en/stable/
-	https://github.com/pybind/pybind11/
-	https://pypi.org/project/pybind11/
-"
-SRC_URI="
-	https://github.com/pybind/pybind11/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-cpp/eigen:3
-"
-BDEPEND="
-	test? (
-		>=dev-cpp/catch-2.13.5
-		dev-libs/boost
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	export PYBIND11_USE_CMAKE=1
-	cmake_src_prepare
-	PATCHES=( "${FILESDIR}"/pybind11-2.10.4_macOS-GCC.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local mycmakeargs=(
-		# disable forced lto
-		-DPYBIND11_LTO_CXX_FLAGS=
-		-DPYBIND11_INSTALL=ON
-		-DPYBIND11_TEST=$(usex test)
-	)
-	cmake_src_configure
-}
-
-python_compile() {
-	distutils-r1_python_compile
-	# Compilation only does anything for tests
-	use test && cmake_src_compile
-}
-
-python_test() {
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	cmake_build check
-}
-
-python_install() {
-	distutils-r1_python_install
-	cmake_src_install
-}
diff --git a/dev-python/time-machine/Manifest b/dev-python/time-machine/Manifest
index 91bd78c0c109..b4548fee5a25 100644
--- a/dev-python/time-machine/Manifest
+++ b/dev-python/time-machine/Manifest
@@ -1,9 +1,5 @@
-DIST time-machine-2.10.0.gh.tar.gz 28770 BLAKE2B ba4ff7dd2559530e86e38d23600209f2e860a1541c9ef5536d07092678018c210ec5e0c63bc615e81b62e8179324953d023ba247c501aa94e16beb0345cacf8f SHA512 4a3120432cb6aacb1e022415094a4fb204d2f1b39c378307a0de34505d470982d81e1d2d940d0b9745c3edcd563ff55f9ab1d602bd1dea720a474fee5fa1e4af
 DIST time-machine-2.11.0.gh.tar.gz 28075 BLAKE2B 2eb07ac60d4014e5796fefcf5cb846d60fef1887fe01459d906a2118eddc924d60642131530f76e131080e2989f60263bda2fbcc0cc917e0f9452d16a4f640a6 SHA512 5bd5d76e2ecc392c249e86e2cfe54ee94a99a4e1cd1dd7e00b240e1299426d87a284ec270ae36aeb82acfe06d974d5aeca27ae977a480441e4daa5b852d00198
 DIST time-machine-2.12.0.gh.tar.gz 27743 BLAKE2B 4ed0c9901edb9c698b8bbba6df80d12b06f344ad6ee8f9e89577264da1f0211774c2d227d02dc1ab0ceb5b905094168d19cdebc00a91a955d216729082ecbc28 SHA512 4708cdc3aa0ec06907d0ee1219ceb074947fc962ab6f0d3606e5273f3d64ca278bb43254d924c04364b967301cf69229ced70d7b1db92b0b6dff1523cccb2f82
-DIST time-machine-2.9.0.gh.tar.gz 28043 BLAKE2B 9a9a521c94b72a7464853661da791b6f57f5155ddc62ffceeb82f808903f4c337e6bf48fe8300bb4f9f5673fd175fd85038a4e80a39e8f3e096c12c27ee790ec SHA512 ecc780a72d279b49d026a8f3f89210cb4c90e02c5a517c08eadbabcb65216a24c603ace39afd76ea1e6ccdef589d5997581d0db7477bb28fe4d1e0510daf17a0
-EBUILD time-machine-2.10.0.ebuild 667 BLAKE2B 76155796a083523d3cdcefb5d4a8aa2c0c092956a0169b247fff8c8dfed6cfd7f965266d3082ed85782e279d39bdb46679aa3ab6caebbed35c7c42664326ccf7 SHA512 d73d636c06915c14323df9edbd9ffc0edab511168c66ca12dc7ef2fe99e97d9c716de59447ab21d03ae05ef5660d4fa3f746f2cde17ab827e1261ace8c68fa9f
 EBUILD time-machine-2.11.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
 EBUILD time-machine-2.12.0.ebuild 674 BLAKE2B 6d36190a66f13da17b9c8b755275ccba14bda8558fc5b5d7f57f5cf33fd64a21b75f564097a7e47122009748530746c1384c084d157d5a68033f1a2d2b93e66e SHA512 e399d9c6b9af06b6fd67760c0046be313d43c031195fc45c1e782448da35fb0004861d84e116d17ac37caabc34b0b4a0bc8d81ef1c3a0aa1a423a2aaca4ad2b8
-EBUILD time-machine-2.9.0.ebuild 666 BLAKE2B 31b2cc19c14d0a6265e9f232e3473912a9597530acd7ec92df6d768eb96c85d1aa404212ad0b3a8a16a96006f4db94bdf70ec532f1dd3ae49ec0540b2b52b2a9 SHA512 f39aadc323edc83a608048cf5557846ce4b5f45d30f8188e19d086715dfd9bec5c9d5f3fe229b5e3882a0fc2dca0870e50bcc158417f0078a2d32cb6749281ed
 MISC metadata.xml 379 BLAKE2B 98883d810d13745555166c9901f0ac15bd1ace4754e67ddb090983d97808a8362f61d91e82e7c903920cf42037c3df2655b211caaff904fb3ac4d2494ebf2fd3 SHA512 74d7de420c0bc5c03a3524bfe9b888fec8e5ec353d89b8a8e5d5d2dbd736ef8d34c45f026fe493dfe87ebcc7754c30d9b3ef7fda1abea91cbf9599bdeb4ed3c9
diff --git a/dev-python/time-machine/time-machine-2.10.0.ebuild b/dev-python/time-machine/time-machine-2.10.0.ebuild
deleted file mode 100644
index 3a7e24696360..000000000000
--- a/dev-python/time-machine/time-machine-2.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Travel through time in your tests"
-HOMEPAGE="
-	https://github.com/adamchainz/time-machine/
-	https://pypi.org/project/time-machine/
-"
-SRC_URI="
-	https://github.com/adamchainz/time-machine/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/time-machine/time-machine-2.9.0.ebuild b/dev-python/time-machine/time-machine-2.9.0.ebuild
deleted file mode 100644
index 13b35cb02156..000000000000
--- a/dev-python/time-machine/time-machine-2.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Travel through time in your tests"
-HOMEPAGE="
-	https://github.com/adamchainz/time-machine/
-	https://pypi.org/project/time-machine/
-"
-SRC_URI="
-	https://github.com/adamchainz/time-machine/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ytmusicapi/Manifest b/dev-python/ytmusicapi/Manifest
index 8479486eae54..c0d8b21d57ac 100644
--- a/dev-python/ytmusicapi/Manifest
+++ b/dev-python/ytmusicapi/Manifest
@@ -1,3 +1,5 @@
 DIST ytmusicapi-1.1.1.tar.gz 69876 BLAKE2B bdc729033710fd1a1bbfb7ee98c3e0ed4651c1f784f3d3fe2d429bac012d6440a897e38955c88f2d8cbe298e5bfdae4e191a894435a4e27b4f6fde57d9117569 SHA512 f65f568d7837cca06b9e1827d39cbb281adf4c9bbf9c1e1030e320ccaac9df00a343bdfa7036807cea57d205b3501551bed37f71e4c33e7cc5a898412ef9e564
+DIST ytmusicapi-1.2.0.tar.gz 71189 BLAKE2B 99c93d650c1546004db2b13b2b56c6cbaa2450b440c0efe4a09cf97d0944dae307c51d0414c00702dd91653ae0e0f4f88efea75d45a55111647235dd5e0d1476 SHA512 4fa5efcbbc2a5e079cfa588ef4328cc17390edb44ae1261f6de87a18d57e7c1d02009e1b6cac26163ed149b131782692f97ec532cff6ee1040812e7f5a9cf193
 EBUILD ytmusicapi-1.1.1.ebuild 503 BLAKE2B 276d9472f84a0fb37daa93c00ae142aa7ed776bc98295bb627db2da26928e0c40c7a45d54bdc7769b3ca8bd4bd1ca80d86f79b46794579c3c8bf55feb6181eef SHA512 3f6c02ed0a5ebc92c48dffe7b54c7edc0a6983327617e5ae0139e0b59d77e1897f55a85d86c17a63ec3af558ae7693262966c064a2483f9fb87a7e84e5c508e2
+EBUILD ytmusicapi-1.2.0.ebuild 504 BLAKE2B ed64585f3d92a8034283d5516f454b8a99adb67d1c0067e4dc6e0e85be31a9392b1932b5d64487b1c0817f13607cf4ac16ee3c5d50d0316df93a89535d675cf9 SHA512 f9825708162f4661d96df20510350c10356d866338c67e7346359d6795c8ea34be7c1bdf3fdcd7a53257374b632c17d4db1c47d34113e642c976ec3d307d302b
 MISC metadata.xml 589 BLAKE2B bf51d5de92082a99ffb69839a9cadcea1d740f05d83194b951383713bcfbc4c95021ef27382cc6020298c3b8817553549ba150876c1398094dcc9a7de38bc04c SHA512 d34382f0041b2f74892661880ee7a318d7571254b18bf41d1152560e06f8d1b2da7432b4e9eb8a0d8b6cba645da9a3bf9c6a7c33002471a17d8c516c0aee8f70
diff --git a/dev-python/ytmusicapi/ytmusicapi-1.2.0.ebuild b/dev-python/ytmusicapi/ytmusicapi-1.2.0.ebuild
new file mode 100644
index 000000000000..3d685ec4c091
--- /dev/null
+++ b/dev-python/ytmusicapi/ytmusicapi-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# 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_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Unofficial API for YouTube Music"
+HOMEPAGE="https://ytmusicapi.readthedocs.io/
+	https://github.com/sigma67/ytmusicapi/"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx-rtd-theme
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index a9de556c2af4..d4246f3ccc2a 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index d0dc75483850..79828aac32e4 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,3 @@
-DIST gamescope-3.11.51.tar.gz 209920 BLAKE2B fdccd6659e33a9ae43eaabc5d41cfa6d0a92bda1a283e23f101296713f5094093b7b41135de44abd65ff17c66d70b27baf50685dcd2a47084022fb611e150a5b SHA512 a4ddd96a4fdacd62eee800f6fb331d08fca32c2798d64148529181a0ee8d8af57d5d67bfa28bff8e9cf62047a7572c43b36e2968660ea2984b8e21fa812baf9e
-DIST gamescope-3.12.0.tar.gz 437848 BLAKE2B 4bf54969557af6a03e6cf788b0e02a4a2dd3981a69abaccfd6b0709003134d984b098dfc2a102041a4d34149423c37ca77efc9947cc2801979a488fea5a44db0 SHA512 864d61d9caf0bb8b13c71a084dd54a74e4d9104168cdc9ff8bc971e5a78a019fa80bf43c3b58b2e5ade6d461842385c37c3184ceede7e058d4d8d989a9e62bd9
-EBUILD gamescope-3.11.51.ebuild 1836 BLAKE2B 21efb1f296b4dccbc98c569e7bcbc1b457e8b7987ac206a462f40887f8f19b1c5a6a7550bdcfa68e9b9b468f292be35ffac332579a4af23171bd5f2daf1ced50 SHA512 5850486fd650c1226f7addff7ae32326893ce05cf128da859d62262e510051bd1221d0345fc2e5b58a0b57ff8fbb377a9809e228fea69c0cd1c06aa4b9ad7be2
-EBUILD gamescope-3.12.0.ebuild 1811 BLAKE2B db9cc627c0ee4133996254ef61f8f5d1bda16cebe23ec5a6a053aa7e439923bd366f8d66d531fcc0844dce9876aacc17979e42377858cc280f299531304776d7 SHA512 011fbcdc1437a0a40945451cc3bf310a9e16499a0383238b9a05408e2d58479469c034829aeffea7d1971c88fc939813846c828a2adb40d9945f8e62e0d1f4dd
+DIST gamescope-3.12.3.tar.gz 439564 BLAKE2B aaa0d2c1a8149bea29a794e4738f1ca24c5d2a8e0a764195e95dd38ac36547ad9790765397e7ba1f81cc33d613507a9a9da4910116f6258f1390133d2f6549fc SHA512 9f78467bb8fe34eb731d645c452442a4db4ba6fa8cf8055d0a0b6e6f4e74ef281a4b6fee5f1555a147d554a0a6579d9f9aac4b613b0b2de267f04584593455c9
+EBUILD gamescope-3.12.3.ebuild 1828 BLAKE2B c0606fefeace90fb02d6ceed8c03f9987562a2693e5c8cbb6bd2f606cb2b81679ac05124dd60f7e21d1623de5a22798cd93086ab6b23ee05cf705386a329ce48 SHA512 2c61e850fcb8e9f879260e3de5098219d67a63d729d02d3e0a2a384afa9ecd91ebfe3a73ce28ec8903b6a33b429cc4f3ee2455ed87543b33ccbf7a87941b648c
 MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55
diff --git a/gui-wm/gamescope/gamescope-3.11.51.ebuild b/gui-wm/gamescope/gamescope-3.11.51.ebuild
deleted file mode 100644
index 724d3bc885d8..000000000000
--- a/gui-wm/gamescope/gamescope-3.11.51.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit fcaps meson
-
-MY_PV=$(ver_rs 3 -)
-MY_PV="${MY_PV//_/-}"
-DESCRIPTION="Efficient micro-compositor for running games"
-HOMEPAGE="https://github.com/ValveSoftware/gamescope"
-SRC_URI="https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="pipewire"
-
-RDEPEND="
-	=dev-libs/libliftoff-0.3*
-	>=dev-libs/wayland-1.21
-	>=dev-libs/wayland-protocols-1.17
-	=gui-libs/wlroots-0.16*[X]
-	media-libs/libsdl2[video,vulkan]
-	media-libs/vulkan-loader
-	sys-apps/hwdata
-	sys-libs/libcap
-	>=x11-libs/libdrm-2.4.109
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrender
-	x11-libs/libXres
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	pipewire? ( >=media-video/pipewire-0.3:= )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/stb
-	dev-util/vulkan-headers
-	~media-libs/vkroots-0_p20221205
-"
-BDEPEND="
-	dev-util/glslang
-	dev-util/wayland-scanner
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-FILECAPS=(
-	cap_sys_nice usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-
-	# Normally uses stb from a git submodule. Upstream does not ship a
-	# pkg-config file so we don't install one. Work around this using symlinks.
-	mkdir subprojects/stb || die
-	ln -sn "${ESYSROOT}"/usr/include/stb/* "${S}"/subprojects/packagefiles/stb/* subprojects/stb/ || die
-
-	# Normally uses vkroots from a git submodule. Upstream ships a Meson file
-	# that is sourced by this project. Create a symlink to it.
-	rm -r subprojects/vkroots || die
-	ln -sn "${ESYSROOT}"/usr/include/vkroots subprojects/ || die
-}
-
-src_configure() {
-	local emesonargs=(
-		--force-fallback-for=
-		$(meson_feature pipewire)
-	)
-	meson_src_configure
-}
diff --git a/gui-wm/gamescope/gamescope-3.12.0.ebuild b/gui-wm/gamescope/gamescope-3.12.3.ebuild
index b8fe62267052..8de18f8b6b60 100644
--- a/gui-wm/gamescope/gamescope-3.12.0.ebuild
+++ b/gui-wm/gamescope/gamescope-3.12.3.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libxkbcommon
+	x11-libs/libXmu
 	x11-libs/libXrender
 	x11-libs/libXres
 	x11-libs/libXtst
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b322201f46f6..1fb590ec9cd5 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 3400f1611c14..2f14c879a737 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +1,4 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2023.4.tar.gz 225728 BLAKE2B b033f9d5e8afdf53afb5c3299a2b0496558b25d4fb1b04eab0ab1610377c391084fcb952bf2836bf88078e902e78bd579d46ae8f07aaed42569edbbc21b0d5c9 SHA512 18b7c31eec9408fc038211d4424d5d82414f427a580ec6f412e9e8d6a7e060e4c39d2c223bfbbf4bd167a1575a7bb900591ff834b3356f4024772e0b96993e91
-EBUILD shaderc-2023.4.ebuild 1892 BLAKE2B 2eeab9f3018d85586177cfaa66aa7f5f4cea178a8429b0f26b2bcb10404f53ea243f76ad79a987f57f49af1e8a9580013b0055af74328abd8f0bf70418d6dd69 SHA512 91e5da7a0f4ff6833a4239c50c25ac9bfb2fd1e2e32ce1569e8ccf0da9aef790066c93700ed140dbbf7e475d64d6ff244948d797b9be346fce7e145cf5f65c82
+EBUILD shaderc-2023.4.ebuild 1899 BLAKE2B 1750ba01044a0e6f369fe72796280836c71af9442bfc934d9a9b3a9d40f46fa23243e05bcde109dda9f659a5b169837dc23887a9997b0c15be3edb54e6a17a00 SHA512 8ea726bf609eb38785455797087bd87cad0aaca33e720def5140a2fbc50f5b95a7cb0b6c58ebb68125e78633b24b6ff4970834b81c6de850c2836c64100595b9
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2023.4.ebuild b/media-libs/shaderc/shaderc-2023.4.ebuild
index c430cf358540..fbb683b556cc 100644
--- a/media-libs/shaderc/shaderc-2023.4.ebuild
+++ b/media-libs/shaderc/shaderc-2023.4.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 ~riscv x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e8ac11c3933f..28ca826e29ee 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7c8374897927..fc8b61944a39 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Aug 2023 20:10:11 +0000
+Mon, 21 Aug 2023 02:11:28 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 31d0f151af89..e5245272d546 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 546284 BLAKE2B ffce95d14dec8e0ecb1658575f411350a797650e5376e656bbe5d1c11b4e05372611ac4ca5de41270e2e69dfa9461b99f212aa044d6509bb082c7f94d92006b8 SHA512 c90fc6416d62b1b09cbafd89df9a8523e7e9eec12dd28fd39f81776bc9076c1e64fdb0203c709c330d323ea0c05daf6d59e5c469948b4d49cc6d59443f29557a
-TIMESTAMP 2023-08-20T20:10:15Z
+TIMESTAMP 2023-08-21T02:11:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTicydfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTix9NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBecw/9GkKBFLgNuuCvKzfN5O7Fz/UvuXYmKbVStb1eoTWBDWopBuA45aFV6UU2
-70vrxk2z5oHRwoSa3AsE53cbARQxNrCiHFURfu9iXekh9U6T87XotFevHhVKR2KS
-osPDNAlvAAWyFtVVj9TJylGhH/KldMqYzc7O6S/kb/aTQj/fmH8g/sqxcbb3k1v1
-erY4dSGIUZ6gX0QFGDK1UU7i9mO8nhQnyLDHHb/TObv52Wan94Kk5PJ8J8cG35nS
-mWJTcl4v3fMX4/4zoGRfFc0+vIrdGkmKxcww2W7/Zx/NyJ8MyMZvfuJWahrkOb94
-8G/WNBfQ1RRWOC5uOCVp10hgxLy6+UvQrd36Oytv02yFGr0e3elV+qKzszTjXkzT
-e4r+VYC0sfRkWerhrbS/8CjzdAayElAbjkt5vHIBBCIDpz+oZz9wnDR9pbDDBPcs
-HjMOhgg/saHa8RjP48PkjRTvDk739W6DDo5/YWYA3k5sHJmW1Z16bJHMdLFGMWoY
-vrqCZrCWW5S349HqgvChfUcHuB0UXx+toyv4xkZW7hpHj4QRtU9ZgwPkylJNcJyG
-eeQRk3/FB8jG+2iGEMu2Tkr2N+n6tnLSAUNdNVY3+5ovzq2G11q7WahOHiG9D0Gv
-6uuvIs7h7QowdY/FV98MawmSb6mKzevxHQMgi0BnA/0LKpS7zd8=
-=2xuI
+klClKBAAlnh7/3qpZx1TVvD+9xJhFCsjo6D4yBpIJ/l5l9SXUoEjtNRJqM8/LS9n
+BHTvHBpES1yjYgdS5FHYHYef3V4gOxc5gcuCrf2Hwp5CKNwUwFDgR9Q4/1cCKqIV
+y1VOeYbhJgs2Ax11HnB4mvYtey/wqNc3C2z0FBkxxtxxjOSSJlT95LJC1YbfAvqv
+jC+T8wQl4/bKkmaUfoIN6oyGl5hRuE/PGlnoxyYwAWwvskVZW77OQjAM349o3aNV
+hlbpP1xyTwQ3/srg4kkqKq1Ru6r65r0hQDgrIRCJNO7mYp5sTnUFyCKij63eEUDm
+MZAFzeoYeifchZ5iQIzAPOjj7s4XlW9zKg8ipQuYKq/bv2LpM4juztmwq2+haAkl
+Su/lMRa77df3XvxiSn3w/jX4z8X+/qheO99I9SBSLVKuLjHu72pAX7zyNo5Roweu
+c3jzNXkmLIdSce2vLUaix7ADOAkNCxkyhFsXEN6R/V5lJPBOv3m2hMfN0HK6/GJo
+aqPqHorZCG74yyqtwUMztEqxp2zvMcH6OtKvKNj5jzLvhrMnHefAN5TD/b7+cHa6
+yaOHCXZIf7h0SbqPJDgL3Kb+7w3dl+5yhys4T+iXsiOrnti9jYFWaTtL7+64rGrV
+KiolKWaUfpQr59in13iTeTb2gsaYuZ5faG0x42XdSePDZ3C6CWQ=
+=ruLj
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e9abd5cd66e8..fc8b61944a39 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Aug 2023 20:10:12 +0000
+Mon, 21 Aug 2023 02:11:28 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 7c0404f00a40..b410290d1cec 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index b1613693ec6b..e8c9372f55d7 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/rg-2.2.1 b/metadata/md5-cache/app-emacs/rg-2.2.1
deleted file mode 100644
index abda48f2117b..000000000000
--- a/metadata/md5-cache/app-emacs/rg-2.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-emacs/transient app-emacs/wgrep test? ( app-emacs/ert-runner app-emacs/s app-emacs/undercover ) >=app-editors/emacs-25.3:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DESCRIPTION=GNU Emacs search tool based on ripgrep
-EAPI=8
-HOMEPAGE=https://rgel.readthedocs.io/ https://github.com/dajva/rg.el/
-INHERIT=elisp
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=app-emacs/transient app-emacs/wgrep sys-apps/ripgrep >=app-editors/emacs-25.3:*
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/dajva/rg.el/archive/2.2.1.tar.gz -> rg-2.2.1.tar.gz
-_eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b3b15bdbe800c721e93b69b70cce2b67
-_md5_=55d8f4905f25d8977f3c47924a7905db
diff --git a/metadata/md5-cache/app-emacs/websocket-1.15 b/metadata/md5-cache/app-emacs/websocket-1.15
new file mode 100644
index 000000000000..35b6391e724d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/websocket-1.15
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-25.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=A websocket implementation in elisp
+EAPI=8
+HOMEPAGE=https://github.com/ahyatt/emacs-websocket
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-25.3:*
+SLOT=0
+SRC_URI=https://github.com/ahyatt/emacs-websocket/archive/40c208eaab99999d7c1e4bea883648da24c03be3.tar.gz -> websocket-1.15.tar.gz
+_eclasses_=elisp	fbefa95f5e9ab880a34bc69832b7c0d7	elisp-common	b3b15bdbe800c721e93b69b70cce2b67
+_md5_=ccec689a839a9b391cc4bd55fda7e73a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ec94c50f2df6..57c6a07b9eb2 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/crystal-1.7.3 b/metadata/md5-cache/dev-lang/crystal-1.7.3
deleted file mode 100644
index 69ce3439ac33..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-1.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-15:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=8
-HOMEPAGE=https://crystal-lang.org/ https://github.com/crystal-lang/crystal/
-INHERIT=bash-completion-r1 llvm multiprocessing toolchain-funcs
-IUSE=doc debug llvm-libunwind
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-15:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/1.7.3.tar.gz -> crystal-1.7.3.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.7.3/crystal-1.7.3-1-linux-x86_64.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=b95a3a03070ebeca4f22ed66375ffd2e
diff --git a/metadata/md5-cache/dev-lang/crystal-1.8.2 b/metadata/md5-cache/dev-lang/crystal-1.8.2
deleted file mode 100644
index 0481df94c2da..000000000000
--- a/metadata/md5-cache/dev-lang/crystal-1.8.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
-DESCRIPTION=The Crystal Programming Language
-EAPI=8
-HOMEPAGE=https://crystal-lang.org/ https://github.com/crystal-lang/crystal/
-INHERIT=bash-completion-r1 llvm multiprocessing toolchain-funcs
-IUSE=doc debug llvm-libunwind
-KEYWORDS=amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/crystal-lang/crystal/archive/1.8.2.tar.gz -> crystal-1.8.2.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.8.2/crystal-1.8.2-1-linux-x86_64.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8456c0ecef1f28d5d9437c3404470043
diff --git a/metadata/md5-cache/dev-lang/crystal-1.9.0 b/metadata/md5-cache/dev-lang/crystal-1.9.0-r1
index e4f217e01203..624050455729 100644
--- a/metadata/md5-cache/dev-lang/crystal-1.9.0
+++ b/metadata/md5-cache/dev-lang/crystal-1.9.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
+DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-17:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
 DESCRIPTION=The Crystal Programming Language
 EAPI=8
 HOMEPAGE=https://crystal-lang.org/ https://github.com/crystal-lang/crystal/
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 llvm multiprocessing toolchain-funcs
 IUSE=doc debug llvm-libunwind
 KEYWORDS=amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
+RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-17:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/1.9.0.tar.gz -> crystal-1.9.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.9.0/crystal-1.9.0-1-linux-x86_64.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8456c0ecef1f28d5d9437c3404470043
+_md5_=e4ce9a1ba8bb1531e3ddd779f64f657f
diff --git a/metadata/md5-cache/dev-lang/crystal-1.9.2 b/metadata/md5-cache/dev-lang/crystal-1.9.2-r1
index 4980e78d1ce2..af56ecaca6cd 100644
--- a/metadata/md5-cache/dev-lang/crystal-1.9.2
+++ b/metadata/md5-cache/dev-lang/crystal-1.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install setup test
-DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
+DEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-17:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) !!sys-devel/llvm:0
 DESCRIPTION=The Crystal Programming Language
 EAPI=8
 HOMEPAGE=https://crystal-lang.org/ https://github.com/crystal-lang/crystal/
@@ -7,9 +7,9 @@ INHERIT=bash-completion-r1 llvm multiprocessing toolchain-funcs
 IUSE=doc debug llvm-libunwind
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-16:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
+RDEPEND=dev-libs/boehm-gc:=[threads] dev-libs/gmp:= dev-libs/libatomic_ops:= dev-libs/libevent:= dev-libs/libpcre:= dev-libs/pcl:= <sys-devel/llvm-17:= llvm-libunwind? ( sys-libs/llvm-libunwind:= ) !llvm-libunwind? ( sys-libs/libunwind:= ) dev-libs/libxml2 dev-libs/libyaml
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/crystal-lang/crystal/archive/1.9.2.tar.gz -> crystal-1.9.2.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/1.9.2/crystal-1.9.2-1-linux-x86_64.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm	976dc8267d6a5af8b259cb956b52d51f	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=fe293193a73508af934fc92231faff23
+_md5_=cdfe8d2241f50969395b72ccc85e7db3
diff --git a/metadata/md5-cache/dev-lang/vala-0.56.12 b/metadata/md5-cache/dev-lang/vala-0.56.12
new file mode 100644
index 000000000000..c5627676f702
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/vala-0.56.12
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/libxslt sys-devel/flex virtual/pkgconfig app-alternatives/yacc >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.12 valadoc? ( >=media-gfx/graphviz-2.16 ) test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 dev-libs/gobject-introspection )
+DESCRIPTION=Compiler for the GObject type system
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+IUSE=test valadoc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.12 valadoc? ( >=media-gfx/graphviz-2.16 )
+RESTRICT=!test? ( test )
+SLOT=0.56
+SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.12.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8e675e8ccb114c18ef7655024daf8d95
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index f43ce1fe9169..469286a1851e 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/mpfr-4.2.0_p12 b/metadata/md5-cache/dev-libs/mpfr-4.2.0_p12
index 7da607a2bfca..69907213fa6e 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.2.0_p12
+++ b/metadata/md5-cache/dev-libs/mpfr-4.2.0_p12
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
 INHERIT=multilib-minimal verify-sig
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
+LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz verify-sig? ( https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz.asc ) https://www.mpfr.org/mpfr-4.2.0/patch01 -> mpfr-4.2.0-patch01.patch https://www.mpfr.org/mpfr-4.2.0/patch02 -> mpfr-4.2.0-patch02.patch https://www.mpfr.org/mpfr-4.2.0/patch03 -> mpfr-4.2.0-patch03.patch https://www.mpfr.org/mpfr-4.2.0/patch04 -> mpfr-4.2.0-patch04.patch https://www.mpfr.org/mpfr-4.2.0/patch05 -> mpfr-4.2.0-patch05.patch https://www.mpfr.org/mpfr-4.2.0/patch06 -> mpfr-4.2.0-patch06.patch https://www.mpfr.org/mpfr-4.2.0/patch07 -> mpfr-4.2.0-patch07.patch https://www.mpfr.org/mpfr-4.2.0/patch08 -> mpfr-4.2.0-patch08.patch https://www.mpfr.org/mpfr-4.2.0/patch09 -> mpfr-4.2.0-patch09.patch https://www.mpfr.org/mpfr-4.2.0/patch10 -> mpfr-4.2.0-patch10.patch https://www.mpfr.org/mpfr-4.2.0/patch11 -> mpfr-4.2.0-patch11.patch https://www.mpfr.org/mpfr-4.2.0/patch12 -> mpfr-4.2.0-patch12.patch
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=4489a8e117c30d77d18d94a343915288
+_md5_=d9373fddd45d55ae07990db2d163f7be
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.2.0_p9 b/metadata/md5-cache/dev-libs/mpfr-4.2.0_p9
deleted file mode 100644
index 85a406f24ccc..000000000000
--- a/metadata/md5-cache/dev-libs/mpfr-4.2.0_p9
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-vincentlefevre ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-DESCRIPTION=Library for multiple-precision floating-point computations with exact rounding
-EAPI=8
-HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
-INHERIT=multilib-minimal verify-sig
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0/6
-SRC_URI=https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz verify-sig? ( https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz.asc ) https://www.mpfr.org/mpfr-4.2.0/patch01 -> mpfr-4.2.0-patch01.patch https://www.mpfr.org/mpfr-4.2.0/patch02 -> mpfr-4.2.0-patch02.patch https://www.mpfr.org/mpfr-4.2.0/patch03 -> mpfr-4.2.0-patch03.patch https://www.mpfr.org/mpfr-4.2.0/patch04 -> mpfr-4.2.0-patch04.patch https://www.mpfr.org/mpfr-4.2.0/patch05 -> mpfr-4.2.0-patch05.patch https://www.mpfr.org/mpfr-4.2.0/patch06 -> mpfr-4.2.0-patch06.patch https://www.mpfr.org/mpfr-4.2.0/patch07 -> mpfr-4.2.0-patch07.patch https://www.mpfr.org/mpfr-4.2.0/patch08 -> mpfr-4.2.0-patch08.patch https://www.mpfr.org/mpfr-4.2.0/patch09 -> mpfr-4.2.0-patch09.patch
-_eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=4489a8e117c30d77d18d94a343915288
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.2.1_rc1 b/metadata/md5-cache/dev-libs/mpfr-4.2.1_rc1
index 1acb5a997729..7626834c41e0 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.2.1_rc1
+++ b/metadata/md5-cache/dev-libs/mpfr-4.2.1_rc1
@@ -6,9 +6,9 @@ EAPI=8
 HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
 INHERIT=multilib-minimal verify-sig
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-LICENSE=LGPL-2.1
+LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
 SLOT=0/6
 SRC_URI=https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1-rc1.tar.xz verify-sig? ( https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1-rc1.tar.xz.asc )
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	verify-sig	dd7ea2e5b0bdcb42523e4797bbf4dd6e
-_md5_=d3ed8635424edaaef333ff9b68eeabfc
+_md5_=c3fecd157d21b800378b49ea8bdd7ae5
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.56.12 b/metadata/md5-cache/dev-libs/vala-common-0.56.12
new file mode 100644
index 000000000000..01e3a5261a64
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/vala-common-0.56.12
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Build infrastructure for packages that use Vala
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Vala https://gitlab.gnome.org/GNOME/vala
+INHERIT=gnome.org
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.12.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe
+_md5_=f953170eb099f68c0730b59bdda6ec1e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index fbc2b65681b6..01101753a8db 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/omemo-dr-1.0.0 b/metadata/md5-cache/dev-python/omemo-dr-1.0.0
index 4946cfd45f7b..9a6880a08138 100644
--- a/metadata/md5-cache/dev-python/omemo-dr-1.0.0
+++ b/metadata/md5-cache/dev-python/omemo-dr-1.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/omemo-dr/ https://dev.gajim.org/gajim/omemo-dr
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/protobuf-python[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-1.0.0.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	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	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=534cf86aabfa7e3da5381f61ef1c1855
+_md5_=f7e7b134eccd9032795c03a6c33b25b8
diff --git a/metadata/md5-cache/dev-python/pillow-9.5.0 b/metadata/md5-cache/dev-python/pillow-9.5.0
deleted file mode 100644
index 10d5e5a534c6..000000000000
--- a/metadata/md5-cache/dev-python/pillow-9.5.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/defusedxml[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] ) ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] ) >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-DESCRIPTION=Python Imaging Library (fork)
-EAPI=8
-HOMEPAGE=https://python-pillow.org/ https://github.com/python-pillow/ https://pypi.org/project/Pillow/
-INHERIT=distutils-r1 toolchain-funcs virtualx
-IUSE=examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=HPND
-RDEPEND=imagequant? ( media-gfx/libimagequant:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:=[jpeg,zlib] ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:= ) xcb? ( x11-libs/libxcb ) zlib? ( sys-libs/zlib:= ) dev-python/olefile[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( dev-python/pypy3:=[tk?,threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[tk?,threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[tk?,threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[tk?,threads(+)] )
-REQUIRED_USE=test? ( jpeg jpeg2k lcms tiff truetype ) || ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-pillow/Pillow/archive/9.5.0.tar.gz -> pillow-9.5.0.gh.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
-_md5_=dc290f2f95cef57b0f65fad0bbe163e4
diff --git a/metadata/md5-cache/dev-python/pybind11-2.10.4 b/metadata/md5-cache/dev-python/pybind11-2.10.4
deleted file mode 100644
index ab6a77188650..000000000000
--- a/metadata/md5-cache/dev-python/pybind11-2.10.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-cpp/catch-2.13.5 dev-libs/boost ) test? ( dev-cpp/eigen:3 >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=AST-based Python refactoring library
-EAPI=8
-HOMEPAGE=https://pybind11.readthedocs.io/en/stable/ https://github.com/pybind/pybind11/ https://pypi.org/project/pybind11/
-INHERIT=cmake distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_pypy3? ( dev-python/pypy3:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pybind/pybind11/archive/v2.10.4.tar.gz -> pybind11-2.10.4.gh.tar.gz
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=c400d094093c67a9e11a1b9db493a68c
diff --git a/metadata/md5-cache/dev-python/time-machine-2.10.0 b/metadata/md5-cache/dev-python/time-machine-2.10.0
deleted file mode 100644
index 318ebdf50fad..000000000000
--- a/metadata/md5-cache/dev-python/time-machine-2.10.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-DESCRIPTION=Travel through time in your tests
-EAPI=8
-HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adamchainz/time-machine/archive/2.10.0.tar.gz -> time-machine-2.10.0.gh.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=53731fcb25a28e8292bd7b13db9acee8
diff --git a/metadata/md5-cache/dev-python/time-machine-2.9.0 b/metadata/md5-cache/dev-python/time-machine-2.9.0
deleted file mode 100644
index 18d02dda02f4..000000000000
--- a/metadata/md5-cache/dev-python/time-machine-2.9.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-DESCRIPTION=Travel through time in your tests
-EAPI=8
-HOMEPAGE=https://github.com/adamchainz/time-machine/ https://pypi.org/project/time-machine/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 debug
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/adamchainz/time-machine/archive/2.9.0.tar.gz -> time-machine-2.9.0.gh.tar.gz
-_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=f1a26547f12c00f1504d9fbf976b8c51
diff --git a/metadata/md5-cache/dev-python/ytmusicapi-1.2.0 b/metadata/md5-cache/dev-python/ytmusicapi-1.2.0
new file mode 100644
index 000000000000..42bf54a0b149
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ytmusicapi-1.2.0
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( dev-lang/python:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ) ) 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 prepare test
+DESCRIPTION=Unofficial API for YouTube Music
+EAPI=8
+HOMEPAGE=https://ytmusicapi.readthedocs.io/ https://github.com/sigma67/ytmusicapi/
+INHERIT=distutils-r1 pypi
+IUSE=doc python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/y/ytmusicapi/ytmusicapi-1.2.0.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	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	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=eb5bee540e093608539e8e256631930a
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 9653e79cad1e..448fd107c457 100644
--- a/metadata/md5-cache/gui-wm/Manifest.gz
+++ b/metadata/md5-cache/gui-wm/Manifest.gz
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.11.51 b/metadata/md5-cache/gui-wm/gamescope-3.11.51
deleted file mode 100644
index 3db09a61e3b2..000000000000
--- a/metadata/md5-cache/gui-wm/gamescope-3.11.51
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glslang dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND==dev-libs/libliftoff-0.3* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) dev-libs/stb dev-util/vulkan-headers ~media-libs/vkroots-0_p20221205
-DESCRIPTION=Efficient micro-compositor for running games
-EAPI=8
-HOMEPAGE=https://github.com/ValveSoftware/gamescope
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps meson
-IUSE=pipewire +filecaps
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND==dev-libs/libliftoff-0.3* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= )
-SLOT=0
-SRC_URI=https://github.com/ValveSoftware/gamescope/archive/refs/tags/3.11.51.tar.gz -> gamescope-3.11.51.tar.gz
-_eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=e40828c1d72abb8584e4c55953c0a053
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.12.0 b/metadata/md5-cache/gui-wm/gamescope-3.12.3
index 2201ac8061be..29576527c3af 100644
--- a/metadata/md5-cache/gui-wm/gamescope-3.12.0
+++ b/metadata/md5-cache/gui-wm/gamescope-3.12.3
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/glslang dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) dev-cpp/benchmark dev-libs/stb dev-util/vulkan-headers media-libs/glm wsi-layer? ( >=media-libs/vkroots-0_p20230103 )
+DEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb ) dev-cpp/benchmark dev-libs/stb dev-util/vulkan-headers media-libs/glm wsi-layer? ( >=media-libs/vkroots-0_p20230103 )
 DESCRIPTION=Efficient micro-compositor for running games
 EAPI=8
 HOMEPAGE=https://github.com/ValveSoftware/gamescope
@@ -9,8 +9,8 @@ INHERIT=fcaps meson
 IUSE=pipewire +wsi-layer +filecaps
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb )
+RDEPEND==dev-libs/libliftoff-0.4* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.16*[X] >=media-libs/libdisplay-info-0.1.1 media-libs/libsdl2[video,vulkan] media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXmu x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) wsi-layer? ( x11-libs/libxcb )
 SLOT=0
-SRC_URI=https://github.com/ValveSoftware/gamescope/archive/refs/tags/3.12.0.tar.gz -> gamescope-3.12.0.tar.gz
+SRC_URI=https://github.com/ValveSoftware/gamescope/archive/refs/tags/3.12.3.tar.gz -> gamescope-3.12.3.tar.gz
 _eclasses_=fcaps	c0a086b957a1b183a8d136eabf02f191	meson	08b7183c3f4811568ee93eb0f79a89fe	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=6d4c03e2fe6d442f897d5e83b9bf26aa
+_md5_=24ce0d4a8da6ed6441675328bd70a887
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index bfbbf0a0fda6..14d9109e012b 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/shaderc-2023.4 b/metadata/md5-cache/media-libs/shaderc-2023.4
index 71dab76c0c7f..d7a34ffd9b4d 100644
--- a/metadata/md5-cache/media-libs/shaderc-2023.4
+++ b/metadata/md5-cache/media-libs/shaderc-2023.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/google/shaderc
 INHERIT=cmake-multilib multibuild python-any-r1
 IUSE=doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ppc64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-util/glslang-1.3.250:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-1.3.250[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/shaderc/archive/v2023.4.tar.gz -> shaderc-2023.4.tar.gz
 _eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	cmake-multilib	37d23064f303dcf23453353ab8c77059	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	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	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8e6154a8eaada77c27d74fc6234d1469
+_md5_=7611e72ca3ccc8a66896efd9fd070443
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d0deb917213d..f063d758de30 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/gajim-1.8.1 b/metadata/md5-cache/net-im/gajim-1.8.1
index 425e29899960..8bbf2a2b17df 100644
--- a/metadata/md5-cache/net-im/gajim-1.8.1
+++ b/metadata/md5-cache/net-im/gajim-1.8.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gajim.org/
 INHERIT=distutils-r1 xdg-utils
 IUSE=+crypt geolocation jingle remote rst +spell upnp +webp python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4[introspection] python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_10(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_10(-)] dev-python/jaraco-classes[python_targets_python3_10(-)] dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/omemo-dr[python_targets_python3_10(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_11? ( dev-python/idna[python_targets_python3_11(-)] >=dev-python/nbxmpp-4.2.2[python_targets_python3_11(-)] <dev-python/nbxmpp-5.0.0[python_targets_python3_11(-)] dev-python/precis-i18n[python_targets_python3_11(-)] dev-python/pyasn1[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pycurl[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_11(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_11(-)] dev-python/css-parser[python_targets_python3_11(-)] dev-python/packaging[python_targets_python3_11(-)] net-libs/libsoup:3.0[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_11(-)] dev-python/jaraco-classes[python_targets_python3_11(-)] dev-python/python-axolotl[python_targets_python3_11(-)] dev-python/qrcode[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] dev-python/omemo-dr[python_targets_python3_11(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_11(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_11(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_11(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_11(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_10? ( dev-lang/python:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( dev-lang/python:3.11[sqlite,xml(+)] )
 REQUIRED_USE=^^ ( python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gajim.org/downloads/1.8/gajim-1.8.1.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=36e855289ec03a72a265fa1d57653b0c
+_md5_=53e510f89a5182e0f08969117b642815
diff --git a/metadata/md5-cache/net-im/synapse-1.85.2-r1 b/metadata/md5-cache/net-im/synapse-1.85.2-r1
deleted file mode 100644
index 6a18f18c70d1..000000000000
--- a/metadata/md5-cache/net-im/synapse-1.85.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hiredis[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyicu[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/txredisapi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-db/postgresql[server] ) ) >=virtual/rust-1.53 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/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-user/synapse acct-group/synapse python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Reference implementation of Matrix homeserver
-EAPI=8
-HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
-INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
-IUSE=postgres systemd test debug python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~ppc64
-LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-RDEPEND=acct-user/synapse acct-group/synapse dev-python/attrs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/canonicaljson-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ijson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/immutabledict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matrix-common-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/phonenumbers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pillow-10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,webp] dev-python/prometheus-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymacaroons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service-identity[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/signedjson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/treq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) systemd? ( dev-python/python-systemd[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/matrix-org/synapse/archive/v1.85.2.tar.gz -> synapse-1.85.2.gh.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.19/download -> aho-corasick-0.7.19.crate https://crates.io/api/v1/crates/anyhow/1.0.71/download -> anyhow-1.0.71.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.6/download -> blake2-0.10.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.18/download -> log-0.4.18.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.52/download -> proc-macro2-1.0.52.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-log/0.8.1/download -> pyo3-log-0.8.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/pythonize/0.17.0/download -> pythonize-0.17.0.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex/1.7.3/download -> regex-1.7.3.crate https://crates.io/api/v1/crates/regex-syntax/0.6.29/download -> regex-syntax-0.6.29.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.163/download -> serde-1.0.163.crate https://crates.io/api/v1/crates/serde_derive/1.0.163/download -> serde_derive-1.0.163.crate https://crates.io/api/v1/crates/serde_json/1.0.96/download -> serde_json-1.0.96.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.crate https://crates.io/api/v1/crates/syn/2.0.10/download -> syn-2.0.10.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
-_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	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	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=8cf2b62ecb9de0e145fd2c111be3432e
diff --git a/metadata/md5-cache/net-im/synapse-1.87.0 b/metadata/md5-cache/net-im/synapse-1.87.0
deleted file mode 100644
index 6a408630b3c4..000000000000
--- a/metadata/md5-cache/net-im/synapse-1.87.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/setuptools-rust[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hiredis[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyicu[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/txredisapi[python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-db/postgresql[server] ) ) >=virtual/rust-1.53 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/poetry-core-1.6.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=acct-user/synapse acct-group/synapse python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-DESCRIPTION=Reference implementation of Matrix homeserver
-EAPI=8
-HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
-INHERIT=cargo distutils-r1 multiprocessing optfeature systemd
-IUSE=postgres systemd test debug python_targets_python3_10 python_targets_python3_11 debug
-KEYWORDS=amd64 ~ppc64
-LICENSE=Apache-2.0 Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-RDEPEND=acct-user/synapse acct-group/synapse dev-python/attrs[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bcrypt[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/bleach[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/canonicaljson-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ijson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/immutabledict[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matrix-common-1.3.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/netaddr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/phonenumbers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pillow-10[python_targets_python3_10(-)?,python_targets_python3_11(-)?,webp] dev-python/prometheus-client[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pymacaroons[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyopenssl[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/service-identity[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/signedjson[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sortedcontainers[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/treq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twisted[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unpaddedbase64[python_targets_python3_10(-)?,python_targets_python3_11(-)?] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) systemd? ( dev-python/python-systemd[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/matrix-org/synapse/archive/v1.87.0.tar.gz -> synapse-1.87.0.gh.tar.gz https://crates.io/api/v1/crates/aho-corasick/1.0.2/download -> aho-corasick-1.0.2.crate https://crates.io/api/v1/crates/anyhow/1.0.71/download -> anyhow-1.0.71.crate https://crates.io/api/v1/crates/arc-swap/1.5.1/download -> arc-swap-1.5.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blake2/0.10.6/download -> blake2-0.10.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.3/download -> block-buffer-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/crypto-common/0.1.6/download -> crypto-common-0.1.6.crate https://crates.io/api/v1/crates/digest/0.10.5/download -> digest-0.10.5.crate https://crates.io/api/v1/crates/generic-array/0.14.6/download -> generic-array-0.14.6.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/indoc/1.0.7/download -> indoc-1.0.7.crate https://crates.io/api/v1/crates/itoa/1.0.4/download -> itoa-1.0.4.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.135/download -> libc-0.2.135.crate https://crates.io/api/v1/crates/lock_api/0.4.9/download -> lock_api-0.4.9.crate https://crates.io/api/v1/crates/log/0.4.19/download -> log-0.4.19.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/once_cell/1.15.0/download -> once_cell-1.15.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.1/download -> parking_lot-0.12.1.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.52/download -> proc-macro2-1.0.52.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.3/download -> pyo3-build-config-0.17.3.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.3/download -> pyo3-ffi-0.17.3.crate https://crates.io/api/v1/crates/pyo3-log/0.8.2/download -> pyo3-log-0.8.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.3/download -> pyo3-macros-backend-0.17.3.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.3/download -> pyo3-macros-0.17.3.crate https://crates.io/api/v1/crates/pyo3/0.17.3/download -> pyo3-0.17.3.crate https://crates.io/api/v1/crates/pythonize/0.17.0/download -> pythonize-0.17.0.crate https://crates.io/api/v1/crates/quote/1.0.26/download -> quote-1.0.26.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex-syntax/0.7.2/download -> regex-syntax-0.7.2.crate https://crates.io/api/v1/crates/regex/1.8.4/download -> regex-1.8.4.crate https://crates.io/api/v1/crates/ryu/1.0.11/download -> ryu-1.0.11.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/serde/1.0.164/download -> serde-1.0.164.crate https://crates.io/api/v1/crates/serde_derive/1.0.164/download -> serde_derive-1.0.164.crate https://crates.io/api/v1/crates/serde_json/1.0.99/download -> serde_json-1.0.99.crate https://crates.io/api/v1/crates/smallvec/1.10.0/download -> smallvec-1.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.104/download -> syn-1.0.104.crate https://crates.io/api/v1/crates/syn/2.0.10/download -> syn-2.0.10.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.5/download -> unicode-ident-1.0.5.crate https://crates.io/api/v1/crates/unindent/0.1.10/download -> unindent-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate
-_eclasses_=cargo	8520ae1bed0e6965d027399b471a3595	distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	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	59e60e9c5cbd3f214d7f1002e798b387	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=bff684ffd3c8b226a869446c2c1ad815
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 61bffb095b7f..95fcd41fbab6 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/libiio-0.25 b/metadata/md5-cache/net-libs/libiio-0.25
new file mode 100644
index 000000000000..d1bbbc99455f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libiio-0.25
@@ -0,0 +1,16 @@
+BDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) dev-libs/libxml2 virtual/libusb:1 aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi[dbus] )
+DESCRIPTION=Library for interfacing with IIO devices
+EAPI=8
+HOMEPAGE=https://github.com/analogdevicesinc/libiio
+INHERIT=cmake udev python-single-r1
+IUSE=+aio python +zeroconf python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) dev-libs/libxml2 virtual/libusb:1 aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
+SLOT=0/0.25
+SRC_URI=https://github.com/analogdevicesinc/libiio/archive/v0.25.tar.gz -> libiio-0.25.tar.gz
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9130fa52a27dcd25c28a893aec62fed5
diff --git a/metadata/md5-cache/net-libs/libiio-9999 b/metadata/md5-cache/net-libs/libiio-9999
index 28ac08561612..00f185492108 100644
--- a/metadata/md5-cache/net-libs/libiio-9999
+++ b/metadata/md5-cache/net-libs/libiio-9999
@@ -1,14 +1,15 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi )
+BDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) dev-libs/libxml2 virtual/libusb:1 aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi[dbus] )
 DESCRIPTION=Library for interfacing with IIO devices
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/analogdevicesinc/libiio
-INHERIT=cmake git-r3
-IUSE=+aio +zeroconf
+INHERIT=cmake udev python-single-r1 git-r3
+IUSE=+aio python +zeroconf python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi )
+RDEPEND=python? ( python_single_target_python3_10? ( dev-lang/python:3.10 ) python_single_target_python3_11? ( dev-lang/python:3.11 ) python_single_target_python3_12? ( dev-lang/python:3.12 ) ) dev-libs/libxml2 virtual/libusb:1 aio? ( dev-libs/libaio ) zeroconf? ( net-dns/avahi[dbus] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_10 python_single_target_python3_11 python_single_target_python3_12 ) )
 SLOT=0/9999
-_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=2c9e17444fb9181a94d1ba0eebb07fcb
+_eclasses_=cmake	aa1d1fa7be37663d48162ac963b22692	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=9130fa52a27dcd25c28a893aec62fed5
diff --git a/metadata/md5-cache/net-libs/libnsl-1.3.0-r2 b/metadata/md5-cache/net-libs/libnsl-1.3.0-r2
index 6bc0933bc9aa..3a7116d54441 100644
--- a/metadata/md5-cache/net-libs/libnsl-1.3.0-r2
+++ b/metadata/md5-cache/net-libs/libnsl-1.3.0-r2
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/thkukuk/libnsl
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
+LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=net-libs/libtirpc-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
 SLOT=0/2
 SRC_URI=https://github.com/thkukuk/libnsl/releases/download/v1.3.0/libnsl-1.3.0.tar.xz
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=3845d3b33c8ced475a17084ade7a8065
+_md5_=f538c35084a25ac039043db9306d6f68
diff --git a/metadata/md5-cache/net-libs/libnsl-2.0.0-r1 b/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
index d52369266219..6c91d3f62448 100644
--- a/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnsl-2.0.0-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/thkukuk/libnsl
 INHERIT=multilib-minimal preserve-libs
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
+LICENSE=LGPL-2.1+ BSD
 RDEPEND=>=net-libs/libtirpc-1.2.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<sys-libs/glibc-2.26
 SLOT=0/3
 SRC_URI=https://github.com/thkukuk/libnsl/releases/download/v2.0.0/libnsl-2.0.0.tar.xz
 _eclasses_=multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	21162ec96c87041004a75348d97342dd	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=05e72241d233fa7a0c7921dac41e1a5b
+_md5_=45a6e250a2fb76455f9efa2ee3f33be6
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f1cfab56937b..95dd6ca4030f 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-0.6.2 b/metadata/md5-cache/net-wireless/nanovna-saver-0.6.2
new file mode 100644
index 000000000000..b0bc81821a5a
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-0.6.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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 postrm prepare test
+DESCRIPTION=tool for reading, displaying and saving data from the NanoVNA
+EAPI=8
+HOMEPAGE=https://github.com/mihtjel/nanovna-saver
+INHERIT=distutils-r1 xdg-utils
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mihtjel/nanovna-saver/archive/v0.6.2.tar.gz -> nanovna-saver-0.6.2.tar.gz
+_eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=438178153dfd866183e10a675dcf69c5
diff --git a/metadata/md5-cache/net-wireless/nanovna-saver-9999 b/metadata/md5-cache/net-wireless/nanovna-saver-9999
index a6e6ee15277e..5dbf720036d3 100644
--- a/metadata/md5-cache/net-wireless/nanovna-saver-9999
+++ b/metadata/md5-cache/net-wireless/nanovna-saver-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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(-)?] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-python/setuptools-scm[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=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(-)?] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DESCRIPTION=tool for reading, displaying and saving data from the NanoVNA
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=distutils-r1 xdg-utils git-r3
 IUSE=test python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-3+
 PROPERTIES=live
-RDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[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 )
+RDEPEND=dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyserial[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/PyQt6[python_targets_python3_10(-)?,python_targets_python3_11(-)?,gui,widgets] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=a0dc8587a74c614c9140f921da5b872c
+_md5_=438178153dfd866183e10a675dcf69c5
diff --git a/metadata/md5-cache/net-wireless/urh-2.9.4 b/metadata/md5-cache/net-wireless/urh-2.9.4
index be2f4d4adf37..c25e87958595 100644
--- a/metadata/md5-cache/net-wireless/urh-2.9.4
+++ b/metadata/md5-cache/net-wireless/urh-2.9.4
@@ -1,6 +1,6 @@
-BDEPEND=test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 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 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=8
 HOMEPAGE=https://github.com/jopohl/urh
@@ -8,10 +8,10 @@ INHERIT=distutils-r1 virtualx
 IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd test python_targets_python3_10 python_targets_python3_11 debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr 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 ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jopohl/urh/archive/v2.9.4.tar.gz -> urh-2.9.4.tar.gz
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a30409ac3fdc51db0803011cbbd9a3ca
+_md5_=af6fdc61f0fb681631a93ea65de5491e
diff --git a/metadata/md5-cache/net-wireless/urh-9999 b/metadata/md5-cache/net-wireless/urh-9999
index ba9ec8aa9b62..0fa80662771d 100644
--- a/metadata/md5-cache/net-wireless/urh-9999
+++ b/metadata/md5-cache/net-wireless/urh-9999
@@ -1,6 +1,6 @@
-BDEPEND=test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr >=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(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+DEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
 DESCRIPTION=Universal Radio Hacker: investigate wireless protocols like a boss
 EAPI=8
 HOMEPAGE=https://github.com/jopohl/urh
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 virtualx git-r3
 IUSE=airspy audio bladerf hackrf limesdr plutosdr rtlsdr sdrplay uhd test python_targets_python3_10 python_targets_python3_11 debug test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite:= ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr:= ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 )
+RDEPEND=python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) net-wireless/gnuradio[zeromq] dev-python/numpy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyzmq[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cython[python_targets_python3_10(-)?,python_targets_python3_11(-)?] airspy? ( net-wireless/airspy:= ) audio? ( dev-python/pyaudio[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) bladerf? ( net-wireless/bladerf:= ) hackrf? ( net-libs/libhackrf:= ) limesdr? ( net-wireless/limesuite ) plutosdr? ( net-libs/libiio:= ) rtlsdr? ( net-wireless/rtl-sdr ) sdrplay? ( <net-wireless/sdrplay-3.0.0:= ) uhd? ( net-wireless/uhd:= ) dev-python/PyQt5[python_targets_python3_10(-)?,python_targets_python3_11(-)?,testlib] net-wireless/gr-osmosdr 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 ) !test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	a93df67775ff86e107e56c6a6e68cf4e	flag-o-matic	be27a904c614cb93ae037762dc69bcc2	git-r3	2358a7b20091609e24bd3a83b3ac5991	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	f3010c780f65d1bb5aea15a9af1adc9c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	59e60e9c5cbd3f214d7f1002e798b387	toolchain-funcs	862d337d98edb576796827be2c6b11ca	virtualx	817571665ee28575da44ee08135089e5
-_md5_=a30409ac3fdc51db0803011cbbd9a3ca
+_md5_=472beee66d5862b2e23ab986205a3f8b
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index b9d3a6d97cbb..744b28208d29 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-r6 b/metadata/md5-cache/sys-devel/binutils-2.40-r6
deleted file mode 100644
index e2c12bad0a48..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.40-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) sys-devel/flex app-alternatives/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet debuginfod doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-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-5.tar.xz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=56069faa79e68517107de7890c9e5ba8
diff --git a/metadata/md5-cache/sys-devel/binutils-2.40-r7 b/metadata/md5-cache/sys-devel/binutils-2.40-r7
deleted file mode 100644
index 634252dff0fd..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.40-r7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) sys-devel/flex app-alternatives/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet debuginfod doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-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-6.tar.xz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d729e2be57aedb6b1654215f78ce2c40
diff --git a/metadata/md5-cache/sys-devel/binutils-2.41 b/metadata/md5-cache/sys-devel/binutils-2.41
deleted file mode 100644
index 82d0e114ebf0..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-2.41
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) zstd? ( virtual/pkgconfig ) sys-devel/flex app-alternatives/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-IUSE=cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib debuginfod? ( dev-libs/elfutils[debuginfod(-)] ) zstd? ( app-arch/zstd:= )
-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-1.tar.xz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=deb46163644406d8f9d97ffcdc099a3d
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.41 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.41
deleted file mode 100644
index 4c59e2c8509d..000000000000
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.41
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) test? ( dev-util/dejagnu sys-devel/bc ) nls? ( sys-devel/gettext ) sys-devel/flex app-alternatives/yacc >=app-portage/elt-patches-20170815 sys-devel/gnuconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-DESCRIPTION=Tools necessary to build programs
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
-IUSE=cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla
-KEYWORDS=-* ~hppa
-LICENSE=GPL-3+
-RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-REQUIRED_USE=default-gold? ( gold )
-RESTRICT=!test? ( test )
-SLOT=2.41
-SRC_URI=mirror://gnu/binutils/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-1.tar.xz
-_eclasses_=flag-o-matic	be27a904c614cb93ae037762dc69bcc2	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=64173b10927dd88eb9ee81e6e3370157
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 548f2adb1a43..26623aa4a7ac 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.11-r2 b/metadata/md5-cache/sys-fs/eudev-3.2.11-r4
index 995a24633d28..6ee4c181414c 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.11-r2
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.11-r4
@@ -9,9 +9,9 @@ IUSE=+kmod introspection rule-generator selinux static-libs test abi_x86_32 abi_
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
-RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
+RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/floppy acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/usb acct-group/video !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eudev-project/eudev/archive/refs/tags/v3.2.11.tar.gz -> eudev-3.2.11.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=a16802bbfef7482b9872efec09bb79ed
+_md5_=459dcc25cb2b20b4c8e5385df3032526
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.11-r3 b/metadata/md5-cache/sys-fs/eudev-3.2.11-r5
index cd383f3cd0bd..b313bb575a1f 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.11-r3
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.11-r5
@@ -9,9 +9,9 @@ IUSE=+kmod introspection rule-generator selinux split-usr static-libs test abi_x
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
-RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
+RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/floppy acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/usb acct-group/video !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eudev-project/eudev/archive/refs/tags/v3.2.11.tar.gz -> eudev-3.2.11.tar.gz
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=d49a871186feb3f7fc2c8367512bc0a2
+_md5_=929894ac18cbee6a5246b97baa027f24
diff --git a/metadata/md5-cache/sys-fs/eudev-3.2.12 b/metadata/md5-cache/sys-fs/eudev-3.2.12-r1
index da03ad5b3edf..f505b17cce3b 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.2.12
+++ b/metadata/md5-cache/sys-fs/eudev-3.2.12-r1
@@ -9,9 +9,9 @@ IUSE=+kmod rule-generator selinux split-usr static-libs test abi_x86_32 abi_x86_
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
-RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
+RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/floppy acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/usb acct-group/video !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/eudev-project/eudev/releases/download/v3.2.12/eudev-3.2.12.tar.gz
 _eclasses_=linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b52e5ccb57d85959cf6d1cfb7ea46da5
+_md5_=31e867e15948d9a2462f9f472819d2bb
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index 00823c5765a7..efee30b847d3 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -9,8 +9,8 @@ IUSE=+kmod rule-generator selinux split-usr static-libs test abi_x86_32 abi_x86_
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26
 PROPERTIES=live
-RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
+RDEPEND=>=sys-apps/util-linux-2.20 >=sys-kernel/linux-headers-2.6.39 virtual/libcrypt:= kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !sys-apps/gentoo-systemd-integration !sys-apps/systemd acct-group/input acct-group/kvm acct-group/render acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/floppy acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/usb acct-group/video !sys-apps/systemd-utils[udev] !sys-fs/udev !sys-apps/systemd !sys-apps/hwids[udev]
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	6ae9a4347149b19a112caa1182d03bde	git-r3	2358a7b20091609e24bd3a83b3ac5991	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=b52e5ccb57d85959cf6d1cfb7ea46da5
+_md5_=31e867e15948d9a2462f9f472819d2bb
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 8827b32d6812..b63e7c2afcf6 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/git-sources-6.5_rc7 b/metadata/md5-cache/sys-kernel/git-sources-6.5_rc7
new file mode 100644
index 000000000000..d4e90eb0c90e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.5_rc7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.6-r4
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=8
+HOMEPAGE=https://www.kernel.org
+INHERIT=kernel-2
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~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_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v6.5-rc7/v6.4 -> patch-6.5-rc7.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.4.tar.xz
+_eclasses_=estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	552a82e0738a2db29ddba6e36373405b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	862d337d98edb576796827be2c6b11ca
+_md5_=e2f49b9fe9db805f05896054e5abff69
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 71ccee2bda7e..08fc91883f4d 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.41 b/metadata/md5-cache/sys-libs/binutils-libs-2.41
deleted file mode 100644
index 7571ae84ed62..000000000000
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.41
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external packages
-EAPI=7
-HOMEPAGE=https://sourceware.org/binutils/
-INHERIT=libtool toolchain-funcs multilib-minimal
-IUSE=64-bit-bfd cet multitarget nls static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris
-LICENSE=|| ( GPL-3 LGPL-3 )
-RDEPEND=sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-devel/binutils-config-5
-RESTRICT=!test? ( test )
-SLOT=0/2.41
-SRC_URI=mirror://gnu/binutils/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-1.tar.xz
-_eclasses_=libtool	9d3a9a889a6fa62ae794f817c156491b	multibuild	30dbf3c5a31db09a19f31ad0a68f2405	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	862d337d98edb576796827be2c6b11ca
-_md5_=00488be9a2a2e0fa4d81b2db1a845238
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 15c34c700d0f..19870674c81a 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-08-20T20:10:15Z
+TIMESTAMP 2023-08-21T02:11:31Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTicydfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTix9NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klArIQ/+PIr53u6MDQvm0CAn71xf1vX+N9JTfEUpkrTbAdELV3JmgSTfUpHiJIQm
-CHC5IqXHXIH2e2lOa2Syt2hCREIkWgqEUkfZNiSJp5gtdawFE1eQ0tTpVKyYAKUj
-ro/xs2IMrkyea+Q/+IsvGNh8w9oY+ChL8/qw2OucHHPgDn4so07A+cFwpc/3ENh6
-Wrh+zUTQRl9peo7Rv+G4iUYbFCyDjMZ+9DWIqlQP/24gSh7n4PDVh7pLfx/ObO1Q
-9dBXiLwIWVh+8pW85tYnqs2OAU2GLni9N1Xl5zL7cE2irHD33vNS9N3/xOJvA1Ep
-5Q5UjABxKxK8Y3cKIIaprh656MRo4xqAVC3BLGO3c5YLMY9KLx7+Hrr8SW/msclr
-WTf7rEGFgxFeyGpQyh25tAlQmJGvnuYiNLR9GKzEjRsLWGkLfdOpk02OrSVRDSNN
-Jogvlz7GsUurV/xhreFoc94m/t01+jIjItoWJz5KWSYKL0sJxF5azMH3NUIckmDe
-CFXIqzcQdfI0jEPuIADs7ZI6Q+aK3/SHo3O2/zp6OVlHaT0w9pU8AIhkDQiTUqR4
-sqgkHgGF7dDIV3uPDoM6WNbxsDei8bTCXroZNGQjUvg+5x+pg0/Pd64Xp2gTH/+Y
-hAGA7Cr2gXMgSHurU63GSrnqYIyGTYRec20eYMAYOeUAnCxkRSM=
-=QGvX
+klDSRA/9GSGgE8Eylq0vb5DjeVJ7NQbQ5plJRG1NTVtAm8ASWLGuxdi8Mp01ZIQv
+rjHldGUFKZpMxNIs9PlfZFA67oAuSkLX2Bj3aGVKiYMV0+vnkVHxKFzh7ZMaU49j
+4c23ZcOmz1EfLQy8FQagJ+T1UcVJk348b0yuTS6GvSxUDUaFFcJyAZpaEYjO43wq
+drQa3BVjgbN3XxXNQmjI3IcpUMREXPaQqGu8Kji33WDSPImIB/znPsDIIotdOQAp
+QsSDw2V0+6j6XvTH6a9ybE6TIyvkQM8Mqzrbuy/CuijGgZJq1FhJoO1neWOW7xQu
+TElsSO6rxuHJXda8QfytiVNaeA3g5QsBnBG8bh7Xn0qtzDsokZU8YJfO/AbW8sQk
+BuveaTiFSqrjbVDTyDkGYS//yhiwr7grgqr1BAupO3N39anClBhwCoV8q2tXDW/6
+RFy2Ni0WNGHmChnIN0IY2fST/QRx180ES7kA+uymKWwANhJXsLEywkkS0E4gQDhv
+QEyEz4SbH9uvaq93qCJsKqdRoJNDo31D+EqfRrjvBfz7ljWlmB0FYN77A9/ZJKow
+wDFl3OuAo+Qb6p1dsMl4NswEkXH2KI79Oypo7Qvo5vOUGcJJ+DzoA2Ks3F0hzb+H
+RNq5SKkS9fosaY2vXRGinFF9Ov9XJSTjm3avOILa7jKE29Urn7Y=
+=rUsc
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e9abd5cd66e8..fc8b61944a39 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Aug 2023 20:10:12 +0000
+Mon, 21 Aug 2023 02:11:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3363b1f54f18..1cb48f3f4a77 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Aug 20 08:10:11 PM UTC 2023
+Mon Aug 21 02:11:28 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 17ac2b6f81fa..7a5c2d639b1b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Aug 2023 20:15:01 +0000
+Mon, 21 Aug 2023 02:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index fdcba3f7d2d6..5de4046afa04 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-56991de1be032762a860eeba7a7cc759a88dae43 1692560722 2023-08-20T19:45:22+00:00
+ef171337b5d7246958de5bf1b7af165e8bc3a84a 1692583427 2023-08-21T02:03:47+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7b0575106179..2e7ddc8203fd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1692562201 Sun 20 Aug 2023 08:10:01 PM UTC
+1692583801 Mon 21 Aug 2023 02:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e9abd5cd66e8..fc8b61944a39 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 20 Aug 2023 20:10:12 +0000
+Mon, 21 Aug 2023 02:11:28 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 4acb14faadb0..4e85dd97113b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index cdec230b71c2..3edc4b7606b4 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -4,5 +4,5 @@ DIST gajim-1.8.1.tar.gz 3844796 BLAKE2B b7bbd751a051cd2a46e814a9b3ebc08f10a6570d
 EBUILD gajim-1.7.3-r1.ebuild 2826 BLAKE2B 3252f39b4fe60c4d049310e744851aa2883fb973756b0f1e6a6b261a96056d0235b203ade0bf82625e145768985ee89a9b390dcd80fdb4208eca912fad789a6b SHA512 6e351104f148ce136903be001aa8a1c18c3e09b94459678079bf16603ad7198f63251d606e1818f9b231b30ea38de34fda4c80b8e6ce7f58b54a672c955a129f
 EBUILD gajim-1.7.3.ebuild 2609 BLAKE2B 3ca58a71c4b3e51fb605d031e55a6caa104d5e53e8d1e0e382a3b1bacc38859d0bb2598ce119b005f36b6ef0c67388ee2b7e4e03bfabfe257cd5c65c74e97d8a SHA512 49e1fcdd326c29f480d672bec91b941c3aa7a3d014a226ec8f87de7bf675a8909e5ab2af8afa788193f4c6bf378bc442951c6720e817887e810bd43d91d3d2c7
 EBUILD gajim-1.8.0.ebuild 2986 BLAKE2B 87fda1d68756188525313fffab21464af480a523e91ff73f50ca23fc02f19a0e5e2286610cf045435365905e9791bf1bc049d999b684abfab73a9eb92e0e2ce7 SHA512 1983904536ac220949fe24a654b1a3575290742fd70fa318f983ab36e06ec985c11687bd2e0c888e7e0cd295eac44d498d6eb6e7ad848d3c2ec9fde91ba2ce77
-EBUILD gajim-1.8.1.ebuild 2998 BLAKE2B 61da216a2c17787c04b9a2b2241971651106b0396e3d520e2b76001cb5ca3793441a5739f47ef7e19d1120532bef4d7c1b129606dfc8814c52ada620dfbae8af SHA512 332f1fcdb346217f5635009116b35cf5cf0cb28d5dcc3ee51db11a782aafaf3b26d6658365ef187bb75a0d7cb5e01c9fb06328c29a62395e44553a4654f79e45
+EBUILD gajim-1.8.1.ebuild 3005 BLAKE2B dfe22cad565c36baec2df346012718b6ee6445be3fe76cea29121e05118ae294d3036c01bdba857b2d9f29e6d36bcb79ba3c1041ad6b95f1fb9521551c68613f SHA512 2e635fb44d7e26b6ad5d74861e0243e0dd27f4bf89b0a66c956b9b482a308b9ffe2dfd06c8707dddc3ce76f720df08ee88ff1421974c7425b57c29224d04e4cc
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.8.1.ebuild b/net-im/gajim/gajim-1.8.1.ebuild
index f8109a90072c..909d51e4a1f7 100644
--- a/net-im/gajim/gajim-1.8.1.ebuild
+++ b/net-im/gajim/gajim-1.8.1.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 # Gajim depends now on omemo-dr. Add KEYWORDS again,
 # when https://bugs.gentoo.org/912285 is fixed.
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
 IUSE="+crypt geolocation jingle remote rst +spell upnp +webp"
 
 COMMON_DEPEND="
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index ba69853882d3..9aa1e671e5ac 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,6 +1,5 @@
 AUX synapse.initd-r1 345 BLAKE2B bc4868eff0103c657725b077a5f9ad002300b34a1a8bb85820c3c12b9da733fb33ef136a3a992cfe50844cba304cfaa8f9577e4f5fdcc9e94f653406043ad663 SHA512 44a0f7124f8730b4fc8f0e52284d8f03a0bf016c584fa0411910f66d236e3130b1c749d45ff84fa3a8619716bb973ff51f0a5733b06006640894eb39f29d188e
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
-DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
 DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
 DIST anyhow-1.0.71.crate 43808 BLAKE2B 1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f SHA512 401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5
 DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074
@@ -18,51 +17,34 @@ DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d2
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST log-0.4.18.crate 38339 BLAKE2B c233a7f792b052d6a23badc839b2e01c0a7a977849a476a0f5e82608037fbb4387c48287283845eaa1e02ce82b1b79bfa020fb49515aaedc784f1c77677bb710 SHA512 c499ab111d0fdb3297f08a4dc538b93d5a9017e6f1cd63dfdb84a799cc445f181379ba02db83072c943ae2e1801bd6f6f3d075c86819108389fbe0e90c87d456
 DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
-DIST proc-macro2-1.0.52.crate 42982 BLAKE2B c432e889c6d02e359863ca40d30e20b5c3567d065ea16e5963eb713ea9a02a9979ec996939efbb23aa37857ec37e6587b2519d8267a1a713d1b17fce014acca6 SHA512 76b24c82bfd37a7eed4dda59a56fa2101ec4e8d6ad726e3fdace9daa729090de2cb2bcfd4246dd691129645c613ae18c6fc448c940b459724681202f7a232f3f
 DIST proc-macro2-1.0.64.crate 44848 BLAKE2B 4422122d9299eff3bfbb4507c4a117fef7c0906cab5a680933d482b7f9b49480bcb9c8172b412e70bf87dd0737b8532e90c310bf083f144292cc72190059ba3b SHA512 884fd14ff23c19420692e35a38f88bb6a766a09da105759cd958c315b9360a2c49cfe61ceaa3122307d44040195ec9dffb12b6d0ce224fbac5d3701621a12b04
 DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644ff9fbd83eccf3d53096a3c2e0991da8b3489ea9984c665751308bcf4aa9c3d31dd62c72127694156a7a0a9 SHA512 5c83ea76202edce13c370d023562a9009382e36fdf3fcd7c4dea844ab8e5e048db4cc79a9c0ea98fb7017a83da16924ba0981ad98bd83e75e2fac434738e9740
 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
-DIST pyo3-log-0.8.1.crate 14082 BLAKE2B 1920a34d18f1f418857abca05c59f5f9a16d00fc460082c2cbe97bc55b8f429d6433780d667a211beecf4df81a2606aa502ce2a1ebb6c0833b74a604abb5eecb SHA512 d69f7c8e3d1997ca06201c15500a2e0e043f7c0b39c8bd826ce9dbced220b4b0fde0c31b865fbc41f94f188e4b9ea15b49e2e2e42068a82678668f3a51a2fca1
 DIST pyo3-log-0.8.2.crate 14254 BLAKE2B 264976c24770d20ba369e3a90f3487cf77ed5ee53c0d075485cce39b3f4b24058538ae1fc8d9122abb4147ef38f1852850ff31ea621f4913acb429f5504d5a33 SHA512 60235b4e2f8e03bdf7538d37f5f8c385941500607f5cc2a284d02d0e25d27d13397a95a205fe924c5f96d6b5470b45c84c4ded7a5609463eedf735d4f2966f9e
 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d1e2a8ec17d9316c9fd2f72990b95977a87f722012e4fb54ce0a8be1a2eaac57b71e9d429dbbe59b0da387b2b81 SHA512 a9a46d27b8aa9e5bd7bb0b114b7457275131d90e20acd07110fbc18b3af3b9aa0683b9306fb645645f3801b64c0c479998665f3e4fcec0ed8e5b5947008b76bc
-DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
 DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
-DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f
-DIST regex-1.8.4.crate 249562 BLAKE2B ad6d1221412beb65eb760ae905d4becc5583ae4d030c67b061626afdd3d4389c24123000688039fc6c8c1d091ff307b4a46f4b0eb84f1c258d0612c51aa2627d SHA512 6fa873671bc188906334202027fdd4d15923fcea88aa85d56a63e3a36bcf6aa77ae61c596f9154dee6c69e03bf3f3441e4ce26304d5a8e0ac47d710bf7af4a5a
 DIST regex-1.9.1.crate 251978 BLAKE2B c5a049a485bb78cf27501b1c150d922ad56fa26fcc4594f111786cda8879b21573cd0b629dc4dee81e579a98d3ad2620a08ab97c5d0bd5abb1fbd1f8eadeb3e1 SHA512 cbee57ecf620795eb2625cb2a6a3d6eb2b46de91ade021111f8960e31d8d0098b786ddc1e97734cfa16f7e68d77ebb8a9b7362542d91f2345bf2e4f64778a454
 DIST regex-automata-0.3.2.crate 603895 BLAKE2B 839aaf55c2c24e14a9f474f2a38e5b190d5a0e85e0f923999a602cb7ac51b338c7f0720f6f42f5a6aaf1107d28320425e1daa540c532b97533985a389fb076e5 SHA512 82fbf0ad8a97b71c5489c69b34a3641dd104e02fc783df62036acb55ff7b6458349ae47164fda691178a054862ed00c26e471c9158391b65f9c383e38f8a5d61
-DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
-DIST regex-syntax-0.7.2.crate 339778 BLAKE2B 0b9533e4e4bfae1304a7ab5e2c8bc0bc3038367dbcab7bc19e680bc4945146f1eca3baa1c5bbff6ac60447b54059228a5790cad20ae33f16b9dab794a5f76140 SHA512 3065cec128ae6ce427d13b68066fc02357c21f7d1517c1669295f857395eea3297344fb2171c96d15dfe48050785249b7b8b8138fbe5b4a65c8427968347c128
 DIST regex-syntax-0.7.3.crate 343354 BLAKE2B 18178923350be3f963a07963e2b04914cafa3778548e1a608389065dc410f60473d980727164e0d6762d2a7ff7c88e3b3623169a042208936f0c44db0eaecf78 SHA512 0eb46957533efbcc6743258384854136a3a2c838533913d4b4573f6374248961bec05c55498b938ff0eb0979a98b13ff5d448e47588b6543766c3d63658c4767
 DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
-DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34
-DIST serde-1.0.164.crate 77057 BLAKE2B a3c9c7deaa841a559ec901eed72a768e0718a77683897a84149dc8211f3e6f8f016e6b86e5b3c7c3c3d512486dd7fdda2860f69e7d9e600fff6ca6da8870bfd4 SHA512 17376fad0d3f0fc696d713c0eec81fc4a83992f6f9dfbed7c3e700e7ca8a3241abd46d4c11303d26a5fe049ddaf3308c2e76b650cc7350e03a1e34002700552a
 DIST serde-1.0.171.crate 77630 BLAKE2B 84b4377c78018a9d32a1a3841d26111f2db8b761f45376abaf0412ce456e0bbb39b287e460a8d99e217dcf0ce24a461488af85539ec127672767fee0b44aab7a SHA512 c8db09da8845e102e209276d5747a28d2e7b12ab5297d24156062c61c6ac8aaac8789d6e91a4f939d1f674375d8c3d3d1e372dd248baf63fece3740ea6f68bce
-DIST serde_derive-1.0.163.crate 54447 BLAKE2B 284d02fcbdd05c53c8da737fac422fd61ff53669b140686d1732ef727a1e873945b1ebdb85fbda1d79f2c563b2c7b81d3ac51c76fe0cf5205dc6ab4d46a9d4d8 SHA512 744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283
-DIST serde_derive-1.0.164.crate 54789 BLAKE2B fb8e50cabecb66bfbb4eff07bbd034510ebc4eef5fa21c855887beb84d19b1201a4e9dc0f68a2aeabc559f2229a905cc44e780a7e6bdc55aaed399bde5dbe168 SHA512 08777ed5775ee6ea47daf084f4ee15869b3969d54e43e6820277535e79b70f61f6152decaeea29bca67137d354bad079393a6709fd10d7cfeb50728e46030c04
 DIST serde_derive-1.0.171.crate 55183 BLAKE2B d60c2aefc4f7ef43bc5ba9b39c9d62d5a784aef205aae4c90c9fe402e872699ce7fb0d74f2c657cb6862459d1dcba39562a7f4a0915cbe3e2c45a9f649858983 SHA512 2561e5105c6fd6ab802ddc04dbb4392450c7eff6709f39ec8ae43ba73138944879330f9bb8de7a6cbef3507153a22007a69d6e27d0acc717889ac91ea195ef45
 DIST serde_json-1.0.100.crate 145170 BLAKE2B 0a15476563643e2b9fa3a2416bf21ce0be62f05d7f483b566eff806c01e19ff82016ecbc970a636252798316f2fec40465ca85c74759cc83b23d147e05016f4e SHA512 182b0a2c77a7c06d0c88e629acd56b16e50bdecac2a066d2b6a3a2a41b50dd6bb147e943df7eb3e26c2b7a99f656f1af98e8c2a83d991c5356b46f3573b94b88
-DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
-DIST serde_json-1.0.99.crate 145102 BLAKE2B c6911880feab10a782aebfbe06b1eb37f415cc362db41ee8f6b0353c3f909d3c92512197503da81c7b74e54cb7dae49fe62c53487b1981480269fd1e657e3088 SHA512 7636fbd4f1f12e0675a8b13d8af80f09a2dc6036f8d6eaccfe0593e2f2e7a36a2ea28fcbf36d396217a8f7995ba29c14a17e695d1c914866055c69768292b292
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29
-DIST syn-2.0.10.crate 240095 BLAKE2B d2def2e1354d41bfcc3ad9cfd80ed611a56fd8560dc1b3c45aabd1927847fe69a92eb7c9575f159a5d3a004e8463f7f13ed60a4aa4ec6055552c1f731badc6fb SHA512 31f9c461b296453dcc0b7fbc71c2350658f447d4d90644b1bb35782fdf4067405090a0f9875a96fce9473855275d800d5986200b7a575b9fafd48218157b673e
 DIST syn-2.0.25.crate 241421 BLAKE2B f8b06686d0891a1d50d5f214836e43f518aeea443cbb7dabd2563c2399559014b9d42b7e0d1dbed2f4aa5e644efaf2f5f8b37358f9e0140efa231a62348fa1b6 SHA512 2c07b24d5bec7463da97eabbbccea3bf82aff5a74d7ffca6ef21f66420dce369cf77529fe722ce77b019b9085a52feb900f707b6aee5ee088d07035ae191930b
-DIST synapse-1.85.2.gh.tar.gz 8285129 BLAKE2B 1f9ba92a8823bc01b8c18baba862dc5e5f9cf5e8aa42ecb321c6c99ab48b9e1d0122969f481f033a2a0db0e273e9e8179e0c936a2d65377e60302db4a066f4ad SHA512 8e025eeb34dbf6fcaa00bde37782d5442584e454b671fd7f49aec809977a4cf1af1aff42957db946438700b0f8c24f1be54aa4c73b2e03de40cc5aa6e66943e6
-DIST synapse-1.87.0.gh.tar.gz 8304909 BLAKE2B 9a62bc06b9b984e25de1d197d1173896ae5fe8738197d8776218fdef9bb4624f671c0210a986fe0ef43d0253aed35f8f2b16c347754ba439d40d7dcb84c83611 SHA512 4543e2ecad98793be8b4a88b613cafd020a65fa94f4b02cfc75a9041fafb9145d8a341c4196bbce5e3801c9df0600a47b48b96363da310400072eb4d597f85c9
 DIST synapse-1.88.0.gh.tar.gz 8316957 BLAKE2B 0a329fa783eae221bd17d56fd463ec8614bd9884c6e6be629addeb6a7de013eaf6a02ae1a8253b1301e43f7c8786e6ab954fe5b5df97e6dd6fba982eb4ef0388 SHA512 0ec4d9a89f14e85aef05e5cf4517f31f5f843182e10fe5471bd03fc7e36c77760ea72432cbf7974db9a983aa2c612e09179847ff54295ee070360a7e2efc8a73
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
@@ -75,7 +57,5 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD synapse-1.85.2-r1.ebuild 5634 BLAKE2B 2fcf70248a5371ca2b8d643f5f9b746edf8b9ae982e22f775dcdaa6b6711768ffce7ed8187b6f3b0bc979363f5d311bf6d74ff6bf0bdae76c7b7d52790237a09 SHA512 fe767b83aa6853090c519b6f71c652ad9b23b8446a4a08a7ee67fcecd54883dfebbe16fb364670847255db4ecc997be3d6af1530e152b8e27fb77b1b410dcbdf
-EBUILD synapse-1.87.0.ebuild 5632 BLAKE2B b52ff4d354c9d539f961d4f18e5bfcc3e9faebae260169ea579f7ae1b1e854d2e4b2435229e9926040b92796fbc2f6637219d740cc8637889cb1a35aecac53d2 SHA512 732deda799781e2fbcf58b443b979d15532aba4d9da2d38b9b87168157dc8d167b397036d879142167b262a46bbc88e87db07c6cb1362cd8407174e712df8a26
 EBUILD synapse-1.88.0.ebuild 5621 BLAKE2B e89d394c12d9c05a316cda997c7b00b4dae12844339fb46d80cac9f4a353cbb189ee4f7fbef5ee103b8db0cba578a75542c22d8b905d42fd5d21e30660e8c224 SHA512 c8b2ca46c7a28ab22fab6f5a950a48be1b25772aa32214d17a65721c7c62d7ee29a057749e49585ac1fd394cb53c53633ca6f6aaea742215738e23584768abd8
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.85.2-r1.ebuild b/net-im/synapse/synapse-1.85.2-r1.ebuild
deleted file mode 100644
index 50379e31f4a1..000000000000
--- a/net-im/synapse/synapse-1.85.2-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
-
-CRATES="
-	aho-corasick-0.7.19
-	anyhow-1.0.71
-	arc-swap-1.5.1
-	autocfg-1.1.0
-	bitflags-1.3.2
-	blake2-0.10.6
-	block-buffer-0.10.3
-	cfg-if-1.0.0
-	crypto-common-0.1.6
-	digest-0.10.5
-	generic-array-0.14.6
-	hex-0.4.3
-	indoc-1.0.7
-	itoa-1.0.4
-	lazy_static-1.4.0
-	libc-0.2.135
-	lock_api-0.4.9
-	log-0.4.18
-	memchr-2.5.0
-	memoffset-0.6.5
-	once_cell-1.15.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.52
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-log-0.8.1
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	pythonize-0.17.0
-	quote-1.0.26
-	redox_syscall-0.2.16
-	regex-1.7.3
-	regex-syntax-0.6.29
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.163
-	serde_derive-1.0.163
-	serde_json-1.0.96
-	smallvec-1.10.0
-	subtle-2.4.1
-	syn-1.0.104
-	syn-2.0.10
-	target-lexicon-0.12.4
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	version_check-0.9.4
-	windows-sys-0.36.1
-	windows_aarch64_msvc-0.36.1
-	windows_i686_gnu-0.36.1
-	windows_i686_msvc-0.36.1
-	windows_x86_64_gnu-0.36.1
-	windows_x86_64_msvc-0.36.1
-"
-
-inherit cargo distutils-r1 multiprocessing optfeature systemd
-
-DESCRIPTION="Reference implementation of Matrix homeserver"
-HOMEPAGE="
-	https://matrix.org/
-	https://github.com/matrix-org/synapse/
-"
-SRC_URI="
-	https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="postgres systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/synapse
-	acct-group/synapse
-"
-# <pillow-10, see bug #909644
-# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858
-RDEPEND="
-	${DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	>=dev-python/canonicaljson-2[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ijson[${PYTHON_USEDEP}]
-	dev-python/immutabledict[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	>=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/phonenumbers[${PYTHON_USEDEP}]
-	<dev-python/pillow-10[${PYTHON_USEDEP},webp]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	<dev-python/pydantic-2[${PYTHON_USEDEP}]
-	dev-python/pymacaroons[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/service-identity[${PYTHON_USEDEP}]
-	dev-python/signedjson[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hiredis[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
-		dev-python/txredisapi[${PYTHON_USEDEP}]
-		postgres? ( dev-db/postgresql[server] )
-	)
-"
-
-# Rust extension
-QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
-
-src_test() {
-	if use postgres; then
-		einfo "Preparing postgres test instance"
-		initdb --pgdata="${T}/pgsql" || die
-		pg_ctl --wait --pgdata="${T}/pgsql" start \
-			--options="-h '' -k '${T}'" || die
-		createdb --host="${T}" synapse_test || die
-
-		# See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
-		local -x SYNAPSE_POSTGRES=1
-		local -x SYNAPSE_POSTGRES_HOST="${T}"
-	fi
-
-	# This remove is necessary otherwise python is not able to locate
-	# synapse_rust.abi3.so.
-	rm -rf synapse || die
-
-	nonfatal distutils-r1_src_test
-	local ret=${?}
-
-	if use postgres; then
-		einfo "Stopping postgres test instance"
-		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
-	fi
-
-	[[ ${ret} -ne 0 ]] && die
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests
-}
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/{lib,log}/synapse /etc/synapse
-	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
-	fperms 0750 /var/{lib,log}/synapse /etc/synapse
-	newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}"
-	systemd_dounit "${FILESDIR}/synapse.service"
-}
-
-pkg_postinst() {
-	optfeature "Improve user search for international display names" dev-python/pyicu
-	optfeature "Redis support" dev-python/txredisapi
-	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo
-		elog "In order to generate initial configuration run:"
-		elog "sudo -u synapse synapse_homeserver \\"
-		elog "    --server-name matrix.domain.tld \\"
-		elog "    --config-path /etc/synapse/homeserver.yaml \\"
-		elog "    --generate-config \\"
-		elog "    --data-directory /var/lib/synapse \\"
-		elog "    --report-stats=no"
-		einfo
-	else
-		einfo
-		elog "Please refer to upgrade notes if any special steps are required"
-		elog "to upgrade from the version you currently have installed:"
-		elog
-		elog "  https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
-		einfo
-	fi
-}
diff --git a/net-im/synapse/synapse-1.87.0.ebuild b/net-im/synapse/synapse-1.87.0.ebuild
deleted file mode 100644
index 78956e2bdeae..000000000000
--- a/net-im/synapse/synapse-1.87.0.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..11} )
-
-CRATES="
-	aho-corasick@1.0.2
-	anyhow@1.0.71
-	arc-swap@1.5.1
-	autocfg@1.1.0
-	bitflags@1.3.2
-	blake2@0.10.6
-	block-buffer@0.10.3
-	cfg-if@1.0.0
-	crypto-common@0.1.6
-	digest@0.10.5
-	generic-array@0.14.6
-	hex@0.4.3
-	indoc@1.0.7
-	itoa@1.0.4
-	lazy_static@1.4.0
-	libc@0.2.135
-	lock_api@0.4.9
-	log@0.4.19
-	memchr@2.5.0
-	memoffset@0.6.5
-	once_cell@1.15.0
-	parking_lot@0.12.1
-	parking_lot_core@0.9.3
-	proc-macro2@1.0.52
-	pyo3-build-config@0.17.3
-	pyo3-ffi@0.17.3
-	pyo3-log@0.8.2
-	pyo3-macros-backend@0.17.3
-	pyo3-macros@0.17.3
-	pyo3@0.17.3
-	pythonize@0.17.0
-	quote@1.0.26
-	redox_syscall@0.2.16
-	regex-syntax@0.7.2
-	regex@1.8.4
-	ryu@1.0.11
-	scopeguard@1.1.0
-	serde@1.0.164
-	serde_derive@1.0.164
-	serde_json@1.0.99
-	smallvec@1.10.0
-	subtle@2.4.1
-	syn@1.0.104
-	syn@2.0.10
-	target-lexicon@0.12.4
-	typenum@1.15.0
-	unicode-ident@1.0.5
-	unindent@0.1.10
-	version_check@0.9.4
-	windows-sys@0.36.1
-	windows_aarch64_msvc@0.36.1
-	windows_i686_gnu@0.36.1
-	windows_i686_msvc@0.36.1
-	windows_x86_64_gnu@0.36.1
-	windows_x86_64_msvc@0.36.1
-"
-
-inherit cargo distutils-r1 multiprocessing optfeature systemd
-
-DESCRIPTION="Reference implementation of Matrix homeserver"
-HOMEPAGE="
-	https://matrix.org/
-	https://github.com/matrix-org/synapse/
-"
-SRC_URI="
-	https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	${CARGO_CRATE_URIS}
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="postgres systemd test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/synapse
-	acct-group/synapse
-"
-# <pillow-10, see bug #909644
-# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858
-RDEPEND="
-	${DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/bcrypt[${PYTHON_USEDEP}]
-	dev-python/bleach[${PYTHON_USEDEP}]
-	>=dev-python/canonicaljson-2[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/ijson[${PYTHON_USEDEP}]
-	dev-python/immutabledict[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	>=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/phonenumbers[${PYTHON_USEDEP}]
-	<dev-python/pillow-10[${PYTHON_USEDEP},webp]
-	dev-python/prometheus-client[${PYTHON_USEDEP}]
-	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	<dev-python/pydantic-2[${PYTHON_USEDEP}]
-	dev-python/pymacaroons[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/service-identity[${PYTHON_USEDEP}]
-	dev-python/signedjson[${PYTHON_USEDEP}]
-	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	dev-python/treq[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	dev-python/setuptools-rust[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hiredis[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pyicu[${PYTHON_USEDEP}]
-		dev-python/txredisapi[${PYTHON_USEDEP}]
-		postgres? ( dev-db/postgresql[server] )
-	)
-"
-
-# Rust extension
-QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
-
-src_test() {
-	if use postgres; then
-		einfo "Preparing postgres test instance"
-		initdb --pgdata="${T}/pgsql" || die
-		pg_ctl --wait --pgdata="${T}/pgsql" start \
-			--options="-h '' -k '${T}'" || die
-		createdb --host="${T}" synapse_test || die
-
-		# See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
-		local -x SYNAPSE_POSTGRES=1
-		local -x SYNAPSE_POSTGRES_HOST="${T}"
-	fi
-
-	# This remove is necessary otherwise python is not able to locate
-	# synapse_rust.abi3.so.
-	rm -rf synapse || die
-
-	nonfatal distutils-r1_src_test
-	local ret=${?}
-
-	if use postgres; then
-		einfo "Stopping postgres test instance"
-		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
-	fi
-
-	[[ ${ret} -ne 0 ]] && die
-}
-
-python_test() {
-	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests
-}
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/{lib,log}/synapse /etc/synapse
-	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
-	fperms 0750 /var/{lib,log}/synapse /etc/synapse
-	newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}"
-	systemd_dounit "${FILESDIR}/synapse.service"
-}
-
-pkg_postinst() {
-	optfeature "Improve user search for international display names" dev-python/pyicu
-	optfeature "Redis support" dev-python/txredisapi
-	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo
-		elog "In order to generate initial configuration run:"
-		elog "sudo -u synapse synapse_homeserver \\"
-		elog "    --server-name matrix.domain.tld \\"
-		elog "    --config-path /etc/synapse/homeserver.yaml \\"
-		elog "    --generate-config \\"
-		elog "    --data-directory /var/lib/synapse \\"
-		elog "    --report-stats=no"
-		einfo
-	else
-		einfo
-		elog "Please refer to upgrade notes if any special steps are required"
-		elog "to upgrade from the version you currently have installed:"
-		elog
-		elog "  https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
-		einfo
-	fi
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index dfffe336166a..df87b230242e 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
index 105c47020168..a6883a9ea321 100644
--- a/net-libs/libiio/Manifest
+++ b/net-libs/libiio/Manifest
@@ -1,4 +1,6 @@
 DIST libiio-0.24.tar.gz 482936 BLAKE2B cd8dce7af7bbafcb10c08722871d3d9abe089cb22fc3a0ada97905a1c5f96c55905980b8511178d662e9316b7ffdada6e84c29b5cbf1ca92b2d53b02d1ac8cfe SHA512 4e7b54870e986e6ba5860ccd8ad6ece4808c21e27a9d3975065f096bac0b035e65bbc68931023c19e69b72006294c3863bfb7272853b5fb1401b77eec88a89fd
+DIST libiio-0.25.tar.gz 518247 BLAKE2B 9b3190b5c69fc9fc624f4b0c686cace828fc34219a986a306ffba6b4c2a4f3b8c60cd8d5c67c350033d83ecdaeb010559318bbf76f0b0565bdbcbe119d85e097 SHA512 e0f2f5545b4c78d1f0f56b037db6e363aab01aad69af3a095b3546af74dab6effe0b00f5c336ef799a739f76c5f16ab76a6b8e823508861edd2745a9d3fd2599
 EBUILD libiio-0.24.ebuild 861 BLAKE2B 991c35a32f296dbf1f0d74d9014f6b808b90c283d8588db6bd333ccad5ecbd99237ea84341d6297ffadc5fa1edc10efa943aa0eb6e070953125a764d189eae12 SHA512 f9838ba653221d2a554b32f62a1acf190b813479183b66bd29cc1186c388f7744f3048f5cbcd9cdd4c8d7f8ac11c50b06321232cebe588986179856ba150e414
-EBUILD libiio-9999.ebuild 646 BLAKE2B f0aab4ca851902093054483125caa8eb716837fa79068db1d161bb0c25452b31cb87b1309481c485bdb33796b24894a62985e6a2a44d950927304fe61a7bb63a SHA512 b5e15bcacc13feea24df1b35f288eb44a204c707ba321faac6a7ce13173e7e792a69c3698e3e941996e50c845cfcaa432dd76f407a4c5b093def967122c7d829
+EBUILD libiio-0.25.ebuild 1214 BLAKE2B 7f57d24bc038cd4b013b5c9a839b186a08e5229b7a6097d3e1bf561bb2e60790b3de455804f05ccc46ac24a8dbcd807178b718bf9e97fd23e016bacebb1bd89f SHA512 9539539d8043eb8de53899ecab1d40376e17764bd2df7ab12a219221f6f5d442ccf7d6f7b4882ceb5fba32d9f6f7f39ead477fa1ec85e3843de88dc182e1dc97
+EBUILD libiio-9999.ebuild 1214 BLAKE2B 7f57d24bc038cd4b013b5c9a839b186a08e5229b7a6097d3e1bf561bb2e60790b3de455804f05ccc46ac24a8dbcd807178b718bf9e97fd23e016bacebb1bd89f SHA512 9539539d8043eb8de53899ecab1d40376e17764bd2df7ab12a219221f6f5d442ccf7d6f7b4882ceb5fba32d9f6f7f39ead477fa1ec85e3843de88dc182e1dc97
 MISC metadata.xml 507 BLAKE2B 505f5ab82f68dd736cfc6ee3433576894fcaa76cbce1c37e98973150fbd8e99026f6da3fe9c5a91626c61b2c1c9a7d85180a16ca822e5f0d0984902957eb5d7e SHA512 f7c7fd7619c757d20eb2255e6b5b2ccf1ae21e7b5fd1ce55210528d009fa8d516656bef0f7ef4ad7e99ed4cab26febfb4421b53de92a8203496558c6963eb6c8
diff --git a/net-libs/libiio/libiio-0.25.ebuild b/net-libs/libiio/libiio-0.25.ebuild
new file mode 100644
index 000000000000..089cda96f936
--- /dev/null
+++ b/net-libs/libiio/libiio-0.25.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake udev python-single-r1
+
+DESCRIPTION="Library for interfacing with IIO devices"
+HOMEPAGE="https://github.com/analogdevicesinc/libiio"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="+aio python +zeroconf"
+
+BDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	dev-libs/libxml2
+	virtual/libusb:1
+	aio? ( dev-libs/libaio )
+	zeroconf? ( net-dns/avahi[dbus] )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DNS_SD="$(usex zeroconf)"
+		-DWITH_AIO="$(usex aio)"
+		-DPYTHON_BINDINGS="$(usex python)"
+	)
+	use python && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
index 66f1603cbe68..089cda96f936 100644
--- a/net-libs/libiio/libiio-9999.ebuild
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
 
-inherit cmake
+inherit cmake udev python-single-r1
 
 DESCRIPTION="Library for interfacing with IIO devices"
 HOMEPAGE="https://github.com/analogdevicesinc/libiio"
@@ -12,15 +13,42 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-IUSE="+aio +zeroconf"
+IUSE="+aio python +zeroconf"
 
-RDEPEND="dev-libs/libxml2:=
-	virtual/libusb:1=
+BDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	dev-libs/libxml2
+	virtual/libusb:1
 	aio? ( dev-libs/libaio )
-	zeroconf? ( net-dns/avahi )"
+	zeroconf? ( net-dns/avahi[dbus] )"
 DEPEND="${RDEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DNS_SD="$(usex zeroconf)"
+		-DWITH_AIO="$(usex aio)"
+		-DPYTHON_BINDINGS="$(usex python)"
+	)
+	use python && mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/net-libs/libnsl/Manifest b/net-libs/libnsl/Manifest
index a742dc89fcd3..b341348e8fd1 100644
--- a/net-libs/libnsl/Manifest
+++ b/net-libs/libnsl/Manifest
@@ -2,6 +2,6 @@ AUX libnsl-1.3.0-rpath.patch 479 BLAKE2B e500165f8ad8af21f64eb570286d8eefe51547e
 DIST libnsl-1.3.0.tar.xz 321488 BLAKE2B 25cb4fa2b3f161ce4cd06ca5cc0a716bf981620de4eb102f464bc1919b8f6d82f7b02a6108260122000bbac0307d9db05d406183dc533dd1b97683d08a7fc5f5 SHA512 a5a6c3ccb2d1e724c8c1f65e55dcd09383eb1ae019c55f4c09441eadf23ffbc2196cfad259805b0ac40ddf3a10af0da453e4d739d67d46829c64d0995dab4e55
 DIST libnsl-2.0.0.tar.xz 284408 BLAKE2B 843cd0346b45a688c59b88caebd9c5c938b0ef4b5e751b27599ae725a19f0ba2b88bc23b861edc75d79ae6c6bb829e4f82e9e3cd994d25d3385b1a75b9b58b8e SHA512 02ff41d335b7e965182c1f47a6448c1a71ae991a4d5a86ae5472cea7b38633a36b736469cc0d9fc407c706f3f144f90e4b7c9653643976805aa96fc319a69784
 EBUILD libnsl-0-r2.ebuild 556 BLAKE2B a2f19bcb32d1d626d4551e111eee73304540778b3180cfbe32b93c30061b50d7bf64edde886c4003ecf6bf61c52f37b37109db6340fd33b6f1a1604c94ec3340 SHA512 1959a6cecaa5b92ba542b83b756da089c8dfb5b1e8b89159027adb830a6cf13a4015bca1124aeff877898f05718670e4e6d0f19733a42d30f6f2beced7114d1a
-EBUILD libnsl-1.3.0-r2.ebuild 947 BLAKE2B 490faf6aec16d8c70d880da369b9251590013081f0ea66d97f35205b624c72ec3b33616cb83bc68eb710150c51e42f230183dd85582d75f747756f23f0f72a57 SHA512 3b0846f669028294648d603bf32aca1d2916b9a16ee7e8965f86ebd712a8f29b3731af2242a61aaafa5b0592063b7f3fad85484be546f467ea075fa7bb34ba9a
-EBUILD libnsl-2.0.0-r1.ebuild 1235 BLAKE2B 2d43425808e79ae1f163adc5f725bba42d14a4ca5f66847eda759b8f81880523c26957c46326a9f9a4ef717298574f259a703dc68ba3358cf0a4e10a47165a2e SHA512 6704ed03f53815206c546a790f06556b852241b0ef3b23f01f58d57ff5a3250924e52ea60b491f48a632fc20e8583c60376981fa11f551b4f138cad7890e73f8
+EBUILD libnsl-1.3.0-r2.ebuild 951 BLAKE2B 72b573b5ab47b3c0cde28604f869f31d1e66f3cf9e71a2357b576055b5974285a7f98646c00cad7aa5bceedf52e339f8c661822b04b3e076d32a70f851d82496 SHA512 67267e0d874d6d67fb92defe07c12701e9d2b1f8019680759d146c91a857fe093b997faf85e22c538ea4833d85222cbf0a5014cc4a1ce8cc6a2d04fd06aaadf3
+EBUILD libnsl-2.0.0-r1.ebuild 1239 BLAKE2B d99b268d9ed8880f0bdaa46dbfe3b69dcb670a8c680e4f5a3c086ef731d94c75cf5cd9edc1bd10eaebc62c643514302d22161e8167ea924dc8cd0b4db1d3d87f SHA512 1bffd3f8272dbd808269168440c878a08268e6639420d53d84ae3212116c0faa253b84968d18263b341e2d50232ce1e9b93e2792ecf61b56d33405556dbdf74e
 MISC metadata.xml 467 BLAKE2B 2d74b806716719c1934f23891142a8d0637a8d18b9d4d135f5bd81171c0014f74e5ba29f84cccc5b05ed93c565e067890b6790aedcb6017431483657cbb1eb68 SHA512 2b506946ace202df654cd398987122955c32d0cb42df1cd5cb159178b6c5df7786c33a309515fd43e2e130dde936536200af1beea2f973efcada4e4dd915d3ce
diff --git a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
index cdf792d83342..45c7eb9eb842 100644
--- a/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
+++ b/net-libs/libnsl/libnsl-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/thkukuk/libnsl"
 SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 SLOT="0/2"
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-2.1+ BSD"
 
 # Stabilize together with glibc-2.26!
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
index 8e1a8de95539..1c3bde051d1e 100644
--- a/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
+++ b/net-libs/libnsl/libnsl-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/releases/download/v${PV}/${P}.tar.xz"
 # with FEATURES="-preserved-libs" or another package manager if SONAME
 # changes.
 SLOT="0/3"
-LICENSE="LGPL-2.1+"
+LICENSE="LGPL-2.1+ BSD"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index a000c035dc49..c612d4bca80a 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 3ffa033276d4..2c88c6067862 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,6 @@
 DIST nanovna-saver-0.5.4.tar.gz 494010 BLAKE2B 71e4292e33dbb5b055e7ddd3a29222a67e05b1af431eaee64b613e50648b0b91ad5446cc2d3af868ae624826caf871bff9062275239298c29de261d741bad1f4 SHA512 6600b3c83fc1dcaf81a85b1d14087d2067327098c486011c8bfbaba83e06ca1081c6f7045730a58f097bab332072139707ea23c037924624d2f8100a7b61acb7
+DIST nanovna-saver-0.6.2.tar.gz 579583 BLAKE2B aa10f8272a63e42f35f5c395203bc1101f2a166bc29274cf28385fa7aab33d89953fdcf4595fadeed25abb2b6c02948307a1576738bd421cd648f7ef2a953bc9 SHA512 d5c548ffda24d8ca69a30cdda4afc1473afa5f5c3fecf2cee17e65e16fd46bee0dc274d5d597c5bb354c7251870e1f3ba0bd61a43f0af424db5403c5694713b5
 EBUILD nanovna-saver-0.5.4.ebuild 1273 BLAKE2B 0d4fbdfb5f9d43da42816fdb80f7dedda810f3280c40b50705eb086c598e7616227719bdb8a83ed37105a3380557b4b158d64f41e1a48bf06f27f623eabbd89d SHA512 08857031cd10edb52931b5a78d687e62470039228a8d8f02efaf7e98759db9cb0d5bbf2fdb2b3de0c97317205e184d612dd4beafaef31eb6796895a27b52e8f2
-EBUILD nanovna-saver-9999.ebuild 1275 BLAKE2B 941fdc3687f3b37fb2d91c08d068e3fd72adab3deb53b3695ee3dc1a8887558e8a340c35ab98d4dd5706909c7506bbc4d8083dc7138d3c05159f480d764c09ae SHA512 d7c300847a171c883d670846d37274f77f4f8a04631e4580598944a25ebcad9698bcd964b852cd0d70685e14042fd13f144181d0ba605a6b6a6b36aa9cece184
+EBUILD nanovna-saver-0.6.2.ebuild 1160 BLAKE2B 880e3bad18ae1d45eb876847558444c855d946023ce4a50f871beca2e2f2d82f68bfe8099dd152ae38db823159fee24cba9fc8498a1540104638729e9ebf81d4 SHA512 cce07f6718a27fb9b94e913f262020895525ad3283eefbb1a9c7e53dfccdc21fc1bd0970e41a377178e167bff80267f5e82f057bfe0463228ba26489c26d43ef
+EBUILD nanovna-saver-9999.ebuild 1160 BLAKE2B 880e3bad18ae1d45eb876847558444c855d946023ce4a50f871beca2e2f2d82f68bfe8099dd152ae38db823159fee24cba9fc8498a1540104638729e9ebf81d4 SHA512 cce07f6718a27fb9b94e913f262020895525ad3283eefbb1a9c7e53dfccdc21fc1bd0970e41a377178e167bff80267f5e82f057bfe0463228ba26489c26d43ef
 MISC metadata.xml 543 BLAKE2B 04c50e81948a367bbe842cc1471471c482a5f813c90d7f98fb5af27868700496d4edc08aabd9d4a0674c556a467ab03a83f7b356039b1fc92e41e301e682f739 SHA512 e250acfe7bae2e5673270f4af746aca72a3d50b5b248cd70cf2a2f87aa30ce74d505fbf806cf5f7809be1aafad631f4e68a83aa13622dfdbbf498107f888bcab
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
new file mode 100644
index 000000000000..f9bae222d086
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_install() {
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index b34fe28b25d0..f9bae222d086 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -17,7 +17,8 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
 else
 	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
 fi
 IUSE=""
 
@@ -25,21 +26,13 @@ DEPEND=""
 RDEPEND="${DEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+	dev-python/PyQt6[${PYTHON_USEDEP},gui,widgets]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]"
-BDEPEND=""
+BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	sed -i -e "s/48.png/48/" \
-		-e "s/TerminalOptions=/#TerminalOptions=/" \
-		-e "s/Path=/#Path=/" NanoVNASaver.desktop || die
-	sed -i "/nanovnasaver/d" setup.py || die
-	eapply_user
-}
-
 python_install() {
 	distutils-r1_python_install
 }
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 6dee893210ab..d3aaf03a34dd 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,5 @@
+AUX urh-2.9.4-no-numpy-setup.patch 473 BLAKE2B 0ab6a8f42fd5ae3fc1bb042596040f875dfec3765ecc0ba624758b156942dc59e7851d75e6230667692f28eda56f063301a5fbe292c3a88176f8b93899bc1d01 SHA512 f7369b6b6dfff596d46067b615c5271899ab8f2a6b1a67042c169b2f89d777cd3aa2e6d412cb8458c3eaa7f377db5db2a687f6be9249c5dbd696cd2edc763028
 DIST urh-2.9.4.tar.gz 13415656 BLAKE2B 504cb073540f614eea070a7aaa83ac62f81c6a115a01f935cfc39baec37bc1deb5b56035100700825f41b21ec0937d6014f0d0b73debcbf9ca951e238805d64b SHA512 a888c20a4d2f349960e41defdb5cce6590d4523f8a1a655e21e4caaf7dd98a6f51936fa5a038787cb5935bc42e8863d2940059130dc9982caeea4b80e431aeeb
-EBUILD urh-2.9.4.ebuild 2542 BLAKE2B edb86cb28d011030a79c04784861b53ef8698f3cd8f35eb772cc71b1fcebc75e6bb490914022a74875a49e39654598ea5a5a913f9cfbcad571fbae0ad0f388a0 SHA512 6d2c8772e6b60b736900a5c2dbd2f12d5bde1a3ab6ce7f39a2d63679c5b3c52628da44bcebbe6ba7306a7d889db6d05a5f04d767b0242b3a3661853c4654d016
-EBUILD urh-9999.ebuild 2542 BLAKE2B edb86cb28d011030a79c04784861b53ef8698f3cd8f35eb772cc71b1fcebc75e6bb490914022a74875a49e39654598ea5a5a913f9cfbcad571fbae0ad0f388a0 SHA512 6d2c8772e6b60b736900a5c2dbd2f12d5bde1a3ab6ce7f39a2d63679c5b3c52628da44bcebbe6ba7306a7d889db6d05a5f04d767b0242b3a3661853c4654d016
+EBUILD urh-2.9.4.ebuild 2591 BLAKE2B edd953cd1557981d87037df9aac707cd5acf0d47794d38d23704f0073bee2d21b154a442302688d7b8e463bcea59543855df7fe6d493e8f1a26470e0940cc1ad SHA512 38bf2256ef04cfe184c99655174dd135cdd8becad51b3bb1adad8ebf6475b6c30c180c1956de028266b4448d25b435e0b8c6e09d66d466f43881f54220e8e468
+EBUILD urh-9999.ebuild 2638 BLAKE2B 914eb114d22d0279b8faab509b333b1b0593f2150901418ac1a53e8f61bf4b5aa8dbd00d5dd67bfd772af2eba697ad429bb1abb84f2e0b3715d7bc15f623afeb SHA512 af3f20a2efd9c80efc6121d2c101dcd6be8ed539ba772f1529f5bed22e05825d7c3b613c02e8d853b8dba0d067aec2afdb6b6c54063d722381a4195da69b56f7
 MISC metadata.xml 1291 BLAKE2B ac1d540ddc87f3331c498b62d35204ce179cb3e329602e50f440d9bb0511a9096b7a1a40ac06a182716d32ede54cbcd2137e17ab76553cf58991623e343ec9dd SHA512 879febeeae3cef3a1ffd9e84fb65a70042c6a95fc0524d57a7fb5ad7d5a041371f041e2d804ed24d835911d41fcff5d42ac4a30a4b903ffddcefbb770123336b
diff --git a/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
new file mode 100644
index 000000000000..4beca0eed64f
--- /dev/null
+++ b/net-wireless/urh/files/urh-2.9.4-no-numpy-setup.patch
@@ -0,0 +1,11 @@
+diff -Naur urh-2.9.4-orig/setup.py urh-2.9.4/setup.py
+--- urh-2.9.4-orig/setup.py	2023-08-20 20:31:45.067321480 -0400
++++ urh-2.9.4/setup.py	2023-08-20 20:31:55.088320822 -0400
+@@ -50,7 +50,6 @@
+         print("Finalizing options")
+         _build_ext.finalize_options(self)
+         # Prevent numpy from thinking it is still in its setup process:
+-        __builtins__.__NUMPY_SETUP__ = False
+         import numpy
+         self.include_dirs.append(numpy.get_include())
+ 
diff --git a/net-wireless/urh/urh-2.9.4.ebuild b/net-wireless/urh/urh-2.9.4.ebuild
index 503e4800fdec..fbf539dbce42 100644
--- a/net-wireless/urh/urh-2.9.4.ebuild
+++ b/net-wireless/urh/urh-2.9.4.ebuild
@@ -33,9 +33,9 @@ DEPEND="${PYTHON_DEPS}
 		audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
-		limesdr? ( net-wireless/limesuite:= )
+		limesdr? ( net-wireless/limesuite )
 		plutosdr? ( net-libs/libiio:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
+		rtlsdr? ( net-wireless/rtl-sdr )
 		sdrplay? ( <net-wireless/sdrplay-3.0.0:= )
 		uhd?    ( net-wireless/uhd:= )"
 RDEPEND="${DEPEND}
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 
 distutils_enable_tests pytest
 
+PATCHES=( "${FILESDIR}/${P}-no-numpy-setup.patch" )
+
 python_configure_all() {
 	DISTUTILS_ARGS=(
 			$(use_with airspy)
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index 503e4800fdec..ed1d620f7de7 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -33,9 +33,9 @@ DEPEND="${PYTHON_DEPS}
 		audio? ( dev-python/pyaudio[${PYTHON_USEDEP}] )
 		bladerf? ( net-wireless/bladerf:= )
 		hackrf? ( net-libs/libhackrf:= )
-		limesdr? ( net-wireless/limesuite:= )
+		limesdr? ( net-wireless/limesuite )
 		plutosdr? ( net-libs/libiio:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
+		rtlsdr? ( net-wireless/rtl-sdr )
 		sdrplay? ( <net-wireless/sdrplay-3.0.0:= )
 		uhd?    ( net-wireless/uhd:= )"
 RDEPEND="${DEPEND}
@@ -45,6 +45,8 @@ RDEPEND="${DEPEND}
 distutils_enable_tests pytest
 
 python_configure_all() {
+	# Using sed in the live ebuild to avoid patch failure
+	sed -i '/__NUMPY_SETUP__/d' setup.py || die
 	DISTUTILS_ARGS=(
 			$(use_with airspy)
 			$(use_with bladerf)
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 8813dbff8f4a..00097adcce93 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index bad55a1fe8c5..fac660ac487b 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -30,10 +30,6 @@ sys-libs/compiler-rt-sanitizers -asan -lsan
 # USE=java depend on virtual/jdk:1.8 which is not support on RISC-V
 app-office/libreoffice java libreoffice_extensions_scripting-beanshell libreoffice_extensions_scripting-javascript
 
-# Sam James <sam@gentoo.org> (2023-01-27)
-# media-libs/shaderc not keyworded here
-games-action/supertuxkart vulkan
-
 # Mike Rivnak <rivnakm1@gmail.com> (2022-11-30)
 # luajit is currently not supported on riscv
 app-editors/neovim lua_single_target_luajit
diff --git a/profiles/package.mask b/profiles/package.mask
index 0810410a06ca..6c3ccc93e494 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -721,7 +721,9 @@ app-office/texmacs
 # switch the compiler / the binutils) ASAP. If you need them for a specific
 # (isolated) use case, feel free to unmask them on your system.
 <sys-libs/glibc-2.36-r5
-<sys-devel/binutils-2.38
+<sys-libs/binutils-libs-2.40
+<sys-devel/binutils-2.40
+<sys-devel/binutils-hppa64-2.40
 
 # Michael Orlitzky <mjo@gentoo.org> (2017-01-07)
 # This package has some dangerous quality and security issues, but
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 1237c1bce83c..e7ee2fdcfa6f 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 425bb41dd36e..4c5310e8b2da 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -7,7 +7,6 @@ DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79ed
 DIST binutils-2.40-patches-5.tar.xz 293628 BLAKE2B b7ed1d1fbf38b420661f984b9519b3d863da45b2a873773a521310021b0c1d5d7c24c152adb3e8a999d40f5619c0e54962114590ec9528380089977af0c30b74 SHA512 6e6df932b18ca20fe245b3ff8d3d06dbdae4daadaec3b668fa44e086d4e8ff56439681b2d810ebc74173b6348020edacb176e8c3cbf20657cce04297b97f4f83
 DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd2490cb72376f2cb6c6a60030d8c6b71357150d956a1e71d91683d43b571cb5bf738270880f72ef175d6c8faa257b090abeb8b SHA512 984dab529276ab4f9d215f643c7c18bd1793f438aaad0be158d209787c9c4a6bb68b10bec2065d3fe14a1594d5f1c29f55b2e9bac34a6f489f4b466c02e24766
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
-DIST binutils-2.41-patches-1.tar.xz 13260 BLAKE2B b7431ec92d5ce0e5d4438b31ca356c8d5366bee9aa8ff2f098a77c2add5b7539f733d0a18988337490af34c9192affbb6ccdf56b97413a8dca3192fb2125b313 SHA512 30548e4f3187444dbfa82587b5b8a0d2ab9d536aa06a572393a195649759149124d79c488c07919850c7ed4940481b852462d5a1aa52ed9162d81d6d3b290377
 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432
 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 EBUILD binutils-hppa64-2.37_p1-r2.ebuild 13273 BLAKE2B 2dd83c1466b42667496a8a37c40a2df498dd7b1de4ecd78a5583cd77ff27befa2bb22110e24622149b4a85c212f03e2a064aa961c13a966123eb8744caf02aa8 SHA512 e9575a12a0a13047c687c918c16ec4c3b93e10f26cb88add82ae1c2bb8f57c7619bc41a6586e231940412ae3974e327acdae567ce4e0e0523f2b654aadfb607b
@@ -16,5 +15,4 @@ EBUILD binutils-hppa64-2.39-r5.ebuild 14291 BLAKE2B ed455cc6b3d903e86b9477d0ca3a
 EBUILD binutils-hppa64-2.40-r5.ebuild 14291 BLAKE2B f700c11b97fb2a02b4f6b530267067881df752a516eb82004d83322ecaf5d92c77a7b6f8d61e5b2bb1bd0ff037c463f9e9399ecdbb02dbc625385194e14ce1a0 SHA512 216fe8f2d49b3d14c7c26633a77977af39ee97947298ff7103c83767ff2c3869d01ef9647d75b95a059dffbc104286ba327cafb34fec3accc220d3df30a394d2
 EBUILD binutils-hppa64-2.40-r7.ebuild 14292 BLAKE2B 559d55be5058b2b4f302948add5f18977c4f5bd5966cd9186a5fbf6bb09b4bca17b84add34b948981a1d2365a0ee2a98f4a2b97a829260926155632e77a51d22 SHA512 ea0ec36bf8351959c6386b4fcd3b3eed5e71c3209ff8913fc6ceb1fab4e09566e8307f02300b8e1b16646b3373e0e84839937a3b7540fe9119d1e4c65788d014
 EBUILD binutils-hppa64-2.41-r1.ebuild 14477 BLAKE2B 8dbf797d8ae375ad69b782c1a9aa177ca3b455aa855ea395d5b1288683c633c305e6ac0d9ef5cef787903196b289f7974a39e35cfff7fa285544f282027b2881 SHA512 4cd54b9315066940a83a292d8ff44742407fa5912694c40e3d263495a8f3e51849a5c596ec013004b20d6537ebcf9c251cfa3b46b8f8181bd9644f0f2d0c5439
-EBUILD binutils-hppa64-2.41.ebuild 14477 BLAKE2B 4e574f2a3f8616fad8657afc0d575c8f83456d56b3cc20a4e953d53f5f968dc636b496013a6f830d39bc883e9b71903f066904ad55f6ea841cf296b92b00197e SHA512 fefb9d46bf5cd3b687b76542a1febfd859de8187301a8ee38175b5d44cd5571e00f1bf74f1f69a37903bab7158fe096aa5579555e70bcec913ad81c804798cfa
 MISC metadata.xml 1004 BLAKE2B 069a799bb001c8c22afecebe6156098546f39e9e03c2ac194172ef6f0f49de976db90bfef03c634cdb696d9484d38bb5f2abb3fcbf7c6cda7cb14a39e5f4a87f SHA512 faa4cb332dd6eeff2ecd4dbfec67693bffcaafba588fb2ef6f64ea5e978c24646d0a555c39983497e660be1cd0518bf15dbc03f89584533f9271d58afb4a3f56
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.41.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.41.ebuild
deleted file mode 100644
index c94f482160a4..000000000000
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.41.ebuild
+++ /dev/null
@@ -1,508 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CTARGET=hppa64-${CHOST#*-}
-
-inherit libtool flag-o-matic gnuconfig multilib strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-
-LICENSE="GPL-3+"
-IUSE="cet default-gold doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla"
-REQUIRED_USE="default-gold? ( gold )"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	KEYWORDS="-* ~hppa"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	sys-devel/flex
-	app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR="${WORKDIR}"/build
-S="${WORKDIR}"/${P/-hppa64/}
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		S="${WORKDIR}"/binutils
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		EGIT_CHECKOUT_DIR="${S}"
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered, bug #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible, bug #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through, bug #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}" || die
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-		if use default-gold; then
-			myconf+=( --enable-gold=default )
-		fi
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-	# logic in toolchain.eclass. bug #446946
-	#
-	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# libiberty's or bfd's configure.
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option, bug #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-
-		# These hardening options are available from 2.39+ but
-		# they unconditionally enable the behaviour even on arches
-		# where e.g. execstacks can't be avoided.
-		# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-		#--enable-warn-execstack
-		#--enable-warn-rwx-segments
-		#--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing)
-
-		# Things to think about
-		#--enable-deterministic-archives
-
-		# Works better than vapier's patch, bug #808787
-		--enable-new-dtags
-
-		--disable-jansson
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. bug #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		# Avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Avoid automagic dev-libs/msgpack dep, bug #865875
-		--without-msgpack
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We can enable this by default in future, but it's brand new
-		# in 2.39 with several bugs:
-		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
-		$(use_enable gprofng)
-	)
-
-	if ! is_cross ; then
-		# No LTO for HPPA64 right now as we don't build kgcc64 with LTO support.
-		myconf+=( $(use_enable pgo pgo-build) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}" || die
-
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin || die
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-	cd "${ED}"/${LIBPATH} || die
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH} || die
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-} || die
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			# No die for now, dies on hppa?
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		# TODO: add || die here, fails on hppa?
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
-		rm -r "${ED}"/${LIBPATH}/lib
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}" || die
-		dodoc README
-
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info} || die
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# the hppa64 hack; this should go into 9999 as a PN-conditional
-	# tweak the default fake list a little bit
-	cd "${D}"/etc/env.d/binutils
-	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 3de9980e9d55..fd8c7e46e3aa 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -22,10 +22,8 @@ DIST binutils-2.38.tar.xz 23651408 BLAKE2B 19ede396ec97b88e632aded2f69f4684cc505
 DIST binutils-2.39-patches-6.tar.xz 92380 BLAKE2B 39f490f1134fb0e7dc80924a280d3113efe0ed094ee15de97c42ab751c83d2f5aa7448966d8cbbcde722b2af4999a36c1e5aa2f37ca6d2e3942b97b6d90ff152 SHA512 213cd7a86da83987966675f3195e843d898ca4ff412dfc29fd33ed80adb7bbf80a0b2919cd8e7dd49208c73a621ab7b720970f2259418bdc82ed2a568ff62064
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
 DIST binutils-2.40-patches-5.tar.xz 293628 BLAKE2B b7ed1d1fbf38b420661f984b9519b3d863da45b2a873773a521310021b0c1d5d7c24c152adb3e8a999d40f5619c0e54962114590ec9528380089977af0c30b74 SHA512 6e6df932b18ca20fe245b3ff8d3d06dbdae4daadaec3b668fa44e086d4e8ff56439681b2d810ebc74173b6348020edacb176e8c3cbf20657cce04297b97f4f83
-DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd2490cb72376f2cb6c6a60030d8c6b71357150d956a1e71d91683d43b571cb5bf738270880f72ef175d6c8faa257b090abeb8b SHA512 984dab529276ab4f9d215f643c7c18bd1793f438aaad0be158d209787c9c4a6bb68b10bec2065d3fe14a1594d5f1c29f55b2e9bac34a6f489f4b466c02e24766
 DIST binutils-2.40-patches-7.tar.xz 299188 BLAKE2B 170cd2432e0458889b240c3603461d0b4bfa62d5314634b101a629db455d87235ac14ad44c63920b713d5235fa8b73902960df1019153873ef06a33aa7050b4b SHA512 a60da163caee68fe1fa355385d404e8998ebed0e390d50e0713e95334733a8b4e37bc63d522817284c027953e43848dbc98042461a47131fb53bc69203b4ee87
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
-DIST binutils-2.41-patches-1.tar.xz 13260 BLAKE2B b7431ec92d5ce0e5d4438b31ca356c8d5366bee9aa8ff2f098a77c2add5b7539f733d0a18988337490af34c9192affbb6ccdf56b97413a8dca3192fb2125b313 SHA512 30548e4f3187444dbfa82587b5b8a0d2ab9d536aa06a572393a195649759149124d79c488c07919850c7ed4940481b852462d5a1aa52ed9162d81d6d3b290377
 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432
 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 EBUILD binutils-2.32-r2.ebuild 12208 BLAKE2B 0ee98e7c366617db619f650327c4c645c31102ed5232262655e03e396a624741d265129721472e42b0aadaa45383bb357fba08ecd09fa1f8c1e2c14909a64383 SHA512 d8c265716f7fd6ae9bc1bdf4571bb626681ac7073b094cca020f1d795a644943eac244efdec6299c7ab6b26624d10f041dddeb1fc879953f4427c03f5d7e18ac
@@ -37,10 +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-r6.ebuild 14463 BLAKE2B 7cb15b48dee4fac6c52e4fd9ec823317fc271531ee2b124c22d6c4aa419f4eab5b5718c6fbdf0a3cc144d06d9427c1f245dcda7ad2ed45210662ef8bf87918c1 SHA512 3552a0dda275d071abd33a5f2b51889b05d1e0f6fe51dffd9542f29fb1e9858f5ff64f359cc5eac8c72afa2c00b1aa957b6d43b6c87662ee17241e7fbc0c6e2a
-EBUILD binutils-2.40-r7.ebuild 14463 BLAKE2B 2c498c5db7ff038959bdd23eaf9453bf6187642165e50d2f2fc37098f5be190af0d25f165c1a833d267cd7790b603e30ea4671a062bf942d9ae99712bf0038ba SHA512 7a5d067be65b89a4daa67a13f2ea882c5acbb558c14d537dddf7b44cd1708b8f0d0b0d8303415911de34ae9369a8c73fb3d2f6b11fc4c327adc68c57bddf7ca6
 EBUILD binutils-2.40-r8.ebuild 14655 BLAKE2B 787d3651accae7dcaa1087531c4ab33f84d39c2805bf3c43b684fcc11126b44bd5f9a5a2a3d8ddf352deb9a284567c7430c37513e00022ee3e783df7ba271631 SHA512 f514491d9d7da809e5dfee390af8be1977d680ec3c8331e01de2feaf25ab9c70f9a1cc563a57d819a4bf9aa0b7351c6c9c2aa12b61a57902a2b23b3a42850768
 EBUILD binutils-2.41-r1.ebuild 14985 BLAKE2B 2a0bc6b83f5d6cd939dffe24930bda9521627335b5d8cad88ab0e1b5e34619634bc304fb33883421e36fcfc5a76afe81bd94e7d39c96d8784217aaf8899ebd28 SHA512 8adb901fcd2a56fb8061e7fc207a00a1fb359e9fce700f9608269e541fb77b382a7ac92bb7e79f807b2f67c670de758b1389af7a5804beab6cba2e7e2363ad45
-EBUILD binutils-2.41.ebuild 14985 BLAKE2B 23dea5b34212deeaa8335e1be61b56357f678a76add7fc2f89c6a99a81863f17f5364f959209348d80b360a7d7b7eb0df5bd65a1a11a8bc24765ae9a2a572a73 SHA512 6ed2705f5e184a2bf5d1f9d29b05df410602a3fefdf46db81974f0b6a1e04e9fb0362c037617a4cf97331121822e7a8f11907265509f52033e5f16e1bb4504a2
 EBUILD binutils-9999.ebuild 14986 BLAKE2B b9c60b13ff366fe5e6440d1d5c720139a0ca4c9312b6d3d1cb24daed5d25c3054b1673bf359a89dc89518e50d2358ce4e58a3528205ad3580643f08e55fb05f7 SHA512 3c90553e49991331820df8cd55c3c1b56786386f08668522f00aa42a10caec550da17d4eb4b086415ab904b67b0e5736bc3db92369c67d4cece7ff4057ff2325
 MISC metadata.xml 995 BLAKE2B 85ccdd924f8c459a4cd7e608dff59c7281523da0d9457b0094b97e140cd07a300cb38383d9402808859100ca0bf219ce86e367bb5282216121bd81f68d588c17 SHA512 3ee538640e5d8c0efe6b8cf1de299e0d78965dece1ad814384844e8e24db72b11ca30d5fb68dfae2e71046d35aee0e71ee3ecbda3730ca49446dd0b2cd0f817c
diff --git a/sys-devel/binutils/binutils-2.40-r6.ebuild b/sys-devel/binutils/binutils-2.40-r6.ebuild
deleted file mode 100644
index ff5ebb262fb2..000000000000
--- a/sys-devel/binutils/binutils-2.40-r6.ebuild
+++ /dev/null
@@ -1,504 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-
-LICENSE="GPL-3+"
-IUSE="cet debuginfod doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=5
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-	debuginfod? (
-		dev-libs/elfutils[debuginfod(-)]
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	zstd? ( virtual/pkgconfig )
-	sys-devel/flex
-	app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-
-			# 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
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered, bug #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible, bug #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through, bug #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-	use cet && filter-flags -mindirect-branch -mindirect-branch=*
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}" || die
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-	# logic in toolchain.eclass. bug #446946
-	#
-	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option, bug #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-
-		# These hardening options are available from 2.39+ but
-		# they unconditionally enable the behaviour even on arches
-		# where e.g. execstacks can't be avoided.
-		# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-		#--enable-warn-execstack
-		#--enable-warn-rwx-segments
-		#--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing)
-
-		# Things to think about
-		#--enable-deterministic-archives
-
-		# Works better than vapier's patch, bug #808787
-		--enable-new-dtags
-
-		--disable-jansson
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		$(use_with zstd)
-
-		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. bug #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		$(use_with debuginfod)
-
-		# Avoid automagic dev-libs/msgpack dep, bug #865875
-		--without-msgpack
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We can enable this by default in future, but it's brand new
-		# in 2.39 with several bugs:
-		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
-		$(use_enable gprofng)
-	)
-
-	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake V=1 info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}" || die
-
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k V=1 check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin || die
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-	cd "${ED}"/${LIBPATH} || die
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH} || die
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-} || die
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die
-		rm -r "${ED}"/${LIBPATH}/lib || die
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}" || die
-		dodoc README
-
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.40-r7.ebuild b/sys-devel/binutils/binutils-2.40-r7.ebuild
deleted file mode 100644
index bad301c3d31b..000000000000
--- a/sys-devel/binutils/binutils-2.40-r7.ebuild
+++ /dev/null
@@ -1,504 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-
-LICENSE="GPL-3+"
-IUSE="cet debuginfod doc gold gprofng multitarget +nls pgo +plugins static-libs test vanilla zstd"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=6
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-	debuginfod? (
-		dev-libs/elfutils[debuginfod(-)]
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	zstd? ( virtual/pkgconfig )
-	sys-devel/flex
-	app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-
-			# 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
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered, bug #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible, bug #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through, bug #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-	use cet && filter-flags -mindirect-branch -mindirect-branch=*
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}" || die
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-	# logic in toolchain.eclass. bug #446946
-	#
-	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.27) offer a configure flag now.
-		--enable-relro
-		# Newer versions (>=2.24) make this an explicit option, bug #497268
-		--enable-install-libiberty
-		# Available from 2.35 on
-		--enable-textrel-check=warning
-
-		# These hardening options are available from 2.39+ but
-		# they unconditionally enable the behaviour even on arches
-		# where e.g. execstacks can't be avoided.
-		# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-		#--enable-warn-execstack
-		#--enable-warn-rwx-segments
-		#--disable-default-execstack (or is it --enable-default-execstack=no? docs are confusing)
-
-		# Things to think about
-		#--enable-deterministic-archives
-
-		# Works better than vapier's patch, bug #808787
-		--enable-new-dtags
-
-		--disable-jansson
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		$(use_with zstd)
-
-		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across
-		# {native,cross}/binutils, binutils-libs. bug #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		$(use_with debuginfod)
-
-		# Avoid automagic dev-libs/msgpack dep, bug #865875
-		--without-msgpack
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We can enable this by default in future, but it's brand new
-		# in 2.39 with several bugs:
-		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
-		$(use_enable gprofng)
-	)
-
-	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake V=1 info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}" || die
-
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k V=1 check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin || die
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-	cd "${ED}"/${LIBPATH} || die
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH} || die
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-} || die
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die
-		rm -r "${ED}"/${LIBPATH}/lib || die
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}" || die
-		dodoc README
-
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/binutils-2.41.ebuild b/sys-devel/binutils/binutils-2.41.ebuild
deleted file mode 100644
index d2afce01c576..000000000000
--- a/sys-devel/binutils/binutils-2.41.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
-
-DESCRIPTION="Tools necessary to build programs"
-HOMEPAGE="https://sourceware.org/binutils/"
-
-LICENSE="GPL-3+"
-IUSE="cet debuginfod doc gold gprofng hardened multitarget +nls pgo +plugins static-libs test vanilla zstd"
-
-# Variables that can be set here  (ignored for live ebuilds)
-# PATCH_VER          - the patchset version
-#                      Default: empty, no patching
-# PATCH_BINUTILS_VER - the binutils version in the patchset name
-#                    - Default: PV
-# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
-#                      for the patchsets
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SLOT=${PV}
-else
-	PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-	PATCH_DEV=${PATCH_DEV:-dilfridge}
-	SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz https://sourceware.org/pub/binutils/releases/binutils-${PV}.tar.xz https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PV}.tar.xz"
-	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
-		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-	SLOT=$(ver_cut 1-2)
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-#
-# The cross-compile logic
-#
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
-
-#
-# The dependencies
-#
-RDEPEND="
-	>=sys-devel/binutils-config-3
-	sys-libs/zlib
-	debuginfod? (
-		dev-libs/elfutils[debuginfod(-)]
-	)
-	zstd? ( app-arch/zstd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? ( sys-apps/texinfo )
-	test? (
-		dev-util/dejagnu
-		sys-devel/bc
-	)
-	nls? ( sys-devel/gettext )
-	zstd? ( virtual/pkgconfig )
-	sys-devel/flex
-	app-alternatives/yacc
-"
-
-RESTRICT="!test? ( test )"
-
-MY_BUILDDIR=${WORKDIR}/build
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
-		git-r3_src_unpack
-		mv patches-git/9999 patch || die
-
-		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
-		git-r3_src_unpack
-	else
-		unpack ${P/-hppa64/}.tar.xz
-
-		cd "${WORKDIR}" || die
-		unpack binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz
-
-		# _p patch versions are Gentoo specific tarballs ...
-		local dir=${P%_p?}
-		dir=${dir/-hppa64/}
-
-		S=${WORKDIR}/${dir}
-	fi
-
-	cd "${WORKDIR}" || die
-	mkdir -p "${MY_BUILDDIR}" || die
-}
-
-src_prepare() {
-	local patchsetname
-	if [[ ${PV} == 9999* ]] ; then
-		patchsetname="from git master"
-	else
-		patchsetname="${PATCH_BINUTILS_VER}-${PATCH_VER}"
-	fi
-
-	if [[ -n ${PATCH_VER} ]] || [[ ${PV} == 9999* ]] ; then
-		if ! use vanilla; then
-			einfo "Applying binutils patchset ${patchsetname}"
-			eapply "${WORKDIR}/patch"
-			einfo "Done."
-
-			# 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
-		fi
-	fi
-
-	# Make sure our explicit libdir paths don't get clobbered, bug #562460
-	sed -i \
-		-e 's:@bfdlibdir@:@libdir@:g' \
-		-e 's:@bfdincludedir@:@includedir@:g' \
-		{bfd,opcodes}/Makefile.in || die
-
-	# Fix locale issues if possible, bug #122216
-	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
-		einfo "Fixing misc issues in configure files"
-		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
-			ebegin "  Updating ${f/${S}\/}"
-			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
-				|| eerror "Please file a bug about this"
-			eend $?
-		done
-	fi
-
-	# Apply things from PATCHES and user dirs
-	default
-
-	# Run misc portage update scripts
-	gnuconfig_update
-	elibtoolize --portage --no-uclibc
-}
-
-toolchain-binutils_bugurl() {
-	printf "https://bugs.gentoo.org/"
-}
-toolchain-binutils_pkgversion() {
-	printf "Gentoo ${PV}"
-	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
-}
-
-src_configure() {
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	# Setup some paths
-	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
-	INCPATH=${LIBPATH}/include
-	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
-	if is_cross ; then
-		TOOLPATH=/usr/${CHOST}/${CTARGET}
-	else
-		TOOLPATH=/usr/${CTARGET}
-	fi
-	BINPATH=${TOOLPATH}/binutils-bin/${PV}
-
-	# Make sure we filter $LINGUAS so that only ones that
-	# actually work make it through, bug #42033
-	strip-linguas -u */po
-
-	# Keep things sane
-	strip-flags
-	use cet && filter-flags -mindirect-branch -mindirect-branch=*
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
-	# https://github.com/gentoo/gentoo/pull/28355
-	# mold needs this too but right now tc-ld-is-mold is also not available
-	if tc-ld-is-lld; then
-		append-ldflags -Wl,--undefined-version
-	fi
-
-	local x
-	echo
-	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
-		einfo "$(printf '%10s' ${x}:) ${!x}"
-	done
-	echo
-
-	cd "${MY_BUILDDIR}" || die
-	local myconf=()
-
-	if use plugins ; then
-		myconf+=( --enable-plugins )
-	fi
-	# enable gold (installed as ld.gold) and ld's plugin architecture
-	if use gold ; then
-		myconf+=( --enable-gold )
-	fi
-
-	if use nls ; then
-		myconf+=( --without-included-gettext )
-	else
-		myconf+=( --disable-nls )
-	fi
-
-	myconf+=( --with-system-zlib )
-
-	# For bi-arch systems, enable a 64bit bfd. This matches the bi-arch
-	# logic in toolchain.eclass. bug #446946
-	#
-	# We used to do it for everyone, but it's slow on 32bit arches. bug #438522
-	case $(tc-arch) in
-		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
-	esac
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
-
-	is_cross && myconf+=(
-		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
-		--enable-poison-system-directories
-	)
-
-	myconf+=( --enable-secureplt )
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	myconf+=(
-		--prefix="${EPREFIX}"/usr
-		--host=${CHOST}
-		--target=${CTARGET}
-		--datadir="${EPREFIX}"${DATAPATH}
-		--datarootdir="${EPREFIX}"${DATAPATH}
-		--infodir="${EPREFIX}"${DATAPATH}/info
-		--mandir="${EPREFIX}"${DATAPATH}/man
-		--bindir="${EPREFIX}"${BINPATH}
-		--libdir="${EPREFIX}"${LIBPATH}
-		--libexecdir="${EPREFIX}"${LIBPATH}
-		--includedir="${EPREFIX}"${INCPATH}
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# libiberty's or bfd's configure.
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		--enable-relro
-		--enable-install-libiberty
-		--enable-textrel-check=$(usex hardened error warning)
-		# Things to think about
-		#--enable-deterministic-archives
-		--enable-new-dtags
-		--disable-jansson
-		--disable-werror
-		--with-bugurl="$(toolchain-binutils_bugurl)"
-		--with-pkgversion="$(toolchain-binutils_pkgversion)"
-		$(use_enable static-libs static)
-		$(use_with zstd)
-
-		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags: https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
-
-		$(use_with debuginfod)
-
-		# Avoid automagic dev-libs/msgpack dep, bug #865875
-		--without-msgpack
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-
-		# We can enable this by default in future, but it's brand new
-		# in 2.39 with several bugs:
-		# - Doesn't build on musl (https://sourceware.org/bugzilla/show_bug.cgi?id=29477)
-		# - No man pages (https://sourceware.org/bugzilla/show_bug.cgi?id=29521)
-		# - Broken at runtime without Java (https://sourceware.org/bugzilla/show_bug.cgi?id=29479)
-		# - binutils-config (and this ebuild?) needs adaptation first (https://bugs.gentoo.org/865113)
-		$(use_enable gprofng)
-	)
-
-	case ${CTARGET} in
-		x86_64-*|aarch64*|arm64*|i[3456]*)
-			# These hardening options are available from 2.39+ but
-			# they unconditionally enable the behaviour even on arches
-			# where e.g. execstacks can't be avoided.
-			# See https://sourceware.org/bugzilla/show_bug.cgi?id=29592.
-			#
-			# TODO: Get the logic for this fixed upstream so it doesn't
-			# create impossible broken combinations on some arches, like mips.
-			#
-			# TODO: Get the logic for this fixed upstream so --disable-* works
-			# as expected.
-			myconf+=(
-				--enable-warn-execstack=yes
-				--enable-warn-rwx-segments=yes
-			)
-
-			if use hardened ; then
-				myconf+=(
-					--enable-default-execstack=no
-				)
-			fi
-			;;
-		*)
-			;;
-	esac
-
-	if use elibc_musl ; then
-		# Override our earlier setting for musl, as textrels don't
-		# work there at all. See bug #707660.
-		myconf+=(
-			--enable-textrel-check=error
-		)
-	fi
-
-	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
-
-		if use pgo ; then
-			export BUILD_CFLAGS="${CFLAGS}"
-		fi
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# Prevent makeinfo from running if doc is unset.
-	if ! use doc ; then
-		sed -i \
-			-e '/^MAKEINFO/s:=.*:= true:' \
-			Makefile || die
-	fi
-}
-
-src_compile() {
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
-
-	# only build info pages if the user wants them
-	if use doc ; then
-		emake info
-	fi
-
-	# we nuke the manpages when we're left with junk
-	# (like when we bootstrap, no perl -> no manpages)
-	find . -name '*.1' -a -size 0 -delete
-}
-
-src_test() {
-	cd "${MY_BUILDDIR}" || die
-
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
-
-	emake -k check
-}
-
-src_install() {
-	local x d
-
-	cd "${MY_BUILDDIR}" || die
-
-	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
-	rm -rf "${ED}"/${LIBPATH}/bin || die
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	# Newer versions of binutils get fancy with ${LIBPATH}, bug #171905
-	cd "${ED}"/${LIBPATH} || die
-	for d in ../* ; do
-		[[ ${d} == ../${PV} ]] && continue
-		mv ${d}/* . || die
-		rmdir ${d} || die
-	done
-
-	# Now we collect everything intp the proper SLOT-ed dirs
-	# When something is built to cross-compile, it installs into
-	# /usr/$CHOST/ by default ... we have to 'fix' that :)
-	if is_cross ; then
-		cd "${ED}"/${BINPATH} || die
-		for x in * ; do
-			mv ${x} ${x/${CTARGET}-} || die
-		done
-
-		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
-			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
-			rm -r "${ED}"/usr/${CHOST}/{include,lib}
-		fi
-	fi
-
-	insinto ${INCPATH}
-	local libiberty_headers=(
-		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
-		demangle.h
-		dyn-string.h
-		fibheap.h
-		hashtab.h
-		libiberty.h
-		objalloc.h
-		splay-tree.h
-	)
-	doins "${libiberty_headers[@]/#/${S}/include/}"
-	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
-		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ || die
-		rm -r "${ED}"/${LIBPATH}/lib || die
-	fi
-
-	# Generate an env.d entry for this binutils
-	insinto /etc/env.d/binutils
-	cat <<-EOF > "${T}"/env.d
-		TARGET="${CTARGET}"
-		VER="${PV}"
-		LIBPATH="${EPREFIX}${LIBPATH}"
-	EOF
-	newins "${T}"/env.d ${CTARGET}-${PV}
-
-	# Handle documentation
-	if ! is_cross ; then
-		cd "${S}" || die
-		dodoc README
-
-		docinto bfd
-		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
-
-		docinto binutils
-		dodoc binutils/ChangeLog binutils/NEWS binutils/README
-
-		docinto gas
-		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
-
-		docinto gprof
-		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
-
-		docinto ld
-		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
-
-		docinto libiberty
-		dodoc libiberty/ChangeLog* libiberty/README
-
-		docinto opcodes
-		dodoc opcodes/ChangeLog*
-	fi
-
-	# Remove shared info pages
-	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
-
-	# Trim all empty dirs
-	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
-}
-
-pkg_postinst() {
-	# Make sure this ${CTARGET} has a binutils version selected
-	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
-	binutils-config ${CTARGET}-${PV}
-}
-
-pkg_postrm() {
-	local current_profile=$(binutils-config -c ${CTARGET})
-
-	# If no other versions exist, then uninstall for this
-	# target ... otherwise, switch to the newest version
-	# Note: only do this if this version is unmerged.  We
-	#       rerun binutils-config if this is a remerge, as
-	#       we want the mtimes on the symlinks updated (if
-	#       it is the same as the current selected profile)
-	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
-		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
-		choice=${choice//$'\n'/ }
-		choice=${choice/* }
-		if [[ -z ${choice} ]] ; then
-			binutils-config -u ${CTARGET}
-		else
-			binutils-config ${choice}
-		fi
-	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
-		binutils-config ${CTARGET}-${PV}
-	fi
-}
-
-# Note [slotting support]
-# -----------------------
-# Gentoo's layout for binutils files is non-standard as Gentoo
-# supports slotted installation for binutils. Many tools
-# still expect binutils to reside in known locations.
-# binutils-config package restores symlinks into known locations,
-# like:
-#    /usr/bin/${CTARGET}-<tool>
-#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
-#    /usr/include/
-#
-# Note [tooldir hack for ldscripts]
-# ---------------------------------
-# Build system does not allow ./configure to tweak every location
-# we need for slotting binutils hence all the shuffling in
-# src_install(). This note is about SCRIPTDIR define handling.
-#
-# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
-# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
-# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
-# Thus we can't just move files around after compilation finished.
-#
-# Our goal is the following:
-# - at build-time set scriptdir to point to symlinked location:
-#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
-# - at install-time set scriptdir to point to slotted location:
-#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e102fae99628..7ecbc18e1934 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 56d786a70019..997986a77ac2 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -2,8 +2,8 @@ AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
 DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33
 DIST eudev-3.2.12.tar.gz 2195743 BLAKE2B 1d2dcc158432f722904f645749420cb44ff98f68b8b8fc11917e83750c95280d0dc2c4d9a322909a4acdb9455c6ec373eade77aacb1039096daa8e642076d3d1 SHA512 da63364e4337515b60a39d354344c03afa1f79d76e264f2ec859c8b8c922595cf24c046e5b0a1bbaa33c5eb6d47632e7853a51bc9304dce2c308318e094a6ec1
-EBUILD eudev-3.2.11-r2.ebuild 6886 BLAKE2B 94227204719bde1e703882979a32202510de947c3581e6e1e7bfe59e9b0e39182685bc56e3c8b2ad2fd009ced10ee9b4668324c882cf04a2a9463ccb3b3e2dbe SHA512 faadb9ca00bbd9b7d8cafc4446fa7c9399c49455d63bcaf0f94a59f7c8d31ff220c5409d94de101c538c4b849f8823c176b8616c0347b7fcdbdb2fe02d8b3080
-EBUILD eudev-3.2.11-r3.ebuild 7126 BLAKE2B 60a375085621231b4e92e942752d46b5a441c1eeebba822521764cedc423fe0564ac48f51ea8900e4ede0fcf54b9af594bab85eb66e0535674949bf8fb8e805b SHA512 7eaea759650fe4ee5cab0a1526655c89cb5071d4781854ec20ae0b63aede8e339402194f62b33a90a0507a8b2ac120736b5f4311ec3a55e8e4ac10b1a0856a70
-EBUILD eudev-3.2.12.ebuild 7031 BLAKE2B a26ded1d78932f737d0269db1664502b15c8132929c7688f54089cc2b83303ae7c5f74b0799c61f6b3c2b9f6e10ab69e76aa15b29527c422b859d67f163b77a5 SHA512 3b6e6a66c79da8d1b2ded861e6cb0d3e32a63de73e4303b4e81aed0a8b3a95183f2da274d440ff58949415d21dc2d1c2f1e328e3a0287d13b2ed56dcb804a9a1
-EBUILD eudev-9999.ebuild 7031 BLAKE2B a26ded1d78932f737d0269db1664502b15c8132929c7688f54089cc2b83303ae7c5f74b0799c61f6b3c2b9f6e10ab69e76aa15b29527c422b859d67f163b77a5 SHA512 3b6e6a66c79da8d1b2ded861e6cb0d3e32a63de73e4303b4e81aed0a8b3a95183f2da274d440ff58949415d21dc2d1c2f1e328e3a0287d13b2ed56dcb804a9a1
+EBUILD eudev-3.2.11-r4.ebuild 7146 BLAKE2B b4961871e468c9f2f708b24be8f40f59ce54c0d9de8b14df833cae7764689c2c991b1fed806aaa1c8991f3c8d145ef7dd692eae7140601d3908f7dab1ccbd8a0 SHA512 75484b41d701334673c86fb4fc1066678d0ad9140aea68ce76febda8d4edc7df61af620656be093d6971640bab515670798a4212c6cac19b1e4b7fc7dd516674
+EBUILD eudev-3.2.11-r5.ebuild 7386 BLAKE2B 12ffa2782897b83ceb9837b089a0ae0f32c92e0df2d70908e0916b62f52430a0e7a3cfc1dff3336f713d9a685391283e167c5e88aee3ce332dbe720dcf687ac4 SHA512 5ceb821676b0351ef3db8ac4f6735dae36f23e6e591aee23cb0c4366c54895d5bf2a597297e30c90eb447870a6a94336a3802e16d8a71f08ba08f0b907a49570
+EBUILD eudev-3.2.12-r1.ebuild 7291 BLAKE2B 266fa1aa07735a92a10ed641a0652a84cc6a60f1edefe57eadbe25bb473600eef54359d2899953cb8209f9e1f6fa65cc7654cf8c2b464797b5d14b419bf0b711 SHA512 788a703376824c5f58e8f4d508aaa63dbda778234fcab7a6e7a073e7101fa17ec348dbbf0dca88a012dfea7d66f37750c25d4af5b3ff4ae87e05723a3cda7a19
+EBUILD eudev-9999.ebuild 7291 BLAKE2B 266fa1aa07735a92a10ed641a0652a84cc6a60f1edefe57eadbe25bb473600eef54359d2899953cb8209f9e1f6fa65cc7654cf8c2b464797b5d14b419bf0b711 SHA512 788a703376824c5f58e8f4d508aaa63dbda778234fcab7a6e7a073e7101fa17ec348dbbf0dca88a012dfea7d66f37750c25d4af5b3ff4ae87e05723a3cda7a19
 MISC metadata.xml 629 BLAKE2B c67407dd805c6e8d4fb0c5152e897263ca56649d1d5c7692c74a69a751e7824a2b6084fe1ce0f8cd1b13dbdd0ae3f082430d6552807690a9d52d83c907f43f64 SHA512 204a04a68ee53fe8fec226ad82fdbb3f2ee478f538379466343bbf55fd0146a71889ac11742d59261ef954bb9b8e09e8d2b9416079da63cc78ab400efd2ba49b
diff --git a/sys-fs/eudev/eudev-3.2.11-r2.ebuild b/sys-fs/eudev/eudev-3.2.11-r4.ebuild
index 2b259de878f5..1427c56973fd 100644
--- a/sys-fs/eudev/eudev-3.2.11-r2.ebuild
+++ b/sys-fs/eudev/eudev-3.2.11-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,21 @@ RDEPEND="${DEPEND}
 	acct-group/input
 	acct-group/kvm
 	acct-group/render
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/floppy
+	acct-group/input
+	acct-group/kmem
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/sgx
+	acct-group/tape
+	acct-group/tty
+	acct-group/usb
+	acct-group/video
 	!sys-apps/systemd-utils[udev]
 	!sys-fs/udev
 	!sys-apps/systemd
diff --git a/sys-fs/eudev/eudev-3.2.11-r3.ebuild b/sys-fs/eudev/eudev-3.2.11-r5.ebuild
index edf2602b57c9..39b57493eab1 100644
--- a/sys-fs/eudev/eudev-3.2.11-r3.ebuild
+++ b/sys-fs/eudev/eudev-3.2.11-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,21 @@ RDEPEND="${DEPEND}
 	acct-group/input
 	acct-group/kvm
 	acct-group/render
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/floppy
+	acct-group/input
+	acct-group/kmem
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/sgx
+	acct-group/tape
+	acct-group/tty
+	acct-group/usb
+	acct-group/video
 	!sys-apps/systemd-utils[udev]
 	!sys-fs/udev
 	!sys-apps/systemd
diff --git a/sys-fs/eudev/eudev-3.2.12.ebuild b/sys-fs/eudev/eudev-3.2.12-r1.ebuild
index 60545ce6b718..2097b5665514 100644
--- a/sys-fs/eudev/eudev-3.2.12.ebuild
+++ b/sys-fs/eudev/eudev-3.2.12-r1.ebuild
@@ -42,6 +42,21 @@ RDEPEND="
 	acct-group/input
 	acct-group/kvm
 	acct-group/render
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/floppy
+	acct-group/input
+	acct-group/kmem
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/sgx
+	acct-group/tape
+	acct-group/tty
+	acct-group/usb
+	acct-group/video
 	!sys-apps/systemd-utils[udev]
 	!sys-fs/udev
 	!sys-apps/systemd
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 60545ce6b718..2097b5665514 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -42,6 +42,21 @@ RDEPEND="
 	acct-group/input
 	acct-group/kvm
 	acct-group/render
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/floppy
+	acct-group/input
+	acct-group/kmem
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/sgx
+	acct-group/tape
+	acct-group/tty
+	acct-group/usb
+	acct-group/video
 	!sys-apps/systemd-utils[udev]
 	!sys-fs/udev
 	!sys-apps/systemd
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 9cdf75d5fff3..976c893a3f00 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index c3f745607ba9..bf943c8293ee 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,12 @@ DIST patch-6.5-rc3.patch 79471277 BLAKE2B 7f66470c266dcfef345a9b8909c68060beb87b
 DIST patch-6.5-rc4.patch 79882880 BLAKE2B c272c129d17704203bf139b9ece1eec27b823d0e5c75d2fd111c0e5df54c2c8dcc79aad78a9bb823d63b88246794fd19327be33751b85cd7839d6b6d66038c39 SHA512 d4e96c1968332a268720d2bcdb679c2f9ff540887a1b4cec43011c80cae4453c7105ecce494b143dcccb0f78d7d918c13d2e909b0ef007bdcb8242c0c3e43980
 DIST patch-6.5-rc5.patch 80131790 BLAKE2B aa1e5e9ce5269207d0d5ab3d27967cfe8960821c3bd67be0b58cc5aff32a866325f35090a0ec30a18b6c21aba52435ae07b3e182734398550e2481d538bcf590 SHA512 65472fe82f2b0498b1aa916b246638781667efd6e3ba4518baaeafc7c4b1dd919802cf0351832080065ae099e9814691a6075d718258e53d61311198c60d9296
 DIST patch-6.5-rc6.patch 80504775 BLAKE2B b4ce0b26847e708517260d5f5c57c48059715cf37e984ad88727feb392f192a976f0bb2be899511784896881e9530cb5bd66e9b4dc19ca4e5a80150dd7a104ea SHA512 b9a225ede39b6f1bb8dcfb1ba1313a378842c906d3aa1956d2a0f856cfe40ab688d9a15c5fba050e6745e42e2ea18b09092844382ebbf2f5aab6320e338d02d6
+DIST patch-6.5-rc7.patch 80687935 BLAKE2B 530cc662c2568ecd656ec409ff571824a3ee5bebe0fb04840eb8b0c1c346f18a4d2b66310bb9c50da9b313a25d03d7fa51a82d90ef32d8390d53e44b781a2c84 SHA512 185214fb8de78a89bab22e03c60375ae1df7a76b242d99f240816b0b318bb3a79e288f02888a27bec166306f2eac5df6bf22e1318fc8485e34a7ce7c9996e345
 EBUILD git-sources-6.5_rc1.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 EBUILD git-sources-6.5_rc2.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 EBUILD git-sources-6.5_rc3.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 EBUILD git-sources-6.5_rc4.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 EBUILD git-sources-6.5_rc5.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 EBUILD git-sources-6.5_rc6.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
+EBUILD git-sources-6.5_rc7.ebuild 1198 BLAKE2B 3037d9a8a063282625e1b09ff859a2f0401b9a441810718a2c888ab05355ea61e9b714b1341b6a840d31b21329aac80466a079ea1420beb1d41544565fec614d SHA512 8c0101b8b21021aad88100529f9e51d1ac24da8b49dd85d2ef7ef316d031cc7f4eb14b0b0bbb9613860875ccbab81a5e667278a7f0d8a38f3656af158c623504
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.5_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.5_rc7.ebuild
new file mode 100644
index 000000000000..ddb3116ab32a
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.5_rc7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="6.4"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+K_NODRYRUN="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.6-r4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index deb5117d61ce..afdb2c363ffe 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index 95fad0588892..c4892854fc8f 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -14,7 +14,6 @@ DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79ed
 DIST binutils-2.40-patches-5.tar.xz 293628 BLAKE2B b7ed1d1fbf38b420661f984b9519b3d863da45b2a873773a521310021b0c1d5d7c24c152adb3e8a999d40f5619c0e54962114590ec9528380089977af0c30b74 SHA512 6e6df932b18ca20fe245b3ff8d3d06dbdae4daadaec3b668fa44e086d4e8ff56439681b2d810ebc74173b6348020edacb176e8c3cbf20657cce04297b97f4f83
 DIST binutils-2.40-patches-6.tar.xz 299212 BLAKE2B 3a68a924e9747fdd0486327a5bd2490cb72376f2cb6c6a60030d8c6b71357150d956a1e71d91683d43b571cb5bf738270880f72ef175d6c8faa257b090abeb8b SHA512 984dab529276ab4f9d215f643c7c18bd1793f438aaad0be158d209787c9c4a6bb68b10bec2065d3fe14a1594d5f1c29f55b2e9bac34a6f489f4b466c02e24766
 DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
-DIST binutils-2.41-patches-1.tar.xz 13260 BLAKE2B b7431ec92d5ce0e5d4438b31ca356c8d5366bee9aa8ff2f098a77c2add5b7539f733d0a18988337490af34c9192affbb6ccdf56b97413a8dca3192fb2125b313 SHA512 30548e4f3187444dbfa82587b5b8a0d2ab9d536aa06a572393a195649759149124d79c488c07919850c7ed4940481b852462d5a1aa52ed9162d81d6d3b290377
 DIST binutils-2.41-patches-2.tar.xz 20288 BLAKE2B 1cc29e868ded12845856c5da567f23798fe3017961ce079325c20f456b837cab11560d896065f70953b0bab55bf565288541579e9c3e0991a87083edf2a85fa5 SHA512 75619a5e17b75d72f9bdd9d5e5ee3b566c94de64410bfc074f1a9bfb9f08db9ecf8be216efa1053263468aa8ec99b8aa3b2b095e63cb95f3566500ac0c3b9432
 DIST binutils-2.41.tar.xz 26765692 BLAKE2B 3bccec2b52f7e82a727121bf2a2e51a6249ba63dcd74c665fd834e858645c912ffd8245d848435288b938852830b482905606f55c40df4061215fd75c52ffc75 SHA512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374
 EBUILD binutils-libs-2.34-r2.ebuild 3633 BLAKE2B 4bb2862dc364c5f64597d2fb22f867028ee85c4d8a14ab85e28c2f5dab43cdb2a690e91b43d1a7994081df9c21be6c9850b808f01d71e18b97c1439ad1890fcb SHA512 84a368c4c1ba2a3f4e1b3043f531deab5457b0169d83b38bada72b857e9a86a7ca86cb317a062216ee7d2b87e39c6648e8bbd62e676507c638ea6fcfc9efda28
@@ -26,5 +25,4 @@ EBUILD binutils-libs-2.39-r5.ebuild 4766 BLAKE2B ee4275f3555984c95e8063a6858e761
 EBUILD binutils-libs-2.40-r5.ebuild 5004 BLAKE2B 6123463e4f95c7e5f2a9b718f780a89ebc0b4b14ed4075c7213b7c841e9aa8cdf4b9e337c4e1b815ae01c80bb4ba96aca43d6d15d37b6905abb8f41c925d6c0b SHA512 75bafa58c49b4a8e43f7b83619def231265b78b462913873b9c9bfab82ae5ddc297526548d797d6661fecc1da3cfbd8c515fd6537b7d3a320711594c9e819277
 EBUILD binutils-libs-2.40-r7.ebuild 5012 BLAKE2B e158d44b4c9cfda0942e138dcd0a003dae67f8d00f81c99fc24de4f94380316c67692417357daf6547140fea2beca8d8fc09d3df622d357a6693844157fbeca5 SHA512 e952d4cc9ab96d1f143a2a9ecbdb7d52829f57f56cc755559132df1d796763342f10797c4562037ddc11ef240a1a3cd51ba05ca0c077ab6ada7ea3b122013445
 EBUILD binutils-libs-2.41-r2.ebuild 5181 BLAKE2B b824e905debb708f120991e75baa70cbba46d039ecd93141be6ec29b89ec5e1b9eb168203c8932bc11e824ba62219818ba217df3a921761ef2732e42c9d67980 SHA512 7330f4e4e7b3009fd5d925a38712d9a13e8a0838685d2dba376f1041dd8cb7cd791f21df1eca28d84e9b79e4ed183aeb6681a885778dc7add70360f57e6b348c
-EBUILD binutils-libs-2.41.ebuild 5177 BLAKE2B edf72553cd7bd1d26d713619a3da3c6ed1416b29d662bf2c6ddc15553e089dea8c399f330a75beda3e77bf0dda1bfa629cba27be15778d9dbdb0793d45106359 SHA512 820e7fa73ea5e6d1145e12eb0ca4bbb602fb887bb24534f3a42026dfa2ab7d2174da811307ecb3a9ad208673fa51e0b1694b8cf8e3273479b2e7d5a57660f4d6
 MISC metadata.xml 612 BLAKE2B ceaafd9fd1421e9f3993e003d0029c92a78054c7a2b90bd78afc05370ad19c931c6a7c150545cfb7d57165168e0fdaf3a00dde1905b328826a91cbc70d9548a8 SHA512 c8d33bb8d1c62c7e95758624ed0febbc9d40e9f141bfd280837b3207bcd771412158d71c0cb5548d60be0b236f6fe103621daf7efa8875191982859b566ffa8d
diff --git a/sys-libs/binutils-libs/binutils-libs-2.41.ebuild b/sys-libs/binutils-libs/binutils-libs-2.41.ebuild
deleted file mode 100644
index f8d9487028fc..000000000000
--- a/sys-libs/binutils-libs/binutils-libs-2.41.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_VER=1
-PATCH_DEV=dilfridge
-
-inherit libtool toolchain-funcs multilib-minimal
-
-MY_PN="binutils"
-MY_P="${MY_PN}-${PV}"
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
-PATCH_DEV=${PATCH_DEV:-dilfridge}
-
-DESCRIPTION="Core binutils libraries (libbfd, libopcodes, libiberty) for external packages"
-HOMEPAGE="https://sourceware.org/binutils/"
-SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_P}.tar.xz
-	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${MY_PN}-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0/${PV%_p?}"
-IUSE="64-bit-bfd cet multitarget nls static-libs test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	test? ( dev-util/dejagnu )
-"
-DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-# Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${DEPEND}
-	>=sys-devel/binutils-config-5
-"
-
-S="${WORKDIR}/${MY_P%_p?}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/bfd.h
-)
-
-src_prepare() {
-	if [[ -n ${PATCH_VER} ]] ; then
-		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
-		eapply "${WORKDIR}/patch"/*.patch
-	fi
-
-	# Fix cross-compile relinking issue, bug #626402
-	elibtoolize
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# somehow libtool/configure is messed up and (custom patch at
-		# upstream?) and misdetects (basically assumes) nm can be called
-		# with -B arg -- can't run eautoreconf (fails), so patch up
-		# manually, this would break any target that needs -B to nm
-		sed -i -e 's/lt_cv_path_NM="$tmp_nm -B"/lt_cv_path_NM="$tmp_nm"/' \
-			libctf/configure || die
-	fi
-
-	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
-	# Avoid really confusing logs from subconfigure spam, makes logs far
-	# more legible.
-	export MAKEOPTS="--output-sync=line ${MAKEOPTS}"
-
-	default
-}
-
-pkgversion() {
-	printf "Gentoo ${PVR}"
-	[[ -n ${PATCHVER} ]] && printf " p${PATCHVER}"
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# portage's econf() does not detect presence of --d-d-t
-		# because it greps only top-level ./configure. But not
-		# libiberty's or bfd's configure.
-		--disable-dependency-tracking
-		--disable-silent-rules
-		--enable-obsolete
-		--enable-shared
-		--enable-threads
-		# Newer versions (>=2.24) make this an explicit option. #497268
-		--enable-install-libiberty
-		--disable-werror
-		--with-bugurl="https://bugs.gentoo.org/"
-		--with-pkgversion="$(pkgversion)"
-		$(use_enable static-libs static)
-		# The binutils eclass enables this flag for all bi-arch builds,
-		# but other tools often don't care about that support.  Put it
-		# beyond a flag if people really want it, but otherwise leave
-		# it disabled as it can slow things down on 32bit arches. #438522
-		$(use_enable 64-bit-bfd)
-		# This only disables building in the zlib subdir.
-		# For binutils itself, it'll use the system version. #591516
-		--without-zlib
-		--with-system-zlib
-		# We only care about the libs, so disable programs. #528088
-		--disable-{binutils,etc,ld,gas,gold,gprof,gprofng}
-		# Disable modules that are in a combined binutils/gdb tree. #490566
-		--disable-{gdb,libdecnumber,readline,sim}
-		# Strip out broken static link flags.
-		# https://gcc.gnu.org/PR56750
-		--without-stage1-ldflags
-		# We pull in all USE-flags that change ABI in an incompatible
-		# way. #666100
-		# USE=multitarget change size of global arrays
-		# USE=64-bit-bfd changes data structures of exported API
-		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
-
-		# avoid automagic dependency on (currently prefix) systems
-		# systems with debuginfod library, bug #754753
-		--without-debuginfod
-
-		# Revisit if it's useful, we do have binutils[zstd] though
-		--without-zstd
-
-		# Allow user to opt into CET for host libraries.
-		# Ideally we would like automagic-or-disabled here.
-		# But the check does not quite work on i686: bug #760926.
-		$(use_enable cet)
-	)
-
-	# mips can't do hash-style=gnu ...
-	if [[ $(tc-arch) != mips ]] ; then
-		myconf+=( --enable-default-hash-style=gnu )
-	fi
-
-	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
-
-	use nls \
-		&& myconf+=( --without-included-gettext ) \
-		|| myconf+=( --disable-nls )
-
-	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
-		# fix underlinking in opcodes
-		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
-			"${S}"/opcodes/Makefile.in || die
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# Prevent makeinfo from running as we don't build docs here.
-	# bug #622652
-	sed -i \
-		-e '/^MAKEINFO/s:=.*:= true:' \
-		Makefile || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Provided by sys-devel/gdb instead
-	rm "${ED}"/usr/share/info/sframe-spec.info || die
-
-	# Provide libiberty.h directly.
-	dosym libiberty/libiberty.h /usr/include/libiberty.h
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-08-21 03:42:55 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2023-08-21 03:42:55 +0100
commit	855f2ab2714a36dd2d3b757890b2449d3e9155f2 (patch)
tree	21996677d9df011c406a514a9487ee25e7a5fe48
parent	90a3be9d71a22834f9bc82c072f1b993f9a10e31 (diff)