gentoo auto-resync : 17:04:2023 - 05:52:08

168 files changed, 1481 insertions, 1114 deletions

diff --git a/Manifest b/Manifest
index d94a7520573b..34dc861c1fca 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29468 BLAKE2B 3dd291d6c79d0174972937d935499ac5374eb2414964257a93d0267b943cd5e0801f0a50c4d2a07dc3a0dd0d7a35521a098c4aa557a65c524070ba43bbac9d21 SHA512 53024b9bebe99e6aa7780474de4f2f2f38e6a33bb91e202a57cfbada0380147c62676da2ae91b4bb55327a39ca4ade1f795fe27b2945d52f30988063f36a0f55
-TIMESTAMP 2023-04-16T22:09:48Z
+MANIFEST Manifest.files.gz 29476 BLAKE2B 17db17aa8b97f3c841768770bac40f41d52ecab2ad2a2d3dc58368e16a3278270d932d583a0f8fe9cbeea2af26be83a8f6e1a02280907e3444028fdba0725dd8 SHA512 10bdbaa3c42aaae7bae93f3c712166f319fffbcf23e3d67af83780439defe336b47fad59cc6dfa311576139c7afea105b368130a1b16859b7c67d4c5a31474e4
+TIMESTAMP 2023-04-17T04:09:50Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8cixfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8xo5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBcjxAApdfeQdpGFf6aErhNVl3k1v9TgMyb8rdylGC9YbIi6ef9wqMAzzEW0kMq
-cXnfzhPXM2vAKRc4lhwSeBqQDiONOg7exyb+uq2/yMmTAAhBhRRRvIgMF3nVOBKc
-/pblWLeI7bluIr7xbp4pebix/qhqpqXWFQ7CnbtJ4iR1SSMRmvI98VzHpE131wae
-2CpoENGy3+Sf6CG3R7OwpwtSBp+3pBYIhB3DzACwOJsAhx6nJ1mZSs9W6dU32WwS
-gBNYOd2hJ7iwJxWzkkyuEP4d4dgtt+dbufAFbi5T3/d3uG+Oi8QYZXUGbxlX668v
-jDPIavChzYDo2urFQ4QkPCxejZloEslrQQJ4wXRz3Mcn27jo3iuoTUHWJQgsm6n5
-DbJqDCt0MBppjYLSZkD4aU5EJ7nje7pvZP76M0a/zkEbSZMRlkd4mYlgSREh8Ajd
-dpNgvh5GKmsorINuIfV8FdDGp49xtKj9xCHfAapHt+HeDmlEeO7N8w/y8eKSsMq8
-e/mv9gFaa7XDzOrtj8ZcL0wMit2XqMgSVI8aA/udErCuhYc5hiKSq4hTPrw0Xdwm
-yPESwIQGHXQ8yt7FL6j+We/vbyhA0SIetvHubKq5LxIsMw035H774VPjaQqFaGdJ
-+8aqPNwGFa/0G5ortfxkcpsgFApjOVVns+Xt8II05UQOCq4h+O8=
-=oTev
+klAq0RAAio6z82BvfFUHvJ//MO9ic39Kq8Ga8B0QwjmWOq0kTUaKl7WFvJfPvpkN
+2wtvb2I2lnnrvENLqGods1v6CA9a14PCMRnYzVMR4t+uuCJF7wprzdcbhoSUDtiM
+L+RnwQQghjgzIOaod5KDfCf7YxGSOlR0pdigH+kaQanP7GOK0gDEKPS/stK47jzk
+aVuF5uDBhfLWQ0L07nxh5Sgu9jV6SwhUdEop8xtGLLpsoo7HtnITReD1DhtUKYJN
+5TOjQe4HFdn7WVzxOO514SfXBUcRfq+CK3qdSktRAwU1gpOUE/N2U6TlcIpRRtxW
+jfMmHbk2GogQR0oZkK4s5QbY4LgWI1HcDNxSmkL82bTJc8u8MKTzU15mKHrMKpJ7
+hOyeDjM10nQVcCHLwwDkumRTn+kmHWkSsZz5SxZl3V3OSyVUGGfsvq08S6AAQ8aA
+41PtfrXPLskUU7QleZgiexlgUCbVFq5F/vaGQmzPBeZA+oGR1fEwcAR2qb4qySI2
++oNw+VIyjNT24r/EjlY8AFRfWPEHqTwtzY6cT2Gpyh+U3EHwknSfDifb5IUA5xpD
+P9sPN2dFncAndb93oVlgnz2ZNZXNeFY2WTMeV4mwNAdjTQj9g0e8/PXfTDUYaGor
+1krCN0L7yqtsL64jmSOWoXy3EzCPgyBgxWlMvas4T2BLh69Dv34=
+=pBEW
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index dfc8b937b4aa..49837e980b66 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f9d54e053adc..56f22c244b54 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 859421090221..0848cb7e9482 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -4,5 +4,5 @@ DIST ghostscript-10.01.1.tar.xz 67567268 BLAKE2B 26f14f11362c7cd6e129044b8e094ad
 DIST ghostscript-gpl-10.0-patches.tar.xz 2980 BLAKE2B e2c20195b153bf45f374e84d91a4df1885a3696f4061340a0a2ac5f586b9723b45eade343ad0e5760e66616624b5f7dad82d62747040493d7ca40c13329b2df2 SHA512 dac26d7f75bbdc2a56891db7d607c2120717fdf8b1cd55c53ed3be09de3e0a62338585f4dac74496d634ce03ecb2212f386187e72b5e6b59debf8d07694e0c83
 EBUILD ghostscript-gpl-10.0.0-r5.ebuild 5557 BLAKE2B ea473304d688c9187e366be0c2464e7b33706ce26e10311d1034ccf4e8dcb78a075db2e59a66d53487451e85b1b09a736cb223a6099eb6590e5ed3d85ee0c0d3 SHA512 bedff71a935d1ca18f9fc1bccbcd090787b1ece734ae5c1f46ef244c4705aecf0545eda5dedd02aade0577b8a942238af17d969850a8c5438efd047028948d0b
 EBUILD ghostscript-gpl-10.01.0.ebuild 5496 BLAKE2B eef46a0757c650aa2749e0f75c211d2a9ea17b8b46b42ecb4348f88d7ba952eba80f61ee6c179f398f355087c50e2c08507a8dead4bb8a6ead4189fa572ed8cf SHA512 4c32176f5a136ad9c378cd633c3dcc4040086acc4a315c8976218220393134bff89d5f5a6a59e82d641a29366ce1039cd495352cd895056c09e72a328bf7f1e5
-EBUILD ghostscript-gpl-10.01.1.ebuild 5491 BLAKE2B be44eea68da598eed589e240efc6c4675c8352fea2fb18a05023a2d0f903b0d9ba0f6ff610b2e2b957593c817d9ab34f4504735cb1aef5bd189dfcba501d3735 SHA512 f253550dfff0168c395b592883cdb05bcfbc22479981822256dc2f00a167162b08f1c710a73c57acbf1751b69d285a66880ad624f78770bd44054f53a2b44480
+EBUILD ghostscript-gpl-10.01.1.ebuild 5490 BLAKE2B 5365ef5195543b16b262dc7ae5022b0ab0abe7ec568fc3e32f752b54dd647dc9db10fef54bf8ccc2da4ede28c6eb9e203713d876911a57a97db3ecc231fcf62f SHA512 5ff4a024369f69500db0fedea4f6a7ff62809d552add501aace8dab1c155e0325586086f626553eefa19f885fd82c4237d2cb40fe3d0d3619eefea6949658519
 MISC metadata.xml 767 BLAKE2B ff690e8acf31dc71da9c563b45316398d4dd74c2c7690df1a2ad0148ac459aead548ac0ed8e203fe8f6d1a375a91807d08d5c053c702f1551a2f32b66444ae74 SHA512 3edb3742706b1cb89ea09428ddcab3959d6dd435e92957cd2982e074acd449560e5abf41af29029593fff280ca02ad909ec05fd83e0d9fc690f5a9227804f3b9
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
index 91a302566066..504411567c86 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-10.01.1.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a075bb4c8882..dbab8bbdae93 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 271c1c27047a..58dc2b9add23 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,10 +1,10 @@
 AUX eisl-2.65-implicit.patch 270 BLAKE2B 3c3e8b9474d7eb4647b9982b27a0bb34f316abbf780ca8bdd78445a4401e96743e8e299d518deeb5ce0903f892684bc9b96f36888a3663b5bb54d221735bc279 SHA512 fd69358726a1226dfc9197dd6e861ee36ee974050ba2455c6d29ecb82efd8128cc7b787dd18c2f686431ba5d8161ae5f8242675f2c66e10725a4985e5c52c181
 AUX eisl-2.67-Makefile.patch 981 BLAKE2B f237f8757f527e8d2e3fb9a207cb0ccbc94427c77b0c0a0df12cea5f32ea8975277a427a017e32071c3dd050596fa3c4719068bebd00a16080ba01199b750537 SHA512 eedc5921f166093d48ed62718028bfca76962b6525d17c9cf2e392942b313bcd5b07a6ceb2782cfaa7e0065e37c68a0d21f546586fa61cb53b0f6b5d56d96502
 AUX eisl-2.85-Makefile.patch 510 BLAKE2B 772f4f5cf20b9a2c76650e287b320e02b7431ee12adfbc3a0cb308dd922fb5456540880f95035059a6fd416965e5a956f1f7bfd7b28007fd11b767bf40fd7be8 SHA512 cac759fe6442eefc3ac41fad3e0e5a6b728161b3962c849006229a9ef6dafa0e3455ecd03abff662e9dae4aa830562a7e7f31ebf4c3664c467e46f0afca5f662
-DIST eisl-2.70.tar.gz 2126647 BLAKE2B f9bebd32a45cf73d3b58598e2f7683611426dc97c4e6411549e49f19c9e843dd24d90e9bdaf9ca97bc70fea970068bf2dfd532a861fd444b9f8b17f76666bf07 SHA512 9aaf75244515d74d40d5534e20d108f7723e0fb9cf01ecc618d32a4cd2fdd2f7132445ed9ce020e0c9ea3a05bee614e78853ac0554ee189946ee3d220ba082ec
 DIST eisl-2.72.tar.gz 2124119 BLAKE2B e0a1216b4e9c301ec965d0dc7a6fcaa5acd91fd611193959fee698a27523c0c4832e7960652af14af3e7f5846131d81f0ae9db7030511e051d5384ba573241ae SHA512 80998239b9cc421f42323f24ffbc5f518a2675c314580284309d127523bab328db21d294d8d32dca413abd63d279a2c857ea34ec35548da15459235eb0f3da2b
 DIST eisl-2.85.tar.gz 2126779 BLAKE2B b95735cac70a1bae0277f910ba0b69746ca44979c08b4c19c5642d1d998e0a248827cf6cc0bac9f29c620c34ede2558e7723b7ab8b841fadbf366fa9047e6a7c SHA512 4b09e0faa126e30e44d0d23cfb79316289631da1ae8069989c58852f14c4b1f2e28539698fc8a1f433ff11e0be7a63efd836d0978965eefe42a7620c11b56c54
-EBUILD eisl-2.70.ebuild 921 BLAKE2B bbaa420166c20be9151fc3ba5f3d2896001b0bf701d66e6066a61e2d14028c54a2fe217c4ad2dc176aaf3e18daad61ec41c600c180fa915af6c1cb89bc49f80e SHA512 f4dbfd02ad131befc7730ade32eb76ab66820b530a53a1a6eb1ad3124ff9fde6494373cb93441d223a0a0e2044058b3159904e693f5b93ea7fd73f9af816d164
+DIST eisl-2.90.tar.gz 2129524 BLAKE2B 5b7a7aaf68a53ac4611b90f98f50fb66973411f1303f0de9dab14301a49847a1250c07d1e912d55783b939d3a2b7a6aa82fa3d9b42818ea9aacf37949ba9e14a SHA512 3cefc6608e1f4d4a0ba581c2043cb9af9d379273cfda74a4ac77f802dbb672faf98af5a60a946e12f0abedd47074b67a0c8163a81eebca92a20cd04f767d6b0f
 EBUILD eisl-2.72.ebuild 921 BLAKE2B bbaa420166c20be9151fc3ba5f3d2896001b0bf701d66e6066a61e2d14028c54a2fe217c4ad2dc176aaf3e18daad61ec41c600c180fa915af6c1cb89bc49f80e SHA512 f4dbfd02ad131befc7730ade32eb76ab66820b530a53a1a6eb1ad3124ff9fde6494373cb93441d223a0a0e2044058b3159904e693f5b93ea7fd73f9af816d164
 EBUILD eisl-2.85.ebuild 873 BLAKE2B 7438f1e9c6324f10b90b6189136f0ca049870ee2f475fdd451b0e3abc679c8d528ffdbe2021715a002beb0cb21e302622ae0586e4eae9b6172db144f8c457977 SHA512 242c39416e07b29855c84e9607cebfba81ee36c0d4fcc035a26371d84bc0a934c32fa8f6a11d76c5e06aea74011149e7907db4f35baec3ea5ba51c9ef7ddd2b4
+EBUILD eisl-2.90.ebuild 880 BLAKE2B 19e62d0d8a04533bffb4ad146b14820c63bd6ed35071985087638e881c17a809cb8455298c4b56e5572bdd27e20c49ff918d2e8486534e887e733cf3185a7d74 SHA512 592c066fb7fb440aa8b990dd182f794b76ddd462b19c708dfa320462a2993a1aa083644a45de71c060e119fc27f73c0ed47bd9aafaa8ef628b5a4747fa03c4e8
 MISC metadata.xml 631 BLAKE2B fd171b07cf1f7beae7be774a5da360d466c83f01a6bd52dc69af436926ae5aebec27a2723c11498be21c4f96f6b82c6aa3571f4b84e763459ef78086450252f2 SHA512 dd9e329f24ce6d3922e92e81d36234b93151f71c88d6ba4b38557565a7c1c3bc4b7172d4d55f1d2d5bd6c5cada449691067cc71abd4d456941f6a8b78fe0df87
diff --git a/dev-lang/eisl/eisl-2.70.ebuild b/dev-lang/eisl/eisl-2.90.ebuild
index c79630e56a74..7a5ed7b0c16e 100644
--- a/dev-lang/eisl/eisl-2.70.ebuild
+++ b/dev-lang/eisl/eisl-2.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"  # Tests run cppcheck (and fail)
 
 DOCS=( README{,-ja}.md documents )
@@ -20,10 +20,7 @@ DOCS=( README{,-ja}.md documents )
 RDEPEND="sys-libs/ncurses:="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.67-Makefile.patch
-	"${FILESDIR}"/${PN}-2.65-implicit.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.85-Makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index 06d3cd6aaebe..8080fc0bdaac 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -3,7 +3,7 @@ DIST typescript-5.0.2.tgz 7050986 BLAKE2B 6f9a187eb6f87971540469f6b212ce25e04b6e
 DIST typescript-5.0.3.tgz 7051270 BLAKE2B 6879f0b4ed07e23dbd7e050c2740100af922ddd09f2989171d46408516026d3eaf548c90286d0bfc0606edeba9e40a39381042130011b029250c5b87efa60f7d SHA512 c6ff263840e78a06ffb4df4f48c4f0484a809d4be4a1731096270e6f421454305240280149a00044e519632d88714cb9a94e976a32b98e38ceed3316a814ca64
 DIST typescript-5.0.4.tgz 7051452 BLAKE2B ed08425d8324a910f2d328fb02f27e08f75334fb190d1c4625452d076d615726d0e852da06f0f25146a4b02c6c99cd569bbcf7c50f5d6ff32c88a40101a59656 SHA512 716f53e56f71637edc73e8df127694bd7f757e8c6d1e4cdadcdc37c24a05e2c4a52a7d0c38d7647449dd8a0fea3c15973649a9961dcdcdac90cc2887338fe1ab
 EBUILD typescript-4.9.5.ebuild 823 BLAKE2B a3777280718dabb4c3cb85f24dd59af91eb2278f8720c1e00335a4ea12a2f5f5da823424cd7b2737ef460a3ff8492fca5e48e052bfb74ac1b87e5c3656d2c9af SHA512 e0eb4afa9fb0f1517987c08815f94dfeaf3e51c55acb3e362a3674f710883d562765dc461442cdcfbb4d25735ec6d70a4b7ae7f01998c19acacac9e68ed291aa
-EBUILD typescript-5.0.2.ebuild 824 BLAKE2B d82c95a8140e984bcaf32e8dafecff16f1a604fe7f56dbe1a5e91ec82f586060802ab6bffa8542ce4ac13b3fd35e79f46d24361985d570499ef43c0e19bc5855 SHA512 d35d657c16d34513f8f6622470514f0a7c9dbcca3e247496f7879de69d044825558eb8f034c2fe15dae6e39d5e297f9b0d6da4558cf12b3920286412bd9f353b
+EBUILD typescript-5.0.2.ebuild 823 BLAKE2B a3777280718dabb4c3cb85f24dd59af91eb2278f8720c1e00335a4ea12a2f5f5da823424cd7b2737ef460a3ff8492fca5e48e052bfb74ac1b87e5c3656d2c9af SHA512 e0eb4afa9fb0f1517987c08815f94dfeaf3e51c55acb3e362a3674f710883d562765dc461442cdcfbb4d25735ec6d70a4b7ae7f01998c19acacac9e68ed291aa
 EBUILD typescript-5.0.3.ebuild 824 BLAKE2B d82c95a8140e984bcaf32e8dafecff16f1a604fe7f56dbe1a5e91ec82f586060802ab6bffa8542ce4ac13b3fd35e79f46d24361985d570499ef43c0e19bc5855 SHA512 d35d657c16d34513f8f6622470514f0a7c9dbcca3e247496f7879de69d044825558eb8f034c2fe15dae6e39d5e297f9b0d6da4558cf12b3920286412bd9f353b
 EBUILD typescript-5.0.4.ebuild 824 BLAKE2B d82c95a8140e984bcaf32e8dafecff16f1a604fe7f56dbe1a5e91ec82f586060802ab6bffa8542ce4ac13b3fd35e79f46d24361985d570499ef43c0e19bc5855 SHA512 d35d657c16d34513f8f6622470514f0a7c9dbcca3e247496f7879de69d044825558eb8f034c2fe15dae6e39d5e297f9b0d6da4558cf12b3920286412bd9f353b
 MISC metadata.xml 733 BLAKE2B 903d85acefa054dd979ac181106cd604c351e4b81e18be7ad0f370501864f6789895244a797ec20041158d8c716907a06fa75c2ba4ea192e798719bbe73b1d45 SHA512 95806f8f442b0246867f0ba0ed70c093dfd772a558ae499be7e22bfe99cb3bc54debc7479ca9b4ac81a54156d3b8745cbb448e412f31ed2d5c43f76cbc642d72
diff --git a/dev-lang/typescript/typescript-5.0.2.ebuild b/dev-lang/typescript/typescript-5.0.2.ebuild
index 598301d43b33..7857fd2f036d 100644
--- a/dev-lang/typescript/typescript-5.0.2.ebuild
+++ b/dev-lang/typescript/typescript-5.0.2.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"/package
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm64 ~ppc64"
 
 RDEPEND="net-libs/nodejs"
 BDEPEND=">=net-libs/nodejs-16[npm]"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4a98ba96c198..58c0444c27b9 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index afd7f08e9d0d..a022ac57b6e3 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,7 +8,9 @@ AUX apr-1.7.2-sysroot.patch 1399 BLAKE2B 921694b66e2a0fe687ec9acb7458b1c860c1266
 AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4af9e65169c1c5862c3fa3532cc02df8e084b540e7a81091c3b16d50388c6234cba469b15fff896d0428fc SHA512 3a87e718859c8f95793f828b764d240907d65c21fe2c99143815ab835f8b657154092c4ad496e86d79490bd85ef03d394d3acb57a15186f2f06a518b32d77fdf
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
 DIST apr-1.7.3.tar.bz2 901048 BLAKE2B effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d SHA512 d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
+DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
 EBUILD apr-1.7.2-r1.ebuild 4629 BLAKE2B 345d5ad2ff4b99ebb95a69b5c6ac40cb0614d38ad50931d8c51b4179f9f335b9eeeb58ce673649252451988109d94af508ea8f94db320df772eaee2ccafdcd79 SHA512 a8eb336f494b349138f70e3ff3ae62689f68e7ff10d7ca8b8fed32c035300e6548f503ee889be6c2990952b438d8c4119aec65093788b1a8012f70aa15e50f32
 EBUILD apr-1.7.2.ebuild 4575 BLAKE2B a0bb685a7235819f77e0239120375fe335c86b9c99d258a4aefa999bbeae5ba41807bf6797267593ea5a19e1f7a3181df4328d04b87088fe4eb7f8533fc18f98 SHA512 189c3ac5aa060eb2d65013ae73a91498dd3a7a861d7434c007f24f31e2b895530b9f3d7a85f76da482b20870d0a505f454f2105d53f06159fb491cc8cc4227e1
 EBUILD apr-1.7.3.ebuild 4629 BLAKE2B 345d5ad2ff4b99ebb95a69b5c6ac40cb0614d38ad50931d8c51b4179f9f335b9eeeb58ce673649252451988109d94af508ea8f94db320df772eaee2ccafdcd79 SHA512 a8eb336f494b349138f70e3ff3ae62689f68e7ff10d7ca8b8fed32c035300e6548f503ee889be6c2990952b438d8c4119aec65093788b1a8012f70aa15e50f32
+EBUILD apr-1.7.4.ebuild 4629 BLAKE2B 345d5ad2ff4b99ebb95a69b5c6ac40cb0614d38ad50931d8c51b4179f9f335b9eeeb58ce673649252451988109d94af508ea8f94db320df772eaee2ccafdcd79 SHA512 a8eb336f494b349138f70e3ff3ae62689f68e7ff10d7ca8b8fed32c035300e6548f503ee889be6c2990952b438d8c4119aec65093788b1a8012f70aa15e50f32
 MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
new file mode 100644
index 000000000000..9ab51b0ca62a
--- /dev/null
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc old-kernel selinux static-libs +urandom"
+
+# See bug #815265 for libcrypt dependency
+DEPEND="
+	virtual/libcrypt:=
+	elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-base-policy )
+"
+BDEPEND="
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
+	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
+	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
+	"${FILESDIR}"/${PN}-1.7.2-fix-pkgconfig-libs.patch
+	"${FILESDIR}"/${PN}-1.7.2-respect-flags.patch
+	"${FILESDIR}"/${PN}-1.7.2-autoconf-2.72.patch
+	"${FILESDIR}"/config.layout.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+}
+
+src_configure() {
+	tc-export AS CC CPP
+
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+		--with-installbuilddir="${EPREFIX}"/usr/share/${PN}/build
+	)
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	if use old-kernel; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_mmap__dev_zero="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, apr detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	if [[ ${CHOST} == *-hpux11* ]]; then
+		myconf+=( --enable-dso=dlfcn )
+	elif [[ ${CHOST} == *-solaris2.10 ]]; then
+		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
+
+		case "${atomic_contents}" in
+			*atomic_cas_ptr*)
+				;;
+			*)
+				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
+
+				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
+				elog "using generic atomic operations instead."
+
+				myconf+=( --disable-nonportable-atomics )
+				;;
+		esac
+	else
+		if use ppc || use sparc || use mips; then
+			# Avoid libapr containing undefined references (underlinked)
+			# undefined reference to `__sync_val_compare_and_swap_8'
+			# (May be possible to fix via libatomic linkage in future?)
+			# bug #740464
+			myconf+=( --disable-nonportable-atomics )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake all $(usev doc dox)
+}
+
+src_test() {
+	# Building tests in parallel is broken
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm "${ED}/usr/$(get_libdir)/apr.exp" || die
+}
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 529be4bb84a6..8d24cdaae887 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,8 +1,10 @@
+AUX xmlsec-1.3.0-clang.patch 614 BLAKE2B 4f08a58e1e7f56d7ae0ec117d836251342ce95b2b8f7290ace8d617f49dbd3130dda8c16417f850268295bbfd24051680dc89ec4d110ed0d66dfcfdf3890ccef SHA512 fdf44de3dd7c1c72d0fceea7ae204a749339b5f022e3354dedcb08564c638567552ea83c434f7d4b82165c77de7a816cbf92dc2cc141c0958aa78420030a8a54
+AUX xmlsec-1.3.0-optimisation.patch 583 BLAKE2B 9035391762150ffa82eef10bc1ba1bde08b04e9e968bf850673dae3e27650e85516e1da4dc3385cd7aafde4cab6270a84e5205a149bcb19dbbdca5ffae678ac8 SHA512 fac70c0e0761d1d8016fb597ed4c139628bfab9d3600eeff17c16b9414732076bea65bee5c778481ecf944053319e030dfb4a455c6d51ba3e758007c36f72323
 AUX xmlsec-1.3.0-strict-prototypes.patch 637 BLAKE2B b6adffe488b5e69e0338e040b8be5c611b927935c2a0f19ee58a9b19731c53b0c8f97d1d42d4b6d5b96400b91d5d31628bfa98e91e3ab4ba68b945d06508eff9 SHA512 03d7ca70aac92b01c78a87f8731d0302b441547c36a274f577f2c31e313b37aa9292b803affb7bf052426e80250480c6bb598be0f9e35d08293025a2f673caad
 DIST xmlsec1-1.2.36.tar.gz 2005656 BLAKE2B 617f7532f3e0401357261d1294f7f497e81f79538b223616433b007a5d3132e9e4ec7a40f36e909759f996754b95c060386ec9740165fb1b045809142e9fae35 SHA512 7545935d33236bc8ec79b9173c8c0967df5c96bb9e2d5c8edacfb5ffb366ff8d087eada0cebb1de81a477f93d40544bf0a12abcdbc60874ecaecb9c8dd33dfe3
 DIST xmlsec1-1.2.37.tar.gz 2009175 BLAKE2B 19f43ba6bf6eb49428b9c5563baecbab21476f326cceee13785ae16769afa258f100732831c0f3f7d160543bd075cdcfdc5cbf11b7406637ee6c2f0e27c07f30 SHA512 99220cb28a346ffac0023f9f177d6a7be3ddcea04bea434b7dc926c1f0aaa5564d75f74f92896ac100179c04d77e001f688ddf46fed4e0a0b4f20b7b87c24900
 DIST xmlsec1-1.3.0.tar.gz 2425729 BLAKE2B a83d0117aaf1824a8a8f597f73ab1b76bcd1a9f0bb5d160df6c775f70cd2485f8e09c250f4ddbb4d42ba35549f9617d06f5470a91306757b4d5d54fdc0684f3c SHA512 ac1b1b88336959f54ef7fcfd6b9ff0feb2ba00a966a8e5b4efb97e802a1f9bb7adf5f4524c7f169344a1b7258377b5a7e879a0ab5ce25cfae3b05eac9b54729d
 EBUILD xmlsec-1.2.36.ebuild 1463 BLAKE2B 76030375b9003a64d46c86869609a5a233e044a6765f2bfd7211dd4a51c3584442107ea68929de36117d2271a1f9d4a16239ff6c31b84b3d06373134c4b9cdd0 SHA512 5cb824cdc34c4e9768245d6c138c57d803316d0d87a45772825fd285912433136daa4f9e52023348cac26a511457a677b4502e12880a205192684938d1357904
 EBUILD xmlsec-1.2.37.ebuild 1463 BLAKE2B d7cd33b3533395b59f4971deae688336fc4b8f52b5e948d7064cb19d7bbd043c7c8d3b48f5b499e51ebc529982b34b1d12a148fd35cfa700270334d7fa555124 SHA512 e92545fd5b5bb5977757cf18c8726a9335403cdc83d2367337e95ed305871cc6279568c1abce800738eefb60a7b84e4f508536c44a5a6426d6268950db223437
-EBUILD xmlsec-1.3.0.ebuild 1784 BLAKE2B aca93b044e1d13dbe14dd6ec9e5089fd42ce819ba624769f4864dc0f08a65de2f98ed40a707cfaca8bc551fc1bbe89c75d7e69320af3986d52dfc2e830542bc0 SHA512 f3c66d03e3bf558620cd4925298011bd77cfba540c529330acb8ccab1d31f42b80fc2649b11e407f11bcce14d87b4e4358134cf2e8f8446cb21fcf8aa9aba0ea
+EBUILD xmlsec-1.3.0-r1.ebuild 1916 BLAKE2B 352c1d873204a34cbce3ad7b57033460ef579835f69e0058b6d9c41c25adbdddf995f679b38738e23b769b4c943d97cc0dbe5cc4b216a5d862b6cf1afdb4fe54 SHA512 ff41e7d69b143e71287e77af595a895151a4221c23b9bb5387b19ffe0f5a92ee97920b02f8787d699c875db4620f5f29fe6da1cd3450ad7a69ec7c2f14a1d844
 MISC metadata.xml 558 BLAKE2B e4517ffa3f034420139ee0fbb8ed51a3cb319b1400e52d6a1d2d3b5363aa64831fd9cc93f49ab25d36a5fcae63115d0ffd152540f176c25dc49f77fbf4dd6c9d SHA512 6aab5452478ba1f71018274b75761c3467868f271b3cf256d05645407fa9c3cc64823384094c8e9024f936dfdaea5be2b8e91573e9addb07c5dab5f142c6a70d
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch b/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch
new file mode 100644
index 000000000000..a8e8a9b50a46
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.3.0-clang.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/904418
+https://github.com/lsh123/xmlsec/commit/0682c1d4be1e1d5d0f3cf5c4d2301dc3da09d677
+
+From 0682c1d4be1e1d5d0f3cf5c4d2301dc3da09d677 Mon Sep 17 00:00:00 2001
+From: lsh123 <aleksey@aleksey.com>
+Date: Thu, 13 Apr 2023 09:49:25 -0400
+Subject: [PATCH] Add newline (#628)
+
+Issue #626
+--- a/src/openssl/symkeys.c
++++ b/src/openssl/symkeys.c
+@@ -618,4 +618,4 @@ xmlSecOpenSSLKeyDataPbkdf2Set(xmlSecKeyDataPtr data, const xmlSecByte* buf, xmlS
+ 
+     return(xmlSecBufferSetData(buffer, buf, bufSize));
+ }
+-#endif /* XMLSEC_NO_PBKDF2 */
+\ No newline at end of file
++#endif /* XMLSEC_NO_PBKDF2 */
+
diff --git a/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch b/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch
new file mode 100644
index 000000000000..2cd0401e019d
--- /dev/null
+++ b/dev-libs/xmlsec/files/xmlsec-1.3.0-optimisation.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2482,7 +2482,7 @@ AC_ARG_ENABLE([pedantic], [AS_HELP_STRING([--enable-pedantic],[enable pedantic c
+ if test "z$enable_pedantic" = "zno" ; then
+     AC_MSG_RESULT([disabled])
+ else
+-    CFLAGS="$CFLAGS -O -std=c99 -pedantic -pedantic-errors -W -Wall -Wextra"
++    CFLAGS="$CFLAGS -std=c99 -pedantic -W -Wall -Wextra"
+     CFLAGS="$CFLAGS -fno-inline -Wnull-dereference -Wdouble-promotion"
+     CFLAGS="$CFLAGS -Wformat=2 -Wformat-security -Wformat-nonliteral"
+     CFLAGS="$CFLAGS -Wconversion -Wunused -Wshadow -Wpointer-arith -Wcast-align"
diff --git a/dev-libs/xmlsec/xmlsec-1.3.0.ebuild b/dev-libs/xmlsec/xmlsec-1.3.0-r1.ebuild
index ca8bb9084b40..e90f0e76d9e9 100644
--- a/dev-libs/xmlsec/xmlsec-1.3.0.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.3.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
 HOMEPAGE="https://www.aleksey.com/xmlsec"
 SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
@@ -42,8 +44,16 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strict-prototypes.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-optimisation.patch
 )
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable doc docs)
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e1caa09241db..66a3549627bb 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 442271097782..671c43182a47 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,5 @@
 DIST jq.py-1.4.0.gh.tar.gz 2648402 BLAKE2B 5efc35fd9ee52e5c1c87ac46d980d1557121eedb14beb5d534987d81a37b05c5c765ef69cecf65141d7c451623d05d378bdcf9a6e48667c07a9f52e7d0317bbf SHA512 8acd9c4094e0e6f5ffd43303432347448e8cb160f2c33250a386afc75eac53134b15142da3f344b0ea3eac4df838ffa322771580a27349299f32a2c525e09555
 DIST jq.py-1.4.1.gh.tar.gz 2648592 BLAKE2B b1413a07ba03f61d3b2e8cfa3f2c646408e24139f76fb9637d23968d953fa78f82b1dd04c355d5a6e6c6761095a4814d8cfd1f012382ca810ad5a44e007c7878 SHA512 03924793e8cab8041b4b2ecb8ef45bafdf31f14b4502170358ddecc027ead7cc17eda37fc04743eeef073e29144d2f7e6c4428e2a92f1bb8aa859100dce4521b
 EBUILD jq-1.4.0.ebuild 747 BLAKE2B fa210bac9cb288cb10aa870efaca27636423ebd1699ee142b4a581e0460757822bf3175c7741a1cd4875fd9cd273d2719c631f50c99f7525c8381095445c2df0 SHA512 e316c1e53010dc894c6eee06ec21f1761971beca489d143eb01c34a0f7ca366a0db87c5e6a2c855dd2ab7f591fdfa7d123951e1e963457b9b6f0d1d9e7775b0c
-EBUILD jq-1.4.1.ebuild 748 BLAKE2B e81bef6df4524a607d5d32b07ec64fab4fc34b545037d76fd43a658e05980079d11755c5119e66045c448d9a7cdc30cbafd317d2a3674d1ded49860311cf0b9d SHA512 c5dd081258b92aac9101a82216656e4e7faa2ece4b2bc7e9491d76f0670dcee9450a504f048e3136ad2d98e072f90d0df5096499a1f09ecef96195927760a9e8
+EBUILD jq-1.4.1.ebuild 747 BLAKE2B fa210bac9cb288cb10aa870efaca27636423ebd1699ee142b4a581e0460757822bf3175c7741a1cd4875fd9cd273d2719c631f50c99f7525c8381095445c2df0 SHA512 e316c1e53010dc894c6eee06ec21f1761971beca489d143eb01c34a0f7ca366a0db87c5e6a2c855dd2ab7f591fdfa7d123951e1e963457b9b6f0d1d9e7775b0c
 MISC metadata.xml 367 BLAKE2B b17eb2d9c460774d98ba18faf8a09d1c9c711433d0dfcff08df4f769411db66fdb2241d12ebc706664cdef98d9dbeb290614446112f53ecede571f77aa085174 SHA512 399b63613673deaef747fd380d6bdc086a4e4b57c5509b15fd6e031ea613ccf59641c95064fc7dbbf61f8d879fe03faf7e8298e4e8792a8a0b7a2bb3225e77c9
diff --git a/dev-python/jq/jq-1.4.1.ebuild b/dev-python/jq/jq-1.4.1.ebuild
index 1a998f86ea13..c0fc8c42374e 100644
--- a/dev-python/jq/jq-1.4.1.ebuild
+++ b/dev-python/jq/jq-1.4.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index c7693ac0a681..1629942555e4 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -2,6 +2,6 @@ DIST simplejson-3.18.3.gh.tar.gz 81540 BLAKE2B bf6a162499b28a362638e19735f668571
 DIST simplejson-3.18.4.tar.gz 83721 BLAKE2B fb9ea04402ba740a445751ff2be2f5f5c826e20f38289dcf9aa9c8abbaba4b59bf906c3378317818c77bcfa6ccc3fe76608651eac660683eeac61f5750099e3d SHA512 6335389eb620c96d5c537cd335e20d4f112b86c0c463ceed4d8fa36c27bab8b00386b7995e40070bda5eed1fe5883a462579c7d09bdbc828c39537282669d0e4
 DIST simplejson-3.19.1.tar.gz 85207 BLAKE2B 4c3d1d5de4292404e44977777332fe57327ece1afcd9890b605d52a248764612da351b7c5afb36d4e1cdcb530f07b99b8d971124899b86e4b2f4005a66afcbb5 SHA512 a2239a932f43abe59da84fc3ba95eeaa6a720c929da79d8f4447603b8c770403c9cba0f008a66c20c5c8aa3255891b687336eef1db071171a2c8435563bbb1bd
 EBUILD simplejson-3.18.3.ebuild 956 BLAKE2B 91409a554c70ddbddf6bf6c22a19a406344a62b6cf99b1befdc45c5a200dd78dba22d3f21372cc70c58521577df9f6221dac29e5955ed5428d868901db310650 SHA512 0f8207f9a27de53edc93e82f4d27e075496c166b8985c30c12994469844f0166c7880c971cbbe1a22326eaaa689d92d6e414abd34a616d5baf4a30ef5f287d9b
-EBUILD simplejson-3.18.4.ebuild 866 BLAKE2B 3b76fcdd92ee7724aa58b48d097204272bbf4dbb2fa037a477282ff6faedd13e44620b07482a2dc33110b93b1602ae67ef7fc9bf9b9d763e13cfc96849a66126 SHA512 a295811f8b46f8177ca3d3bb01295266815256c3f80a4e813f90ef61edfbedf43e7aca1a96abefe78fbf260bc5e7dfba68215860e9dea03577166cb0ff6a4396
+EBUILD simplejson-3.18.4.ebuild 865 BLAKE2B 467906c476f23f28b1a03561e7b2757fc9fa97e5a009506a02afabddb6d0eb4bd3a2114be6e4db33a404f51c40be93f5a18368671fcb3938d6660ff2d0d1db22 SHA512 b3a2696c9e9eb2af5d9a982c732d9b2d845e4f6f68bf5f86c84dcd77502076db7a82613bfa40bef71bd4624b54701acba7f6d98682ee0740e728cdf1f2ddadf7
 EBUILD simplejson-3.19.1.ebuild 873 BLAKE2B 1bb6e18767e5f232ad972a996a4870a4a3f791ccd98a4a468b023bcdb5a85af598429a408016145a122fc015bc2e6947bb7289b6326e2f277d75a691ed7f904f SHA512 b940fc6f65f54e93c17ceef010aec99347691726e8ec58718e8f9fc8e27dc523511b77a3d19f68eab7a733edd7ec6ae6392b886a5007f51173aa0f842ad1d1d9
 MISC metadata.xml 522 BLAKE2B b8b8fdade498ef65f4d5d6e30bc9f0708390f3d064a332d04f0b33346224c59252ef3d512a5a7187c637348201829ccc83254cd898e8df06dff314e857debb58 SHA512 1a1b53900ef62d4d40977504378dce3ce15f1c56ae5a73263127f5919674b1f9b13964128550e0c0e274d4bf50f2c2b438626e3ba1a5f8436071e1eb2f4c30af
diff --git a/dev-python/simplejson/simplejson-3.18.4.ebuild b/dev-python/simplejson/simplejson-3.18.4.ebuild
index 8284047249eb..fcb83a588896 100644
--- a/dev-python/simplejson/simplejson-3.18.4.ebuild
+++ b/dev-python/simplejson/simplejson-3.18.4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index cda4ab6920b3..7eb619822dd1 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,7 +5,7 @@ DIST SQLAlchemy-2.0.8.tar.gz 9314926 BLAKE2B bc54ba9be9f68cc2995bf5328cc5268e089
 DIST SQLAlchemy-2.0.9.tar.gz 9318327 BLAKE2B 6fd734aad4a7c281164a6a4188066d5e14996a80c849cc18b979d2acaa4bd24ed66c8ddc37de2c08759e8c0a9b36a0009bdb48123c6a50fc5c8c382a1e5df4ae SHA512 e81193ac254280feee542ad61a28540d62441d0471bdcf00cce20d3730ad956414de23ccce6d3bf8781c0970c3c825407b909d645d58c9657c38ba68716dfe54
 EBUILD sqlalchemy-1.4.47.ebuild 2835 BLAKE2B c2ed746fa742a1a59acec80bf6c7b0342c28226e3235fb3a7ae46a2d8b260cabc05840ce58d091bfaa16b7601b24c4da0f3ef32364d8817258af0551f560d787 SHA512 a326e8a93a6b6567314833c9b1b2f3da08cdab0176166e7faf7e19fb5ba65bbf0a54ab8ab1772fc7394157af02eddfcf40055292ab05431af6210adda30bdb3f
 EBUILD sqlalchemy-2.0.4.ebuild 3765 BLAKE2B 0250e7fada00dfd9043367270cc40a7e4ffaafe587859fe7dd938dc4f7714f6a016779c928856ac35f64a430ae6f6c5629f2458dc85beb0388820fba69f81dce SHA512 565ff18cae76c9383848b569d78a4c61a5ccf1b760c363eaaa80ef489daee95f210a589a710fa273ae35ef99e768fbd17d72f2a221d31546cd43e298f41fe602
-EBUILD sqlalchemy-2.0.7.ebuild 3781 BLAKE2B 37a074706e9140fc1cc2d93bb07ec31e3f477729d6d0cf9fe8fab065b3070f3b2d5c9b995119967d532f0f0bbe1d278013633a917ca281c90b6a40383fd8b38f SHA512 1cec3c21c8c14cf546769a3e113dc2f41551aef372296d01c5924e22c23c7204c17e0b7fc79e5f1c421d71440022b2eb374e3a845635869402d76a405c64db07
+EBUILD sqlalchemy-2.0.7.ebuild 3780 BLAKE2B 2cd23bb74e03733fcc73fb5ae17713f5f7c2de5a7b5ede9921f9ec7dad2639144b0fcd23575e214fdec0efebe984ee9b2cd3b802bfc82eda300835cb01bbbddf SHA512 97ac5a265a5cab92651919c6cbc43baa48a1a2327841e81df99f932d2888e7304f1215d1476d3691373692849d3ba68f0219ad2851d4a9da58d29a4f522c8423
 EBUILD sqlalchemy-2.0.8.ebuild 3782 BLAKE2B fb89f7cdcda30ae985a2a8099e1d3cf9a7274661bd84711183f80af9b79d30269504953799889ede63abf62cd82bca06c9f6ad2461cb468edebb5a4dfa3d8cc6 SHA512 63832cd21822ef46b2047e4d2b7383bb2d148f85b743988b8f557e006a0e709ed79c628a0181c204c0f0e54f59d6c38b12e0c05b1454fba5c3a66baf0c2812b0
 EBUILD sqlalchemy-2.0.9.ebuild 4080 BLAKE2B 1659a397b7511fbab71a9a11b1f9d900175e22c6653c7d7b81bcb59fc52041310369786f922266a45a2e1a3ad6bc699403f453eea30f2ae09b6068b93879a8c0 SHA512 22cf24bf6905986c2d0a17ca3b361498599700bb23b9da7f7e00131e92293dc93984e44558cbfc9ea5ab8d19477019fef99a4e91206f4cf5ac6a222d08b45578
 MISC metadata.xml 444 BLAKE2B 5fbfcf8f16e52ab5bb691b0b33a8491d94e42a80409114cd9b306af7d4b0eb8b6660fabc663adee53080c635217961301b78df536995b91afe9288d255f73d62 SHA512 b432b65ed3033d34ac0784d007909eb838b309b6a4785eebb1a3f808e43dfc41c786cd55e4dd048776c65127aac170bdd9fb9e5a8ae63accb5f65e300bca9676
diff --git a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
index 9dd057f56fc7..3bad86a1f581 100644
--- a/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-2.0.7.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/typeguard/Manifest b/dev-python/typeguard/Manifest
index 5ac3b81c79f8..9bd740b52802 100644
--- a/dev-python/typeguard/Manifest
+++ b/dev-python/typeguard/Manifest
@@ -6,5 +6,5 @@ DIST typeguard-3.0.2.tar.gz 58171 BLAKE2B d11b9592c191f131a48c8545a1ffbc4dcf4fc3
 EBUILD typeguard-2.13.3-r1.ebuild 1005 BLAKE2B 44dcf33112e89ea5f5e395ddfc545b6fff8bcbf69a3bc5cd68c3770fa8b4be2975c50928c8868d0072e0038100e5223e053bde379b57f2264f4d9b0616b8db88 SHA512 0fd1b6b4f408e9d68331fefa0b24cc8d4790af5661c24e41e3dd6e25387fefc5454bb9f2a788a3f42b023c6eda7b9da4bfda63c7bc36c5e4fb1ecc45d1b89227
 EBUILD typeguard-3.0.0.ebuild 1042 BLAKE2B 591924c711340bc0166b7c0b805f97619c1976aa4917fb49dd85f6c0a65f04b168b1157dbe10988dc5a2c2db192d169c3746d0d114a585e9a147058672d39744 SHA512 6e57ab665afbf9fe30a64393e1211dabec80ce88aa6b6129294db53d7298c0171253b05f5fa2730d45e2df4806c96dddff88926916b2bc8fa1b834549cd5ee8a
 EBUILD typeguard-3.0.1.ebuild 1042 BLAKE2B 591924c711340bc0166b7c0b805f97619c1976aa4917fb49dd85f6c0a65f04b168b1157dbe10988dc5a2c2db192d169c3746d0d114a585e9a147058672d39744 SHA512 6e57ab665afbf9fe30a64393e1211dabec80ce88aa6b6129294db53d7298c0171253b05f5fa2730d45e2df4806c96dddff88926916b2bc8fa1b834549cd5ee8a
-EBUILD typeguard-3.0.2.ebuild 1035 BLAKE2B 6902ce622603add7a939811599ed334bec931f21dc8d07d2de84f604bc75cc3177858afa515386f77a61fb4fe3b20b1a54ea656b8480bb5767e9bb2feb1df567 SHA512 b6340989d84a54c93caaba869ba51ddf091c5ce092731e73de1b5487dd25a2f4a5763d7b9d8f0ec2ab6de5280daccfdc8e834551bf486e9c4642956c79be7af6
+EBUILD typeguard-3.0.2.ebuild 1034 BLAKE2B 447d88f2d887be5bded54bbb8c02536c49e9b19ee577dc80ba7e11d030680ca2981b7c30958efe11fe57ec0f12c326a6084145ab46dc678e377f9ba9cff12e45 SHA512 1c02cd073d8d9dc5d6b6d35afdf77be79cacf366109edb617ccc31fff083627e633d725ef85396afa3126081736aab47fae61eb618535fc62949c1f4b014f452
 MISC metadata.xml 350 BLAKE2B 78dc7293e08dae7974b38d84ce457ceddc5888a7278c1b149b8ba3057f07130b2e002dd78a9df91fd09d85b7ebc26272b4c78dd96c6cdd3938cff67b9c451366 SHA512 1fe4c4164b0732bd294815dacdd46a70ace6e8886343491232fb59b6b3697316c3eac5dd72e2e4758d87fd093d845f4453b8f278009be640ca1555413f47e869
diff --git a/dev-python/typeguard/typeguard-3.0.2.ebuild b/dev-python/typeguard/typeguard-3.0.2.ebuild
index d0ca5aa215d9..3f32cac8a6c1 100644
--- a/dev-python/typeguard/typeguard-3.0.2.ebuild
+++ b/dev-python/typeguard/typeguard-3.0.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2295e339556c..78d17a9a6776 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index cadbfbc3e479..a035a62c5b92 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -4,6 +4,6 @@ DIST rbs-2.8.4.tar.gz 1069703 BLAKE2B a7b97e2ba7b8bd5afca303d69262cd54169bfad8e7
 DIST rbs-3.0.4.tar.gz 1123563 BLAKE2B 335ba5d438b74ef36a65c1bd5d41508bb4d89a5273d413899f96684e6d97a6911ab157ad5b8acde97e23b832ebd2bd04517c37a3edc2fd66703442333d3fa5b1 SHA512 17dff709693c2b554178a31580ed48e863490fc527c86a8d823928379483665076c498e402c1dcb85c0ba401e6754e9c2d8cb9a48655952136521e6e7b47025f
 EBUILD rbs-1.5.1.ebuild 1180 BLAKE2B 01b55d7b617aef6141a955fc59ac2bda2dee8415ae3f7f89dd9ebf2d161ed8f39c95004b18ab8d3764bb29662cedaf6de42bd19fb8311084a45c6dff1f05633a SHA512 1634a3de02711d2fe1a5f7674df3cd9169689304a10d9f59720e8bc80630a2d2d8d905db69e191d7a6a09a6f5ec79b2c9ab4cc678be99dc8e3efacfda4186a45
 EBUILD rbs-2.5.1.ebuild 1860 BLAKE2B da65e1e44af71c41143c87de89a6e9996f70849c57ccc1fca9656183111645aaad7add7c8bf6c14e6488f1f76c0b522645fbd164e06f79d402d894028a379ac5 SHA512 23a57b99c5e8c03bd6e77ebb14a27571d9c9ece9e3ab499396119f3bab3ae1b69aa30f578839d5506f71fee4171fb9f4014ad18ea40417240467a042b0e7df7b
-EBUILD rbs-2.8.4.ebuild 1918 BLAKE2B 89028b44dd233454d6795a192b4d5157bea61a15107be1567676426c158434ea5df3942f8a007d3d83dbb4a02e583fdc39b2cb4bf45a73e14ea3f71acdc47ff3 SHA512 854d6c237a6eef7ba3ea71b911aa5a71ea44e25758ae2dd07aef488e106b564aca30086e617cbdd3c6c40f3fc7932432059c66f8fdc52782affd0490f645f1c1
+EBUILD rbs-2.8.4.ebuild 1917 BLAKE2B 806e37aa8a8f47c5e211c85c79645730774d8d76849b87c94e8925142ed7a4afabd1a79b36547593b7344bf90213570aad9eb02414bfe3b703fb06e8249dd38a SHA512 129c194db85727af9535b291126572706154c84504b8659bf6f8f5f14357027df4103646da278900a03515c46b5a6e6dbf8f19cd978f9ea4342e9a4138096b3e
 EBUILD rbs-3.0.4.ebuild 1922 BLAKE2B 0812e3fe9bbe37a4d25fb148c40779e872151fd64ff89deed6c684f125a006d0bc8c3f28cb8691b089eeab7f91605e22bdf0e7ac4ba3f93fba274a0f2bae0602 SHA512 08f2d09f115ceb5a85f6d65c7320bb09582ea143cc00044c2f8ee2d58d278e0c4735da934823502b47aa70b95f1f91012cac88f5dc6c467fb53a2bd268108f07
 MISC metadata.xml 335 BLAKE2B 287ad52f77f7c62c6fa58fcdb9b1c1498cf39010ab26b6f98655beef9719ee5803844b1ab084788af70087e342a02806a8619a8dee472bf6d4d0b2ea54d2152f SHA512 75703ccbe3a15813f6fd3fca2489a9b39e586f59ff2cd89ec8d7a6293760a8789aed715565520f0f623746932bd756820eef960e45fea5f130d34cf4cd586cb5
diff --git a/dev-ruby/rbs/rbs-2.8.4.ebuild b/dev-ruby/rbs/rbs-2.8.4.ebuild
index 877e43c9ebab..145408767cf9 100644
--- a/dev-ruby/rbs/rbs-2.8.4.ebuild
+++ b/dev-ruby/rbs/rbs-2.8.4.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rbs"
 SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index 535904506738..fb68bd128617 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -2,6 +2,6 @@ DIST stringio-3.0.4.tar.gz 43654 BLAKE2B 08f0d41577cae1acba36acc3823218649342c45
 DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d8500b0ad0cdae1f3029c2b53e8e3f46583ed0b5e289afe6636bb4610bc27a25e24acba5c7c1e679c5e4283f3b SHA512 d881dea34738e46fffaceb9a5e88fa3148979eff3571a6693d1d80bd01fbe236c0eb65bd8b2003abc0241bceff93d87fd3acd27b038b3a7bf6da65d492047153
 DIST stringio-3.0.6.tar.gz 44971 BLAKE2B a143fc01e7b9434db3b444f6049b002549a4149b9573ceeab4bf8955555290b1f41ef6ff012c7f58d1bc0559ca864e83aeb34f0cb75c3133ea91ac51f55008ff SHA512 118e7672fb347b111f90f4380e49ad01aac617fdf6afc9317f2242e942e68fa55ef5d71782c15156ed7b4c91d1eff75ac68d870885650ac4505d6a17b368afab
 EBUILD stringio-3.0.4.ebuild 923 BLAKE2B bb99fe0718f884ac84faf133bd190f46525a5f05e7e062fbcf78bdc99a94a6b2b1de92b3d31cc8549daeda54bf61d7a18f3033b630673f0f28a262fda8b1f367 SHA512 5a1b18e503619082cd7ea16ba2d9a439b7eb349f1aa24d3c1cf7801290800b0294afffc47701968982bb74bc8e5c4203eee905d350ddb778127163b3142ff71d
-EBUILD stringio-3.0.5.ebuild 932 BLAKE2B 6839726e7fbab7b6dbaee419b004871b9b82b4f8dbe3bcb6564a18dfd398a589886ae971a6ab870c82e639ece44b07265da2e78f32231204da01d15a3440106d SHA512 8fa85eafcf768884bce3bc8bd29b31dd8dee26bec687b2fabe6770e713ff64f7bfb9887359d2bec3bbaf2341aa0e59dbf2b8ae3dfe1d7679507f5bb9401e392e
+EBUILD stringio-3.0.5.ebuild 931 BLAKE2B f090fb961a173fba696ceb48b984757850f5bd89a80f6871a6d4a6061d5376740225d1acdf0368c58eb2635e379cb9b9542b3d238d499f6400c805d07ffdb990 SHA512 35743d25b608df3cda5b8a8b2bbfba08eae04a3892a6732e1f06b9b4030d26647db360570dd5fd9340fba8abd77ae9c0b7aaf47b4b4423c86f17943e2974d56d
 EBUILD stringio-3.0.6.ebuild 931 BLAKE2B 557e06e333c986f6807eb8321280e5ee95d2da5a3c3a27050df44fd9093542fbfbf178685d6a60cdd843558bfb13e608f8169522a349f495aeb93c4cc236a716 SHA512 becd6b7b10edcef6b1aaced89603dd8dde929a414e0e95241d5296189a36ed00d51d030b3ab3b150c5ad50c5bbc7d725b9dfea4925a39382ff1366a8d8aa063a
 MISC metadata.xml 340 BLAKE2B bd5f8222a43eb391d2d14a1b878fadefd9f8a322e87b5058d482df79d95d70f7ef19c54e7ae12dc29e7ffc84c72e630f0ca46ac095059263cdcf6047cb4fa4d9 SHA512 f1f32d2c4c13e19500a7ff23b684b180d3dba8a79e49b8cb57b80e265d09e06cb8b7a9e6b743158a140967b7ccbb991fdf51cb3a6e95be4e24378a5f85efcbb2
diff --git a/dev-ruby/stringio/stringio-3.0.5.ebuild b/dev-ruby/stringio/stringio-3.0.5.ebuild
index f7df3249e79a..701e2800531d 100644
--- a/dev-ruby/stringio/stringio-3.0.5.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/typeprof/Manifest b/dev-ruby/typeprof/Manifest
index d955fb572dc1..e1a4f5128a47 100644
--- a/dev-ruby/typeprof/Manifest
+++ b/dev-ruby/typeprof/Manifest
@@ -1,5 +1,5 @@
 DIST typeprof-0.21.3.tar.gz 1073355 BLAKE2B e8fa905b69f30b8f9884bae6b9600f802d0f0055f61f4a619768bf37547049fba97b8670cad9cdaeec9aa44519ae28bb13b8b0f533ff4d89e892e1726b56f7ff SHA512 ac9f0be4025181b994568e946591ddca4d0e4bb1949ba84d1920d765ba4549212e3fc4c10904ed691ecdbb153cd1b494f51065fcfddc4cb3c72ff5b393aa7c62
 DIST typeprof-0.21.7.tar.gz 1036834 BLAKE2B c0a8a1ed3a0592f72489eb342cbaf132e647d11ef5f3eef003b4208e512f581aacd586cac137c9b405d59f71e1b9e2cbc9903a9c1b4791db0ad0a64485247eea SHA512 0dd149da7873ec4422a03fa31a828a8efafa5faff0c23dffde74650b71e14d472f1bb0c36d28a48e0538a761538504937ad4e0f8a711a9f5c2b52ac4128a8f37
 EBUILD typeprof-0.21.3.ebuild 991 BLAKE2B 1a3783e5361f618e420b118f0c94a7ae4cac6f7dba514a57212647160eafb1538ed32951f73420be71b6a83db47892ffe08d412e052caf6ef5e757668ae739e8 SHA512 3a7657c841ef09079a204af1cbb0cb17a68aae8fef12c5d159f8ff004198447e834b50ceb6164d82947d47a0231535d35c8b4df46ccf3fede1a657cbb0b56e08
-EBUILD typeprof-0.21.7.ebuild 999 BLAKE2B 97041fbe6b43c93170541a74ea4182a14a06fc667839f823dab8f3ee49fb25199eaf38e9f4293a228d6c052ba2291fec1621b08915fc1f4321c100fcd23fe4b1 SHA512 bb5b108eaf43df7c2f8d27f2438b29119d0c3c3f32556d152ff6d42e9df986281e58dce755a0a2c0b3d3ef74604f8bd48714f1525e42f6059453ce6a9d60ecc0
+EBUILD typeprof-0.21.7.ebuild 998 BLAKE2B 28c05661a8b6220eb6ee8fb7fffb90d696b76195e389b65d6eed4d4c7c2be5f8fb2764e3d523e2a1dd6e747fd6aeaf23eb9090df9718c10dfc78225a35a837d6 SHA512 7651515ff0a846860e7a1edae465303f46023769992e8b3c729c628dfcfc89a42d0af71f22f60ed6519e4406456ef78525f334e6c7b4cf32afefe5c5edbbe7cd
 MISC metadata.xml 340 BLAKE2B ef30979bde6019c1290d2f6038c0465b7bb23754da9a118d1493cf5f8ba404258a97b67b0e5098d1e02fba2aa0ee569a8d0217a2ba8f5467cfb9ae795a457a8f SHA512 2a38dc39885b6693d013c28591bde40dcad4c38d1c8195944104b501b40b49808594781cfb468de8f1982c172e5b98cacb8113a42e3e215493272bf65c691e19
diff --git a/dev-ruby/typeprof/typeprof-0.21.7.ebuild b/dev-ruby/typeprof/typeprof-0.21.7.ebuild
index df8b8df4d4e1..ed817e622e30 100644
--- a/dev-ruby/typeprof/typeprof-0.21.7.ebuild
+++ b/dev-ruby/typeprof/typeprof-0.21.7.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/ruby/typeprof"
 SRC_URI="https://github.com/ruby/typeprof/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 78353a665bd0..6baddf56ce54 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 2731300c8b81..5f0b3ccb61ca 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -3,8 +3,10 @@ AUX 15.0.1-fix-file-conflicts.patch 291 BLAKE2B 4ad2a65c731372de5553386bbe3136d0
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-15.0.2.tar.bz2 1480065 BLAKE2B 9fa5c024d05b25da2ec5d8a93efd2428ca0e47e88e3c5e701995664a548775ae6061fbe1bc4671c15595151a68a3e186544f671b683231461f9be02a86caf11e SHA512 5b345cd0cfe5c588ae062f402c66b45fbbdd03705c4c4900a2314ff19562279436712e19d7143d87cbf6db49e10cba825dd37c0a57aba8b1c1fd9a3e7dbe363e
 DIST gucharmap-15.0.3.tar.bz2 1480191 BLAKE2B 9cb551099982286305b24afc8c5d134f61a937e22641d254c0ce60de73b02d9fdb2d4a6c7f6c760bce0ef4e434ead07db0a8f1a14c7ef3a5d8a8ea9ab5af5a33 SHA512 017bd747bfce02c10d6a8f4528ff90f0e99f19e037704d706af73f8751c2ecb3d3ebd01e1d0499d910a368b2b0707cc91d48d7943a3157f0f20522be7ce769c6
+DIST gucharmap-15.0.4.tar.bz2 1453197 BLAKE2B 718890e466e19934b012a79deefc2174edba6de59bd9a374dee5e8cf396fd0a06ae8e4db4cfb223d43284d59be87344310e4cb94e1e45ae158e0213e7bfa06f5 SHA512 280fb164f2d850f9b4a8e54c24d0bc461e0abe2e53f34a6f2f0098397c04856091c6f730cfa9451de5b676b569e2a43bcf2a9dfe160f916b00622ec5535c1e94
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-15.0.2.ebuild 1648 BLAKE2B a64ebede5df957ff41389af01bf8557174818c8a0bddab5744ed60fb55400c520de13e30bfb55a8901e1fc48852d7f61831860b6c34478fa87df11da84b3b5e3 SHA512 f7ff73bf86f3ac7dc5b5bee19eeb5a60579747ea320ef3a37a76c3226951c84c710f5958cf5c10c2fa12bac66f955b09019e03ea34ecf8597381aee72aa5db99
 EBUILD gucharmap-15.0.3.ebuild 1655 BLAKE2B 0ac19aa5d02467569c9864a219f87d773138cfc3b95d40bde4bf9db9d95328721098f435577fef603e210c8ac96dc8b0c405fe0c39b3f392df2cc5c74b225881 SHA512 de7e58c4b75760b53c5ad34806cf3c400b0f7daf17790ab6d8b15ee45f6debee999105d499ff4cb81326a9430c61a9b00ad976b295c86d8208b4ce6e61748475
+EBUILD gucharmap-15.0.4.ebuild 1655 BLAKE2B 0ac19aa5d02467569c9864a219f87d773138cfc3b95d40bde4bf9db9d95328721098f435577fef603e210c8ac96dc8b0c405fe0c39b3f392df2cc5c74b225881 SHA512 de7e58c4b75760b53c5ad34806cf3c400b0f7daf17790ab6d8b15ee45f6debee999105d499ff4cb81326a9430c61a9b00ad976b295c86d8208b4ce6e61748475
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 350 BLAKE2B 980e1e37dcf73e8d3d41f93cef5a3ccb1ab98ac54d6bb2e69c0d6d20bf9ca62ee4ec342c7fd243348f84998e48b30e4d86e9db956731e7c6b250bfc4505df7bf SHA512 48df258ddd3271d63abfbeaaaf408e9b890a526e3363aa10cd8820de07d7d1683722dd02d38329e04559ccb2df529d0007b4609dd744fd4f21ad86c497e1bf69
diff --git a/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild
new file mode 100644
index 000000000000..375128fee077
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-15.0.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+UNICODE_VERSION="15.0"
+
+IUSE="+introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="media-libs/freetype:2
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=dev-libs/libpcre2-10.21:=
+	=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=x11-libs/pango-1.42.4-r2[introspection?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/14.0.1-install-user-help.patch
+	"${FILESDIR}"/15.0.1-fix-file-conflicts.patch
+)
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcharmap=true
+		-Ddbg=false # in 14.0.1 all this does is pass -ggdb3
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dgtk3=true
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 0186e680c151..0b50a692245d 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,5 @@
 DIST network-manager-applet-1.30.0.tar.xz 1880076 BLAKE2B 9fb663baf40760818055fb89528d593c53fb6c3884b375712e44967250b294651ce2d9d16fe080a7f64cd111fb3581a3fc56e6e9478ed1765f3bc42303995686 SHA512 2c0acf1942c0d238b28a2d9d39f8741f376dd16defefc776852c63f79c2e8e01974c3a485dc6382d5a239b8308eb12bb668f1c327ef27e7fc228d1ad03498b7d
+DIST network-manager-applet-1.32.0.tar.xz 1899584 BLAKE2B 7ce83c1a81ef62002283b87d09dd7045d3688597f71dba7f91b6feaed504934af10974cbe5732027a187a031df6668697cd433ad4bb5975503b1c7fa6789d6c2 SHA512 a7abe55c88fa95406e62fb442c068f95325fca748438aa037e0bd5b23add6454c3bc27ac54afe520746d32845bc7403f228f9bfde8e70c7442c906a8227ebe6c
 EBUILD nm-applet-1.30.0-r2.ebuild 1323 BLAKE2B 588c0ef2d341d0d96340c9daabb1919d986446f68939defee1733aeb30c1ce5a205f6750b696fbe30298a31b589c08bb55b5c27899597dbc4e0f20cb2f562af7 SHA512 40b5361b6bdb350379f54dc7f9865dfddc1ccaae8c0ae0cebc73815a5e19604a576c125a346624decaaf9536d6bba4134f57f9ba28a09b04e5e19521587ca81f
+EBUILD nm-applet-1.32.0.ebuild 1326 BLAKE2B 97da591b6a9afe5fcb61cc78dd81a1d461a3b3a412f14d6343353fa90e5fa4343ca3a36be094062aa581fce5dd42b1cfa31c9a03f38c9bb185216aa0a5a55200 SHA512 babee6b752aa3a976ccdd167d62e89fc44d7cb4930f21dfe80052d729b84fc3ea78f7738ce412d7319c94da86301bd9660cc3cc379e8baa245135cef60ffaef9
 MISC metadata.xml 564 BLAKE2B 9eae8bd089e03562bfd24679336b0110f4b856d998570e453d3abf602c66cede48be22d231f778d0acdf9206400e94a8c4d942082fd7443297c2070000a85f46 SHA512 5041d7f87d1501e1c6f6d4d9d2e37762ad068ea789f9a38813d2a7c83a72a03eacc2dae6d2876b308cdf21634233e326aba2d046f56856991609f5a4c9bf501c
diff --git a/gnome-extra/nm-applet/nm-applet-1.32.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.32.0.ebuild
new file mode 100644
index 000000000000..5d85e1c2d4e7
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.32.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.10.4-r2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=net-misc/networkmanager-1.16[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libayatana-appindicator
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7:= )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ayatana no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 3708661d26a4..747202641fee 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest
index 7e2da39e8e50..66513c410cbb 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -2,7 +2,9 @@ AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b002
 DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d
 DIST vte-0.70.4.tar.bz2 502950 BLAKE2B d3152c939e0b90b542aad268b455085e04c194cc6d86e4d9352b6531cf74a19bdcd16351e1f3934b1835d1470815215c19b1301136cecf43d23a6951fd8bb889 SHA512 f899c99bf5a9593fa618016a31c93e249bcc01b8635e1b878ab236de71a24a5b3cf1a032bea96855e43d894d004b0e00f20cc2e08079e52d8e7cb709cc73a7af
 DIST vte-0.72.0.tar.bz2 503848 BLAKE2B 4c87f5648b17a269072a7fbe520e9cf086325d8740050b9868fd6e0d812ed78e240a3d3dc882729435bbae30fbbbfe35c0e92f36cd62e6aa8e581350b81a3f90 SHA512 198ea27d0991d825cc993746422e89b0e7b2b225e9cbdb072477dcf5b5866e79a27920233e8da63a412c5f270769e6d333470f5368d0b09b39e15d53ddbe6dd6
+DIST vte-0.72.1.tar.bz2 504271 BLAKE2B 8ab39ab8d491757ab9402ad4bfc10ca733427d2efe895204c0db580e44107a9ab005c29ce2e6934ae27e8da7c27e39d1173fe787ddb8569938a29697eed2e2e1 SHA512 a5655d2d2602183cbda1050003d7cf883e427c8e00976af4ee2685f43530d87169e31a3b9597133d14dffdc95f20f9ca1488186d8463997a2672510f5a95d145
 EBUILD vte-common-0.70.3.ebuild 1893 BLAKE2B 44307cc4fcfca5292f2302b263eaf4bf2008053e787f098fce7a46f5013b95261920ccd824c1370282408d1a319ecf3d323ea76050188d0c4b71f6476f513750 SHA512 9d0c60985026894dd7e6343f8ff46c4459ed21c92484edea35590e0d475f6899762404043608fb49053a284d6be2444b28741da3db139d539eb988273854c61e
 EBUILD vte-common-0.70.4.ebuild 1900 BLAKE2B e1a18682d390761d4c865d7dbc33d5a0782e64115a8e04aca28144b618d2e02ee1934f68aa7678ee1720686870ab7a6f10474a3a3bbe87bb17009cf8d406bc32 SHA512 7954594f37c1f041168bc3e9e3261f3962440cfe3900f1fff76d1b6579fa7b9e6fdf05b821e6518743ce24eb70544153e8b42fa835e75bd21abdd00155d2b8f2
 EBUILD vte-common-0.72.0.ebuild 1900 BLAKE2B a691afcd3d5193bb8fcc6cfc530ebe475d83d944a558ebbeffcdda91918f197e1a85e82f8d8d7a07ae41a4522b3d831b241a361aff1b6018b09670d446c1a3a9 SHA512 a9ad78c4ae76fcd7e1e6afed5052cfd251e5e8257397393068b1eb18aa83ef80afbc3a10931b8e61df8278b23f67f218f591708cbabea64201ff74ec1a70b214
+EBUILD vte-common-0.72.1.ebuild 1900 BLAKE2B a691afcd3d5193bb8fcc6cfc530ebe475d83d944a558ebbeffcdda91918f197e1a85e82f8d8d7a07ae41a4522b3d831b241a361aff1b6018b09670d446c1a3a9 SHA512 a9ad78c4ae76fcd7e1e6afed5052cfd251e5e8257397393068b1eb18aa83ef80afbc3a10931b8e61df8278b23f67f218f591708cbabea64201ff74ec1a70b214
 MISC metadata.xml 524 BLAKE2B 2a7e14b63adff1385d2a1260d238c0f35854cbd7ba0579a55edf0c6367e37fba80c99fa21b911279c6b7eb7ff4d122f56d02cfc463076614adec2eb059666b68 SHA512 60c71846ff7745c3f3d4c2fb0c9b0214c7fef04d221d2b7e568d1a63b2bff56d49a442072aa5aba48b9247c1a60b1cdf3ca8e3766986e9ef1a38ee659fb65437
diff --git a/gui-libs/vte-common/vte-common-0.72.1.ebuild b/gui-libs/vte-common/vte-common-0.72.1.ebuild
new file mode 100644
index 000000000000..b2ef085b763d
--- /dev/null
+++ b/gui-libs/vte-common/vte-common-0.72.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-any-r1
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91" # vte_api_version in meson.build
+IUSE="systemd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/vte/-/archive/${PV}/vte-${PV}.tar.bz2"
+
+DEPEND="
+	|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 )
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.60:2
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	x11-libs/pango
+"
+RDEPEND="
+	!<x11-libs/vte-0.70.0:2.91
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/vte-${PV}"
+
+src_prepare() {
+	default
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.70.0-musl-W_EXITCODE.patch
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=false
+		-Ddebugg=false
+		-Ddocs=false
+		-Dgir=false
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=false
+		-Dgnutls=false
+		-Dgtk3=false
+		-Dgtk4=false
+		-Dicu=false
+		$(meson_use systemd _systemd)
+		-Dvapi=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	exeinto /usr/libexec/
+	doexe "${BUILD_DIR}"/src/vte-urlencode-cwd
+	insinto /etc/profile.d/
+	newins "${BUILD_DIR}"/src/vte.sh vte-${SLOT}.sh
+	newins "${BUILD_DIR}"/src/vte.csh vte-${SLOT}.csh
+	if  use systemd; then
+		insinto /usr/lib/systemd/user/vte-spawn-.scode.d/
+		newins "${S}"/src/vte-spawn-.scope.conf defaults.conf
+	fi
+	einstalldocs
+}
diff --git a/gui-libs/vte/Manifest b/gui-libs/vte/Manifest
index 81197e83dac5..7d63ab607b54 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -3,7 +3,9 @@ DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c
 DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d
 DIST vte-0.70.4.tar.bz2 502950 BLAKE2B d3152c939e0b90b542aad268b455085e04c194cc6d86e4d9352b6531cf74a19bdcd16351e1f3934b1835d1470815215c19b1301136cecf43d23a6951fd8bb889 SHA512 f899c99bf5a9593fa618016a31c93e249bcc01b8635e1b878ab236de71a24a5b3cf1a032bea96855e43d894d004b0e00f20cc2e08079e52d8e7cb709cc73a7af
 DIST vte-0.72.0.tar.bz2 503848 BLAKE2B 4c87f5648b17a269072a7fbe520e9cf086325d8740050b9868fd6e0d812ed78e240a3d3dc882729435bbae30fbbbfe35c0e92f36cd62e6aa8e581350b81a3f90 SHA512 198ea27d0991d825cc993746422e89b0e7b2b225e9cbdb072477dcf5b5866e79a27920233e8da63a412c5f270769e6d333470f5368d0b09b39e15d53ddbe6dd6
+DIST vte-0.72.1.tar.bz2 504271 BLAKE2B 8ab39ab8d491757ab9402ad4bfc10ca733427d2efe895204c0db580e44107a9ab005c29ce2e6934ae27e8da7c27e39d1173fe787ddb8569938a29697eed2e2e1 SHA512 a5655d2d2602183cbda1050003d7cf883e427c8e00976af4ee2685f43530d87169e31a3b9597133d14dffdc95f20f9ca1488186d8463997a2672510f5a95d145
 EBUILD vte-0.70.3.ebuild 3194 BLAKE2B 150f3cf645c43b1432b3dc4d21bcf61289af002c454d114531c2b5c9fe5ff14f3e15b7561cf43c78b14f0cd9e49e41648cfd2ad698051e69eda26e840ba914a6 SHA512 5a5fe4dabfcb070e63f42688b5d21da32bef12c07b4ad12178a8067bcd953c4ba947d87ecb73c39d2d22e9cdf423b54a83098e4202049f0c33ae7b78eb344777
 EBUILD vte-0.70.4.ebuild 3195 BLAKE2B 81183f15a109b4c464cce94768472a17c503e8450d4278f7caba892315dac3876f622830194e7efe926927d95a1183568d8fe4072c47eef5fc6e0309e60f36ee SHA512 c01b25d1db690c65e374ad8ecf5088bd3cae1a85a06ee4f49e1ee2beec2fe0b1a27935ad0317e0118f749ed95c898194dce6ac556a57bd9983bc18a46c3bb004
 EBUILD vte-0.72.0.ebuild 3195 BLAKE2B 21802635a351d5427ba45ef4b82d3896e2ed3ff0cd9aaa229ac976a569f5afda55c84d4bf6259a98e8a2d444ff42a50c135e733c0e86c8732f578f9ad176cb0c SHA512 cd6cbb8c834116315f5939f047ec9994ae332130c01f302edf3c46c7dd6fae86a1e1c9d204f2f88f5a755539e6397cd028a96da3a05f92eff6d71409c8851a2b
+EBUILD vte-0.72.1.ebuild 3195 BLAKE2B 21802635a351d5427ba45ef4b82d3896e2ed3ff0cd9aaa229ac976a569f5afda55c84d4bf6259a98e8a2d444ff42a50c135e733c0e86c8732f578f9ad176cb0c SHA512 cd6cbb8c834116315f5939f047ec9994ae332130c01f302edf3c46c7dd6fae86a1e1c9d204f2f88f5a755539e6397cd028a96da3a05f92eff6d71409c8851a2b
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/gui-libs/vte/vte-0.72.1.ebuild b/gui-libs/vte/vte-0.72.1.ebuild
new file mode 100644
index 000000000000..b9c4b4743126
--- /dev/null
+++ b/gui-libs/vte/vte-0.72.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91-gtk4" # vte_api_version + "-gtk4" in meson.build
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
+
+DEPEND="
+	>=gui-libs/gtk-4.0.1:4[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.60:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21:=
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+RDEPEND="${DEPEND}
+	~gui-libs/vte-common-${PV}[systemd?]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk4_api_name/' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=false
+		-Dgtk4=true
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with x11-libs/vte
+	# Remove files that are provided by gui-libs/vte-common
+	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
+	rm "${ED}"/etc/profile.d/vte.sh || die
+	rm "${ED}"/etc/profile.d/vte.csh || die
+	if use systemd; then
+		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
+	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/ || die
+	fi
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 97468471a529..6e9890f7581a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 7ddc48c50f3f..680483cb5ebd 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -3,5 +3,5 @@ DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591
 DIST libass-0.17.1.tar.xz 403160 BLAKE2B b191e8910ddb3e41fb9df79b27517a127c0da2ad74c0a81920bc2cf8843ab18b02a60738024fa8d3594b91bd26ec6ea7f87e17ca5e07825a6017dd29d2b72b32 SHA512 437b4b60db2626e48f438b5138ab4dbf2c2ab4c8f0b587a6e554510c6719544ef2235c601ff1e482d020410f9bab95ad1a9b176d19a3bd54880499a576b41f23
 DIST libass-0.17.1.tar.xz.asc 228 BLAKE2B 0e70c104438be4409239f435d7872737fde1aba4485816ad0e35f0de743ee303662e66334425d0d511af4974e03443ba6d33ac44f941de9b0da17a56f204edea SHA512 a28c8271b4c5b5756620be9baf81b0262eb71c4f20d1aadb24238d1d0ccba44fdb3b25d788a3f7c9039945431a3d31842a7855660cc28a0a8acc36ff8f0c0298
 EBUILD libass-0.16.0.ebuild 1406 BLAKE2B 92357824f79e7968911f544d0ddcd14242c2f799843a690c7c8fa87dbebf14efec14ee29723e026083d0d617dc6bb471820626a48385be0f6d4d3705410b00ef SHA512 c56a7894b77ebcd6870d77a655e4fdf1f629be779d6d99a15b349ba855174c4cf84df7588bba549aa47171ca75b2ceff6c4f6670282965148827c1e083e85fa8
-EBUILD libass-0.17.1.ebuild 1518 BLAKE2B 370e15c5685e71bccb3609e6c1fef72e1cbb26d6fa8c5432ba5e99c86e8ef75fa06f2ac81c5ef12f328357a87425c9334ecfa0b96bd38c6bfcd27f30ade0bc04 SHA512 5960b3766d73d9fb5b946826b9ae62ba976b81411bda6583806863a3f071f08d07c414bb55c8171c288ff3b146b1399630f4cbcbd952af200d3c2b86fa9378d7
+EBUILD libass-0.17.1.ebuild 1517 BLAKE2B c385ad05a28f093fae258281c6262fb3de6bc66bc8b5e5cf7ee3072536b9d160d9b1d19108f9802c778c58d10369a88ceda9ffccd06686dd48894154983d2ce7 SHA512 1d8916288195151da7e618d7c825c16d2471a1e0029dbd358c9c995e33175f725224ccb043fdd1477d311b2df9da19f951a400147312b2a92ed554b56b403e0b
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.17.1.ebuild b/media-libs/libass/libass-0.17.1.ebuild
index 2edae7ac0760..507e23173a87 100644
--- a/media-libs/libass/libass-0.17.1.ebuild
+++ b/media-libs/libass/libass-0.17.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/libva/Manifest b/media-libs/libva/Manifest
index cdf0c888ecbf..b665615a36c0 100644
--- a/media-libs/libva/Manifest
+++ b/media-libs/libva/Manifest
@@ -1,6 +1,6 @@
 DIST libva-2.17.0.tar.gz 276993 BLAKE2B 4d003f6649e4356a06438f8a88a5a549e94b12f342b1b72649b17d0aeb259ec7f26c3d1b5d21ca6cfc2b31141e01449ccc94a6bfdf2716976cbc80f63091fcfe SHA512 c9f841b4f35e732bfaa0358fe031207f011be90f95cc46acfd8c83092510cf68fe0921f28ce82402e7cce65f263eeb4d06cc17fd3c525274530a53b212f33779
 DIST libva-2.18.0.tar.gz 278493 BLAKE2B 619a1dcb9aaa71b38ec7be500adf6b526f50ae20fa76d1c5ac750229e03a2d5b82dabe334cf07c0f539c1b079829f2ec000ce6570e05e6e18fbf7415c5d5b9b3 SHA512 12e8d837604d2f354d849a8adc84281ae1ecfd2433f1b7dc8e28b5d703ada42b4a84b2b3870e8d2397b77d0d9741afe3bc04d25b4426531805aeb72defaac7ad
 EBUILD libva-2.17.0.ebuild 1719 BLAKE2B d8745a3f8b92c9f61310f61307ef9eb90adbbba4440c2b8a86894d810b22c59d1ff98da3bee803f8446d821fb4aebe06862d142f1563d65968dc76906b4ba853 SHA512 3045261c46456b48a598449cfb7a6b6ed2d5faee979fe87cd3d39fc9f2ab124c302fb8134d70a5a0a4a4994b07b9734ad398947b981437b968ccfb89b1580905
-EBUILD libva-2.18.0.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
-EBUILD libva-9999.ebuild 1694 BLAKE2B 8b840e15759fdaf967f93ce93b3cb36dbaa230ec427bb2d06d33b7e47d42dc216b014d4fcd382b5c44930a6826736c43f1040aa933bad9e7cc64c9208876ccce SHA512 ef471970a85be2d065cdaf32ec560a637f0e2f93fb1a1ad3ddd58b0788836278f2ba9789e5b0c500a6e1b58bf55f0b973a72fe214a929d11ea1fb54c4fe16ad9
+EBUILD libva-2.18.0-r1.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
+EBUILD libva-9999.ebuild 1545 BLAKE2B 6fdf54255522daed04b98f8197fab60de24d5135033a2bf06e4a1e51216475c44629297bce8dcbca8c5ef28ad59002f861a3f42ce581f2ebef80980ffff4f81c SHA512 e0184e6812ce5255b3260215c3d168d4a9e1978c3b8ec6e10cbbb9c15695996475f97825fead54c622e0cff98989f46bc4b1aba0d07d0f9f03f1c357444496ed
 MISC metadata.xml 332 BLAKE2B ee8f4e2f059c3b81126ce55575cfb267c783c37e84bfd39b4564b5f0615da7d6d7efda0bd1fe3c547aa81ff3a6de056bf2555d5049d15bc33aab16c0e2a7271d SHA512 dfa43788c2b4701dde7eacecacdd4a372b192fb98ba8d471a5226eb15b20acb89e564358aa75a1673956005ed904b9e34135ff77d230b1bee95731d61198aef0
diff --git a/media-libs/libva/libva-2.18.0.ebuild b/media-libs/libva/libva-2.18.0-r1.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-2.18.0.ebuild
+++ b/media-libs/libva/libva-2.18.0-r1.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)
diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild
index ef0203c92e12..4f264beeabed 100644
--- a/media-libs/libva/libva-9999.ebuild
+++ b/media-libs/libva/libva-9999.ebuild
@@ -19,8 +19,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1)"
-IUSE="opengl wayland X"
-REQUIRED_USE="opengl? ( X )"
+IUSE="wayland X"
 
 RDEPEND="
 	>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -28,7 +27,6 @@ RDEPEND="
 		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
 		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
@@ -42,11 +40,9 @@ BDEPEND="
 "
 
 MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/va/va_backend_glx.h
 	/usr/include/va/va_x11.h
 	/usr/include/va/va_dri2.h
 	/usr/include/va/va_dricommon.h
-	/usr/include/va/va_glx.h
 )
 
 multilib_src_configure() {
@@ -54,7 +50,7 @@ multilib_src_configure() {
 		-Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers"
 		-Ddisable_drm=false
 		-Dwith_x11=$(usex X)
-		-Dwith_glx=$(usex X)
+		-Dwith_glx=no
 		-Dwith_wayland=$(usex wayland)
 		-Denable_docs=false
 	)
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index 15212d1da022..0f05bffde727 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,6 +1,8 @@
 AUX opencollada-1.6.63-pcre-fix.patch 530 BLAKE2B c0f96d1f3d93570f49670d5dc63f6faa4f164a21a8e1b840a0d54c596049f29a7e94cbe6297343fa323dacebc1831ed6871d7e82ac12fe3026ab75823d07670c SHA512 8ea88344ebc345e4a996ebe39852e5d52806cba76ce433253c67f8840de6ce082515d2bec571d49bddfe3ec620912b3de0674c522c10203bbc590bd6df80fc55
 AUX opencollada-1.6.68-cmake-fixes.patch 4823 BLAKE2B 0a403bf25b0935380d86ee9fe272935dcff053b29813de665d4e65028115f7b0ae5d7c8e51a4de0d027c74a41d0ebc23883469a20ca2e150fb1c440976f4db25 SHA512 5c2499575d5127a94eab5876817019a9bf28a32843d6f610d5b39ca35de2463589a12cc58b0004947a6cfb369c0b4c8115584f32f827b11dd5b966bd0f171494
 AUX opencollada-1.6.68-fix-null-conversion.patch 781 BLAKE2B ea4edb531f8075d8f70730707c3315ee8207a603fe2f6f1d569a37712572b69b011d75890837d530ddf788dfcd2f952dbeef9427a9167bf0b23d148a311512a6 SHA512 b18662b5844d71c643ad384fbdccd679b1177d6a9f0afcda653fd38d07a9d0048ab6abb029bc7b992198e455fcfbd868f8b74569606b3794d5a1892fddbf83be
+AUX opencollada-1.6.68-gcc13.patch 1263 BLAKE2B ecb12ae78a732d3e8a2d858d7a6ff1409e98f01dc23b94a376b9ceb3b76c076939054531a58781cfa378027f8bd5aa27c587185e66f80327a3d2d0e1981c85db SHA512 3b879549faf5261a30f141ea9a2b96701a4e02310156b602f47d507deadadc2db57e9f8ba20405d28f819d3886f9307d1e1736bc40b2cce62acd705dc86d63e8
+AUX opencollada-1.6.68-werror.patch 445 BLAKE2B 8b397bf950c8240e95214221f4fcfe0379fae3f31ce4cf3fb989f7c6b89f5432cf655202daf570cd3a692c0dd00b4efbeaa3b7c06de81ab034ad994727e9f798 SHA512 8fe614fe475a1a8b06cfcee2aaa1a666e1b4b42cfeaf5053cb23bbf056fafba6cf2cb13262cdd812f80bb8a4a63365f94e81aebeddc6c8d53f00c7f366f4776c
 DIST opencollada-1.6.68.tar.gz 12098718 BLAKE2B 45e0cd788b50a9a528b120e3cf8385803fa3dab0baaf8e28026cea8bf9afb0ab6b3d37f1d67803c9a48dae94d41efb9b5da119f75bd22a697c50c332d626cde2 SHA512 1b875ac2f59344aa33486f9e7479f76e94d58d5b567f17438c002cbfb36685fb38420467804c9eb28657d71d7efad550a24873dfe940d781c2a733c831532173
-EBUILD opencollada-1.6.68.ebuild 1887 BLAKE2B c3a62d6fb6c53de47eb872b1bc2bef933c13c6880ac55d80706bafc0dc37c547ddde3f7d334f9913d4faf7a3fa9bdb57b02547924179755f6475af3b5f38902d SHA512 de0a56e8f3854b053543b0e91f846558dd0d32f4743b1b12b4a59b091c83a6bbaadf4c0a1903ffa857e8b10539c702bb8ebc3fddba7be9f80a79a84eed44a9e0
+EBUILD opencollada-1.6.68.ebuild 1968 BLAKE2B 4c7e06f75e153cca81f48efa37f3b4506299890f0ff004c293c28076711a1510237cfaecad986caf1ec85cf6e11f1f46502ee3ddae7a6277f33a1b760caaa21a SHA512 db237c5ebb556ac9f415e747b1ed445531da5f604ffe388b67e42da50a5c781de6c5533263db8f02f98dc86a3333c04741cb4a0d3266c5c6b617ccc33da656b2
 MISC metadata.xml 489 BLAKE2B b978448cfc058c6d9e723fef98d2f7d16974497bee81dfe3817cbf92cbbbacba6450ce32a931875d082760c4a2ae196b82214672dcd9c415f59dd97b20190a23 SHA512 91bd5a59106015bd88e11f99a2d68feac2b94f374c9344b068ad1563ae888fd6b0840a0d0c83fd8237c66892e311fb6ea8b0eb34302c30595667b4cf310d9cc2
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
new file mode 100644
index 000000000000..e12771ca97a4
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/899750
+https://github.com/KhronosGroup/OpenCOLLADA/pull/656
+
+From 84c8c9a02b4e5fe40465034563cb36527e865dac Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Mon, 11 Jul 2022 21:33:11 +0100
+Subject: [PATCH] DAEValidator: fix gcc-13 build
+
+On gcc-13 c++ headers don't include <stdint.h> implicitly any more.
+This exposed build failure as:
+
+    /build/source/DAEValidator/library/src/XmlDoc.cpp: In member function 'virtual void opencollada::XmlDoc::readFile(const std::string&)':
+    /build/source/DAEValidator/library/src/XmlDoc.cpp:59:17: error: 'uint32_t' was not declared in this scope
+       59 |                 uint32_t signature = *reinterpret_cast<const uint32_t*>(content.data());
+          |                 ^~~~~~~~
+--- a/DAEValidator/library/src/DaeValidator.cpp
++++ b/DAEValidator/library/src/DaeValidator.cpp
+@@ -4,6 +4,7 @@
+ #include "Strings.h"
+ #include "StringUtil.h"
+ #include <cmath>
++#include <cstdint>
+ #include "no_warning_iomanip"
+ #include "no_warning_iostream"
+ #include <set>
+--- a/DAEValidator/library/src/XmlDoc.cpp
++++ b/DAEValidator/library/src/XmlDoc.cpp
+@@ -1,5 +1,6 @@
+ #include "Macros.h"
+ 
++#include <cstdint>
+ #if IS_GNUC_AND_GNUC_VERSION_LT(5,1,1)
+ #include <cstring>
+ #endif
+
diff --git a/media-libs/opencollada/files/opencollada-1.6.68-werror.patch b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
new file mode 100644
index 000000000000..3a490d326ddc
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.68-werror.patch
@@ -0,0 +1,11 @@
+--- a/DAEValidator/CMakeLists.txt
++++ b/DAEValidator/CMakeLists.txt
+@@ -100,7 +100,7 @@ if (WIN32)
+ # C4820: 'bytes' bytes padding added after construct 'member_name'
+ 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /Wall /WX /wd4505 /wd4514 /wd4592 /wd4710 /wd4711 /wd4820")
+ else ()
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
+ endif ()
+ 
+ add_custom_command(
diff --git a/media-libs/opencollada/opencollada-1.6.68.ebuild b/media-libs/opencollada/opencollada-1.6.68.ebuild
index 49f53f567c18..d11bbc826b9f 100644
--- a/media-libs/opencollada/opencollada-1.6.68.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.68.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
@@ -33,6 +33,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-null-conversion.patch"
 	"${FILESDIR}/${P}-cmake-fixes.patch"
 	"${FILESDIR}/${PN}-1.6.63-pcre-fix.patch"
+	"${FILESDIR}/${PN}-1.6.68-gcc13.patch"
+	"${FILESDIR}/${PN}-1.6.68-werror.patch"
 )
 
 src_prepare() {
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 49d10aaf8cb8..50dc1c8ec8e2 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,7 +4,6 @@ AUX xine-lib-1.2.13-configure-clang16.patch 4979 BLAKE2B 2b22560cb1aac2df82922d7
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 DIST xine-lib-1.2.13.tar.xz 5007364 BLAKE2B 8c39328b4135035e7b4070c670591e61a92443bb389af3b7da053fd68101fcb2f18cd258840e96a5f3e02d4cf979b028947a10fddd1bfc3b92ed7f18d3f58942 SHA512 269275f0e324acc559695d268fb93e0e0ca4b17d22c4a57d482365ac058ae2aed125b9e1b522c1fc501cf4b2c186ac05d921d7c82a98e094cb0c70489e61c924
 EBUILD xine-lib-1.2.12-r4.ebuild 5489 BLAKE2B 21151c6f8f4d714a770b1add99a02e30ad258abbce0b34148dd81e1a193bdfb4f59addbbd01423dfe0c53935fd085a0246b79ffdf558cba128b1c3a5fcaeafa1 SHA512 bd34e9a9a9b894d3ff7529a53c4ed2e2adbc3190e9572ec02e7ef5048cbd5edf83bd4ed536cf88a33ccc993d6094e0965e38283dbe48e8724f99dc48eb9eba94
-EBUILD xine-lib-1.2.13-r1.ebuild 5540 BLAKE2B 9b0c4e455766f638b9860a0b09933221fa6a2ae26a9260ab605e9bc0c1b1ff8e9c446dbcf73b19bf107ff7c8a6982569b656652460cbece7f779771a81377a2f SHA512 3cf3609205fd26bb800dcc3672fe5bb3a1b2577704da0d6eb6a01aa53612ccef08a2bc73c1955cc439580b50ba5f65233ecbdb0241cc051653542ee9471dd0af
-EBUILD xine-lib-1.2.13.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
-EBUILD xine-lib-1.2.9999.ebuild 5475 BLAKE2B 408ff7caff8917e90d242bbceac715ea15c843531096763e2328f3c169e66c025900701786ba1a75ac8b7dd50f68563e914e26b555b61276673611cc4255d839 SHA512 2b93784e11b4b89e25b98e5011df8cedacacb8fd784e1e58029b183292b8d2c242e3f3a570aab6b9fad75924aec08e62ebecc6c08f2f1c938b1de9216e6c3661
+EBUILD xine-lib-1.2.13-r2.ebuild 5533 BLAKE2B 36357725cdab97ad7f6d3758aba058bc02144dbe6fe71c496b70cf6cb5ac01e90096bc0be652cd5878362b66616985e446eab397c2d1e61cf6aaf34c3a415df6 SHA512 3cb4d495229d9b8fb929fc4ea7bddd95c0306a056cab5f8d2b40d4ea33cdeb075241ad315051294d9143667d956c151b5bb8faa6d6d31c0ed0fd4a3663e6f2b7
+EBUILD xine-lib-1.2.9999.ebuild 5468 BLAKE2B f7bd1560c88d8334146bc06cc985587474ce202641bdf653525e261e559b29e86524089e71bc3f1c42187b1964f3f4f7ccca94b29582a080d6d62be13bd1552f SHA512 adf9b79ae4a361c50d81f36422c9dfaaec6a9f6d82e0746bd77c2af79b9d198b22f3d83903b4616f94b510bb6bc820328266be10aca2ff08f8378fcd4d33aab2
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
index ab82dbcb36f7..6ee408c8c782 100644
--- a/media-libs/xine-lib/xine-lib-1.2.13-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.13-r2.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
diff --git a/media-libs/xine-lib/xine-lib-1.2.13.ebuild b/media-libs/xine-lib/xine-lib-1.2.13.ebuild
deleted file mode 100644
index a7cce97ce1ac..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.13.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.code.sf.net/p/xine/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
-
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="https://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc ${NLS_IUSE}"
-REQUIRED_USE="
-	vidix? ( || ( X fbcon ) )
-	wayland? ( opengl )
-	xv? ( X )
-	xinerama? ( X )
-"
-
-RDEPEND="
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	media-video/ffmpeg:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	dav1d? ( media-libs/dav1d:= )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac:= )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( virtual/jack )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng:= )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	nfs? ( net-fs/libnfs:= )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)
-	pulseaudio? ( media-libs/libpulse )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-	)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-	)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-	)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:=[-minimal]
-	)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	vpx? ( media-libs/libvpx:= )
-	wavpack? ( media-sound/wavpack )
-	wayland? ( dev-libs/wayland )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libxcb:=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-"
-DEPEND="
-	${RDEPEND}
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libXt
-	)
-	xv? ( x11-base/xorg-proto )
-	xvmc? ( x11-base/xorg-proto )
-	xinerama? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/libtool-2.2.6b
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-directfb
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--enable-avformat
-		--enable-ipv6
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-esound
-		--without-fusionsound
-		# Added dav1d for now. Could support both? Does it need to be XOR?
-		--without-libaom
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable bluray)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable nfs)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable sftp)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_enable wayland)
-		$(use_with alsa)
-		$(use_with dav1d)
-		$(use_with flac libflac)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with X xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index a7cce97ce1ac..1c9b1e49151b 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -81,7 +81,7 @@ RDEPEND="
 		media-libs/freetype:2
 	)
 	v4l? ( media-libs/libv4l )
-	vaapi? ( media-libs/libva:=[opengl,X] )
+	vaapi? ( media-libs/libva:=[X] )
 	vcd? (
 		>=media-video/vcdimager-0.7.23
 		dev-libs/libcdio:=[-minimal]
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 05c61e70907c..af6e8068aec3 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 032f71793084..fa7b8a1e4422 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,5 @@
 DIST rhythmbox-3.4.6.tar.xz 3535224 BLAKE2B 5e24facd810e72296ea541f8131b2ac364de0b38b0fd08a1fe6223a333e619cd08a3959fbbc6fbbd36a39990c7cc871decaefc316ce4910460aa6b446b3cb4c0 SHA512 d48818a6f299b3da8ae78bf13e41d702244d83a473586008b53f9c4cc504495ac2570c520c65efaf9e75408363b0256121d12680940c673d2977c7d177ef1fb3
+DIST rhythmbox-3.4.7.tar.xz 3673444 BLAKE2B a9186d7c23f281ff0a0d4a2188061473e9bab39078f816051e385319afeb1a8825e124e608fc50422f1bd27adae569d75fb6c53af23c7d51086dcf01b962d652 SHA512 58de6e51d046920857ba0905043f4863ef443d5eca28cdf93c1a25e3053322664eb1f894c102d5629f8261c507626e215c097ee166f13a3e7cd82fb35c891cb4
 EBUILD rhythmbox-3.4.6.ebuild 3274 BLAKE2B 06b83bda8109e2ba07fababfa6a0e3f745e411897bc68a5ed4adf97c7173acb604801ebae44418f82e4a8e2de0ed5a70c414f91e576077cb027796abde0d8159 SHA512 ef1f82178df9a9306e4ef35230bee59844111e10298c834b4b0ec9650228e9b022170994a60efc464c20d1b4415d11282d38407e9952b07defc52da1228185c9
+EBUILD rhythmbox-3.4.7.ebuild 3231 BLAKE2B f3d190c1f314c328e4430beb75c5a32159514965ae0aace3d4820873ddf7bbf6e4681aa65a7c49f004ee68b78140f28114e550ed09c7e18d8b39dcd68e63f4db SHA512 02c9be4e73602d218eb2a4109e42fd2c2a261fe057c10100bc30d2e53a9b3c790d462c69b20cd2288803fb1fa8ed3295863cb66ea4232edc1795a072afa5f0fa
 MISC metadata.xml 644 BLAKE2B 634d49a8c604a388d4dd50e52ce3d6730b5202e4b67a4ce103fe47e48de2311339905231d2426e9a8bb84a13ea047c9337169562d04c909f9e954e443927fb23 SHA512 9019047907c04b18d2c94eb2c3d5aef1f2adba2be503537cc1538a26b5b61fa882c898a4efbce3fd799c633bed3e6359fef073c0b597093673fce15768386991
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.7.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.7.ebuild
new file mode 100644
index 000000000000..eecda8b51b10
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.7.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=media-libs/gstreamer-1.4.0:1.0[introspection]
+	>=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+	dev-libs/json-glib
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=net-libs/libsoup-3.0.7:3.0
+	>=dev-libs/libxml2-2.7.8:2
+	x11-libs/pango
+	>=sys-libs/tdb-1.2.6
+	>=dev-libs/totem-pl-parser-3.2:=
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-3.9.11:4.0=
+		>=media-plugins/gst-plugins-soup-1.4:1.0
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+		')
+	)
+	udev? (
+		dev-libs/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 )
+	)
+"
+RDEPEND="${DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0
+	)
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
+		net-libs/libsoup:3.0[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] )
+	)
+	upnp-av? (
+		>=media-libs/grilo-0.3.15-r1:0.3
+		>=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av]
+	)
+"
+BDEPEND="
+	gtk-doc? ( dev-util/gtk-doc )
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cdr brasero)
+		$(meson_feature daap)
+		-Dfm_radio=enabled
+		$(meson_feature upnp-av grilo)
+		$(meson_feature udev gudev)
+		$(meson_feature ipod)
+		$(meson_feature libnotify)
+		$(meson_feature gnome-keyring libsecret)
+		$(meson_feature lirc)
+		$(meson_feature mtp)
+		$(meson_feature python plugins_python)
+		-Dplugins_vala=disabled
+		-Dsample-plugins=false
+
+		-Dhelp=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_feature test tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 27a71f8a163c..7d424677af8e 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index edc40880b304..378f94a7674e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -13,7 +13,6 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173
 DIST libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz 128896 BLAKE2B 021da81f82da0a6a47dfa1019ef07f1879cb3fcc41e790726b0afd5ba0591d24c58399c28f8e3e9b60fe4b078853236e1cb49c0c7a57c1508e6cc4d2f8ecaabd SHA512 01c415a561ea8bd9d568ad2668fbf8bc54304557e413776e1b841145cad3f7b9991a6772af7bac408b2cb87c6236c378e79c1c023a58b280a6c92fee151f0fb1
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf513d602c79014eb34c7d16a4c7c091a6054d7e121175b8c53a8f1339a6e5baa2d9687e8b6d8439ce76781c49612d26593a20d5ede6a388 SHA512 f96e365ac6788c538b5ed54c5330ef8625962e77c27098b5cbd21332fed5cbafd422f2a997499bc17aa814849fa44b131942278547207e6611a491b0ee05b91a
-EBUILD kodi-19.4-r3.ebuild 11160 BLAKE2B c9b04c12381c63f80177d0b963b149ebfdbaaa20261b985756229418f67f1406f499ebd3920383cad4de8148c37bc288c834297fc39dc1de811b62ed2c8f675c SHA512 b67930cbd3ca5bbdc341cc7317137fb1eb312acc5f8762ed94d339ec20b5c34308b5c82d64c85f2bb46054547979844c2821853cbe2b9a7c4989c8b88956ce30
 EBUILD kodi-19.4-r4.ebuild 11196 BLAKE2B 4029c40f4eaaa745b407599f777ba23dfcc678a4a98fe61b2d32aff26ed96be05286bfb13bc79ab434eaa6131b99b708a170c48bf68aeecd41d400649686eed7 SHA512 af17633390ccad65aa6d64820d7ce8aecaf92cb98f11bcac39b8be52dbd5634cfdec093d9deeabdf38625fbf75f9cbbe1670fd1e2ae0a72df03595fc6027411d
 EBUILD kodi-19.5.ebuild 11220 BLAKE2B 919efb02a3fa6a25303b13a4d3816e654c2dc574120cda9b18358506913e30fca83b8c116aeffa28684834a615f49e532a52898a4e1e00d87a72341099e21e15 SHA512 79cf12792cb8efe68c931b7a0da133496b2595ade469ffe18b385127f445c13021d4084b96274a17ec0158e12d0d40a6039431b2e2e4d5b015daec7c3d4d9ab0
 EBUILD kodi-19.9999.ebuild 10922 BLAKE2B 1cb8bd4eccfc4a78f349d36728153379e769cdc734a31ab54a5fccb42cc18a3b805c65f2030b0cbf86ce5b2fd9ad83dd5229c1c984c4df8b688b4c60f4a12dfc SHA512 e1dad9fde61a3513de1d224fe956a9e6f59f4acd145098842e36212a4c82c6a549d243b6889cf3b8064eab667e79bc033f48c181165262b851ba986b0ef9d5ad
diff --git a/media-tv/kodi/kodi-19.4-r3.ebuild b/media-tv/kodi/kodi-19.4-r3.ebuild
deleted file mode 100644
index 7f010fb5fdd6..000000000000
--- a/media-tv/kodi/kodi-19.4-r3.ebuild
+++ /dev/null
@@ -1,370 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3.2"
-CODENAME="Matrix"
-FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{9,10} )
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
-	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
-	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
-	EGIT_BRANCH="Matrix"
-	inherit git-r3
-else
-	MY_PV=${PV/_p/_r}
-	MY_PV=${MY_PV/_alpha/a}
-	MY_PV=${MY_PV/_beta/b}
-	MY_PV=${MY_PV/_rc/RC}
-	MY_PV="${MY_PV}-${CODENAME}"
-	MY_P="${PN}-${MY_PV}"
-	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 x86"
-	S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-
-PATCHES=(
-	"${FILESDIR}/${P}-dav1d-1.0.0.patch"
-)
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# use flag is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
-IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( gbm wayland X )
-	?? ( mariadb mysql )
-	bluray? ( udf )
-	udev? ( !libusb )
-	udisks? ( dbus )
-	upower? ( dbus )
-	power-control? ( dbus )
-	vdpau? (
-		X
-		!gles
-		!gbm
-	)
-	zeroconf? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=dev-libs/lzo-2.04
-	>=dev-libs/flatbuffers-1.12.0:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
-	airplay? (
-		>=app-pda/libplist-2.0.0
-		net-libs/shairplay
-	)
-	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
-	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.1.2 )
-	caps? ( sys-libs/libcap )
-	dbus? ( sys-apps/dbus )
-	dev-db/sqlite
-	<dev-libs/crossguid-0.2.2_p20190529
-	>=dev-libs/fribidi-1.0.5
-	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
-	dev-libs/libpcre[cxx]
-	>=dev-libs/spdlog-1.5.0:=
-	dev-libs/tinyxml[stl]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	')
-	>=dev-libs/libcdio-2.1.0[cxx]
-	>=dev-libs/libfmt-6.1.2
-	dev-libs/libfstrcmp
-	gbm? (
-		>=dev-libs/libinput-1.10.5
-		media-libs/mesa[gbm(+)]
-		x11-libs/libxkbcommon
-	)
-	gles? (
-		!raspberry-pi? ( media-libs/mesa[gles2] )
-	)
-	lcms? ( media-libs/lcms:2 )
-	libusb? ( virtual/libusb:1 )
-	virtual/ttf-fonts
-	media-fonts/roboto
-	>=media-libs/freetype-2.10.1
-	>=media-libs/libass-0.13.4
-	!raspberry-pi? ( media-libs/mesa[egl(+)] )
-	>=media-libs/taglib-1.11.1
-	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
-		=media-video/ffmpeg-4*[openssl]
-	)
-	!system-ffmpeg? (
-		app-arch/bzip2
-		dav1d? ( media-libs/dav1d:= )
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.68.0[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
-	!gles? ( media-libs/glu )
-	>=dev-libs/openssl-1.1.1k:0=
-	raspberry-pi? (
-		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] )
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
-	>=sys-libs/zlib-1.2.11
-	udf? ( >=dev-libs/libudfread-1.0.0 )
-	udev? ( virtual/udev )
-	vaapi? (
-		media-libs/libva:=
-		!gles? ( media-libs/libva[opengl] )
-		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
-		wayland? ( media-libs/libva[wayland] )
-		X? ( media-libs/libva[X] )
-	)
-	virtual/libiconv
-	vdpau? (
-		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
-		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
-	)
-	wayland? (
-		>=dev-cpp/waylandpp-0.2.3:=
-		media-libs/mesa[wayland]
-		>=dev-libs/wayland-protocols-1.7
-		>=x11-libs/libxkbcommon-0.4.1
-	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
-	X? (
-		media-libs/mesa[X]
-		!gles? ( media-libs/libglvnd[X] )
-		x11-libs/libX11
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		system-ffmpeg? ( media-video/ffmpeg[X] )
-	)
-	x11-libs/libdrm
-	xslt? (
-		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
-	)
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
-	lirc? ( app-misc/lirc )
-	power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
-	udisks? ( sys-fs/udisks:2 )
-	upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
-	dev-libs/rapidjson
-	test? ( >=dev-cpp/gtest-1.10.0 )
-"
-BDEPEND="${COMMON_DEPEND}
-	dev-lang/swig
-	dev-util/cmake
-	media-libs/giflib
-	>=dev-libs/flatbuffers-1.11.0
-	>=media-libs/libjpeg-turbo-2.0.4:=
-	>=media-libs/libpng-1.6.26:0=
-	virtual/pkgconfig
-	virtual/jre
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
-	check_extra_config
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/885419
-	if has_version ">=media-libs/mesa-22.3.0"; then
-		PATCHES+=( "${FILESDIR}/${P}-fix-mesa-22.3.0-build.patch" )
-	fi
-
-	cmake_src_prepare
-
-	# avoid long delays when powerkit isn't running #348580
-	sed -i \
-		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-		xbmc/platform/linux/*.cpp || die
-
-	# Prepare tools and libs witch are configured with autotools during compile time
-	AUTOTOOLS_DIRS=(
-		"${S}"/tools/depends/native/TexturePacker/src
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src
-	)
-
-	local d
-	for d in "${AUTOTOOLS_DIRS[@]}" ; do
-		pushd ${d} >/dev/null || die
-		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
-		popd >/dev/null || die
-	done
-	elibtoolize
-
-	# Prevent autoreconf rerun
-	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
-		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
-		|| die
-}
-
-src_configure() {
-	local platform=()
-	use gbm && platform+=( gbm )
-	use wayland && platform+=( wayland )
-	use X && platform+=( x11 )
-	local core_platform_name="${platform[@]}"
-	local mycmakeargs=(
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
-		-DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-		-DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
-		-DENABLE_AVX=$(usex cpu_flags_x86_avx)
-		-DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon)
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-DVERBOSE=ON
-		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_AIRTUNES=$(usex airplay)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_BLUETOOTH=$(usex bluetooth)
-		-DENABLE_BLURAY=$(usex bluray)
-		-DENABLE_CCACHE=OFF
-		-DENABLE_CLANGFORMAT=OFF
-		-DENABLE_CLANGTIDY=OFF
-		-DENABLE_CPPCHECK=OFF
-		-DENABLE_ISO9660PP=$(usex optical)
-		-DENABLE_CEC=$(usex cec)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DVDCSS=$(usex css)
-		-DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
-		-DENABLE_INTERNAL_CROSSGUID=OFF
-		-DENABLE_INTERNAL_RapidJSON=OFF
-		-DENABLE_INTERNAL_FMT=OFF
-		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
-		-DENABLE_INTERNAL_FSTRCMP=OFF
-		-DENABLE_INTERNAL_FLATBUFFERS=OFF
-		-DENABLE_INTERNAL_DAV1D=OFF
-		-DENABLE_INTERNAL_GTEST=OFF
-		-DENABLE_INTERNAL_UDFREAD=OFF
-		-DENABLE_INTERNAL_SPDLOG=OFF
-		-DENABLE_CAP=$(usex caps)
-		-DENABLE_LCMS2=$(usex lcms)
-		-DENABLE_LIRCCLIENT=$(usex lirc)
-		-DENABLE_MARIADBCLIENT=$(usex mariadb)
-		-DENABLE_MDNS=OFF # used only on Android
-		-DENABLE_MICROHTTPD=$(usex webserver)
-		-DENABLE_MYSQLCLIENT=$(usex mysql)
-		-DENABLE_NFS=$(usex nfs)
-		-DENABLE_OPENGLES=$(usex gles)
-		-DENABLE_OPENGL=$(usex !gles)
-		-DENABLE_OPTICAL=$(usex optical)
-		-DENABLE_PLIST=$(usex airplay)
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_SMBCLIENT=$(usex samba)
-		-DENABLE_SNDIO=OFF
-		-DENABLE_TESTING=$(usex test)
-		-DENABLE_UDEV=$(usex udev)
-		-DENABLE_UDFREAD=$(usex udf)
-		-DENABLE_UPNP=$(usex upnp)
-		-DENABLE_VAAPI=$(usex vaapi)
-		-DENABLE_VDPAU=$(usex vdpau)
-		-DENABLE_XSLT=$(usex xslt)
-		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
-		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
-		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
-		-DCORE_PLATFORM_NAME="${core_platform_name}"
-	)
-
-	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
-	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
-	if use system-ffmpeg; then
-		mycmakeargs+=( -DWITH_FFMPEG="yes" )
-	else
-		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
-	fi
-
-	if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
-		CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
-		CXXFLAGS+=' -DNDEBUG'
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile all
-}
-
-src_test() {
-	local myctestargs=(
-		# Known failing, unreliable test
-		# bug #743938
-		-E "(TestCPUInfo.GetCPUFrequency)"
-	)
-
-	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
-	KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
-	cmake_src_install
-
-	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
-	newicon media/icon48x48.png kodi.png
-
-	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
-	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
-		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
-	if use !eventclients ; then
-		rm -f "${ED}"/usr/bin/kodi-ps3remote || die
-		rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
-		rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
-		rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
-	fi
-
-	python_optimize "${D}$(python_get_sitedir)"
-}
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 7116580c322a..c508b06145ae 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -9,6 +9,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
 DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c
-EBUILD mythtv-31.0_p20210731-r2.ebuild 12515 BLAKE2B 71bfaaedafb6d4143227e52fcf558779ee58d99a50a99528ba3f32b63bcff9a697522b9b3520cc0b86b1b015ed5057f86a31aeacf2599c59ca805fd147d5f544 SHA512 6d525f620d9d2bb9e1b425d0c790f220a458dccc7668f67d7672456ab9f21ade8de8601b46e55805e7ac9a86943d101e78eab739c875bb4ab180a066aa0cfafb
-EBUILD mythtv-32.0-r2.ebuild 12230 BLAKE2B 2b05d8a453245866c8bfe371911a02af03516f515babce81e1a0e6f160d9821983e9cba3720e7891f8b59ef2378f99d2ee0f2498694897ec24a542fa3659f04a SHA512 28755b2bb27e3621494637523781ce78fb545d30fd6725872902efd060f4a83bbcabb80b9dd28584a3276dbc16d7ad5e8cfdc6496b1292047244fb79b30aa2dc
+EBUILD mythtv-31.0_p20210731-r3.ebuild 12507 BLAKE2B 2da5faf9d5c8ee4604f810518dfc45c7bed4083eb1ed015da5a5ea4ea17937e6b7c7c3241112cf46437e05ea690bb3ab6d10f47feef2da2c75ef9e61ed0ab933 SHA512 3474e3f50a3fbe20e28180a777c49f99e1b370b8657781d105d8afab44238eca4bee3231150316bd4c197508fd04c7ac18182c00d2b7f100ef2d94b547e57d9e
+EBUILD mythtv-32.0-r3.ebuild 12249 BLAKE2B 9836893488706778d830aa32e60603f910b3d0d8a232bb22e0af7a5e8e7122c5ed2f49643f28cf519fce7adb4899abc134c21788503e2a6920ecc92fe5a14f3b SHA512 716d71b85bf2bc080703287dcd549327c10b6894ad48c4d2ac5b056716823bb683dbf9c06da144b4aece5ca405006b44b9d0ae0b870ebe8c4fd66387652340bb
 MISC metadata.xml 2239 BLAKE2B b8b2c890bec1edfdc46ed53ddfc694af63ed762996759b7dd0a03c0d743874256deb0cae4cad36f9ce28388f349a023528536f828e86e51b93ffdc50597d55d6 SHA512 1b6abf1bafa4a34cc91209b23d8b8957852f7efda3013f2868086faf3d14f28b8c9e84edc1a07f09e952723dc406c5ea8be809935f45750be7155970d165c421
diff --git a/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild b/media-tv/mythtv/mythtv-31.0_p20210731-r3.ebuild
index b528fb7056b2..1065b21829e0 100644
--- a/media-tv/mythtv/mythtv-31.0_p20210731-r2.ebuild
+++ b/media-tv/mythtv/mythtv-31.0_p20210731-r3.ebuild
@@ -92,7 +92,7 @@ RDEPEND="
 	opengl? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	systemd? ( sys-apps/systemd:= )
-	vaapi? ( media-libs/libva:=[opengl] )
+	vaapi? ( media-libs/libva:= )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( media-libs/libvpx:= )
 	x264? (	media-libs/x264:= )
diff --git a/media-tv/mythtv/mythtv-32.0-r2.ebuild b/media-tv/mythtv/mythtv-32.0-r3.ebuild
index 5af8488a91e0..29e1671cf498 100644
--- a/media-tv/mythtv/mythtv-32.0-r2.ebuild
+++ b/media-tv/mythtv/mythtv-32.0-r3.ebuild
@@ -85,7 +85,7 @@ RDEPEND="
 	opengl? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	systemd? ( sys-apps/systemd:= )
-	vaapi? ( media-libs/libva:=[opengl] )
+	vaapi? ( media-libs/libva:= )
 	vdpau? ( x11-libs/libvdpau )
 	vpx? ( media-libs/libvpx:= )
 	x264? (	media-libs/x264:= )
@@ -284,6 +284,7 @@ src_configure() {
 		$(use_enable vaapi)
 		$(use_enable vdpau)
 		$(use_enable opengl)
+		$(use_enable opengl egl)
 		$(use_enable libass)
 	)
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index f70252b8df80..b17cbfa3b1fe 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9e39b1f300c0..7443bbb79d0e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 16 Apr 2023 22:09:43 +0000
+Mon, 17 Apr 2023 04:09:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0e948d15ea53..97673ff502ee 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-04-16T22:09:47Z
+TIMESTAMP 2023-04-17T04:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8citfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8xo1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCLcw//YsMeTkuchUQfvRcRKXdtann2oVxeXWB/Zojo6JDnUl8s40kw5UyZfoI2
-7xZ7RoaUEODuIa6VCJazgubIx/+gtXoTkicKFw4Ti/LHkTuYOhPxn2PhpYJ/c3I6
-aOuleLuQK7qQMFoFHQ12M0opk0TLua7L1BcVqCiTVUegGogxZwyhYXTPBfafFC8a
-1ZgLzd4M7AFiJggNcPdoU9ProZJsd3QgHZcyYmRLKGfsmMLHXpBb69DYEnft4Up0
-yy8Tr4PBWZHpKQyyR1QUVL/350RLjbU3Thj7PqSwsb7W6ONthjO9tDlpZxweimpg
-tUcrE736pKQYiwwPhK+dET1uPEFzyD/hwb9v39P3hG+ixTjkFJbMOSIL1IJJ2+wL
-9qZ6GD6wkvajmbNtoB7V5d89wFsetCNEQPZdazKSSE5io87CtWCwrcMktxKLJS9j
-dfz6NMvymOHY4va/ltJC8I2Tn7/b6W9F8fDWmnEkfG/M3z/hh5yE6O0djHw5GB2D
-/fHDzhYe1FkwKvx97w+DM3YdlGrZCiq8Rf/D7lHa/KNmCOqSUCaGx8li7Q6Tfebr
-SswRaSBfQldzJ6qNfSmMjYGa6dgS1RiclJPNTcAPAAJdCJrBk16CQL9PIjNZGyS+
-QBA2LcsDugicjAWMw6RwgxpQvJZHik44eiue4Wba9fU9yEDCGMg=
-=qdeS
+klBA5RAAiSrghvzz1QTHhTVxAHB/TpIv5VpQz0K4tr2MkoWAdT3ek1pwl0eO5yBM
+2xuu6VFyDMA9AE+6f8otXFKnWrtgUs3qHMatad8a6lnPTWYu6vGiqoBu9dNv9lIe
+bMsLBYgV/0aWjQkweWoeWYIzoTkI0mGGMmmbrWZsjXLhNvwsmiU0UnNL90wQoCIM
+3wcekX1PwUxcgiqHP2ykna9DmODqwTYBuMWAsev3fUsmpK2NdSD8R9s2VUhfsWUB
+xHZmzVB3Uyay+vrmPctKzhbluX6YCXDcZxBvjiUhXVr65Ia78RiRW2N7HNohY05K
+FLhJFYZGqHZGQioJsgCUzPj8dXXEgwUF0pYFTcfkRcu3q6gLiE40NpqWNz4qNxJF
+TkyrhXXLPmjKfRJgEOKNz5Gc0A1PLSPJ4TjhWUev/tRckhQUqjGTtG6Ou8kNDCH2
+xKYv0bTIHNkApl3+vfSMM1fxF4DfvHPRxiRZQGsykJwHT7sY0jLjaEltzK45JhTG
+dF/yrgkM2zyhHmDtw9PUC5G0pwQJKeaGu5bXy7eUWUOzOPCOF+QOKt/IVEh7u7cF
+Ln7VL5zFwpTOXb+FSTliHE65Kxkv6Gn1IHfs8Z/CmGdLt5fA7bU0SFWLzeyBeYsk
+BROkyZnzRCkTZlMB6VR7r7sqr/uBUc1ua93nw8YmCiwmG6dyIro=
+=lyx9
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9e39b1f300c0..7443bbb79d0e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 16 Apr 2023 22:09:43 +0000
+Mon, 17 Apr 2023 04:09:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index acbb183d8a27..50d5ec955afe 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index cfc8acf0a65f..f5f38c16b3df 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/ghostscript-gpl-10.01.1 b/metadata/md5-cache/app-text/ghostscript-gpl-10.01.1
index a8ecedbec3e0..05230fa7497a 100644
--- a/metadata/md5-cache/app-text/ghostscript-gpl-10.01.1
+++ b/metadata/md5-cache/app-text/ghostscript-gpl-10.01.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://ghostscript.com/ https://git.ghostscript.com/?p=ghostpdl.git;a=summary
 INHERIT=autotools flag-o-matic toolchain-funcs
 IUSE=cups dbus gtk l10n_de static-libs unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=AGPL-3 CPL-1.0
 RDEPEND=app-text/libpaper:= media-libs/fontconfig >=media-libs/freetype-2.4.9:2= >=media-libs/jbig2dec-0.19:= >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:= media-libs/libjpeg-turbo:= >=media-libs/openjpeg-2.1.0:2= >=media-libs/tiff-4.0.1:= >=sys-libs/zlib-1.2.7 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:3 ) unicode? ( net-dns/libidn:= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.11-r2 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts )
 SLOT=0/10.01
 SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10011/ghostscript-10.01.1.tar.xz https://dev.gentoo.org/~sam/distfiles/app-text/ghostscript-gpl/ghostscript-gpl-10.0-patches.tar.xz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=922634d622d48a9ebca318f4e2087afb
+_md5_=301ae184292e579df57654dc237def0d
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 5f75ccc73e66..a720231e5032 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/eisl-2.70 b/metadata/md5-cache/dev-lang/eisl-2.90
index 4b84a02d9f29..037a2b0b32b6 100644
--- a/metadata/md5-cache/dev-lang/eisl-2.70
+++ b/metadata/md5-cache/dev-lang/eisl-2.90
@@ -4,11 +4,11 @@ DESCRIPTION=Interpreter and compiler compatible with the ISLisp standard
 EAPI=8
 HOMEPAGE=https://github.com/sasagawa888/eisl/
 INHERIT=toolchain-funcs
-KEYWORDS=amd64 ~x86
+KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:=
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.70.tar.gz -> eisl-2.70.tar.gz
+SRC_URI=https://github.com/sasagawa888/eisl/archive/v2.90.tar.gz -> eisl-2.90.tar.gz
 _eclasses_=multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f83f238245e8fc7b2f7002d44a858d3b
+_md5_=0715ee9e43ada0d691a899816a58dfd6
diff --git a/metadata/md5-cache/dev-lang/typescript-5.0.2 b/metadata/md5-cache/dev-lang/typescript-5.0.2
index 11fd550f5f5a..cc9ab542916d 100644
--- a/metadata/md5-cache/dev-lang/typescript-5.0.2
+++ b/metadata/md5-cache/dev-lang/typescript-5.0.2
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Superset of JavaScript with optional static typing, classes and interfaces
 EAPI=8
 HOMEPAGE=https://www.typescriptlang.org/ https://github.com/microsoft/TypeScript/
-KEYWORDS=~amd64 ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=net-libs/nodejs
 SLOT=0
 SRC_URI=https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz
-_md5_=568998b4539209d8f5cd4405cf393c05
+_md5_=911c17e13410a9dab52ed5fe0583b7fd
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 0915fefaf950..f602271d5aa4 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/apr-1.7.4 b/metadata/md5-cache/dev-libs/apr-1.7.4
new file mode 100644
index 000000000000..2f6e4eed6a26
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/apr-1.7.4
@@ -0,0 +1,15 @@
+BDEPEND=>=sys-devel/libtool-2.4.2 doc? ( app-doc/doxygen ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+DESCRIPTION=Apache Portable Runtime Library
+EAPI=8
+HOMEPAGE=https://apr.apache.org/
+INHERIT=autotools toolchain-funcs
+IUSE=doc old-kernel selinux static-libs +urandom
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=virtual/libcrypt:= elibc_glibc? ( >=sys-apps/util-linux-2.16 ) selinux? ( sec-policy/selinux-base-policy )
+SLOT=1/1.7
+SRC_URI=mirror://apache/apr/apr-1.7.4.tar.bz2
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=74dd4628e053579759f29dc6f2d43716
diff --git a/metadata/md5-cache/dev-libs/xmlsec-1.3.0 b/metadata/md5-cache/dev-libs/xmlsec-1.3.0-r1
index a31ee86d6558..141cd0768977 100644
--- a/metadata/md5-cache/dev-libs/xmlsec-1.3.0
+++ b/metadata/md5-cache/dev-libs/xmlsec-1.3.0-r1
@@ -1,9 +1,10 @@
-BDEPEND=virtual/pkgconfig test? ( nss? ( >=dev-libs/nss-3.9[utils] ) )
-DEFINED_PHASES=configure install test
+BDEPEND=virtual/pkgconfig test? ( nss? ( >=dev-libs/nss-3.9[utils] ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare test
 DEPEND=>=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.0.20 dev-libs/libltdl gcrypt? ( >=dev-libs/libgcrypt-1.4.0:= ) gnutls? ( >=net-libs/gnutls-3.6.13:= ) nss? ( >=dev-libs/nspr-4.4.1 >=dev-libs/nss-3.9 ) openssl? ( dev-libs/openssl:= )
 DESCRIPTION=Command line tool for signing, verifying, encrypting and decrypting XML
 EAPI=8
 HOMEPAGE=https://www.aleksey.com/xmlsec
+INHERIT=autotools
 IUSE=doc gcrypt gnutls http nss +openssl static-libs test
 KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
@@ -12,4 +13,5 @@ REQUIRED_USE=|| ( gnutls nss openssl )
 RESTRICT=!test? ( test )
 SLOT=0/1.3
 SRC_URI=https://www.aleksey.com/xmlsec/download/xmlsec1-1.3.0.tar.gz
-_md5_=de98bad95922cdb895f5f91c596dff64
+_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=867c51fc0828eadf6b40d3db64a01d77
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ffa3c43d4cc3..fb066eafdfaf 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/jq-1.4.1 b/metadata/md5-cache/dev-python/jq-1.4.1
index b05287e5ae8f..883f92735427 100644
--- a/metadata/md5-cache/dev-python/jq-1.4.1
+++ b/metadata/md5-cache/dev-python/jq-1.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mwilliamson/jq.py/ https://pypi.org/project/jq/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.4.1.tar.gz -> jq.py-1.4.1.gh.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6eb36c8461daf26e8a173679ccdac1ff
+_md5_=a6c38d3f1de6a461ff84f93dd548ab67
diff --git a/metadata/md5-cache/dev-python/simplejson-3.18.4 b/metadata/md5-cache/dev-python/simplejson-3.18.4
index 4ad0a500c0f2..ef711ffe1d1a 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.18.4
+++ b/metadata/md5-cache/dev-python/simplejson-3.18.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
 INHERIT=distutils-r1 pypi
 IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( MIT AFL-2.1 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/s/simplejson/simplejson-3.18.4.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=4359c2fe9c35127142658ab611aaf4c2
+_md5_=dd775f714c81ae699e97a14f83d2fc6b
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-2.0.7 b/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
index 0ae1b0014098..50d9f3e08e8f 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
+++ b/metadata/md5-cache/dev-python/sqlalchemy-2.0.7
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/ https://github.com/sqlalchemy/sqlalchemy/
 INHERIT=distutils-r1 optfeature pypi
 IUSE=examples +sqlite test test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=>=dev-python/typing-extensions-4.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.11-r1:0=[sqlite?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite?] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite?] )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/S/SQLAlchemy/SQLAlchemy-2.0.7.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=81bf45b2a18864a8028454f39a534a2f
+_md5_=6fe8939c9aef754e61e1ae0b358fec34
diff --git a/metadata/md5-cache/dev-python/typeguard-3.0.2 b/metadata/md5-cache/dev-python/typeguard-3.0.2
index d38e62190cb6..52b9a1dd885a 100644
--- a/metadata/md5-cache/dev-python/typeguard-3.0.2
+++ b/metadata/md5-cache/dev-python/typeguard-3.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/typeguard/ https://github.com/agronholm/typeguard/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/t/typeguard/typeguard-3.0.2.tar.gz
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	3b6a844fbf71f1581992b44c78b549b7	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=607f36cbc6617c694b5c48f57b914445
+_md5_=4d93229d5db73e1535f89f035df1d943
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 20296bbb7e7a..1a91f00893eb 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/rbs-2.8.4 b/metadata/md5-cache/dev-ruby/rbs-2.8.4
index 2eec2cc47e2b..d4a4da6093a1 100644
--- a/metadata/md5-cache/dev-ruby/rbs-2.8.4
+++ b/metadata/md5-cache/dev-ruby/rbs-2.8.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/rbs
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby-BSD BSD-2 )
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/rbs/archive/refs/tags/v2.8.4.tar.gz -> rbs-2.8.4.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=ec91b3298ea91dbff81437131e478928
+_md5_=62d2ad1fa65b052cea1cff6a395cb370
diff --git a/metadata/md5-cache/dev-ruby/stringio-3.0.5 b/metadata/md5-cache/dev-ruby/stringio-3.0.5
index d1ec2a933443..80f14aa2275e 100644
--- a/metadata/md5-cache/dev-ruby/stringio-3.0.5
+++ b/metadata/md5-cache/dev-ruby/stringio-3.0.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/stringio
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/stringio/archive/v3.0.5.tar.gz -> stringio-3.0.5.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=3dc045ffff1e3c5fc2d773d39f7228b3
+_md5_=c9a4a5aaa70ef3ce12c986c918d8dfdf
diff --git a/metadata/md5-cache/dev-ruby/typeprof-0.21.7 b/metadata/md5-cache/dev-ruby/typeprof-0.21.7
index 7d77d775f6bd..a89e9c5c20a1 100644
--- a/metadata/md5-cache/dev-ruby/typeprof-0.21.7
+++ b/metadata/md5-cache/dev-ruby/typeprof-0.21.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ruby/typeprof
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/rbs-1.8.1[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby/typeprof/archive/v0.21.7.tar.gz -> typeprof-0.21.7.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	d1408425c7c4a7669b9b17735404b693	ruby-fakegem	52594c9f6d00a877106c877d3dd1acee	ruby-ng	76a677328d71b04b457f26be67717028	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=1f39b5bdd881da9c4584aa3369d09461
+_md5_=47170631feef4dc47d790e684eab5968
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 6ab649f0b8cc..d3d8832c93f7 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-15.0.4 b/metadata/md5-cache/gnome-extra/gucharmap-15.0.4
new file mode 100644
index 000000000000..e0966b61b345
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gucharmap-15.0.4
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) app-text/docbook-xml-dtd:4.1.2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( >=dev-util/gtk-doc-1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) vala? ( || ( dev-lang/vala:0.56 ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
+DESCRIPTION=Unicode character map viewer and library
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2-utils meson python-any-r1 vala xdg
+IUSE=+introspection gtk-doc vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-15.0* >=x11-libs/pango-1.42.4-r2[introspection?]
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/15.0.4/gucharmap-15.0.4.tar.bz2
+_eclasses_=gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=8822aa32c28884c36572c056b1ae1279
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.32.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.32.0
new file mode 100644
index 000000000000..7f19c99cedf2
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.32.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.10.4-r2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=net-misc/networkmanager-1.16[modemmanager?,teamd?] appindicator? ( dev-libs/libayatana-appindicator >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
+DESCRIPTION=NetworkManager connection editor and applet
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=appindicator modemmanager selinux teamd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.40:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.10.4-r2 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=net-misc/networkmanager-1.16[modemmanager?,teamd?] appindicator? ( dev-libs/libayatana-appindicator >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.32/network-manager-applet-1.32.0.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1b3ea1f38836b4603cbc5d3b1fb3610e
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 423ad28fb141..b7ec9f64a466 100644
--- a/metadata/md5-cache/gui-libs/Manifest.gz
+++ b/metadata/md5-cache/gui-libs/Manifest.gz
diff --git a/metadata/md5-cache/gui-libs/vte-0.72.1 b/metadata/md5-cache/gui-libs/vte-0.72.1
new file mode 100644
index 000000000000..503b7a6f6386
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/vte-0.72.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.60:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson python-any-r1 vala xdg
+IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=>=gui-libs/gtk-4.0.1:4[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.60:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.72.1[systemd?]
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+SLOT=2.91-gtk4
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.72.1/vte-0.72.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f838e69749b0c0c2ea57dadd8bb4a2a4
diff --git a/metadata/md5-cache/gui-libs/vte-common-0.72.1 b/metadata/md5-cache/gui-libs/vte-common-0.72.1
new file mode 100644
index 000000000000..8b96ea6d8ed6
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/vte-common-0.72.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-libs/libxml2:2 dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=gui-libs/gtk-4.0.1:4 >=x11-libs/gtk+-3.24.22:3 ) >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.60:2 >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib x11-libs/pango
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
+INHERIT=gnome.org meson python-any-r1
+IUSE=systemd
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=!<x11-libs/vte-0.70.0:2.91
+SLOT=2.91
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.72.1/vte-0.72.1.tar.bz2
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=431994639dd865374bf785925c643e41
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 41068eb8cf99..a0df79cb5aa0 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/libass-0.17.1 b/metadata/md5-cache/media-libs/libass-0.17.1
index 8e7372f5bcc0..7f9d80863655 100644
--- a/metadata/md5-cache/media-libs/libass-0.17.1
+++ b/metadata/md5-cache/media-libs/libass-0.17.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libass/libass
 INHERIT=multilib-minimal verify-sig
 IUSE=+fontconfig 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 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[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? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz.asc )
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	verify-sig	ed3712fa46ee0fdc2dbbad539e20ff26
-_md5_=7c53cf6e154f434d8aafe757da6ddc9b
+_md5_=b3b30be5459681b83d70fa843dbd6807
diff --git a/metadata/md5-cache/media-libs/libva-2.18.0 b/metadata/md5-cache/media-libs/libva-2.18.0-r1
index d018a744c469..4abbd05e0652 100644
--- a/metadata/md5-cache/media-libs/libva-2.18.0
+++ b/metadata/md5-cache/media-libs/libva-2.18.0-r1
@@ -1,16 +1,15 @@
 BDEPEND=wayland? ( 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 test
-DEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[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=Video Acceleration (VA) API for Linux
 EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature
-IUSE=opengl wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=wayland X 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 ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=opengl? ( X )
+RDEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/2
 SRC_URI=https://github.com/intel/libva/archive/2.18.0.tar.gz -> libva-2.18.0.tar.gz
 _eclasses_=meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f584a3fb0b5637c84226c92feda80e65
+_md5_=f1b3c6ad859981340e49da1cebf714ad
diff --git a/metadata/md5-cache/media-libs/libva-9999 b/metadata/md5-cache/media-libs/libva-9999
index 4529c272e609..163718fade5a 100644
--- a/metadata/md5-cache/media-libs/libva-9999
+++ b/metadata/md5-cache/media-libs/libva-9999
@@ -1,15 +1,14 @@
 BDEPEND=wayland? ( dev-util/wayland-scanner ) virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[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=Video Acceleration (VA) API for Linux
 EAPI=8
 HOMEPAGE=https://01.org/linuxmedia/vaapi
 INHERIT=meson-multilib optfeature git-r3
-IUSE=opengl wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=opengl? ( X )
+RDEPEND=>=x11-libs/libdrm-2.4.60[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] wayland? ( >=dev-libs/wayland-1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libxcb:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/9999
 _eclasses_=git-r3	27e13c09a4c7e4c78ac812f74727e676	meson	915ec7c25e08d7886558215e6809ca1e	meson-multilib	8989922d980e5e870cc3de949d1b2586	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=f584a3fb0b5637c84226c92feda80e65
+_md5_=f1b3c6ad859981340e49da1cebf714ad
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.68 b/metadata/md5-cache/media-libs/opencollada-1.6.68
index 2ee446612f8a..62991af5a350 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.68
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.68
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libpcre:= dev-libs/libxml2:= dev-libs/zziplib media-libs/lib3ds
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.68.tar.gz -> opencollada-1.6.68.tar.gz
 _eclasses_=cmake	7fb5980de96325cbab639f5b2187357c	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=1a1db54ae5847a10c5d3aa76e2dc02ec
+_md5_=0d776f8e7b8603d2552421c1699c1f7f
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.13-r1 b/metadata/md5-cache/media-libs/xine-lib-1.2.13-r1
deleted file mode 100644
index 1f5d115c13c3..000000000000
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.13-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
-DESCRIPTION=Core libraries for Xine movie player
-EAPI=8
-HOMEPAGE=https://xine.sourceforge.net/
-INHERIT=flag-o-matic libtool multilib
-IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
-REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
-SLOT=1
-SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.13.tar.xz
-_eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=6fae95e5ec1591908aac3ed0c8b63816
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.13 b/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
index 0a07c7642eda..6a1958e81ae8 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.13
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.13-r2
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=8
 HOMEPAGE=https://xine.sourceforge.net/
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic libtool multilib
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
 KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.13.tar.xz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=75cf8204d6949c7ce38cc9f612bc4ebb
+_md5_=5178a5ebd54aae95c1fe2b9342785f85
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 26f32b12f513..d5620352f5e9 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -1,6 +1,6 @@
 BDEPEND=app-arch/xz-utils >=sys-devel/libtool-2.2.6b virtual/pkgconfig >=app-portage/elt-patches-20170815 sys-devel/gnuconfig || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 dev-vcs/mercurial
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-base/xorg-proto x11-libs/libXt ) xv? ( x11-base/xorg-proto ) xvmc? ( x11-base/xorg-proto ) xinerama? ( x11-base/xorg-proto )
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=8
 HOMEPAGE=https://xine.sourceforge.net/
@@ -8,8 +8,8 @@ INHERIT=flag-o-matic libtool multilib autotools mercurial
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[opengl,X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac:= ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-libs/libpulse ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( media-libs/libva:=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb:= ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) wayland? ( opengl ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	mercurial	32c6bad6428a38951696c75f3b9a955a	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
-_md5_=75cf8204d6949c7ce38cc9f612bc4ebb
+_md5_=b2ecbe01149320f093106b22b81458a5
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 7cba44d2fbbd..d4ee13822fd2 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.7 b/metadata/md5-cache/media-sound/rhythmbox-3.4.7
new file mode 100644
index 000000000000..0926830c4094
--- /dev/null
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.7
@@ -0,0 +1,18 @@
+BDEPEND=gtk-doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.35 dev-util/itstool virtual/pkgconfig test? ( dev-libs/check ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=x11-libs/cairo >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/glib-2.66.0:2 >=dev-libs/gobject-introspection-0.10:= >=media-libs/gstreamer-1.4.0:1.0[introspection] >=media-libs/gst-plugins-base-1.4.0:1.0[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] dev-libs/json-glib >=dev-libs/libpeas-0.7.3[gtk] >=net-libs/libsoup-3.0.7:3.0 >=dev-libs/libxml2-2.7.8:2 x11-libs/pango >=sys-libs/tdb-1.2.6 >=dev-libs/totem-pl-parser-3.2:= cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-3.9.11:4.0= >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) )
+DESCRIPTION=Music management and playback software for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils python-single-r1 meson virtualx xdg
+IUSE=cdr daap dbus gnome-keyring gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=x11-libs/cairo >=x11-libs/gdk-pixbuf-2.18:2 >=dev-libs/glib-2.66.0:2 >=dev-libs/gobject-introspection-0.10:= >=media-libs/gstreamer-1.4.0:1.0[introspection] >=media-libs/gst-plugins-base-1.4.0:1.0[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] dev-libs/json-glib >=dev-libs/libpeas-0.7.3[gtk] >=net-libs/libsoup-3.0.7:3.0 >=dev-libs/libxml2-2.7.8:2 x11-libs/pango >=sys-libs/tdb-1.2.6 >=dev-libs/totem-pl-parser-3.2:= cdr? ( >=app-cdr/brasero-2.91.90 ) daap? ( >=net-libs/libdmapsharing-3.9.11:4.0= >=media-plugins/gst-plugins-soup-1.4:1.0 ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) libnotify? ( >=x11-libs/libnotify-0.7.0 ) lirc? ( app-misc/lirc ) python? ( python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[xml(+)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.0:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pygobject-3.0:3[python_targets_python3_11(-)] ) ) udev? ( dev-libs/libgudev:= ipod? ( >=media-libs/libgpod-0.7.92[udev] ) mtp? ( >=media-libs/libmtp-0.3 ) ) media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-libmms:1.0 || ( media-plugins/gst-plugins-cdparanoia:1.0 media-plugins/gst-plugins-cdio:1.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-0.7.3[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?,python_single_target_python3_11(-)?] net-libs/libsoup:3.0[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] dbus? ( sys-apps/dbus ) gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) ) upnp-av? ( >=media-libs/grilo-0.3.15-r1:0.3 >=media-plugins/grilo-plugins-0.3.16:0.3[upnp-av] )
+REQUIRED_USE=ipod? ( udev ) mtp? ( udev ) dbus? ( python ) python? ( ^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.7.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	virtualx	817571665ee28575da44ee08135089e5	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=1e27f9c1447f859544971549045946e0
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index add33e81247b..620ab1567c8f 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-19.4-r3 b/metadata/md5-cache/media-tv/kodi-19.4-r3
deleted file mode 100644
index 69acfb6a42bd..000000000000
--- a/metadata/md5-cache/media-tv/kodi-19.4-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A free and open source media-player and entertainment hub
-EAPI=7
-HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
-INHERIT=autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.12.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite <dev-libs/crossguid-0.2.2_p20190529 >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.3.2:=[dav1d?,encode,postproc] =media-video/ffmpeg-4*[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d:= ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= !gles? ( media-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz -> libdvdcss-1.4.2-Leia-Beta-5.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz -> libdvdnav-6.0.0-Leia-Alpha-3.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.3.2-Matrix-19.1.tar.gz -> ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz ) https://github.com/xbmc/xbmc/archive/19.4-Matrix.tar.gz -> kodi-19.4-Matrix.tar.gz
-_eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	cmake	7fb5980de96325cbab639f5b2187357c	desktop	021728fdc1b03b36357dbc89489e0f0d	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	linux-info	c4f1201b96a8a2c1f3b86cc8b2c71c91	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=b08e14c062ad1b6eaa630237e45d5c68
diff --git a/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2 b/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r3
index 57a3df6dea04..e7272dff23eb 100644
--- a/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r2
+++ b/metadata/md5-cache/media-tv/mythtv-31.0_p20210731-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig opengl? ( virtual/opengl ) python? ( || ( >=dev-lang/python-3.9.16-r1:3.9 ) ) virtual/pkgconfig
 DEFINED_PHASES=config configure info install postinst prepare setup
-DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/mysqlclient[python_targets_python3_9(-)] dev-python/requests-cache[python_targets_python3_9(-)] dev-python/simplejson[python_targets_python3_9(-)] ) ) )
+DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:= ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/mysqlclient[python_targets_python3_9(-)] dev-python/requests-cache[python_targets_python3_9(-)] dev-python/simplejson[python_targets_python3_9(-)] ) ) )
 DESCRIPTION=Open Source DVR and media center hub
 EAPI=7
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
@@ -8,9 +8,9 @@ INHERIT=eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd u
 IUSE=alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] )
+RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= <media-libs/dav1d-1.0.0:= media-libs/freetype:2 media-libs/libsamplerate media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:=[java?] sys-fs/udisks:2 ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) egl? ( media-libs/mesa[egl(+)] ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) java? ( dev-java/ant-core ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:= ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] )
 REQUIRED_USE=bluray? ( xml ) cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/5824c588db24b4e71a7d94e829e6419f71089297.tar.gz -> mythtv-31.0_p20210731.tar.gz
 _eclasses_=eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0425155df6b4b089edd17ebbadff2b3c
+_md5_=810f29bd6ca92df76ac031da1e0d2bc6
diff --git a/metadata/md5-cache/media-tv/mythtv-32.0-r2 b/metadata/md5-cache/media-tv/mythtv-32.0-r3
index 5e8ba6656648..8c44e28f54d6 100644
--- a/metadata/md5-cache/media-tv/mythtv-32.0-r2
+++ b/metadata/md5-cache/media-tv/mythtv-32.0-r3
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig opengl? ( virtual/opengl ) python? ( || ( >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) ) virtual/pkgconfig
 DEFINED_PHASES=config configure install postinst preinst prepare setup
-DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libbluray:=[java?] media-libs/libsamplerate media-libs/libsoundtouch media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/mysqlclient[python_targets_python3_10(-)] dev-python/requests-cache[python_targets_python3_10(-)] dev-python/simplejson[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/mysqlclient[python_targets_python3_9(-)] dev-python/requests-cache[python_targets_python3_9(-)] dev-python/simplejson[python_targets_python3_9(-)] ) ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit )
+DEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libbluray:=[java?] media-libs/libsamplerate media-libs/libsoundtouch media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:= ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) dev-lang/yasm x11-base/xorg-proto perl? ( dev-perl/DBD-mysql dev-perl/DBI dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 dev-perl/LWP-Protocol-https dev-perl/Net-UPnP dev-perl/XML-Simple ) python? ( || ( ( >=dev-lang/python-3.10.9-r1:3.10 dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/lxml[python_targets_python3_10(-)] dev-python/mysqlclient[python_targets_python3_10(-)] dev-python/requests-cache[python_targets_python3_10(-)] dev-python/simplejson[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16-r1:3.9 dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/lxml[python_targets_python3_9(-)] dev-python/mysqlclient[python_targets_python3_9(-)] dev-python/requests-cache[python_targets_python3_9(-)] dev-python/simplejson[python_targets_python3_9(-)] ) ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit )
 DESCRIPTION=Open Source DVR and media center hub
 EAPI=8
 HOMEPAGE=https://www.mythtv.org https://github.com/MythTV/mythtv
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic java-pkg-opt-2 java-ant-2 python-any-r1 qmake-utils readme.
 IUSE=alsa asi autostart cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb exif fftw jack java +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx +wrapper x264 x265 +xml xmltv +xvid +X zeroconf input_devices_joystick v4l ieee1394 hdhomerun vbox ceton java
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libbluray:=[java?] media-libs/libsamplerate media-libs/libsoundtouch media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:=[opengl] ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=acct-user/mythtv dev-libs/glib:2 dev-libs/lzo dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5[mysql] dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts media-fonts/tex-gyre media-gfx/exiv2:= media-libs/freetype:2 media-libs/libbluray:=[java?] media-libs/libsamplerate media-libs/libsoundtouch media-libs/taglib sys-libs/zlib alsa? ( media-libs/alsa-lib ) autostart? ( net-dialup/mingetty x11-apps/xset x11-wm/evilwm ) cec? ( dev-libs/libcec ) dvd? ( dev-libs/libcdio:= media-libs/libdvdcss sys-fs/udisks:2 ) fftw? ( sci-libs/fftw:3.0=[threads] ) hdhomerun? ( media-libs/libhdhomerun ) ieee1394? ( media-libs/libiec61883 sys-libs/libavc1394 sys-libs/libraw1394 ) jack? ( virtual/jack ) lame? ( media-sound/lame ) lcd? ( app-misc/lcdproc ) libass? ( media-libs/libass:= ) lirc? ( app-misc/lirc ) nvdec? ( x11-drivers/nvidia-drivers ) opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:= ) vaapi? ( media-libs/libva:= ) vdpau? ( x11-libs/libvdpau ) vpx? ( media-libs/libvpx:= ) x264? ( media-libs/x264:= ) X? ( x11-apps/xinit x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= x11-misc/wmctrl:= ) x265? ( media-libs/x265 ) xml? ( dev-libs/libxml2:2 ) xmltv? ( dev-perl/XML-LibXML media-tv/xmltv ) xvid? ( media-libs/xvid ) zeroconf? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=cdr? ( cdda )
 SLOT=0
 SRC_URI=https://github.com/MythTV/mythtv/archive/v32.0.tar.gz -> mythtv-32.0.tar.gz
 _eclasses_=flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	java-ant-2	5a1b508f2544b7cac8ec27c170676de0	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	8c72ea36a4935f626b13a30141d0d39c	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	qmake-utils	59420c906278d16deaaa629f9d115707	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	user-info	83547b4df3e1ba5a6bf91a0837eaa664
-_md5_=9462057c479fbd0c4db289aa07799f6d
+_md5_=14dfe02ed7efe5634777dd3dae8fb95e
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 71e4ec3e86f9..9f10b7e566de 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.4.7-r1 b/metadata/md5-cache/net-im/gajim-1.4.7-r1
deleted file mode 100644
index 50fab24ff6b6..000000000000
--- a/metadata/md5-cache/net-im/gajim-1.4.7-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.7.0[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 app-arch/unzip virtual/pkgconfig >=sys-devel/gettext-0.17-r1
-DESCRIPTION=Jabber client written in PyGTK
-EAPI=7
-HOMEPAGE=https://gajim.org/
-INHERIT=distutils-r1 xdg-utils
-IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-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 python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_9(-)] <dev-python/nbxmpp-4.0.0[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_9(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) 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 ) omemo? ( dev-python/jaraco-classes[python_targets_python3_9(-)] dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_10(-)] <dev-python/nbxmpp-4.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(-)] dev-python/pyopenssl[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:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[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 ) omemo? ( 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(-)] ) 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[introspection] ) ) python_single_target_python3_11? ( dev-python/idna[python_targets_python3_11(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_11(-)] <dev-python/nbxmpp-4.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(-)] dev-python/pyopenssl[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:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[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 ) omemo? ( 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(-)] ) 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[introspection] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gajim.org/downloads/1.4/gajim-1.4.7.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=e3bc01b2227ab8a307483cfb2e30c228
diff --git a/metadata/md5-cache/net-im/gajim-1.4.7-r2 b/metadata/md5-cache/net-im/gajim-1.4.7-r2
new file mode 100644
index 000000000000..64a72582e871
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.4.7-r2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.7.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.7.0[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.7.0[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 app-arch/unzip virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
+IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+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 python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_9(-)] <dev-python/nbxmpp-4.0.0[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[python_targets_python3_9(-)] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) 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 ) omemo? ( dev-python/jaraco-classes[python_targets_python3_9(-)] dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd:0[introspection] ) ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] >=dev-python/nbxmpp-3.0.0[python_targets_python3_10(-)] <dev-python/nbxmpp-4.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(-)] dev-python/pyopenssl[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:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[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 ) omemo? ( 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(-)] ) 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-3.0.0[python_targets_python3_11(-)] <dev-python/nbxmpp-4.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(-)] dev-python/pyopenssl[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:2.4[introspection] media-libs/gsound[introspection] dev-python/pillow[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 ) omemo? ( 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(-)] ) 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_9? ( >=dev-lang/python-3.9.16-r1:3.9[sqlite,xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[sqlite,xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[sqlite,xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.4/gajim-1.4.7.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=536f4160d204f4e14f720205bb20682c
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 319564a16ee8..097402648c70 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/farstream-0.2.9 b/metadata/md5-cache/net-libs/farstream-0.2.9-r1
index a6edfd37dd8f..e4acc71e7905 100644
--- a/metadata/md5-cache/net-libs/farstream-0.2.9
+++ b/metadata/md5-cache/net-libs/farstream-0.2.9-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.18 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 app-arch/xz-utils
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:0= ) test? ( media-libs/gst-plugins-base:1.0[vorbis] media-libs/gst-plugins-good:1.0 ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Audio/video conferencing framework specifically designed for instant messengers
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/Farstream
@@ -8,9 +8,9 @@ INHERIT=gnome2
 IUSE=+introspection test upnp valgrind
 KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
+RDEPEND=>=media-libs/gstreamer-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0 >=dev-libs/glib-2.40:2 >=net-libs/libnice-0.1.8 introspection? ( >=dev-libs/gobject-introspection-0.10.11:= ) upnp? ( >=net-libs/gupnp-igd-0.2:0= ) >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-good-1.4:1.0 media-plugins/gst-plugins-srtp:1.0 media-plugins/gst-plugins-libnice:1.0
 RESTRICT=test
 SLOT=0.2/5
 SRC_URI=https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.9.tar.gz
 _eclasses_=autotools	f0d3196128225dee3220e65f3371bc7a	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	9bd787a54d31405e742ae7537eed650b	gnome2-utils	b0183db3b2e07b18f3b77bffec72e116	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=7317bc88d3052b0cf8add8cdab68c3eb
+_md5_=ee2904fb1ad1c6f3595e1c23e47cc921
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index d948ae13d5f2..9f84b6e829d8 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20230416 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20230416
new file mode 100644
index 000000000000..4e4be2c51934
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20230416
@@ -0,0 +1,14 @@
+BDEPEND=dev-libs/libxslt test? ( dev-libs/libxml2 ) app-arch/xz-utils
+DEFINED_PHASES=-
+DESCRIPTION=Database of mobile broadband service providers
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
+INHERIT=gnome.org
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=CC-PD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20230416/mobile-broadband-provider-info-20230416.tar.xz
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe
+_md5_=8af5c47d421a6583664be88d6a76c815
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6 b/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
deleted file mode 100644
index 9232b9ed26ca..000000000000
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) <dev-libs/openssl-3:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
-DESCRIPTION=The NTP reference implementation, refactored
-EAPI=7
-HOMEPAGE=https://www.ntpsec.org/
-INHERIT=distutils-r1 flag-o-matic waf-utils systemd
-IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~riscv ~x86
-LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) <dev-libs/openssl-3:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz
-_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	eapi8-dosym	741bfa77afb2a9321261501aca58c208	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	5abcf99e5070e9e32e7b4d64ad438a65	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=1196eb7e62e414c4ff4fe995d29c43eb
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.2-r1 b/metadata/md5-cache/net-misc/ntpsec-1.2.2-r1
new file mode 100644
index 000000000000..08d295a3014a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-text/asciidoc-8.6.8 dev-libs/libxslt app-text/docbook-xsl-stylesheets sys-devel/bison python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools )
+DESCRIPTION=The NTP reference implementation, refactored
+EAPI=8
+HOMEPAGE=https://www.ntpsec.org/
+INHERIT=distutils-r1 flag-o-matic waf-utils systemd
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.2.tar.gz
+_eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	5abcf99e5070e9e32e7b4d64ad438a65
+_md5_=bfe4cbde0cbad0a06a349cc5b0a7bece
diff --git a/metadata/md5-cache/net-misc/ntpsec-9999 b/metadata/md5-cache/net-misc/ntpsec-9999
index a15c9dc2cf4f..0bd90b4cb517 100644
--- a/metadata/md5-cache/net-misc/ntpsec-9999
+++ b/metadata/md5-cache/net-misc/ntpsec-9999
@@ -12,4 +12,4 @@ RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16-r1:3.9[threads(+)]
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) nist? ( rclock_local ) || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	05bcfd9823be251f6e9f211ca285094e	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	git-r3	27e13c09a4c7e4c78ac812f74727e676	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	3c6cd0f418ba702c186a9865b85e704d	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	waf-utils	5abcf99e5070e9e32e7b4d64ad438a65
-_md5_=da4928f3e6f5d9d2dc126129cbb14c90
+_md5_=bfe4cbde0cbad0a06a349cc5b0a7bece
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index b71d89d42de5..a57c2b7439a2 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/gcc-13.0.1_pre20230416 b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230416
new file mode 100644
index 000000000000..f16675562d2d
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.1_pre20230416
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind ) d? ( || ( sys-devel/gcc[d(-)] <sys-devel/gcc-12[d(-)] ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags ieee-long-double default-znow default-stack-clash-protection rust
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=mirror://gcc/snapshots/13-20230416/gcc-13-20230416.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-patches-9.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-13.1.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	514815b1cc0dd4aeac177c2e812b3b1a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	9d3a9a889a6fa62ae794f817c156491b	multilib	d1408425c7c4a7669b9b17735404b693	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	39096b494432e505dfd5af92401f7de4	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=fefa93195c0e2849e6d21ab9c7579c84
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 6805a376e62b..c6bc1ee2815a 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.3_rc7 b/metadata/md5-cache/sys-kernel/git-sources-6.3_rc7
new file mode 100644
index 000000000000..b6e68792491b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-6.3_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.3_rc7
+SRC_URI=https://git.kernel.org/torvalds/p/v6.3-rc7/v6.2 -> patch-6.3-rc7.patch https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	5ec69098eb726d07eec2cf05ce4fbdfe	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e
+_md5_=c152b1e7ab9fc06fdb114e19543dd1eb
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 76fbde52fa6e..bd783e6af0d2 100644
--- a/metadata/md5-cache/x11-libs/Manifest.gz
+++ b/metadata/md5-cache/x11-libs/Manifest.gz
diff --git a/metadata/md5-cache/x11-libs/vte-0.72.1 b/metadata/md5-cache/x11-libs/vte-0.72.1
new file mode 100644
index 000000000000..5fe90c0edb18
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/vte-0.72.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.1-r1:3.11 >=dev-lang/python-3.10.9-r1:3.10 >=dev-lang/python-3.9.16-r1:3.9 ) dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.60:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
+DESCRIPTION=Library providing a virtual terminal emulator widget
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org meson python-any-r1 vala xdg
+IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-3+ GPL-3+
+RDEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.60:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21:= systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?] ~gui-libs/vte-common-0.72.1[systemd?]
+REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
+SLOT=2.91
+SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.72.1/vte-0.72.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
+_eclasses_=gnome.org	6b39404f1491c60a2d32e3c693a683fe	meson	915ec7c25e08d7886558215e6809ca1e	multilib	d1408425c7c4a7669b9b17735404b693	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	76050953ad5b70d7e09a6ca55558db92	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	429bfd4e8d8e39db5385ba5744f30788	toolchain-funcs	14a8ae365191b518fad51caad7a08f3e	vala	1343f639cc74d2aa8b36fc08677da58d	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=f68fbd63d4f19ae31e0fe15f3891c441
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 903a92b4622c..4fbb41cae36c 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.9.3 b/metadata/md5-cache/x11-terms/mlterm-3.9.3-r1
index c83ec83254fd..780131f1b423 100644
--- a/metadata/md5-cache/x11-terms/mlterm-3.9.3
+++ b/metadata/md5-cache/x11-terms/mlterm-3.9.3-r1
@@ -1,5 +1,6 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
 DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty[api(+)] ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=virtual/libcrypt:= X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty[api(+)] ) cairo? ( x11-libs/cairo[X(+)] ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( x11-libs/gtk+:3 ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) xft? ( x11-libs/libXft )
 DESCRIPTION=A multi-lingual terminal emulator
 EAPI=8
 HOMEPAGE=http://mlterm.sourceforge.net/
@@ -12,4 +13,4 @@ REQUIRED_USE=|| ( X fbcon wayland )
 SLOT=0
 SRC_URI=mirror://sourceforge/mlterm/mlterm-3.9.3.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d
-_md5_=734854f4e03a3206c71204807be38f24
+_md5_=dfe5eed5aeb4c593fe2d98fcc4ce0ed5
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 92e6859afc7a..2b3561f39dde 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 15493 BLAKE2B ec5ea168778a79b147975de4177e6e700a7d37e6ee037cb43e8a2fb5109fe7703b6271a466b25edb7a1f6a61aa9467b69f02382396560dc259c3acdd5e880f30 SHA512 24314abdcaad22302e8e4885bab38f0250026f6284cc14fc2d6d81378bea47d1c1e985134c2fc0d63a8bc88f3563b53ea9e7b90d1e24f24b6733a9cc9fe4c83a
-TIMESTAMP 2023-04-16T22:09:47Z
+TIMESTAMP 2023-04-17T04:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8citfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmQ8xo5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAUQw/+K9/xk15FKWGY3xZF2AnU8SHEaQWrF30CEfkg1dg0CXleoukQXdHc0we8
-RS8pW99Do3ZWxfy1AqYPwgTw0CzzxqCGM7TJ3O8t9XKKQOJAjJCSeTJVZLcmYEQf
-cBKULTqcMX8NftjnvLNlBUlaHVphzOTYpVhTjpUujIh7xBQkOp2BLfovmeYFESkG
-H2M07y0AQf7IqGTWiRsoNEHjZ+iymvSb6wQk6FNNok3ymOQoflycOdkIVUchJgb6
-ewrKdEGI41LIUEA7KNeYlgu5DWcXisCTDYsbKpch+QoNgeDvlfgOmasTZA7E39eU
-FqI1zfLo020k7VR+3MXI6t9ketyoUs0ozv5TAgz9KdBz/mBef3k/8wPmHc1u8xqv
-WvMwb0lzvLJ/jo/hPXS9Zl0HgHitzprLgr/aogwMT9PhABlZwWhBOruxQ2z6xApl
-J7jMm1ch+t4V26FDxFE5wUV3VcV6XIw4oc5SWCnwtrQ7gIdoRwVODInbzTiPpPFY
-N1jtgntzdck8D4ouAHNdB9RNp17b1KGTHpqxdYiKaIfV/vnXewN5ompbwOxL7GtG
-HWoLJaTXK0LSAGG7zC8x+cU55zoaLk614gjjGzkt01cy06tKzL11SJf2g35FNrYl
-R5R1gzLw25RZd9OrwjxCq+QCCaC2GZHGZh/0Qz09qUgKOBWvE5Q=
-=/Rqm
+klC4Mg/+LPl+I7UngBemdbC/pxQNSAJBn92zF8Hgek2eLifKccnqQApsL/cogloq
+u1RnLQ7aEbHME61l09DRRG3v8vp1H9X3Epxdc+9Mns5/OUm4ziooEIocDCQgMsm/
+IxhMpLtADRYbCDkfQWE5F9lcXkM7kXe/lVN5/QDZVJ3FJuByWDBVOUXsmBS0qDxe
+pMsNiF9hLASTKEcAJYHe2ru28aEcQQ+zZFD8zt8Di4kYvYnTDxspB5mPhvvI0LHx
+96e9+QBe0xuHD/1NpzNLwBCp2OH4tJRS+xT9vCaL1TXz89hcJi9IN7AGwLu6ejBd
+HqPaHYZiVAiIb4/zxvreA/oOa37i4ptX7llNVOpUV/7mknJqu21Dj0Uqt/WuEh+R
+Rl0/1kSAALSyAMEZWwGKCsbVsuFt/DiWPAST87QNQZKpTI0qYXfA9tibdn3AHLaz
+UQh6uQwUUcZ7NbJ5w6LzaEorNvziihk2Ij/ngBPSHaX9qjlbAf7CbDJf2G0ZsqvR
+S0OV3bmFb3+PuG0CFgZAxhtzYP72E56hb3ASijkSh4YPqhqEQYMdlZHOHrApeE1c
+OqNNPMJlM/Y8ZBZF0jVhq/iLhrpzbkphn3/Jz6Yu7epkbm9Vh3zjL3d+kvvADdrg
+MVTSgP3a1bRo392fnAfulxPhDkShjDrPCq1T24ExTalUr+SesxI=
+=7gJX
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9e39b1f300c0..7443bbb79d0e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 16 Apr 2023 22:09:43 +0000
+Mon, 17 Apr 2023 04:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a5b727084b6d..44155c5f9000 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Apr 16 10:09:43 PM UTC 2023
+Mon Apr 17 04:09:45 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a71de0656d97..997346352b50 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 16 Apr 2023 22:15:01 +0000
+Mon, 17 Apr 2023 04:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d3f5418a8afd..02d7bddbbb3f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-7631dd545b729a264af76aab1b35940e838430b5 1681677324 2023-04-16T20:35:24+00:00
+c48adea9a4e9123be02da3bb06d581686e0f5bc5 1681694746 2023-04-17T01:25:46+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0413a0d2051c..975e5378c960 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1681683001 Sun 16 Apr 2023 10:10:01 PM UTC
+1681704601 Mon 17 Apr 2023 04:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9e39b1f300c0..7443bbb79d0e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 16 Apr 2023 22:09:43 +0000
+Mon, 17 Apr 2023 04:09:45 +0000
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 8dd2615f4910..20bdf4ee331b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 7b9dfc144b03..02cdf008e5b0 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,3 +1,3 @@
 DIST gajim-1.4.7.tar.gz 7184866 BLAKE2B 9be0ae485a372683623eff1f9ed1d209800c3088bf01c134bb5c6f1770e8ded1ebe6c2b301ad648c6cfb1793e2be43aade1410a701f7d0490f2ab1b0a4c3fdd5 SHA512 5988f6b7aa46166208b1693b9e1a5fe982cea2987f3f4170bcb14e4bb9be1154b1c6ceed020a949131a498db43d2dffee30bd3167cd56889c1cbb5641ed960f4
-EBUILD gajim-1.4.7-r1.ebuild 2684 BLAKE2B d6072a89c4c6f3c3073af52f09ccbe3855fdac1621d39609b1079671759bf7c38a05a79dd33d4e4cdb6b95e4b36a5ab08768d7be1406a8dee8be9da847bf3c94 SHA512 7aa156a7016c88ca10cd4324c4755184791de83d6c9d11f1dbe488ce25c618f63ef40d2598fb429c887809056e768ec5f97f07ce8a59932a4d83cd781d2ee252
+EBUILD gajim-1.4.7-r2.ebuild 2686 BLAKE2B 6bfa971349e0e4c3331a975a378382cb5bd362c03b14265c8371a69875580cef0f7cfbcb417f4c0358a378974706fec188fb052a1cb540db5f63b6ce308bdad0 SHA512 b24310ca16ee32e186f42a5619390ff331f152ef8f2ed804bd9af95286d2d2c66832a4438ddbc87b20ba12ee4ff4a7cc4e488689e48def931e3580864cd4da94
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.4.7-r1.ebuild b/net-im/gajim/gajim-1.4.7-r2.ebuild
index 1d8927da3dcc..0c1f9e76c74a 100644
--- a/net-im/gajim/gajim-1.4.7-r1.ebuild
+++ b/net-im/gajim/gajim-1.4.7-r2.ebuild
@@ -73,7 +73,7 @@ RDEPEND="${COMMON_DEPEND}
 			app-text/gspell[introspection]
 			app-text/hunspell
 		)
-		upnp? ( net-libs/gupnp-igd[introspection] )
+		upnp? ( net-libs/gupnp-igd:0[introspection] )
 	')"
 
 src_install() {
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index dace52a4af02..c1cfb8bf4b9b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/farstream/Manifest b/net-libs/farstream/Manifest
index 3faea85379f2..00eb722313f9 100644
--- a/net-libs/farstream/Manifest
+++ b/net-libs/farstream/Manifest
@@ -1,4 +1,4 @@
 AUX farstream-0.2.9-make43.patch 1423 BLAKE2B d17a589cd2c91eab66cfb86c3050e0c9fa6cdf7a92ffb9e483f7cce2cbb9106ddc3755f56e70a33446b59aee68fb5e8bf9a4b6cde3d480f0ed411b42bb273ec3 SHA512 55c95b76e897b64b350f1740cf65311bf3ce1e2ed24515c713dbe8f0a4f1e4d4232e630e5c8abd8fce580f4ff7265f77bdefaf78ac3eb135342b2a70305bd104
 DIST farstream-0.2.9.tar.gz 1334833 BLAKE2B 3c23f9534cb8578acd82bb0f7308891e0448cbf5a5b986f27d14e4d727a1e52f4268532c44dcc84e2a1db19504840ddac128c9bd0a731f06e2972d233d8781b9 SHA512 8840725d2f1de59bebc8c49cf68a6712822a4e7b6ba9078713f80e3c35a39135565a1a885edab43a562f895e11b8f5d8d666d57d9b3814dabb661f46498515bd
-EBUILD farstream-0.2.9.ebuild 1957 BLAKE2B be0a4aa184b8ba62bc4bfa5560e5703b32c891150d1b395a464b6512120d7b8bbf21e3e7690b4beee8e684c1a8f530d604c1c848187bc14856fe22ca72d584dc SHA512 c4deaebab3929b0bba08aaa4ee8505b671b3d1ca3583853dd4c667a58d5ba43ef3d607e02600c844b550a7442f19e175fde78d563a104cffc72d9b4d65fb0774
+EBUILD farstream-0.2.9-r1.ebuild 1958 BLAKE2B 9f4eb6972ac1b60771ac8a14dabefaacf5b08a6890e99edf1be3cde449b927410a752736a917f505e6de233617d7cc1b71c289b734cf987eff0282f0055f6c80 SHA512 3f612ae036dc637ae8fc5b90493e759f018846975c67f8b109fec0723dafb1296543f0e27e23ad7c440f5972a2280993ed5a1663636d22487d900ac22661b0e9
 MISC metadata.xml 352 BLAKE2B e83127d07e36ca6785d178289842f3f4cd3b6110bf411ca6958658b787a9b2a301f1e53b2b45f12311f2fee3ed11f82f6b3743c371997af34258e944636e2bd1 SHA512 b489e0e0bed03fd07e376595b3c08a16c39cc93f6e1201ed13ce6928c6974b3c93ce81519baac3d7a4b9d95a54cb314f4e1512b33e5c6202dcd7ef8f31150a9b
diff --git a/net-libs/farstream/farstream-0.2.9.ebuild b/net-libs/farstream/farstream-0.2.9-r1.ebuild
index e9c168e952c2..f3c7655535a9 100644
--- a/net-libs/farstream/farstream-0.2.9.ebuild
+++ b/net-libs/farstream/farstream-0.2.9-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.40:2
 	>=net-libs/libnice-0.1.8
 	introspection? ( >=dev-libs/gobject-introspection-0.10.11:= )
-	upnp? ( >=net-libs/gupnp-igd-0.2:= )
+	upnp? ( >=net-libs/gupnp-igd-0.2:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=media-libs/gst-plugins-bad-1.4:1.0
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b4bd01c378fb..75e0a2d86f28 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 5ebfd4184aeb..20cb73f8f1cb 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,3 +1,5 @@
 DIST mobile-broadband-provider-info-20221107.tar.xz 85416 BLAKE2B 91772a7f16fbba8d477abd623e4902e1aa2317ba0e226ab493ca8cc94bd6dc4c68ea61fc2f3d8f1f4c6bbfce2d7b27dc9dcfa3d35df6a9c9370b9c4ff277318f SHA512 e72fc1c78dd1bf991fc29ba952757af9c38d11e3e918662ce6380337c75eaa56fe33705f6d1eb78627378e1575b4102dceaa68e5e035c62c02e60570752f3e86
+DIST mobile-broadband-provider-info-20230416.tar.xz 85884 BLAKE2B 51416cbd7e208eca14a5ddf023cad4a76495773794fed7955cfb346950614b1b6d6f9df7d24525c769c2742381eb9d8780575fe9d0bc0de333b17be3d53400d1 SHA512 fd6be1387284b31fa300fe59244a5d2d65c9851037f78b540d8d907c9bedd1ec24a8d23bf66403a30995ddb4791b7cb746952d9438c08c846906f6825c44dd9b
 EBUILD mobile-broadband-provider-info-20221107.ebuild 488 BLAKE2B 412a87ce704d84c711295ef2eb551d61d7a5228535ccf0127edb5734c234084391fd06cf56d4f74b6e97c6aba73ba285101f50288b57054a05a140bc5f5258a3 SHA512 a12cab7fe9065286e27398e090f48a7cc674cd9f3bab7ae34330ba7b57e036548e8db146701c4a1e513c96f7ec180e7a0157aaf5c6697156a4a535e95682e5bc
+EBUILD mobile-broadband-provider-info-20230416.ebuild 495 BLAKE2B 7351e5350821754a82c01db19c37ae720eaf1cbc8d6b6dd88671a288e2f34ce7100843176c1ff7d2dd9a546bb5730bec881ce8142a00ed754a09a3200b10f980 SHA512 41bd5e961042c238fb062c20d4742f0c3173898b102884bff092bbf4fe4d69b73fe9c173dfe31252954ab0f3fe9e7fb5c8103ce7e31f0a853bd0c6c44447edbb
 MISC metadata.xml 371 BLAKE2B 0bebc02fecc2a73323bb775ef52ccad19b856e70beb7202a588d128d3abc8fd77fa0937cc3ae897596c29dca0d3ce0e0d2ef88b3528ac90a07db4de1e0b97a46 SHA512 3b3eb4caef7124cb52d7a42d4abffcafc7b0f480546a57fd568b7ac98e22b217105f0699c4ab0c9ee3d004e6e392ad1da4213bfb61f0d04440058c717b75917f
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild
new file mode 100644
index 000000000000..19ba474ec257
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20230416.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-libs/libxslt
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS=( README )
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 700077217487..7a0be757849b 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -3,15 +3,10 @@ AUX ntpd-r1.service 613 BLAKE2B 9e0d0fdefa670c2ac25142bfb37880ce4ba0662f70f7cf9a
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r3 491 BLAKE2B e91eb8921b60142d9f827abf7c2a4e4e48be423b3227cbe736433d2423db8f9927d4af34e82e1577ae294e1819ba4313279911288c29248d202fd57675da6fec SHA512 d9d30654842932b5e5d276b2b59c6cf5a95aadbe68f32e818103f576877b4a5e204498cc53a2f9491db2a37378ba176fc3fc1d6ed4b7b4b529b75cc7fec2ae92
 AUX ntpsec-1.1.9-remove-asciidoctor-from-config.patch 680 BLAKE2B 7204a831b3dc0dba7f268febd10fa7599ef6b9bee30199ce10529d2d326719f5b376d301aabfef3beacecd4af813bcef1d6a65d61ab00996d72f1240f83ef8e3 SHA512 3e012ad70507f440ed3a4aca4886a96e40d49a0dd7c14572f664633a56139cb7767e07ee1bb5e8295fc32052914364660c928d11369b6f80193ae7e190e5a48e
-AUX ntpsec-1.2.1-build-notests.patch 1512 BLAKE2B 16f1b49802c2883866d5ddc862c49ddca994fc530938b53d6059a0f044aa67692180efd528727b91940357562eb4db4a1abaa0a04404b13b912eb11a6a94b9fc SHA512 5b9cf22809a727c687d4a6796a334fd515d1de3883f2e72b5a44e787dd5e1189cc86e5a50c7f693d45e58ac1c5ee0503571fe4aa15cc31f7fc7d3f409128d21e
-AUX ntpsec-1.2.1-seccomp-nsd.patch 1469 BLAKE2B a3b0db89c8eff4f184263fdaaaf522718cd8bbc26b67b5bfdbbff3ba4e4c6000702f8e683d4069a2a87b157748025d48ecbd68f6f1634ca2070083a9b9326e2e SHA512 f73989906b24357a99dc5d56ab830c7f5605c992b11d25d75ef35b92242cdcb41cad2bf301963c1df2f3564ffe96ac19bd1836060585187ee282719b6cb2b66a
-AUX ntpsec-1.2.1-seccomp-rollup.patch 2987 BLAKE2B 82bd355cdd169133f232f6514f363e87b6876472d49d69d034dd33aefe7179dc3db5e661909774471635dd947761f5e8ab47ecc0dcf8d6c2e62ffdad06044a3f SHA512 34c1941dfd7d7968fa954fb36411aad5e711767f1c0b6aca52cd8f8c839163110af2d4774a7a41b1f3d0daa49af5823b74e9c8a2a9ec12b9a344c72ce505d279
-AUX ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch 785 BLAKE2B df61801e9748e20ce7fa8577c472ea2ed4e31a8d2cb1aef39a245bfe145e482b61b6b30398fc5c2da69685ed872b70ac8399481ec71ea35fc4469df1b83bd195 SHA512 a35ba539aa6a0b8f28079e1dd7a729e7ea21ab045233d7b5e1938a11c03a72aa87907068505e0330c644ebb9b509663a21a24ad9a4cc954a0f03ec7198309c0e
+AUX ntpsec-1.2.2-logrotate.patch 663 BLAKE2B c5e8eca739909695b6fd6cf7e507acb8e49a8eb2eebbf2afe83733159b8240f563a22a7389ac58373c10df104ee5dd34c7aec40787200bd3d704e5f0273cfc42 SHA512 ccba1116fac3fcb8dc075c81f2d8ed24399b41b6718ae65ed042b0da8bf19c0a5259650323a9b1d6f0e5c44ae167874ccaca7cbdd50b38955b17a4a49840c863
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
-AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4
-DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
 DIST ntpsec-1.2.2.tar.gz 2710329 BLAKE2B 031412d0fc7ecb5aba73501e63f8d0c416b23fe69114dd32422b03b4827e1ac9c92a4dfeb2e7d074cf6fd410d00cf86632f241dffd22987e4c03b21d21d8693a SHA512 864afb72c4bd8bc439ee06d343893cf92b3893c26c972a7bd1ff2713f0ad1f50704b6d0c6f155e6373c9747efff3ea36097a590be0d53e1a7ea7f429ba409cd1
-EBUILD ntpsec-1.2.1-r6.ebuild 4409 BLAKE2B 3214e5e2ffc5b06ec8b086bc87e6e623c6a929107388a03e1bef2a28f651657dd23267483e94e5acecdf0664a9c349d4b075b833599c971da1062b0877b6de93 SHA512 d28107a05e9e208af20a70473f8cc918a82a04c71fe3e076332c29980ad6364b0cbf77678367816278c5a4cac94754f05d2e3686784f73324bd7a2b1f7ac9dc4
+EBUILD ntpsec-1.2.2-r1.ebuild 4195 BLAKE2B 345e01f1365b81313e63ad25abe980818ac37f19aa478be93054676e3958cb59c91c7d807b0baae042637ee79064df97c0b064bfe0c5db1650ad9f5a9960b880 SHA512 79d3f19de723c4d11e7e7fe91b38b97b7ace66da1f5e6d5708d2ca7ea523c03a688ba0c6f92b6e7cf1e785abb96195368fd3dee3dc84c2c4d00e1fce51181a60
 EBUILD ntpsec-1.2.2.ebuild 4149 BLAKE2B d494c97f4ee0630d3e20a5b16513b41386eef9b0d953ee24a5b5e410a8977560740bf31c06a4d83fae56006433d75d1051d906e1901f869f4eecb7bb72a31063 SHA512 62399621ac3b15a9a3cf39811e05be841f80d573c5eb237bb08bafd90e4ed5ff1b7e97e677686bc7b31fafa11ffdeb8f5292017e71d82a2e3c532a0be90d71ce
-EBUILD ntpsec-9999.ebuild 4152 BLAKE2B f7f63083a7e86fd4048377d62ba37e9c598743856986191766a0c636b1737cdb7a273c99abbf37e1e174bb6c16d6613882fee55fa157712dd0fb6f6ac378d756 SHA512 42466608a924fa01bba11d7a17f30b4515a70d01b2001aa0c631757825a817a516f606cd5240fb95093af87b860a7e67318277fda1046173aa4b5a6350b5d63d
+EBUILD ntpsec-9999.ebuild 4195 BLAKE2B 345e01f1365b81313e63ad25abe980818ac37f19aa478be93054676e3958cb59c91c7d807b0baae042637ee79064df97c0b064bfe0c5db1650ad9f5a9960b880 SHA512 79d3f19de723c4d11e7e7fe91b38b97b7ace66da1f5e6d5708d2ca7ea523c03a688ba0c6f92b6e7cf1e785abb96195368fd3dee3dc84c2c4d00e1fce51181a60
 MISC metadata.xml 1777 BLAKE2B e324b32f904e5f076331594aefa32e5174e917a78fb0e1ca0361a2a0cae8f7813637e044d6c351e3f1d07d01733062def59666b89f73d134a507332585f29ae9 SHA512 db03c0268e00fea3701979e30b3bb3b1677de9f2c6692c99eb78cf5a929ca39cb8f379add7ba6786f1ddbb80e1b9263ec46bf459706996c12f3fd38bbc9452ea
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
deleted file mode 100644
index dab51a97fc0a..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-build-notests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1a7bb2e3a2749bd709ea4cf10b66b6f6d05aaf9d Mon Sep 17 00:00:00 2001
-From: James Browning <jamesb.fe80@gmail.com>
-Date: Sun, 10 Apr 2022 07:53:37 -0700
-Subject: [PATCH] I: NTPsec build does not repect --notests
-
-STR: (run the following)
-- git clone https://gitlab.com/NTPsec/ntpsec
-- cd ntpsec
-- ./waf configure build --notests -p
-
-AR: NTPsec runs tests despite having a parameter telling it not to
-ER: NTPsec should not run tests when it has been told not to
----
- wscript | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index c1d765046..d8a20b82e 100644
---- a/wscript
-+++ b/wscript
-@@ -1131,6 +1131,7 @@ def build(ctx):
-     ctx.manpage(8, "ntpclients/ntpsnmpd-man.adoc")
- 
-     # Skip running unit tests on a cross compile build
-+    from waflib import Options
-     if not ctx.env.ENABLE_CROSS:
-         # Force re-running of tests.  Same as 'waf --alltests'
-         if ctx.cmd == "check":
-@@ -1139,6 +1140,8 @@ def build(ctx):
-             # Print log if -v is supplied
-             if verbose > 0:
-                 ctx.add_post_fun(test_print_log)
-+        elif Options.options.no_tests:
-+            return
- 
-         # Test binaries
-         ctx.add_post_fun(bin_test)
-@@ -1152,7 +1155,6 @@ def build(ctx):
-         ctx.add_post_fun(bin_test_summary)
-     else:
-         pprint("YELLOW", "Unit test runner skipped on a cross-compiled build.")
--        from waflib import Options
-         Options.options.no_tests = True
- 
-     if ctx.cmd == "build":
--- 
-2.32.0
-
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
deleted file mode 100644
index 5b7a4e51374c..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-nsd.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://gitlab.com/NTPsec/ntpsec/-/commit/a49d53b7fe1d
-https://bugs.gentoo.org/851531
-
-From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
-Date: Sat, 11 Jun 2022 15:16:15 +0200
-Subject: [PATCH] ntpd/ntp_sandbox.c: allow readv() for glibc nscd
- getaddrinfo() provider
-
-Otherwise, ntpd crashes from time to time with the following stack trace:
-#0  0x00007f5763bfac4d in readv () from /lib64/libc.so.6
-#1  0x00007f5763c48b4c in __readvall () from /lib64/libc.so.6
-#2  0x00007f5763c467ed in nscd_gethst_r () from /lib64/libc.so.6
-#3  0x00007f5763c46c0d in __nscd_gethostbyname2_r () from /lib64/libc.so.6
-#4  0x00007f5763c15a2a in gethostbyname2_r () from /lib64/libc.so.6
-#5  0x00007f5763bed3ca in gaih_inet.constprop () from /lib64/libc.so.6
-#6  0x00007f5763bee225 in getaddrinfo () from /lib64/libc.so.6
-#7  0x000055fcf0ad6544 in open_TCP_socket ()
-#8  0x000055fcf0ad79b4 in nts_probe ()
-#9  0x000055fcf0ac37c4 in dns_lookup ()
-#10 0x00007f5763b8205a in start_thread () from /lib64/libc.so.6
-#11 0x00007f5763c05d1c in clone3 () from /lib64/libc.so.6
-
-Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -357,6 +357,7 @@ int scmp_sc[] = {
- 	SCMP_SYS(poll),
- 	SCMP_SYS(pselect6),
- 	SCMP_SYS(read),
-+	SCMP_SYS(readv),	/* nscd getaddrinfo() provider */
- 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
- 				* It will die on the first reply.
- 				* (Or maybe sooner if a request arrives.)
-GitLab
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
deleted file mode 100644
index c9ba3760cce6..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rollup.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 9a13c2bd472786472360f1a6465d8a808f6b8311 Mon Sep 17 00:00:00 2001
-From: Stephen L Arnold <nerdboy@gentoo.org>
-Date: Thu, 2 Dec 2021 20:16:18 -0800
-Subject: [PATCH] ntpd/ntp_sandbox.c: seccomp rollup patch for arm, arm64,
- riscv, all
-
-* add renameat2, move newfstatat and faccessat, remove arch dups
-* rollup previous patches, remove cruft
-* includes riscv fixes, previous bugs:
-  https://bugs.gentoo.org/705128
-  https://bugs.gentoo.org/786228
-  https://bugs.gentoo.org/823692
-  https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1247
-  https://gitlab.com/NTPsec/ntpsec/-/issues/713
-
-Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
----
- ntpd/ntp_sandbox.c | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/ntpd/ntp_sandbox.c b/ntpd/ntp_sandbox.c
-index e66faaa8c..04eaa003a 100644
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -306,8 +306,8 @@ int scmp_sc[] = {
- #endif
- #endif  /* ENABLE_EARLY_DROPROOT */
- 
--        SCMP_SYS(accept),
--        SCMP_SYS(access),
-+	SCMP_SYS(accept),
-+	SCMP_SYS(access),
- 	SCMP_SYS(adjtimex),
- 	SCMP_SYS(bind),
- 	SCMP_SYS(brk),
-@@ -319,6 +319,9 @@ int scmp_sc[] = {
- 	SCMP_SYS(connect),
- 	SCMP_SYS(exit),
- 	SCMP_SYS(exit_group),
-+#ifdef __NR_faccessat
-+	SCMP_SYS(faccessat),  /* riscv and aarch64 */
-+#endif
- 	SCMP_SYS(fcntl),
- 	SCMP_SYS(fstat),
- 	SCMP_SYS(fsync),
-@@ -349,11 +352,13 @@ int scmp_sc[] = {
- 	SCMP_SYS(lseek),
- 	SCMP_SYS(membarrier),	/* Needed on Alpine 3.11.3 */
- 	SCMP_SYS(munmap),
-+	SCMP_SYS(newfstatat),  /* riscv and aarch64 */
- 	SCMP_SYS(open),
- #ifdef __NR_openat
- 	SCMP_SYS(openat),	/* SUSE */
- #endif
- 	SCMP_SYS(poll),
-+	SCMP_SYS(pread64),
- 	SCMP_SYS(pselect6),
- 	SCMP_SYS(read),
- 	SCMP_SYS(recvfrom),    /* Comment this out for testing.
-@@ -362,6 +367,9 @@ int scmp_sc[] = {
- 				*/
- 	SCMP_SYS(recvmsg),
- 	SCMP_SYS(rename),
-+#ifdef __NR_renameat2
-+	SCMP_SYS(renameat2),  /* riscv */
-+#endif
- 	SCMP_SYS(rt_sigaction),
- 	SCMP_SYS(rt_sigprocmask),
- 	SCMP_SYS(rt_sigreturn),
-@@ -401,6 +409,7 @@ int scmp_sc[] = {
-  * rather than generate a trap.
-  */
- 	SCMP_SYS(clone),	/* threads */
-+	SCMP_SYS(clone3),
- 	SCMP_SYS(kill),		/* generate signal */
- 	SCMP_SYS(madvise),
- 	SCMP_SYS(mprotect),
-@@ -415,9 +424,9 @@ int scmp_sc[] = {
- 	SCMP_SYS(nanosleep),
- #endif
- #ifdef CLOCK_SHM
--        SCMP_SYS(shmget),
--        SCMP_SYS(shmat),
--        SCMP_SYS(shmdt),
-+	SCMP_SYS(shmget),
-+	SCMP_SYS(shmat),
-+	SCMP_SYS(shmdt),
- #endif
- 
- 	SCMP_SYS(fcntl64),
-@@ -450,10 +459,9 @@ int scmp_sc[] = {
- 	SCMP_SYS(mmap),
- #endif
- #if defined(__aarch64__)
--	SCMP_SYS(faccessat),
--	SCMP_SYS(newfstatat),
--	SCMP_SYS(renameat),
- 	SCMP_SYS(linkat),
-+	SCMP_SYS(renameat),
-+	SCMP_SYS(syscall),
- 	SCMP_SYS(unlinkat),
- #endif
- #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
-@@ -463,6 +471,9 @@ int scmp_sc[] = {
- 	SCMP_SYS(send),
- 	SCMP_SYS(stat64),
- #endif
-+#if defined(__arm__)
-+	SCMP_SYS(statx),
-+#endif
- };
- 	{
- 		for (unsigned int i = 0; i < COUNTOF(scmp_sc); i++) {
--- 
-2.32.0
-
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch b/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch
deleted file mode 100644
index 155304148b1f..000000000000
--- a/net-misc/ntpsec/files/ntpsec-1.2.1-seccomp-rseq-glibc-2.35.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://gitlab.com/NTPsec/ntpsec/-/merge_requests/1262
-https://bugs.gentoo.org/833274
-
-From 75970342391b0b1fad422e6ca3dc89dd76dcf607 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 7 Apr 2022 03:02:22 +0100
-Subject: [PATCH] ntpd/ntp_sandbox.c: allow rseq for glibc-2.35 in seccomp
- filter
-
-Fixes: https://gitlab.com/NTPsec/ntpsec/-/issues/728
-Bug: https://bugs.gentoo.org/833274
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/ntpd/ntp_sandbox.c
-+++ b/ntpd/ntp_sandbox.c
-@@ -366,6 +366,9 @@ int scmp_sc[] = {
- 	SCMP_SYS(rt_sigaction),
- 	SCMP_SYS(rt_sigprocmask),
- 	SCMP_SYS(rt_sigreturn),
-+#ifdef __NR_rseq
-+	SCMP_SYS(rseq),		/* needed by glibc-2.35+ for resumable sequences */
-+#endif
- 	SCMP_SYS(sigaction),
- 	SCMP_SYS(sigprocmask),
- 	SCMP_SYS(sigreturn),
-GitLab
diff --git a/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch
new file mode 100644
index 000000000000..60152bc846c4
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.2.2-logrotate.patch
@@ -0,0 +1,26 @@
+From 4ba53b95a6a45f08f5d3436a4a3ba4f9a97146e2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 17 Apr 2023 00:24:32 +0200
+Subject: [PATCH] Give ntpd a chance at re-opening the logfile as ntp:ntp after
+ rotation
+
+https://bugs.gentoo.org/873514
+---
+ etc/logrotate-config.ntpd | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/etc/logrotate-config.ntpd b/etc/logrotate-config.ntpd
+index b64998e..9144e57 100644
+--- a/etc/logrotate-config.ntpd
++++ b/etc/logrotate-config.ntpd
+@@ -5,6 +5,7 @@
+ 
+ /var/log/ntpd.log {
+     monthly
++    create 640 ntp root
+     missingok
+     postrotate
+       /usr/bin/killall -HUP ntpd
+-- 
+2.40.0
+
diff --git a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch b/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
deleted file mode 100644
index 027c3df18ad2..000000000000
--- a/net-misc/ntpsec/files/ntpsec-py3-test-clarify.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f360741dec76a9c9d831f0b547596891ea321599 Mon Sep 17 00:00:00 2001
-From: James Browning <jamesb.fe80@gmail.com>
-Date: Sun, 10 Apr 2022 16:23:34 -0700
-Subject: [PATCH] clean test output up in Python 3
-
----
- wafhelpers/test.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/wafhelpers/test.py b/wafhelpers/test.py
-index 9351a5675..6bba34881 100644
---- a/wafhelpers/test.py
-+++ b/wafhelpers/test.py
-@@ -31,12 +31,13 @@ def test_print_log(ctx):
-         pprint("YELLOW", "RETURN VALUE:", retval)
-         print("")
- 
--        if retval or error:
-+        if retval:
-             pprint("RED", "****** ERROR ******\n")
- 
--            print(error or lines)
-+            print(polystr(error) or polystr(lines))
- 
--        if (not retval) and (not error):
--            pprint("GREEN", "****** LOG ******\n", lines)
-+        else:
-+            pprint("GREEN", "****** LOG ******\n",
-+                   polystr(lines), polystr(error))
- 
-         print("")
--- 
-2.32.0
-
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild b/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild
index e40e8e17271c..cee0430804e4 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 DISTUTILS_USE_SETUPTOOLS=no
 
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -34,7 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 DEPEND="${PYTHON_DEPS}
-	<dev-libs/openssl-3:=
+	dev-libs/openssl:=
 	dev-python/psutil[${PYTHON_USEDEP}]
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
@@ -54,11 +54,7 @@ BDEPEND=">=app-text/asciidoc-8.6.8
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rollup.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-rseq-glibc-2.35.patch"
-	"${FILESDIR}/${PN}-1.2.1-build-notests.patch"
-	"${FILESDIR}/${PN}-py3-test-clarify.patch"
-	"${FILESDIR}/${PN}-1.2.1-seccomp-nsd.patch"
+	"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
 )
 
 WAF_BINARY="${S}/waf"
@@ -115,7 +111,6 @@ python_configure() {
 }
 
 python_compile() {
-	unset MAKEOPTS
 	waf-utils_src_compile --notests
 }
 
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 2fec1857639a..cee0430804e4 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -54,6 +54,7 @@ BDEPEND=">=app-text/asciidoc-8.6.8
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.1.9-remove-asciidoctor-from-config.patch"
+	"${FILESDIR}/${PN}-1.2.2-logrotate.patch"
 )
 
 WAF_BINARY="${S}/waf"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9e0ac2a59e32..22c321f4d93b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 4e75f7461c3f..6d6169013544 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -517,6 +517,7 @@ media-gfx/gnome-photos
 >=media-libs/grilo-0.3.15-r1
 >=media-plugins/grilo-plugins-0.3.16
 media-sound/gnome-music
+>=media-sound/rhythmbox-3.4.7
 net-libs/libdmapsharing:4.0
 
 # Jaco Kroon <jaco@uls.co.za> (2022-11-05)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 95ecc0a48f4d..f104b13b30a7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8161,6 +8161,7 @@ sys-devel/distcc:gssapi - Enable support for net-libs/libgssglue
 sys-devel/gcc:ada - Build the ADA language (GNAT) frontend
 sys-devel/gcc:cet - Enable support for Intel Control Flow Enforcement Technology (CET). Only effective on amd64/x86. Only provides benefits on newer CPUs. For Intel, the CPU must be at least as new as Tiger Lake. For AMD, it must be at least as new as Zen 3. This is harmless on older CPUs, but provides no benefit either. When combined with USE=hardened, GCC will set -fcf-protection by default when building software. The effect is minimal on systems which do not support it, other than a possible small increase in codesize for the NOPs. The generated code is therefore compatible with i686 at the earliest.
 sys-devel/gcc:d - Enable support for the D programming language
+sys-devel/gcc:debug - Enables GCC's 'checking' facility via --enable-checking=yes,extra,rtl. This adds checks to various compiler passes for integrity and input validation. This can help catch possible miscompilations early as well as latent bugs which could become real problems in future, but at the cost of slower compile times when using GCC. Unrelated to backtraces.
 sys-devel/gcc:default-stack-clash-protection - Build packages with stack clash protection on by default as a hardening measure. This enables -fstack-clash-protection by default which protects against large memory allocations allowing stack smashing. May cause slightly increased codesize, but modern compilers have been adapted to optimize well for this case, as this mitigation is now quite common. See https://developers.redhat.com/blog/2020/05/22/stack-clash-mitigation-in-gcc-part-3 and https://www.qualys.com/2017/06/19/stack-clash/stack-clash.txt.
 sys-devel/gcc:default-znow - Request full relocation on start from ld.so by default. This sets the -z,now (BIND_NOW) flag by default on all linker invocations. By resolving all dynamic symbols at application startup, parts of the program can be made read-only as a hardening measure. This is closely related to RELRO which is also separately enabled by default. In some applications with many unresolved symbols (heavily plugin based, for example), startup time may be impacted.
 sys-devel/gcc:fixed-point - Enable fixed-point arithmetic support for MIPS targets in gcc (Warning: significantly increases compile time!)
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 763e17bbf368..e539827ebcad 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1f6fcc233b04..f89560b3b3b7 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -34,6 +34,7 @@ DIST gcc-12.2.0-patches-13.tar.xz 13756 BLAKE2B df0388a669458f2991951d2f4027badb
 DIST gcc-12.2.0-patches-14.tar.xz 13752 BLAKE2B c44609a8a3a96480f144b7e6859c2b1d7105f421ffa08929c35fc13eb5ec11d967b02cf8248ecb4ea85824b1872125a73c92f404050c3399d5c06fe668711fd3 SHA512 c1db7a7f3a929dfdc8de9a662448f57296ab818b9fd133763b2ab0dddce2e01cf322e5ac53f3d69c2366053ef3c4fa44c72eed248dc7aeef49f558341bdd3854
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20230409.tar.xz 83942252 BLAKE2B 9fb394de80814c13f91ea1cc078e9ab5623576d67115f61b6090594d44ed9179445fe58fc35f509e9bfcc2c7305e8e111c24df4f2f62fe134eb24b09f7c15b7f SHA512 6b2fb29abf0ed77dcccd393d8ec0b8abc2d7aada0de6bab20eb561fd3f738c4b5023fb5598ffb017d10f099d597ddbc324a6dc71d5ed0119a7d9a7ef1faec1a1
+DIST gcc-13-20230416.tar.xz 83936936 BLAKE2B c052fff2838a0bdd87f90345a5f7f5c607a6fe360b02ce8cb076f6dd3a62f6aae0c7d3914eee447e9c92c971331ddcbf0c94f2aa120aef89a742162b5e7dbfdd SHA512 222bb6db05b23aeb428262c69319a4964097065a88a5ae6c19b104c31af82c465f139c08f01bb077b0e776685769b77a54b772ebc4e2057e7c3e8954283997cf
 DIST gcc-13.1.0-musl-patches-1.tar.xz 3528 BLAKE2B c572ab4a0fb929b16ec36b3a3616cdcccd62f7ee27ded8077008b9beb50539db64cc251ff8a3eade54e8ebfe1012f8f32d0802379bf8ffb0f1b8ce7c8457da37 SHA512 ffb7dfa54a9d23b5333664e915efd9f18a43cd696f4ff5669a8b072a0e9cf4978de53e315123542441a2533e4f269de0bb7d90ee7a37d3a7517b7cda6ea06681
 DIST gcc-13.1.0-patches-9.tar.xz 11720 BLAKE2B c26a2924fa8aab318a1f4a4974ca4aeba255f3605fa0cbf448a4e48b6f3e9359012aeae15726299059257b93043c5cdd86bf1b2f2fffd4b9a096ab411a0503ba SHA512 98e48abaa664ea18bf00ba7bdb29cc1e908cc55ba9d12d52061e86fc917753ade8e38a190c04d23c63102808ac5a9e8ecf085dcc29a1568a329ceb5d43cf0290
 DIST gcc-8.5.0-patches-4.tar.xz 18616 BLAKE2B 7594cbaea5daecf1a0b3d526c06aeba0a84c6da66aee2e105a51fda6be8d30a37ccc3814281b284a4582d892a1d556bca063551584edfc2525bed8ea5b6888e7 SHA512 1aa5742c361186637e7855f06feb1a4547e7d4d5de6e51f3d049e0ef3c19e2eff179465f52781739f59422035b7f8e4c0efa3844849f920f3c96acfdc37ca6a6
@@ -64,6 +65,7 @@ EBUILD gcc-13.0.1_pre20230409-r2.ebuild 1414 BLAKE2B 800e6b88062a76573c5aa578d11
 EBUILD gcc-13.0.1_pre20230409-r3.ebuild 1466 BLAKE2B b7e13173a533de6b8c5e546e2b8744934cb0ad3a2277fb6e7bf8f4a69444a215c1069d07e5d83d81d08d3ce67e05a541a0a5d4b0c1de7256257fa4bfb6863ca1 SHA512 32ac41406e31d0a3785b35621775b7d8f7eb3ddded2d72028ad173f7363009b1895c5d466e2fd148b3927038d47ca20947214d1ebdc5ce9ea0b60ba679156e46
 EBUILD gcc-13.0.1_pre20230409-r4.ebuild 1612 BLAKE2B a0496149790bff7829c140ff9e2f2fbad8b13a3aacb0c6c20af2137bd51936d1aaa9e4e46ad10d5cea8f42039f692a290897775b7fb9f39873d46fbdaffa48b4 SHA512 ffd79d04c85dc9d76e51e7eafeb8a6ae7633f45b89364f4b20744dc4e98e6f3af9690eb25dea7fb5175bbeeb010a6afb432401730108fdbfc2cc68322dc62310
 EBUILD gcc-13.0.1_pre20230409.ebuild 1354 BLAKE2B b1dcf92771940c65b4862f76107df49bdc811c279fa33205cc63d8ed74ceed786712e42a7c050e691a30494b3b55c7bcf62e14d7baa2550c392b7d0bac0007d0 SHA512 4e49f8ea0487bd4cf57a2518647e1dc1f82e1b891a200463f2c17f6285b67070abd1d732ef2c578389a927f142495b3f721a6017f211684b27a3f5ce903cd774
+EBUILD gcc-13.0.1_pre20230416.ebuild 1354 BLAKE2B b1dcf92771940c65b4862f76107df49bdc811c279fa33205cc63d8ed74ceed786712e42a7c050e691a30494b3b55c7bcf62e14d7baa2550c392b7d0bac0007d0 SHA512 4e49f8ea0487bd4cf57a2518647e1dc1f82e1b891a200463f2c17f6285b67070abd1d732ef2c578389a927f142495b3f721a6017f211684b27a3f5ce903cd774
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 719c259a6f39c72f7d1748095a9e649d4ab3dde04b118125313ab9b915eb9cbd038592532185317080dbc46d73a8bd324b498462db73b12d23144cd58378dd9c SHA512 1ed19c79239d155be3b267fcad4d7230821406ba8fb2c11857168fc0e717c4edcd8d7fb0972bc6df0fbcfbd8a9f085aa023f452368278c0e7e0af014c1124d89
-MISC metadata.xml 4885 BLAKE2B 2029ff68e73fa6d97abb5d03df8efbfd03b2145ad6ced9ca7a048d48d16e5f50e12448b9d0343f8d22262dccdf4c7c4fb2554b1894a13eddc502924f9ad70220 SHA512 9c22fba4bcdb7ac3f1e8a6a36903e940f9b53c284b446e240cf3bf51590efe8af0b9219688693dad233bf8593dd306b85af9c18fb9ef253a8e3413e3b926fd9e
+MISC metadata.xml 5287 BLAKE2B 60195698898b517940eb7af3fd8bf35175df4537802beafb0e6eba0150e456c9b7898eb6dfc260eb0ad5c1b2614b345a33cb5742ea08b03673669b39e3d701ed SHA512 3a3f9ecb2b03e0c35f8a2844052c2f5d6cd860f78c3c803cf78ab89534097687c6d42d5f1a72d488f4f8e18d65ba40122feab88577974549cf1952fb6ff6edd2
diff --git a/sys-devel/gcc/gcc-13.0.1_pre20230416.ebuild b/sys-devel/gcc/gcc-13.0.1_pre20230416.ebuild
new file mode 100644
index 000000000000..f476227f8198
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.1_pre20230416.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="9"
+PATCH_GCC_VER="13.1.0"
+MUSL_VER="1"
+MUSL_GCC_VER="13.1.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=master
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~loong"
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index d1c5c038131d..da28d6809a07 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -24,6 +24,16 @@
 			code is therefore compatible with i686 at the earliest.
 		</flag>
 		<flag name="d">Enable support for the D programming language</flag>
+		<flag name="debug">
+			Enables GCC's 'checking' facility via --enable-checking=yes,extra,rtl.
+
+			This adds checks to various compiler passes for integrity and input
+			validation. This can help catch possible miscompilations early as
+			well as latent bugs which could become real problems in future, but
+			at the cost of slower compile times when using GCC.
+
+			Unrelated to backtraces.
+		</flag>
 		<flag name="default-stack-clash-protection">
 			Build packages with stack clash protection on by default as
 			a hardening measure.
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 01c829ff49d1..cac5e7263057 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 4db0c99718f3..cad747e87f7c 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,10 +5,12 @@ DIST patch-6.3-rc3.patch 77958099 BLAKE2B 5e459202c7e77ec1cb977cd6e7d49b014e9ca0
 DIST patch-6.3-rc4.patch 78319961 BLAKE2B ba2690ec145446691f8bc912ffd52765937c215d18bfbec1af415c787a969776f334e8cda602207edf60ffdc66bcd7ddb391d8182ed46cdfe440a8fc101d4d20 SHA512 30ddebaba6ba8c0c0355f4dd65e82609fe2782ae36842d07908584aa49cb75abe7097e30de472f2141b0d6503105059daf6151bb0b5085926e3882dfbb9011e2
 DIST patch-6.3-rc5.patch 78517689 BLAKE2B 028e7cfa36677ba882c6bd67a3aa8e41c250cbafc11e689c02083eb35207899df6edef26913166aadbc55d3b25860e2f4fd2a6306a71544123b0a120ca936a5c SHA512 7372a9acfdedeb03b33efc6a3693c12b43e187ad2f98ee1736f3705b7f9ad28606891df01b434f0de85ff33a4ff0adc0b1d6d8df2b30c32bbb878f7e9601007d
 DIST patch-6.3-rc6.patch 78720432 BLAKE2B 6b6f9bf3965489a1f94c3738bdfc96978ccc91486c59b4552ebccb1c055e9d41b587d9d88fe6581fc95b0e84a6627581db26edc8d72f44fe9ec2d46b0b02eb0d SHA512 1e2e777de5c46e52409b2afd762fcec351113bc9db32d9f69b9b1dbfb58ab89bcac4af6b6a6f4bd1b254b8ecb089bcd3dbb4b6019388d71bcae9b46404da49f3
+DIST patch-6.3-rc7.patch 78902170 BLAKE2B b627b9d2ebbb91d2102a7ca46616bcc31609713b0120c5051ec7397261e206ad9b93f6e54a2a96c6371f80a21e9043d1abd746632e16034e9d787d7b3ece4650 SHA512 060080a1d501aa2a6b534b48fbd92ffdf59ec8179b68089cce6f807bbc980716b98718751f7a4fc89c54c4f116eba109e3945445466fe9e31b3add28a42fc86f
 EBUILD git-sources-6.3_rc1.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 EBUILD git-sources-6.3_rc2.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 EBUILD git-sources-6.3_rc3.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 EBUILD git-sources-6.3_rc4.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 EBUILD git-sources-6.3_rc5.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 EBUILD git-sources-6.3_rc6.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
+EBUILD git-sources-6.3_rc7.ebuild 1198 BLAKE2B 3109dfd7f79013ba600643edafe2380b41b39f6e4973d8b7b361c48a521136eec0f4e356ba4331a8072498149f16b900f354d6b6d369e97ae1c6f5e1506fe130 SHA512 57b67b0c6f52463e57950d3f000bd4aff95fee3979faa2fdc52e2af68bcb8c5a1f9a8aab968a136e6ff6ce36b501e914b964f96a098c08afa60517e9be801748
 MISC metadata.xml 465 BLAKE2B 089bfb0e4af03b69d3d118d39713b54aac6912012cf0e9352d22b4b597abe5b1ef86863c37f6a0be2f81995f2a81a8d08bc7c2927d06ac2042b7b18ba02c77be SHA512 cb2bec5a8cce1e6da593f6ab11ceb854112fb4e828198793820699913f2f7cb2a9443e1cb15c42e16730891a27fe8dcd1713527c2ba2cfa56f6d2296f6f6e001
diff --git a/sys-kernel/git-sources/git-sources-6.3_rc7.ebuild b/sys-kernel/git-sources/git-sources-6.3_rc7.ebuild
new file mode 100644
index 000000000000..ae9a3401cdd2
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-6.3_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.2"
+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/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 54cb7d8e3a3f..48fd85501969 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 2a50a33648d8..38ebfa394788 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -7,9 +7,11 @@ DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c
 DIST vte-0.70.3.tar.bz2 502706 BLAKE2B 1fee46dee38618137781d62b27730893b0c6969cf3badfa157628621a608983be48e35ef4d8e58099c93b8be91434b257d120cab2e7a943cfecaf37ff7b3fd5d SHA512 5520bc58b0ad2f803da27985e30862de987ecc31c0137895c6945c53f99a7c16ee0281646b9e04362de934364ee7beaa1acf47dad9baf5a16ab9898d5f746d2d
 DIST vte-0.70.4.tar.bz2 502950 BLAKE2B d3152c939e0b90b542aad268b455085e04c194cc6d86e4d9352b6531cf74a19bdcd16351e1f3934b1835d1470815215c19b1301136cecf43d23a6951fd8bb889 SHA512 f899c99bf5a9593fa618016a31c93e249bcc01b8635e1b878ab236de71a24a5b3cf1a032bea96855e43d894d004b0e00f20cc2e08079e52d8e7cb709cc73a7af
 DIST vte-0.72.0.tar.bz2 503848 BLAKE2B 4c87f5648b17a269072a7fbe520e9cf086325d8740050b9868fd6e0d812ed78e240a3d3dc882729435bbae30fbbbfe35c0e92f36cd62e6aa8e581350b81a3f90 SHA512 198ea27d0991d825cc993746422e89b0e7b2b225e9cbdb072477dcf5b5866e79a27920233e8da63a412c5f270769e6d333470f5368d0b09b39e15d53ddbe6dd6
+DIST vte-0.72.1.tar.bz2 504271 BLAKE2B 8ab39ab8d491757ab9402ad4bfc10ca733427d2efe895204c0db580e44107a9ab005c29ce2e6934ae27e8da7c27e39d1173fe787ddb8569938a29697eed2e2e1 SHA512 a5655d2d2602183cbda1050003d7cf883e427c8e00976af4ee2685f43530d87169e31a3b9597133d14dffdc95f20f9ca1488186d8463997a2672510f5a95d145
 EBUILD vte-0.68.0.ebuild 2714 BLAKE2B 0a37048aff805a0db321f2b2a5f6014c24be5f81d638ebefea29db820c3652b389de3d00bef9823b8e46919d61d89d0da9149cb0249a7503376268d6cd979684 SHA512 245eaa094a28934cf7f728213847f53f8f8851fa158a5590aab87334984d45cf802b9338132be3729d5977f206840458173744004f09bacec3c81e81b7f749bc
 EBUILD vte-0.70.3-r1.ebuild 3297 BLAKE2B c6bde5015192f1f09095a752c6d8ac9cfd3c3c03500e3455ddf44b566f54dd890bcc0a92d348c725f1c58a9f76b05c04a621d72b07f8d9bb600a1d9ea5944729 SHA512 4eb553a5fcb84b9775362bff12a5be01c313e727c214d0982f28c210469d4709152c3cb54cc5f51cb3ed2a5f5193c72d7a092bd51d5ac961867a9b0ffd56f0a9
 EBUILD vte-0.70.3.ebuild 3197 BLAKE2B 096d6788d1972977def46ae85b8038f56a189bea06fcc94f2a11e39b90f1c80203cd5ef5b4c3c5bbea23a8463435f114195c59f0bea25e9cb2bfe1e727a8ddaa SHA512 ab6d2fb997372c89d9ac5b24eea3119dc50c9bacb84c2c2d863199f9bdfb42de66329e64a092a6c609575b48797a14d1023ee238884bfe9e70a760ffb4b86a4e
 EBUILD vte-0.70.4.ebuild 3297 BLAKE2B c6bde5015192f1f09095a752c6d8ac9cfd3c3c03500e3455ddf44b566f54dd890bcc0a92d348c725f1c58a9f76b05c04a621d72b07f8d9bb600a1d9ea5944729 SHA512 4eb553a5fcb84b9775362bff12a5be01c313e727c214d0982f28c210469d4709152c3cb54cc5f51cb3ed2a5f5193c72d7a092bd51d5ac961867a9b0ffd56f0a9
 EBUILD vte-0.72.0.ebuild 3204 BLAKE2B d28c6b8d09be00e87ea5ff5c4fdad79647de572c39a8535c41634407f0b4b14ed0ea07b7bc3444afcec331295c2f00c189ae9254b034a1e77e43320ac02e8119 SHA512 b88ea081a5e02d76af2e94eb47d38ffce1bd6223f64d6ec8a8dadd1a874608eb2835ede9055288bf777d9919d1f48b2b765005abcb74e90817ffc5cc53bdf3d3
+EBUILD vte-0.72.1.ebuild 3204 BLAKE2B d28c6b8d09be00e87ea5ff5c4fdad79647de572c39a8535c41634407f0b4b14ed0ea07b7bc3444afcec331295c2f00c189ae9254b034a1e77e43320ac02e8119 SHA512 b88ea081a5e02d76af2e94eb47d38ffce1bd6223f64d6ec8a8dadd1a874608eb2835ede9055288bf777d9919d1f48b2b765005abcb74e90817ffc5cc53bdf3d3
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/x11-libs/vte/vte-0.72.1.ebuild b/x11-libs/vte/vte-0.72.1.ebuild
new file mode 100644
index 000000000000..81fa4779bda4
--- /dev/null
+++ b/x11-libs/vte/vte-0.72.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+# Once SIXEL support ships (0.66 or later), might need xterm license (but code might be considered upgraded to LGPL-3+)
+LICENSE="LGPL-3+ GPL-3+"
+SLOT="2.91"      # vte_api_version in meson.build
+IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# Upstream is hostile and refuses to upload tarballs.
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-0.70.0-command-notify.patch.xz )"
+
+DEPEND="
+	>=x11-libs/gtk+-3.24.22:3[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=dev-libs/glib-2.60:2
+	crypt?  ( >=net-libs/gnutls-3.2.7:0= )
+	icu? ( dev-libs/icu:= )
+	>=x11-libs/pango-1.22.0
+	>=dev-libs/libpcre2-10.21:=
+	systemd? ( >=sys-apps/systemd-220:= )
+	sys-libs/zlib
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	x11-libs/pango[introspection?]
+"
+RDEPEND="${DEPEND}
+	~gui-libs/vte-common-${PV}[systemd?]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? ( dev-util/gi-docgen )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+
+	use elibc_musl && eapply "${FILESDIR}"/${PN}-0.66.2-musl-W_EXITCODE.patch
+
+	if ! use vanilla; then
+		# Part of https://src.fedoraproject.org/rpms/vte291/raw/f37/f/vte291-cntnr-precmd-preexec-scroll.patch
+		# Adds OSC 777 support for desktop notifications in gnome-terminal or elsewhere
+		eapply "${WORKDIR}"/${PN}-0.70.0-command-notify.patch
+	fi
+
+	# -Ddebugg option enables various debug support via VTE_DEBUG, but also ggdb3; strip the latter
+	sed -e '/ggdb3/d' -i meson.build || die
+	sed -i 's/vte_gettext_domain = vte_api_name/vte_gettext_domain = vte_gtk3_api_name/' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Da11y=true
+		$(meson_use debug debugg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		-Dfribidi=true # pulled in by pango anyhow
+		-Dglade=true
+		$(meson_use crypt gnutls)
+		-Dgtk3=true
+		-Dgtk4=false
+		$(meson_use icu)
+		$(meson_use systemd _systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_install # not meson_src_install because this would include einstalldocs, which would result in file collisions with gui-libs/vte
+	# Remove files that are provided by gui-libs/vte-common
+	rm "${ED}"/usr/libexec/vte-urlencode-cwd || die
+	rm "${ED}"/etc/profile.d/vte.sh || die
+	rm "${ED}"/etc/profile.d/vte.csh || die
+	if use systemd; then
+		rm "${ED}"/usr/lib/systemd/user/vte-spawn-.scope.d/defaults.conf || die
+	fi
+	if use gtk-doc; then
+		mkdir -p "${ED}"/usr/share/gtk-doc/ || die
+		mv "${ED}"/usr/share/doc/vte-${SLOT} "${ED}"/usr/share/gtk-doc/vte-${SLOT}-gtk3 || die
+	fi
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 74b0435980ea..e0aff2720a18 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 1da1bada3a44..af68a5880e84 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,6 +1,7 @@
+AUX mlterm-configure-clang16.patch 3768 BLAKE2B 2a7b5e99c469fcc4303017a0aa0d5a4e7c097d5ce4a4a0642701d7e5b68e3737a557c34a60d2847ca4571ae6d4788f8853a4b72d95df9bb721110dcff6c5c372 SHA512 be0025373d14eff53ad4d3d07333f0ffb269a0f2b7857a79046596abd2761ef12044cbcefe42a30193626e3eea5c016d6f484f9aecb325ebe1caa3d086da3ea5
 AUX mlterm-font.patch 606 BLAKE2B 5d9989a2656a0375e79c189db88167f443c3f7ee6f7f8b83972b65cc59b455fcb2c2ee6c4a25c82bb48cb2610d7453a5552b0eb5a17bd80eed947418a038b252 SHA512 60e625e554341feda77a926f3a59c4858ab19a810eeba39810701c429a504666643e1a614586b88379fe2d42606865f0afa8da6c14c1499a52aa1200e8bd5c4a
 DIST mlterm-3.9.2.tar.gz 4259208 BLAKE2B 161d496326abd58e8dabedd4c49e0e17ade77956fd0be6f450d5adf2953fe04a2c62a40d3694296d12cdea1274410e17a64cc62f88b953d894cce216425b29f3 SHA512 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
 DIST mlterm-3.9.3.tar.gz 4272090 BLAKE2B 8f71a8c5cd63b7caa803e699a7e42b8d11cb18324595a7a255c7542df6fad6b968bf56a03a2d19a2381d103232685e3c3cd62388ac036a024870fbe3d222d081 SHA512 67c22ee8411cef499620a37e43af5609bb52cf8be6b617f0dfa6605217eb7f66227bfe073ca9b878606392fac26f94299221b5890fba1d90a3afc35a0f3132a1
 EBUILD mlterm-3.9.2.ebuild 2988 BLAKE2B 59e3a253040ecbab108e3b213e6f792835a0a7a5218030719e7a64ae697905a38d409db4f9d767d51c973fa7398a0225af93c0bbeccb22129892bc822ad59347 SHA512 0e7baa0d749843c051c0102f38c3e51924bb8b168ed44053fb7ce42d1f98827647fa90f431f87f7daff4d7e0457bcd4d78ae62ff6b7f82ea0b8a3a93177e333c
-EBUILD mlterm-3.9.3.ebuild 2992 BLAKE2B d906561c6e7d39867ea3f519500a4df37b77abcd4c37dc1a63737ef16bd700e2009ccd7069f61f4cf717616a2e8cdd5785d57aea71b5d8ac10cfcd153c9f2bc8 SHA512 c3f02977723ff46a7f13fe2163957a5bf2e0ce9d4722c7d035a2c71c836de32a4fd1f10ce07715d8e4d82f75e5796ce903d3fc7b7da62e678339d75190b1aaeb
+EBUILD mlterm-3.9.3-r1.ebuild 3055 BLAKE2B 828c78486903dacc1e3194375335b812545f30bcc480e1318d8f8121ad3530d8f383b89d6304abef5400e7a222e425a961eaf1512d47f32f793e7f75af8553c6 SHA512 0d95b6f364b8416b844261f779746810b42a131925ff35b4f92343e3008c6879b7bd21185b37835d7818ca8a0d8159760966e5723a50dbfd0cd3830e8feb5ac5
 MISC metadata.xml 1228 BLAKE2B 788a19c8b676d0d5991cd80809f67f526edf6343ab897bc6287cc51f100b4e82bc5cffea0d2165ed3dc7950d0302579005763b0679aaaad5aaabdb8947a94d94 SHA512 d2efc5096992c50c00437cb5e735a12959e6e577b11c9f3d653ca2123ad04923db38c796bc3eaabd79772f521096784404b68a324712f749a15fbd81ae33eabe
diff --git a/x11-terms/mlterm/files/mlterm-configure-clang16.patch b/x11-terms/mlterm/files/mlterm-configure-clang16.patch
new file mode 100644
index 000000000000..134870d8f756
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-configure-clang16.patch
@@ -0,0 +1,123 @@
+https://github.com/arakiken/mlterm/pull/68
+
+From 4eb1a0b237a861cee7ba0ceb4b69d54ab46f87f5 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 16 Apr 2023 11:38:16 +0100
+Subject: [PATCH] Fix configure.ac compatibility with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2],
+or the (new) c-std-porting mailing list [3].
+
+Bug: https://bugs.gentoo.org/904353
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+--- a/baselib/configure
++++ b/baselib/configure
+@@ -13226,6 +13226,8 @@ See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define _XOPEN_SOURCE 600
++#include <stdlib.h>
+ #include <fcntl.h>
+ int
+ main ()
+@@ -13599,6 +13601,8 @@ else
+ /* end confdefs.h.  */
+ 
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/baselib/configure.in
++++ b/baselib/configure.in
+@@ -285,7 +285,9 @@ elif test "$bl_cv_mingw" = "yes" ; then
+ 	bl_cv_pty=streams
+ elif test "$host" = "$build" ; then
+ 	AC_CHECK_FUNC(posix_openpt,
+-		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <fcntl.h>],
++		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
++						#include <stdlib.h>
++						#include <fcntl.h>],
+ 						[return posix_openpt(O_RDWR | O_NOCTTY) == -1;])],
+ 				[
+ 					AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
+@@ -435,6 +437,8 @@ if test "$host" = "$build"; then
+ 	AC_TRY_RUN(
+ 	[
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/configure
++++ b/configure
+@@ -25110,6 +25110,8 @@ See \`config.log' for more details" "$LINENO" 5; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define _XOPEN_SOURCE 600
++#include <stdlib.h>
+ #include <fcntl.h>
+ int
+ main ()
+@@ -25147,6 +25149,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <fcntl.h>
++#include <sys/stat.h>
+ int
+ main ()
+ {
+@@ -25475,6 +25478,8 @@ else
+ /* end confdefs.h.  */
+ 
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
+--- a/configure.in
++++ b/configure.in
+@@ -2150,7 +2150,9 @@ elif test "$bl_cv_mingw" = "yes" ; then
+ 	bl_cv_pty=streams
+ elif test "$host" = "$build" ; then
+ 	AC_CHECK_FUNC(posix_openpt,
+-		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <fcntl.h>],
++		[AC_RUN_IFELSE([AC_LANG_PROGRAM([#define _XOPEN_SOURCE 600
++						#include <stdlib.h>
++						#include <fcntl.h>],
+ 						[return posix_openpt(O_RDWR | O_NOCTTY) == -1;])],
+ 				[
+ 					AC_DEFINE(HAVE_POSIX_OPENPT,,"HAVE_POSIX_OPENPT")
+@@ -2160,7 +2162,8 @@ elif test "$host" = "$build" ; then
+ 		[bl_cv_pty=bsd])
+ 	if test "$bl_cv_pty" = "bsd" ; then
+ 		AC_RUN_IFELSE(
+-			[AC_LANG_PROGRAM([#include <fcntl.h>],
++			[AC_LANG_PROGRAM([#include <sys/stat.h>
++					#include <fcntl.h>],
+ 					[return open( "/dev/ptmx", O_RDWR | O_NOCTTY, 0) == -1;])],
+ 			[bl_cv_pty=streams])
+ 	fi
+@@ -2297,6 +2300,8 @@ if test "$host" = "$build"; then
+ 	AC_TRY_RUN(
+ 	[
+ 	#include <stdio.h>
++	#include <stdlib.h>
++	#include <stddef.h>
+ 	int main() {
+ 		return  calloc(8, ((1 << (sizeof(size_t) * 8 - 1)) + 1)) ? 1 : 0 ;
+ 	}
diff --git a/x11-terms/mlterm/mlterm-3.9.3.ebuild b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
index 48e60e6194d8..f9f685ab417d 100644
--- a/x11-terms/mlterm/mlterm-3.9.3.ebuild
+++ b/x11-terms/mlterm/mlterm-3.9.3-r1.ebuild
@@ -53,19 +53,23 @@ RDEPEND="virtual/libcrypt:=
 		x11-libs/libxkbcommon
 	)
 	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=( "${FILESDIR}"/${PN}-font.patch )
 DOCS=( doc/{en,ja} )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-font.patch
+	"${FILESDIR}"/${PN}-configure-clang16.patch
+)
+
 src_prepare() {
 	# default config
 	sed -i \
 		-e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
 		-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
-		etc/main
+		etc/main || die
 
 	default
 }