gentoo auto-resync : 03:01:2023 - 20:27:24

author: V3n3RiX <venerix@koprulu.sector> 2023-01-03 20:27:24 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-03 20:27:24 +0000
commit: 27e5574c9ed56a2633e25f7fa8f591554266a1b4 (patch)
tree: eafae39b8faa55ceb7cc8100d5d03a2dfc9b7842
parent: 5aede38e7304fc5c3bd8a2034b25758b15a19fa0 (diff)
753 files changed, 1670 insertions, 14074 deletions
diff --git a/Manifest b/Manifest
index af0d2591a8fa..a80437838f6e 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29789 BLAKE2B 3ac3b8c1e305404c52808522d45786c384870ee5677b6dc2778c0db13c67f8522303e83600e69523bd93cdc8d82c645c8fe9c57cfc057a98e73d727a814f5056 SHA512 edea6e72400c41bb5c72bb65c31e175c2a794a8d85ba8011f3c3911d5fd80bdf1c01341c10713a7f89bc26f02a2a4f339cee8e21af4dea7692f4b1dc436e7097
-TIMESTAMP 2023-01-03T13:39:58Z
+MANIFEST Manifest.files.gz 29785 BLAKE2B 28f13e8561f0a5c41076677cb95fd804f94ddabc11135c9537899928db8d3f7d970f81556f1876bc76916fc49105fa6be699a8b7bd924afe75ad237704797dd3 SHA512 7e997835f6af520ccd951527a2cc319c63ec556176cfa84936c6358276e33c248d4f876b338fb358ff4c4f72663a4c0b11f379e124a31845563ae7fc75e71808
+TIMESTAMP 2023-01-03T19:39:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0MC5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0hI1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQAw/+INo+HSPhFmUSVIqen9MQKvg8MnFQgtBw6TDmFOli3mhtqOSSGs1ZWDs/
-ECnBpzRnZycxu/bo6MgGQvmI4DQlzkRp/5JX1PryxIIWMl667VFDl30lzxPPfx4k
-bB8uiYEeDcN9BAutCtNeini84oAwyZ2iiG/JEsGmJ/Ndj7Pte8nWVhj7ImJJODxg
-jpiFNrM2+jmWDb/gRsn3AUUdcPlmnvYcGV3lBYDvxdjpBApB7+Vh0LltVgvu7dEr
-y2lzT7mRsFbxcwlEldHmGeKr8LT6JhEFy4cC009ue3TLoKZ1Kk/1HNysJJ+wUAnR
-rWLzhpytXxLbZPnhlG4CxbtxXRgHkC0KcHf372hLrKM3yDQ+OB7mU8RP7NoPbF1a
-NET1bMcTXVDijEA3hbE+WOzhr/YFeozoxqt/NUwZU67jhA3jpu8pXRqfPfRFW3MZ
-U+ocDHXtgU8p7y2Fm/QfxFKvltWuYkhlN9L+ipRwS+FTv/W6oxgrKWdG30EZxO7F
-+EGZJ332nOKuPB6vo32Foxa/GicVWRymfG5E8L1jjGtp956nKTcQ/0937Iz4SZHI
-w2CTvgsuu0UV1XIjL4to/xtHWGlMOy4vAh4/SpAiwrvw7KDt3tgQFlxT0M4d2Ket
-qv3LhzlMiq2JmB3ZIhldXEY15cO95M0raMQGbtIqOcE89CXAL94=
-=/H7u
+klBHHw//acdaL97tuycvwIKG/YZOTtT+Gao8MucOP/KqUls4cevRDfKu2xjrY4Yu
+vfF6O6NQnkQAxuRQOhCWDkEf440TqgpijUxKV7m3gX3MvzLn8AHLbd/UaQj9ooGC
+VIbhp3qgRnaDkOa9c8ROZcpNcvAqb+u/1o+Je8QyPnKoWJWZSA09sZlR8QV4J+8d
+ZbIs0Hc7WXn32H2B6L6CVNc0PiooYgAzFepU++RM5iQ7n9d4uN9/33mTcEZ5FnvL
+PpF/k5lAh6kaM5ZZOXBbOQeeNUss7nud0iEowSQ2u5kWTJ2eTdKAFvy805es08NI
+PNik5bPQOsRIVCECNVAsIwZ7FUJq2wPan/3CXVeClnkH7IPXnZ7rfWcUERmJB8KH
+V581hcZe5mFn6bloWylAMZ9vLhKPep851KzZyZj+WfDcav5zIL0z/e3pQ2ZWS/Us
+C7FueopVmB46Yh1U4yw59eMCSlsr29lWwGj7xTppyMoz48xqMGSYJr22ie7hDNgn
+QNNv93fiCHYvq0apA6ROqoC+XgWlhGl0Q88vf65axWkqMAqOubPyj0y2ZMt637ep
+rrmb01lE2TiPtuaaI+fe1BAxuxvqDMDmco5mkHvdxm/Mb6fxbWXVJcjjxfDH0gjl
+is4gV6O2X8OHqfChLlYH5SYewUKVwQc1djmr/hrT5FJ20T5Q/Rg=
+=wDFE
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 90f82fcba48a..d52543a76327 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 74647e1ac0f5..b8eee958d6d7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index ffcf0796b8b4..fd3fdc4da7f7 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,5 @@
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
 DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
-EBUILD conky-1.13.1.ebuild 4790 BLAKE2B cb92375c4fd37347be0630fcfff04f3ace5139f48f28667ecaee71b7e9537a436a704586b201b6e0a9304701acd80c07c79bc5a60c2435f3e3b15dcf0dfb524e SHA512 dac5a9b5618532e8def0d09f0dafb4690588c9c8d9b18ed773a71cf6ebcbf904b88fc8fdd65f36b4ebf002e7e913ced21f6fcbb8c2599bca669c7fff2f18a4dc
-EBUILD conky-1.15.0.ebuild 5098 BLAKE2B 1e2cd75f456ae14378684f59e4be9aacfe8295fefb2788706ce27c7cc0ed0381896bb2829421f7115e28ae84e2a322c1d4582e575a9062e3b586eb0f9d8c08c3 SHA512 898fc78b1980a38bdacda5f4fe4655f7edec1df39d7a21f5160d961df8c908b8f1f468e336bdcbed4b7a4efdf01197ebae65de224d55b57ecd9fffcdd7484612
+EBUILD conky-1.13.1.ebuild 4795 BLAKE2B daff0445b97281fcd8fd737b681b862fae0570c15bbdcd9dd25fbaf5db825e8b6e0eeba771b34d09329ca338e869d341cd83b3ace80f31b28ccc103d59a66829 SHA512 75bd14e46fb12acc2d31b933adcfccf3a25e0202c8a40238bc585c9275c875e145833ae5e9870a9d0697bcf2b04b1ae5bbbb680fcd3c023ca21350fd6ead6e7f
+EBUILD conky-1.15.0.ebuild 5103 BLAKE2B 2e9485589a97fad28c223f495f3811e9514d9a358f3f5f7b064ff19b8b49e6293df0965597c069f0d71a36e990dc38fc0545efebc2a40efc2a2d307d9bb58074 SHA512 c5808d22d0fdfef98379eeaa97f9656e7600cd25d9727a7a4428329c4ca157f00f27b0b6bb876e5a8d7e22c928dd4cbcc6db1be64fc2ca420033bda40bbc27b7
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.13.1.ebuild b/app-admin/conky/conky-1.13.1.ebuild
index cf2c7c6dbc1d..5cc04259da16 100644
--- a/app-admin/conky/conky-1.13.1.ebuild
+++ b/app-admin/conky/conky-1.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -103,10 +103,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs
+	local mycmakeargs=()
 
 	if use X; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DBUILD_ARGB=yes
 			-DBUILD_X11=yes
 			-DBUILD_XDAMAGE=yes
@@ -115,7 +115,7 @@ src_configure() {
 			-DOWN_WINDOW=yes
 		)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DBUILD_X11=no
 		)
 	fi
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index d3d700c1507a..640060b9264d 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -120,10 +120,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs
+	local mycmakeargs=()
 
 	if use X; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DBUILD_ARGB=yes
 			-DBUILD_X11=yes
 			-DBUILD_XDAMAGE=yes
@@ -132,7 +132,7 @@ src_configure() {
 			-DOWN_WINDOW=yes
 		)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DBUILD_X11=no
 		)
 	fi
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7e3fd295867a..a39b9725b35e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index fe966bc0980e..b7ffb6dd1b26 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
-DIST file-roller-3.42.0.tar.xz 878968 BLAKE2B af3a8bb566a0549434f20911315358dbcfb98aab17ca47adaad166f620fc3b8cfc6b60301842a55a0d35ca29f6317b16d07497de759b55bc42b61100e7357066 SHA512 ad151e1dc6546ca45550ab4c7384fb89e91dc2fc17a29437922192fefd5cbcd115d1f064e090dac48ae3fca33709a54bac918cbe03cbfd0e6fc3554913dd8322
 DIST file-roller-43.0.tar.xz 894308 BLAKE2B 85bf73947e153a3b40507e524c35f8be98a08a9ce5916e24ef44559400d7d44e4e0fbd94de8b5638fd1da967ff007894011624ccf9ad8c3481cac63aba3da6e5 SHA512 dff3d9ef5c96e5957fb4ca146072b5fdf0309299d0b1a4ab6db55e24a0652b52ba45915121db4d59d9b1ab60b4c3c64bbb56799a46a0eac5609236f4e1251837
-EBUILD file-roller-3.42.0.ebuild 2244 BLAKE2B b36266be2187e3472bd06cd572982f9cb543c31192e847b91d1921b6b9c779a7d40727d8477735146ce0666fa9de68bc725d49b0d279233877c242a62bcf74d9 SHA512 e199dd0ad875976b75c249b51e86070a0fb5f0a4d9a4af93e5e78198246f609c8d65043fe0b5541823be6c7d37543f85e35664f568f67c7b22c026a7e13472a8
 EBUILD file-roller-43.0.ebuild 2512 BLAKE2B 159cf79da743b080279bffc9de189b8b15ef5d14ff6e2c4e669a532d74f952152c8a1da423acb43fcac8caaa66d157d248a14436b6fe654f73d107398faf7b9f SHA512 41979adc3415532fafe6c22e31a8adef75cf4ffbcfea34b261b4d0f330b71d7e212a07acb3e1f1eb5e1850616d209dae8e7f2a2bb356ef2c2123ac857e537df9
 MISC metadata.xml 544 BLAKE2B 395aff0ef64dd1ae52ecf07df0a723454f648ae54468c611a3d3c10c2930bf25413f892a02dca15dad5930ad24baa45adb2df41e740c4d2dbdce9104f8f89e0d SHA512 3639aa10a6e40e9ea901842e40b9e33857254a00f84aa61403fc663e8ef1f356850d77ffa9ee61c7fb05a1152a9cd1ab0adb972edd3d1020308da06680a64410
diff --git a/app-arch/file-roller/file-roller-3.42.0.ebuild b/app-arch/file-roller/file-roller-3.42.0.ebuild
deleted file mode 100644
index 1f4a5a97cd14..000000000000
--- a/app-arch/file-roller/file-roller-3.42.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3.2:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.22.0:3
-	>=gui-libs/libhandy-1.5.0:1
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-brotli  - app-arch/brotli
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zstd    - app-arch/zstd
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
-
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_feature nautilus nautilus-actions)
-		$(meson_feature libnotify notification)
-		-Dpackagekit=false
-		-Dlibarchive=enabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index db961f1e43b1..c4a01e9838b2 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index c08ebd8363a3..ab2420b4a8be 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -3,6 +3,6 @@ DIST containerd-1.6.14-deps.tar.xz 95727780 BLAKE2B 15782df59512ee66eacbbb65b215
 DIST containerd-1.6.14.tar.gz 8698335 BLAKE2B 5f088faa35ffbcfd2e62334c12f9c741e23199d6d9999e28c69ad21b760fb85f514ef70cfdeebbdfaab914a8905ea7dae989d9fc8da36f3e077196e14dd6a220 SHA512 d29e2fb4a43f12d7e196f95b59b2c55793a1848177fb64b8bd9a4fd299fe54680a26f8a809b1d63f653ed9f0b30c209fc39d46b78ac0914d3253a10e5d3b015b
 DIST containerd-1.6.8-deps.tar.xz 96625924 BLAKE2B 773b7c660826648b4077d320cbb3b265129fdd81233ac4aeb833586c9f25707c62e338492fb9905010b160e3fa635069ca4220136bca344ce54d154ee074bdeb SHA512 d805fefc0500fe2156bd8c6a752f9d13cafe85b528454ddc6efc95b09e05548df666cf9136aa3169794a0f7cc8135b943da1b106eec7e3dbbc83938892d80ead
 DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf586a2877b2899446a323e2e7ccf8a0ec9015277693f9b1bac6f663721117704e97031ce923ae62d27a8d7b882bdfd SHA512 c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba
-EBUILD containerd-1.6.14.ebuild 1926 BLAKE2B 50f9da8e2347447a5c40282c9597f7c7f66ea6cee2bcad178628f872eb282a9952c074f5c71a9cd63753d39ce2a5f5d8ce547113bcfa3918b3c9a84aa887e453 SHA512 1bd6c96d6ad402b1a3079bcbd2a8583cd0060dd7bc7d68f5345a0e5599eb6f74f514bb6aa35ce27823b81a34b0d6192f20a22264d4830d48d252c89bca851a46
+EBUILD containerd-1.6.14.ebuild 1924 BLAKE2B 0b3eda18ef7ce3fb66c3e1e8aee162d73bbc724405d187c6a13549f80dbb3b5fcf933a66624f7378f380942c3c8d31cffd57a2fac2f085492af17a5e4a84aa94 SHA512 ac524ac54a9ebd0ccb431f569f66f6dc200e8c318a0d89f3722d927d1e32e1ddbaa27dc56d710af326620fab54ec4bce2d3c25e96ac93a46dc261b3d6790cf89
 EBUILD containerd-1.6.8.ebuild 1972 BLAKE2B 61b059f9f5aa48eeb1e94480141e5c827bb1d1fc3d418d2f7e51fb020e3af108c0162d58fd28842ad7be5ced62221a708f0eb37eff3ad0152d9ba8671c737015 SHA512 2149d274746c929e34bfbcf480cdaf6b4677349091cea64b0d00f87f6c41f662e28075922a91ba4a48e4848c7c10995c060043e9eb097740de2702c724c6a86d
 MISC metadata.xml 1093 BLAKE2B 692497be353e27b92d968142a155b5010a60f60739e1cfc9faeb966033f868c67e18c8feaaf661903266f160742a0c9e3d34485258df3ace9e8982d2ad3602d6 SHA512 18280d46fe79ecbcfd4e3f9cc139103da1fca31b6a5cfafb4c9c30d8b2a559fa30bf71f17f228a96c56506c5e18eb7c1f3340b5428c213be9e2e45e4cf5fc407
diff --git a/app-containers/containerd/containerd-1.6.14.ebuild b/app-containers/containerd/containerd-1.6.14.ebuild
index e6a34e17a7f7..386eb1e54ff9 100644
--- a/app-containers/containerd/containerd-1.6.14.ebuild
+++ b/app-containers/containerd/containerd-1.6.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"
 
 DEPEND="
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index b7962aa7c0d2..0cd760319481 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1,3 +1,5 @@
 DIST docker-cli-20.10.17.tar.gz 7636087 BLAKE2B 2777ca5c310ffeca75a07f2667703a3f1d24b4d1c1691ffb58df3144b7bfe54bb2b9cb9896a253718b7f47ab4c246064c5944a1ca05328fe7924f9bb79e10ff3 SHA512 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316
+DIST docker-cli-20.10.22.tar.gz 7590020 BLAKE2B ab003a9af2b441a9bad9c27345dea2e82087cfc8a8ac865adeb2e47e91be4bd9b27f499ae95b0ddcddb66d27c3498938682dcd10d5e3bef41fc18ce1f034a476 SHA512 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6
 EBUILD docker-cli-20.10.17.ebuild 1892 BLAKE2B c1b88b4bdc27f9f499dadbe56da3bdd5d7805bddb96eaffeaa256813542b3324bf96dcbd437f4d09b96e72c665e3ba1303b53252c3b11f12db828b5d9870f582 SHA512 652c8b7540ccaef968e74e0423891105741b410c04db9fedd82009e58e0131cce82f929f1956bf1853fc44fb034736a6fa8fe86ccc379cae5b8653001e3fec81
+EBUILD docker-cli-20.10.22.ebuild 1893 BLAKE2B 54298603a5e8bd46680dbbb87707806fdff17e1d59ba6b1a09e1fab50947390055738545638068ce9ac2cca7a9dae120c9e0c1a15e4477b5d5422a0a90e13b51 SHA512 2c21f2e637a28d3da785070c9bebf6adc4be10589b4605c1c4aa6c86d2379fa16069d38d2364e06c310e405c7bebb45b32d15842c1f378d7fb3a091853d49565
 MISC metadata.xml 689 BLAKE2B 45f4a07f9d949ad4e0175908af936140573bd257f7b11f9b9cc25cdd52bb821a294036635fd81662bcd348aa21e69b5582ab2dc8efaf94dbbdc9608b131414f4 SHA512 efe37f3ae8bc6b26433b7bacfda203ea3b480f419b343921214f19a4ad4e25b2cca5f0426a27348902f51ef15f558e81599ccdadcab6504f9d22314bb472d80c
diff --git a/app-containers/docker-cli/docker-cli-20.10.22.ebuild b/app-containers/docker-cli/docker-cli-20.10.22.ebuild
new file mode 100644
index 000000000000..4b82112840c7
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-20.10.22.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=3a2c30b63a
+EGO_PN="github.com/docker/cli"
+MY_PV=${PV/_/-}
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+IUSE="hardened selinux"
+
+RDEPEND="!<app-containers/docker-20.10.1
+	selinux? ( sec-policy/selinux-docker )"
+BDEPEND="
+	>=dev-lang/go-1.16.6
+	dev-go/go-md2man"
+
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="${PV}" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	mkdir -p ./man/man1 || die "mkdir failed"
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 1caca9d424a8..92be93fb3549 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1,5 +1,7 @@
 AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee88751e8e0471cd33429b8141cbea07a3a56c61eccd63c796c9135edafaf5977571a4413e5d71931aac44b5313110af94c3206e286b15394f637 SHA512 bc709b6f0dd8685fbf2404be589743f32a5f4deb24dec8ed6aeec18f0fcd1db4c5d59587209c28f62d964d78ec9ab3a3fdbb795dc4b7e3fabd00a06a002af34e
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
 DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4
+DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c
 EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206
+EBUILD docker-20.10.22.ebuild 8003 BLAKE2B b84d111643743852b97273ec45e52ac40d504f3ea1cab532814e0de04229d8063a3e43aa10c61ff67154999ecf80c12619951c72cc260019bdc4a78b0572b434 SHA512 29480340380f1668ac20c6dfbb04099dbbc33cd0a11420952400005b4a7a163049cca0d7b3a180575f1b116ac615d9386efe3426547c288ee06f00382bc453fe
 MISC metadata.xml 1680 BLAKE2B 6c128f9ea99f1634e260b2f944b6560636d8501f93c3e208aff7ca8ee10199f520b187a063f9a8869130305bef8749ee1af10971658e04515e80907bc8a48be0 SHA512 913bed94f44d2093868999e8a1064c8443e4d1298b53ac065b0df0857809e93194f7650dfa1e49933022461f0adec956effff61f627838e1d0104e9d9004bf14
diff --git a/app-containers/docker/docker-20.10.22.ebuild b/app-containers/docker/docker-20.10.22.ebuild
new file mode 100644
index 000000000000..181e6b801531
--- /dev/null
+++ b/app-containers/docker/docker-20.10.22.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+MY_PV=${PV/_/-}
+GIT_COMMIT=42c8b31499
+inherit linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
+IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened
+overlay seccomp selinux"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure docker-proxy is pinned to exact version from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	>=app-containers/containerd-1.6.6[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-containers/docker-proxy-0.8.0_p20220601
+	cli? ( ~app-containers/docker-cli-${PV} )
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+	selinux? ( sec-policy/selinux-docker )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.16.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=(
+	"${FILESDIR}/ppc64-buildmode.patch"
+	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
+)
+
+# see "contrib/check-config.sh" from upstream's sources
+CONFIG_CHECK="
+	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+	~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+	~CGROUP_NET_PRIO
+	~KEYS
+	~VETH ~BRIDGE ~BRIDGE_NETFILTER
+	~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE ~NETFILTER_XT_MARK
+	~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
+	~IP_NF_NAT ~NF_NAT
+	~POSIX_MQUEUE
+
+	~USER_NS
+	~SECCOMP
+	~CGROUP_PIDS
+	~MEMCG_SWAP
+
+	~BLK_CGROUP ~BLK_DEV_THROTTLING
+	~CGROUP_PERF
+	~CGROUP_HUGETLB
+	~NET_CLS_CGROUP
+	~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
+	~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
+
+	~VXLAN
+	~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
+	~IPVLAN
+	~MACVLAN ~DUMMY
+
+	~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR
+	~EXT4_FS_SECURITY
+	~EXT4_FS_POSIX_ACL
+"
+
+ERROR_KEYS="CONFIG_KEYS: is mandatory"
+ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
+
+ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
+ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
+ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
+ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
+ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
+ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
+
+pkg_setup() {
+
+	if kernel_is lt 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+		ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
+	fi
+
+	if kernel_is lt 4 7; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is lt 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+			~IOSCHED_CFQ
+			~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	if kernel_is lt 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is lt 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+		"
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+	export VERSION=${PV}
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
+		ewarn "app-containers/docker contains the daemon and"
+		ewarn "app-containers/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-containers/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index 8022e8089730..1636ca6743ed 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,5 +1,5 @@
 DIST runc-1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9
 DIST runc-1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6
 EBUILD runc-1.1.3.ebuild 1843 BLAKE2B a5cd10807918d4128b60944385f1315ecebfb0fb0421750477d360d5295b97555c59c6afc75e939e5d3af2696b43ed4a959f65123503ddc93d70e52123b2b71a SHA512 ebed92d9aa4b179622249695c38e0d5730b68c1e0b4ec9f859b4c6a1ad35cb0c29111b3e66e54f6a014e3c7f753b8f93f623bf01aab857991c77ba3fa0050def
-EBUILD runc-1.1.4.ebuild 1846 BLAKE2B 8367eb319d8f048b6ce6ebb04264293ab576eb98e0d24c06d75cfd98687c2651a897cb1ed71375e8a9b08eacae676a1dff198b95795267c3747661bc59efefa5 SHA512 cbf9b9aa5fd364d032ae9991470126c4707d45df4ce39a722ec6bf1b13a0cd15b104ad97a192f203fca8c90ccbe763021afdfb0dd658d1f1f56182e497689497
+EBUILD runc-1.1.4.ebuild 1844 BLAKE2B 5a7c86551f5451c7b0287d855b4771cd8c9eed2e2a5ba26e78fd4cc543cde048b51714834b80769d962ac374be4f2c55a3e8a9e69001b1b6d5f5fb8638692d31 SHA512 a67d2b628f19a7006bed76b0e5d76aa48e0e016a8ebd1afff1bc59cb304ab8c058ff7312db09c5d2c119cf23a712a116c37dfa2776a9ae3451c6013832798c85
 MISC metadata.xml 759 BLAKE2B 2eefd8bf06b709fe70d91b444fb232fb23e51702d75c29b0fb49675056e9721f8f63dac596b55a2ae33ef7b46825a1543a9ffdaaeddcb80448953daa5505bd60 SHA512 34d1dd28f55a6aff44c2f6dadef2dede502837af0fb8411b55a7f3ef96d35d2ddae9cc0d230525715e41c423d813b0089c36369dfa666c1249f152de90a5c555
diff --git a/app-containers/runc/runc-1.1.4.ebuild b/app-containers/runc/runc-1.1.4.ebuild
index e54c791a9b78..0e6806625342 100644
--- a/app-containers/runc/runc-1.1.4.ebuild
+++ b/app-containers/runc/runc-1.1.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp selinux test"
 
 DEPEND="seccomp? ( sys-libs/libseccomp )"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 404b5970a14b..d5b1f2bb2102 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c8ba123cd1f4..a8a481e4c75f 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,6 +2,5 @@ AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af10
 DIST gcr-3.41.1.tar.xz 1030368 BLAKE2B 9d254b7f2ad864c45200e58b685db97c1ffbc83d29ba8cbda94d30ec565aa3dc5a2535305dc63b3264131b68ec9e48f37ac30d5ba08d0ce156f3b6091cd62dc1 SHA512 dd70d41636ede863d05824b26823a8f572902f7a9b6f09b0c70586ef0d4c046864e6956130b9231850a515a9fbfcd56faf20354c1cf8f697f005827c048a2325
 DIST gcr-4.0.0.tar.xz 715600 BLAKE2B 8f656cea44bc9c2ab710d33db61f26b7c7f1df73a59430945aa3c9e4acad503d7d93f916f90e2c4efb0e1379eabd9616e974a76c3d3564657b16cd46dd5954c6 SHA512 5d036710c9ae58016467e63b60ab18e461ec1db1740880dccf555dd8c555b382b1ceac3e3ee6fda22dce395e93ba8ecf0578d6c815d08c2790e618f7ca5bfd50
 EBUILD gcr-3.41.1-r1.ebuild 2338 BLAKE2B cbca8fe4481e3e96e66d601e1d5b1f0b2643a852b18ea361896363dc06a67125689c8126676bb6abedd5000dcc2fefb0a0c852202287432394879a5f8c78198d SHA512 24b60b47f7e0955c1505489305019ee908341fec42c1b60dc376b01dfa75372abeb3db3194d6ed4db9e66886f156947156d46cb3f6a8bc311914b9f2800e6a5f
-EBUILD gcr-3.41.1.ebuild 2093 BLAKE2B 0790692215e78f89bdbbd7c88cc6be3745f9089f860ff8d3418e45b8b53548ec5261c4b3118d4eca4fb6348be0a89b17e7aaf1e7fd1abb57f2d1731d86f17c97 SHA512 d53bda6a7bc7ed1e9bc35be40c725722ea0b0137b3010788a98ca01b38777a32c40454aa3439f4b429fb0f05941c9d4f67b8ca8793f85cf3783bb5641da51c4a
 EBUILD gcr-4.0.0.ebuild 2076 BLAKE2B 91e402976fcd7a40fb1b79bbe8895d115a650117cb7a1d217500a13e2541bcce3f6825a3db52a0974a4f2c6bab2d928a9109ca6044341b9f510ca9523893fd85 SHA512 ebdfa86c1ba376bf052eb6e512d309c1c77a247614db1a8c67007dd33d6cdf69bf1d2f12de000b22a3f7451d969e3e48bdecca4edf234eadf88648e28ad05778
 MISC metadata.xml 344 BLAKE2B a5b129a4c722cc7b8b0e40ba087dab0449ed91ffeaec73b433fc2fcaa1d1c67a1f1db3ab639676880f526bb9ea55d71c7e876a947116c279cbc186d14090b10c SHA512 502308ab38854c2b61212f4b049bd20534147b9a7c565f5a5246a129fbcd12dc4a7cf1d39b560dd991a3211628afaf964a6c8f020c4e446ef0b8cb8688df0028
diff --git a/app-crypt/gcr/gcr-3.41.1.ebuild b/app-crypt/gcr/gcr-3.41.1.ebuild
deleted file mode 100644
index 39bd5b586655..000000000000
--- a/app-crypt/gcr/gcr-3.41.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
-
-IUSE="gtk gtk-doc +introspection systemd test +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=app-crypt/p11-kit-0.19.0
-	>=app-crypt/libsecret-0.20
-	systemd? ( sys-apps/systemd:= )
-	gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
-	>=sys-apps/dbus-1
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="app-crypt/gnupg"
-BDEPEND="
-	${PYTHON_DEPS}
-	gtk? ( dev-libs/libxml2:2 )
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( dev-util/gi-docgen )
-	>=sys-devel/gettext-0.19.8
-	test? ( app-crypt/gnupg )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.38.0-optional-vapi.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use gtk)
-		$(meson_use gtk-doc gtk_doc)
-		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
-		-Dssh_agent=true
-		$(meson_feature systemd)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-src_install() {
-	meson_src_install
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/{gck-1,gcr-3,gcr-ui-3} "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index fe679be19cdb..6e9c8ed2c23b 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,6 +1,4 @@
 AUX seahorse-43.0-gnupg-2.4.patch 577 BLAKE2B 5e85a1ffbaa044b38f26a9fb2a561e62d71d892d090036d4cdb6a67072c06dd9fcba728c963c2205ae681b8722fe764a22b62b5bf5f2125db66d7e45c20e7f88 SHA512 bdef1c825a2cf407f6fdf4797b9220c69465265072204ea2d07e9c0cd1804e872d5d731a068abf5d40465ae32e2abc05eeebc96913aeba75653849bbd494c59a
-DIST seahorse-42.0.tar.xz 1395040 BLAKE2B ae40d587c881851014b1989af986993768598a6a530f281cef3e177f0e6dbb3a97ec5128c5f39a463f69a4dfabb5c9f95af1dd3de7af12247338b8003c102ea3 SHA512 2a961a4054360c9a4fe0e9e360d6ea621a65325db8e40365e75d747cfe751c2dc3230ff51ffe0435d24766a91e8a042b8c01183fd58a70974a7ad095af8d247e
 DIST seahorse-43.0.tar.xz 1392460 BLAKE2B b7ae8b42042ad8e07eaf2633583b566f9757f83bd066eb8b0786d5e89353901f5526ed925bb6152820a5b2a36defb0c0f38dea634c3ae78ebf8d29ab07ff9cfb SHA512 168fdfc829134915f513028b1d35b647aa18a0390786cbf512f7ddb7b125b239f3f3d880a847119a5aa22580354f0b594e553fe3940a3afbda5861e69dd88e5d
-EBUILD seahorse-42.0-r1.ebuild 1705 BLAKE2B 910b89fabca9d67cca465829cbd8812f150c807d90c106f156ee8b0cfb0fd3e784397a73cbd9e78292d173ae5e66574e6310d5153c7a822920afd3f5d6606042 SHA512 7abbbb9a657174d9b59056d793525e202e7945b7eb140738baad329186d71e7c455601c699254b1e967ab3a0b8313ffdf400c5a4bb10647c45136875965038d3
 EBUILD seahorse-43.0.ebuild 1743 BLAKE2B 08015226bc52aea0a57101ec79d4fbd2cff22e13bca48bdd78471a24ba2860c2feb0febea9637278b32194a27be2df812400cb9a6956fc0a513ac270a5955270 SHA512 1f197cd57ce92dbcdd52fb8df70c0bb9923f31279b917064e043712852206148aaf66f8aa8ce1f4e8cbfa8cd80cc7200c801d2ebf70b53f66307315197352622
 MISC metadata.xml 874 BLAKE2B 5aa0d587b2dc015d9030160fb1fa89a2fe670a56ecd10972096199deafa321f9c1ded0702c74a27b42224f356a623817beb831f50ab7aeb3e00f8470a72d15a5 SHA512 59d1aa71802cff633f84c2500126dbfb729fb5e1a0f08fad496f53692be2b7c5db7e509a7289ba7521a916ebae13f772e35c6d52f6b2cb6c421134a1caa5bae7
diff --git a/app-crypt/seahorse/seahorse-42.0-r1.ebuild b/app-crypt/seahorse/seahorse-42.0-r1.ebuild
deleted file mode 100644
index 2d3778f229b8..000000000000
--- a/app-crypt/seahorse/seahorse-42.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.66:2
-	>=app-crypt/gcr-3.38:0=
-	>=app-crypt/gpgme-1.14.0:=
-	>=x11-libs/gtk+-3.24.0:3
-	>=app-crypt/gnupg-2.2
-	>=gui-libs/libhandy-1.6:1=
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	app-crypt/gcr:0[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:1[vala]
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	gnome2_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9a2eb37809a6..f68d88242f2e 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 2fd3f2ff30d5..4675e1acc6dd 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,7 +1,9 @@
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
 DIST dict-en-20221001_lo.oxt 6099681 BLAKE2B 206380ca9da3198cc057a43f71b9bc1bcbf2c2794f4bcff8893b86bacb2201f7709a645e98b131072a92df5dc5a95127807e2f5726d1224fe3fa75e11bd93b50 SHA512 d08f66829f3d5f03c1cfcefb4981af016f1f7127fbccfbe76cf40cbcdf70ad4c5d612517fe6beb4d0457e5cdd4e779b5816d9685468e5b3cb0c8058efa064c74
 DIST dict-en-20221101_lo.oxt 6099028 BLAKE2B 0a8e967670de07a62c2b0d1b39878eea02eae8371eccfeab967ddf1059b9f9866202dddeaebf017c9035153753d8dcafb92eca2868103ec8754396fafe736db4 SHA512 51ea769a87b70e22c84101a131d111db2f9c186707a4fac361378965dce11f03ecd1d1c5c6908bc1199e709870e2b38c1c675ab4d0d8393022e522d765a948c1
+DIST dict-en-20230101_lo.oxt 6099782 BLAKE2B 5103d0bdf9558184deb8d5d3d9ce00d7b597d4bdf4bfa2fefe3caa68d6e0fa68e2f9295d87c7a8315ba244ccbf007c198cad017aee6faf6590914f63c161cf61 SHA512 d34948b012245c0ad07819d625cd417a85b9edc13b842ad7d3974ed1428af4d2e02020ff0b89cde64a1b844ca8c2a54a7e77f37076e8cc1b38d6a2473da01d7d
 EBUILD myspell-en-20210601-r2.ebuild 1429 BLAKE2B 5b654120f1f628ca0229f282cf613bf310830e411591ade2e5e31619e310c8ef133f6a6b0494b724747634f90ea96e42193976d2a4b844f5fcde4244f7874347 SHA512 843d033ac853bb550c66765308ba496025324de03672646e739d5823a6578b5ba37185439bafdc78452c77a28998bacf259f6aa638f27c3e3978832dd7168072
 EBUILD myspell-en-20221001.ebuild 1453 BLAKE2B da23a1861c63a271a9bb64e842f76bb00dc8b7409afebfa21a30149366896a4b23a826d89e13bbbfe79ffa87caf8de7577419b40f717d6d1277cac922dd88a67 SHA512 daaa075c915235050ec2fde31cbd43beb91de4c3ab31c5faff2ff76a5e67a43c8fdff0ce6c125d60c0b18e859a12337bde2d69dff89ebb1ac742a309fb1155eb
 EBUILD myspell-en-20221101.ebuild 1453 BLAKE2B 57e593d9b6cbd5d5c9e18869d5959324e1400f638145eee3d11ca40653db0b19941aacb8b3f6398563419ff21eda3d7c88514c5f1d989c9bdf637166c998a902 SHA512 5d89f6300ea60e9a6b26d0a3f6c842b3760c81dea1b4d04b5c5acb640cbec6c9da8222c788e2c59114fd84e99ff287cb24ea9be0355e0ecd48d92c07b1642d3b
+EBUILD myspell-en-20230101.ebuild 1562 BLAKE2B fca3555c053afc25ac0aa3e300e96a3fa8e83aca9cfc66367b874883d53485d574fd93a5e007e8f375163e1b845df7f63650105f499daa286a22a67eb9406be2 SHA512 0d18e97197d87e5ad399f605b2128aeb5dbf63fef0ea1fe28bd70c5cdb5c0ffeee82724b152f73f7b73c51449ceb509f9e047280127b5891a1781a61c3b281c1
 MISC metadata.xml 422 BLAKE2B 2a08cd9598f852c8ef8a83649d7ac8c8617eb2d5dbe160c5bc21457c412b51ff8fe0c7413238252333e9622e0bc367b9e5b33d5d8051bed9c53a1287296f8385 SHA512 ebc962ac0a2aa0cda987269d52b5dd9607e59aecc73ec265dc6f0b4469827502482dc5c18f5b9122831ed554b852a823c7fb31d58beb5b2a8e14cd16ee12c474
diff --git a/app-dicts/myspell-en/myspell-en-20230101.ebuild b/app-dicts/myspell-en/myspell-en-20230101.ebuild
new file mode 100644
index 000000000000..7e4459b94379
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20230101.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="
+	https://extensions.libreoffice.org/extensions/english-dictionaries
+	https://proofingtoolgui.org
+	https://github.com/marcoagpinto/aoo-mozilla-en-dict
+"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1672590731/dict-en-20230101_lo.oxt"
+
+LICENSE="BSD MIT LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+PLOCALES=( "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
+IUSE+="+l10n_en ${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( l10n_en ${PLOCALES[@]/#/l10n_} )"
+
+src_prepare() {
+	if use l10n_en-GB || use l10n_en; then
+		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
+	fi
+	if use l10n_en-US || use l10n_en; then
+		MYSPELL_THES+=(
+			"th_en_US_v2.dat"
+			"th_en_US_v2.idx"
+		)
+		MYSPELL_HYPH+=( "hyph_en_US.dic" )
+	fi
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+			if [[ ${lang} == "en-US" ]]; then
+				rm "README_hyph_en_US.txt" || die
+			fi
+			if [[ ${lang} == "en-GB" ]]; then
+				rm "README_hyph_en_GB.txt" || die
+				rm "README_en_GB_thes.txt" || die
+			fi
+		fi
+	done
+
+	default
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index ac8a5b8cb8fa..7799f4b98156 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/jargon/Manifest b/app-doc/jargon/Manifest
index aad4080fe48c..895f70e06145 100644
--- a/app-doc/jargon/Manifest
+++ b/app-doc/jargon/Manifest
@@ -1,4 +1,4 @@
 DIST jargon-4.4.7.tar.gz 9061260 BLAKE2B f2e29464d0ed946a5a2f0529eba3110f55ae068796522c05402ff2addc626501a43cbc633aecee15d6289e7a5236ce196f065ab782e4686142c51ba21658b517 SHA512 afc8c44994f22de3fbae325e315fa101c04a5db2ef6af7c5592b4c072cc0e94a2bc523042ab9c894977c34f8321aea77c8208ae57040a4e3419cd240ce169803
 EBUILD jargon-4.4.7-r1.ebuild 603 BLAKE2B 91853911a0a99f4794b73dc6f2d0e67a2252b5f2e358eb32049b64ca8a563fdd01d97c38e7e52d20951e003fcbe681608869fbec5ccdb86bbf718c49f363c961 SHA512 25a5b8e67fd8e918a70e0025a8b958fd2e50d278dcfab286fc16a1fbb765115900c522717ddf2957edac4d868dc73487ea8f621d7793457fe50fdf6bea19bcdf
-EBUILD jargon-4.4.7-r2.ebuild 595 BLAKE2B 3e6d117bbc68f7704c1d7aa0f71cb72688e9b250049a99b1c56847da722ae6d3152076190a57a8dc3d8527d66967cfc90a78672c494c2189070a1015167d0d06 SHA512 6925bb73cd7eb096074a176e90fe834ddc44073d6da4e85f906cf15358046917d8797da7e2f8e4eca5517fea30bc4483e846105144fcdf02b6d1c0acf6dda7e0
+EBUILD jargon-4.4.7-r2.ebuild 589 BLAKE2B 9e3ed8d611b882dbd6748fd1d06e5ff1a8b6155de05e4dd3def152622af9d82a0845ec89183ad8bee5ef08a94b53c5ebf609b561ec770ffd766b35fae6ce7a44 SHA512 146dd414f14ccbe5846f7bc4b01715d28d05ebd17f80b4852fb3ec805bed2ad38785a950dae2226c3db9db59ea09518bac29b0a53b05fbc6de3144504488b6c1
 MISC metadata.xml 190 BLAKE2B d559575e12e34a66fec07e2f63236ea9b6284ca73aafb2471715d08329f5fad685b5e6f81ee446a4377efd3ca5785827306e491391dcf1789a7bafbe2b506a56 SHA512 5ee7503a2f18cc27f052203ffd239180eb796dda5425690a03a43b51a6d09262141d0108bdc64bad0fcdbedad3ea884e4187ab581a63e5ea2e73e057a5eba0d0
diff --git a/app-doc/jargon/jargon-4.4.7-r2.ebuild b/app-doc/jargon/jargon-4.4.7-r2.ebuild
index 5a209b20012a..af2bf5bc74aa 100644
--- a/app-doc/jargon/jargon-4.4.7-r2.ebuild
+++ b/app-doc/jargon/jargon-4.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="http://www.catb.org/jargon/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 52af29142589..6e69814f25a2 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index d02b77ef2fd8..df722a22db9f 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
 DIST gedit-plugins-43.1.tar.xz 913072 BLAKE2B ebfaa6311aac490c75339cf506a58ce60864925ebee8284d72cc4b42634696511d7060eca1b8988d574e1b17dc0e0d32cc934da3c29421339044a220ea5e854e SHA512 2aad05ce15e148121b8e0dcf59546061e448aac09f42c28cee7dfc0b3c16965716059cf147c6391f1c439ac04241e94384bf6ff8dfaa40303dfe80d8de1e2fbc
-EBUILD gedit-plugins-42.1.ebuild 2704 BLAKE2B 996f031b83848d81288aaaf91a02db69e0241946234284e2b579e67e31d733c1d31adec4fe18c7cf889461a62aea62edf0aac32ed2d6ea6e36f5d0a7143b10d6 SHA512 5f14b805ddee568ff88e03f710a280ae42d1088c2432a0d63284c75d372aeabcb8101f3b859d2657cd63086eb420b2c4b8c41153503b86de9c4fbac4d0a11b45
 EBUILD gedit-plugins-43.1.ebuild 2587 BLAKE2B b11a55b0bdc122ad21906a09e8e0e45424a6767eeef6fd7ba52e34703968a21a1a583178d7b0419f79e066f4ee944b4820fe57b2ed64bcf58d7a28e50ce92c31 SHA512 a278ef3a963bfd7d2a3b040e8bab110e97a42c909193b99429daa62685e0060a8f6a2b905914ca821a677aa01ccdc191528dba72e2e2aab2a8be0dedba57263e
 MISC metadata.xml 596 BLAKE2B cf545e591c160fc584c5c2b1e3f5fa6a47922a958f981daa5c85f3f6c8f7eaed2a520d6265241998dfe211098f70c75a0fdfff033e55e892e5775b678ea9ef5b SHA512 0a3b9e748bc2d22ea16a694f8ebd6196d05e6652f552523bfe6fa60f1c69ab50110692cda7a59239c8f6946c06d3139a4225f1744e0dd40ccbdef3e8b396f692
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
deleted file mode 100644
index 32801b416540..000000000000
--- a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-SLOT="0"
-
-IUSE="charmap git +python terminal vala"
-REQUIRED_USE="
-	charmap? ( python )
-	git? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	terminal? ( python )
-"
-
-RDEPEND="
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=app-editors/gedit-40.0
-
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.9:3
-	>=x11-libs/gtksourceview-4.0.2:4
-
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		')
-		>=x11-libs/gtk+-3.9:3[introspection]
-		>=x11-libs/gtksourceview-4.0.2:4[introspection]
-		x11-libs/pango[introspection]
-		x11-libs/gdk-pixbuf:2[introspection]
-	)
-	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
-	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
-	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-" # vte-0.52+ for feed_child API compatibility
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dplugin_bookmarks=true
-		$(meson_use python plugin_bracketcompletion)
-		$(meson_use charmap plugin_charmap)
-		$(meson_use python plugin_codecomment)
-		$(meson_use python plugin_colorpicker)
-		$(meson_use python plugin_colorschemer)
-		$(meson_use python plugin_commander)
-		-Dplugin_drawspaces=true
-		$(meson_use vala plugin_findinfiles)
-		$(meson_use git plugin_git)
-		$(meson_use python plugin_joinlines)
-		$(meson_use python plugin_multiedit)
-		$(meson_use python plugin_sessionsaver)
-		$(meson_use python plugin_smartspaces)
-		$(meson_use python plugin_synctex)
-		$(meson_use terminal plugin_terminal)
-		$(meson_use python plugin_textsize)
-		$(meson_use python plugin_translate)
-		-Dplugin_wordcompletion=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 9d5d4c4d2834..d4d6b442b1d1 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,3 @@
-DIST gedit-42.2.tar.xz 6917596 BLAKE2B fd7b0a1c113e944b1b3f0c2bb55a061e76e7ee71ebbfe8d64c6d5b0c7e47b8dd54519bde1b7b095a1cab27a169427eecdf35d06422c1a984f51dab82e19c7cb0 SHA512 d50f021f33764e0cdd3ac51650db0e37dacb5b6edeadddfd8136e8120e83eb740db66ada25ae43eac810896714859d6f8876640a8976ddfd6e7e602c278dcc99
 DIST gedit-43.2.tar.xz 2724036 BLAKE2B 64039018c604874945cc6835bba14d80f969b0a860c0384d969af7fc81cdc4ade568539a80571440af605f14eaf33730140a48b48b92d1bdb652199770ca3411 SHA512 447f0da946ff7474637bb6b88f41eb53e5ba886c66e8b9f8c17e67d2f52e3eb115d905a850300f70488cfebcd6654a14ce8c57044760f4fdb3394cedf4e91f23
-EBUILD gedit-42.2.ebuild 1882 BLAKE2B fd260e8df390c8bfc7fa296a3a90260df9de3d9b3594449ee485867eabf382bea8f2c8331800f1227bedea8f22c16d4c2c4d4eb8e70cf8e5975f3c4725f477ed SHA512 cf12494d027f6f150520ffb5d3966a2c801204d89071de3dfab4ab5c4eebb0d8300c11db80ee064df4538a0331c324a7f2041d3d89c7eadd699ac8be012c26d5
 EBUILD gedit-43.2.ebuild 1770 BLAKE2B c48e25944efb1d716db31d8b7340a08c1ba5ebb89aac5bfe458478f2114db5d11ef28262a3e899cb09a52342d9bd4c773988a1a0b560dbd275b2c5d3bcb013f5 SHA512 3473bf78bc6f154279893813448a185fa0646be36092642e09ff767be2792cb6a999e886c5751e776ccd82089d4e652a4c280d7609e3647e46f33787589762b5
 MISC metadata.xml 346 BLAKE2B 59226b3220bd9b1770fad0f5acf3b1888a57a3496f9e0a6eb0eb09c12b7a5aa461961753dd8a5a6f01db1cdb97af5b28d6a8d1d632b60f499f86e0864e29264f SHA512 3e1d83ad67b85a681b85f8fece9d6c2c3eab2f2f726447230dc1f2399a21cba211d97e11d8c06d0d1b1803fafe67be4b32c04b39c5f8586a421c525624f6697d
diff --git a/app-editors/gedit/gedit-42.2.ebuild b/app-editors/gedit/gedit-42.2.ebuild
deleted file mode 100644
index 5b4aa2eea9bc..000000000000
--- a/app-editors/gedit/gedit-42.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+python gtk-doc spell"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22.0:3[introspection]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/libxml2-2.5.0:2
-	>=dev-libs/gobject-introspection-1.54:=
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	$(vala_depend)
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use python)
-		$(meson_feature spell)
-		-Duser_documentation=true
-		-Denable-gvfs-metadata=yes
-
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest
index 598797126840..7aef5175c58d 100644
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-latex-3.40.0.tar.xz 1050088 BLAKE2B bd8764450ee122599fd96a7e889291805fc09d854d77aa4e7d3b01709cda8bf0c38327d05de6117a19f325ca6a61ab42e014d27b941ed8e40f0bfd963dd65680 SHA512 822d86eac81994593e71428f1c893ce7d6970bb8e98349c8ad9cc6a113e3fdb49209f1bc7f19fb8d5a22da98d7650a822c8f8ab1f5aa096e6ea0cbaf74dfafca
 DIST gnome-latex-3.42.0.tar.xz 1170904 BLAKE2B 0bd1b3c50910f70d5ef690bbc9d755a61f6e076c4a491662be77ffeb5985d50c664323c7e743d108bc65fd2c826ee12cf28076a0bfb1111cc2a922381b02034c SHA512 b36300226344eced21a694ecfa6aaef0b1e788ebbc461e0ae57adab30361bc6765c6b0136213ecf19e5b61ddbb35ac5c832fb21b6f1e7f555564bb372d5f2c7b
-EBUILD gnome-latex-3.40.0.ebuild 1128 BLAKE2B 03a5c6c42afc5037644a514bd015406f373e4f134b55535d6f4d8c3ff2b421571a278d50097ab8700bd371f90a528c9b9d24a564fce33b549d4fa14f723ca653 SHA512 c1726566142ad8529b445a3fb7894587e578471d461ebd296795422d0c49349b9293e1f7fc90555077d0b276d49cfaf94b046d7e97faa7a498bd254f15d533d1
 EBUILD gnome-latex-3.42.0.ebuild 1088 BLAKE2B 6cea8625ad96095f5b6679daeb3833820482f56fc8aaaa545e853db2c6f2ce3f2cd533110c9b8d32dd9a04d316676df04c9a0ef0f02d2e8c11590411e484f0d3 SHA512 5c04602c15b652cf7d83f34805c9e0abaacb8183c7fa7e2d1179dd65bd1c93a133982efe0a14427f6e7f330069390a48df9964ba0516de5bf7b982ba4ee225ab
 MISC metadata.xml 575 BLAKE2B 73604444b6c40826ddad63c484b35ed2bb7c3edf6ab59e40994881769051c96b2ebb211d47d2f67b562c48e15ca589863f6cad9984accaf40567bc8f697b15e6 SHA512 6a6bbbcd0f1e3119f624828a3f008d12377c835f4235fe6fe232f326dc8d3bcc960406d1c33ababd00b0a941f9c7160c3f6a7b106a9f70ccb505b0eb0349e5b6
diff --git a/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
deleted file mode 100644
index 30d68a995d13..000000000000
--- a/app-editors/gnome-latex/gnome-latex-3.40.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2
-
-DESCRIPTION="Integrated LaTeX environment for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX https://gitlab.gnome.org/swilmet/gnome-latex"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="+introspection +latexmk rubber"
-
-DEPEND="
-	>=app-text/gspell-1.8:0=
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libgee-0.10:0.8=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-4.0:4
-	>=gui-libs/amtk-5.2:5
-	>=gui-libs/tepl-6.0.1:6
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-	gnome-base/dconf
-"
-RDEPEND="${DEPEND}
-	virtual/latex-base
-	x11-themes/hicolor-icon-theme
-	latexmk? ( dev-tex/latexmk )
-	rubber? ( dev-tex/rubber )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--enable-dconf_migration \
-		--enable-vala=no
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 7f65eec86c55..feabdf434516 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/boxquote/Manifest b/app-emacs/boxquote/Manifest
index a0815108354a..102475762c04 100644
--- a/app-emacs/boxquote/Manifest
+++ b/app-emacs/boxquote/Manifest
@@ -4,5 +4,5 @@ DIST boxquote-2.2.tar.gz 5568 BLAKE2B ccc78a0c1ba64ba8b8668d0f0b4f476c06214b75a1
 DIST boxquote-2.3.tar.gz 17408 BLAKE2B 6f25c107564bb49bad382779580c4f9f0e801561cef45850ad37e56e873aff053b863f8621070237ca21d97ba4caf261e50a59eb38052f4ff96037c488c33020 SHA512 551ae9b5362fca94a9bd672673f4084eb46fbb07846340189856e36907f27e807012116eb0ae2b213b4f415e637ffbefcb10dc12ec93f3e39fe4b5a283a93b68
 EBUILD boxquote-2.1.ebuild 489 BLAKE2B e33a45588645cc19a3dd5913d97e52d97b166ab158033fc1d449920ed7729d62807d4f91d2a67d0e1e92660cdd0e20888cb86d251f138cb66263b974fdb16f9e SHA512 1bdd384194d45d1568e411c5b92f35f0e7fd2fe238335c01fec8e06390a34add040b1c02c9550b5bee90f024ad7fece39aca7139040e33ff4e65ceb2d028a8f0
 EBUILD boxquote-2.2.ebuild 489 BLAKE2B e1bc522296803aea0150bbe541031d34c7458d8850b60c6e92491ba192b955fa24deec0a69834db433ea44115d19c022e6a2b598a67bad1def5065e29d86ab9c SHA512 353af42441d2b748670cfcc4eed04cf57b211a7967b4c3074051ac028113c20fcfa1c882f4effd39881da5c7620dc4a33ad8b54a8804600c2a1129a5dc9af311
-EBUILD boxquote-2.3.ebuild 493 BLAKE2B 87e070d050d25023569312ff0830836928e9e6df2a24e0c67d350fe1d0f1b0c03087f29e1dec76d67e6f74300da1c823062ebb1739c9d62d05fef6f063a2c326 SHA512 e99ce54fcf2d4049314e3107c861aa2b70cd5215032bf8267c83ef9361d3eb1fde6e5f1d4e5b966e6ad2d3d065781da0af76fd70156794bda643b831a6cefa5d
+EBUILD boxquote-2.3.ebuild 489 BLAKE2B 2d2b67ba5422cd7f2c8018c8f988f38660a7ae7ec74c966d067cf83fe5ca5b5b99537d7440dc1aa74539c12e3977d65fe0dd20500f7d4acc3226e1cafb875bae SHA512 638e93e23e94ee9d5d9c6d5485ff9845f9dc04b7bbf2bc29ec641632f9bb7c70084f80f2401ad5d95f9a45f8286f34352d51b742eec6c54bfd807817cb913e47
 MISC metadata.xml 855 BLAKE2B 4b4b62fb7cbbe88f8e0f15fac4f781ac932782e3f43f5db120faaff8be25b214520ef9e4880b7d332ca4abce7920df13f0c20ccf0d94b742e901a1b8968168dd SHA512 afab1e8b9cb18f46c38832b45d14d61cf1637940be51303f3ffa1647964494d1e5c0d024e2b9885e968f8e8fde1f90a05ddae85b217a77117953582792c3cbdc
diff --git a/app-emacs/boxquote/boxquote-2.3.ebuild b/app-emacs/boxquote/boxquote-2.3.ebuild
index 2dab7e45d131..85cc973fb1c4 100644
--- a/app-emacs/boxquote/boxquote-2.3.ebuild
+++ b/app-emacs/boxquote/boxquote-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 S="${WORKDIR}/${PN}.el-${PV}"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/company-ebuild/Manifest b/app-emacs/company-ebuild/Manifest
index 3cf3356fccb9..a5d24b073e33 100644
--- a/app-emacs/company-ebuild/Manifest
+++ b/app-emacs/company-ebuild/Manifest
@@ -3,7 +3,7 @@ DIST company-ebuild-0.1.1.tar.gz 11059 BLAKE2B 5eba661f1956a019a133d3e61f997dcf2
 DIST company-ebuild-0.1.2.tar.gz 11697 BLAKE2B e376626d13aa32a4df09ecdae2245b9c961a6e2cd615febfaaa626ac48ccd420b462a6195d9f769d64c37629c34929ba87e3ea6543e2344b62b217a51695870a SHA512 2a67c6ea6e53f78a6c41b2251b928cf7e97bb3f71c7c03057c540c699bd275898bdf8840d723cf5d8846dbbe82cc531f1cc2707181825fe05c4433ea80039011
 DIST company-ebuild-0.1.3.tar.gz 11699 BLAKE2B d098bbf925c308335ad498eb968c6dcdbe8a981ee32c85cea22c38628a360455f109fa884188cdb8e1a096b3e97fa1e95de044653cc9adeec3962bcdff550c69 SHA512 dc0328aa5da9e7472f35f01826dfe934831362141709885f799e3a0c1141702b63f08569508f5af502aab3d790105fc89cd16e0c863877348eeba4156f64bbcd
 EBUILD company-ebuild-0.1.1.ebuild 611 BLAKE2B fb1fddcb8d3f45bb23339104a23f11544aa461c85f369d36bd273fb2b1e2f16f85d8d214cf04a78d8549bb81add36970ec6f4d14200fad2c5515bb9a4a7db148 SHA512 7a44d9c2d0e1701958e61de247d0c832c5b949273656ebfa454d9e00d4266fa00c41095797a6d1720bc0335c55b3ce5cbdc9750f4f6018a2203675ddb38c515e
-EBUILD company-ebuild-0.1.2.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
+EBUILD company-ebuild-0.1.2.ebuild 621 BLAKE2B a81bd078f120285cb5e400ab35bd953cad7f8b9dd8224f5d8f42ca2e18741b745a85d4135102235d61a260ed00c875801c76b4c3a33396c1b0f37db05e4a5d4f SHA512 f66dbe9711951d64cbe09e7ec6a8d44391c6c1581d585af272681173b8c077409927902fa59f6086c306b7e16886d796c7c1a1a65a09cedce20a7cf7157a369e
 EBUILD company-ebuild-0.1.3.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
 EBUILD company-ebuild-9999.ebuild 622 BLAKE2B 57f0ca4543f5e68c41ac86413a0bc68a81afc251235faf727407129535a615b28133b213a40037ec30967192001b8367a658175aebe66f8cb9e2727697ff354a SHA512 95154f84abe16382fe014ae6146125de349f822b4081edcb6ec95350481501bafa58c7f36bbfc36c4664a21161bf59168861d4e42cc30323d72e5334efda347e
 MISC metadata.xml 451 BLAKE2B 85cf2b33444f33f2dee8a0ccdfff3f83de7ab15d3233e0264dbceddb68382cdd551a6dcc691d71f52fbf8a3e7d1a1d041bab9b3dae0c91e81f7d7c3de8f3e2bc SHA512 4886219382c419a94a07041a0e4d0ed6622c45a0371cd0c70a912d391ee29db1a6e730c1134b8493e5edb299646f35df8eb799cfa311f3927256dba2cb345b55
diff --git a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
index 678f43ec2830..47d75602ae65 100644
--- a/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
+++ b/app-emacs/company-ebuild/company-ebuild-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index ddfab5518f42..713e0eb560a7 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -4,5 +4,5 @@ DIST csharp-mode-1.1.1.tar.gz 36326 BLAKE2B b76c926eb32b0ac1e72bd3c789d6d8ccda9f
 DIST csharp-mode-2.0.0.tar.gz 36697 BLAKE2B f4ed14de59e89e09a6da68e6e46ca5acde69eafaa9d6aefdf15d609d828f972ab45769368bc6fe620965d3fa1132e46965080e6538d235cbd9b64e7044b017e9 SHA512 d55c832905af3ce112bdf3b896f056a963c7f13035d474b314599179c448b76b79d9633e493824cda948554ca6d33a6e426b61a7a9230de6523d2427ad72a1d4
 EBUILD csharp-mode-0.9.2.ebuild 540 BLAKE2B 1ce353c24d36286c139e7681a633e7bfc705cf992d8d393d29d053a130edbd78700e080515fda3a75c29ba9bcaaa44020e89d99df068af8d387c16e36a5e0a7b SHA512 b662d976dee79d73534c083fab34b9aa98a737c4c5390d051e9ed9d52225a6c6968475cacbd25e3c42a2268d5ecd282f5b304ad86bbab8a11b1f57bc97ab8007
 EBUILD csharp-mode-1.1.1-r1.ebuild 598 BLAKE2B 8a4dbef1d47a183f7b4173a8f940398241701cd1d17537d149325572a491f5479bef8324b1b8851d3be86e3e0b62eb075032530fd167d82e9442805f9abad4b6 SHA512 3cffd7ab93489dd81bf0f256d01f7b50267b23271c4faddb18ba140aa0528acf79f2621d268b821031c2a6441a8812eac254caa07dad4cd77ab2973efa6c0d46
-EBUILD csharp-mode-2.0.0.ebuild 600 BLAKE2B 46e9a36655861544a5a980af6ce31963087b34a5f50e6ee69ee8732d1e9a4d254a11516514658024a7f1592499228a7638edd710ef95abf4e5d15b988232b4a1 SHA512 a62b37dfd6e1c1a382ffb7795492bbbe0f5caef8e6b3de294a4ec56815442958f1d7c5d4bc7c50b86ad042f3aba1c8982172d72582664d70b50fc8d52dd19695
+EBUILD csharp-mode-2.0.0.ebuild 598 BLAKE2B 356a8992c1981a5dfb2a5b3c43a170fee34f6d90fbf67985be4f31a055245cfc8b811705746f3ca27075a38f9323d0718c4b2de1b182550ec3e7c2a7f76807ed SHA512 360ea55b5d44b1983c57b95232167d70e70a2c7d267451fc0dc904e2d66da39ac3b23bd87270620c277f19c815c23dbbb885c47f1d989e9a51776fa5c4a52d97
 MISC metadata.xml 366 BLAKE2B 14fde660cfcda8c045193020c0fa1c1b6f82de229ba2eba1aaa34ca82d1c93abe1f97290d87661c91dbee58f3c7f4d2848fda28bcfa113dd4cc5b92ca68e825c SHA512 060790025d1f855035b0adbf7156619fb8b60bb0f9b977057f21ee37e7c25272569dc46d4622a1302c037deeaa1cd774e14fa8e4d52fd3bb3370bc1ab2907396
diff --git a/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild b/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
index d5c9237a3a7f..38b6550b6d21 100644
--- a/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
+++ b/app-emacs/csharp-mode/csharp-mode-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/emacs-csharp/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 RESTRICT="test" # tries to install an old version of dash from the network
 
 DOCS=( README.org )
diff --git a/app-emacs/dashboard/Manifest b/app-emacs/dashboard/Manifest
index 55e10406db6c..5741adbddb6c 100644
--- a/app-emacs/dashboard/Manifest
+++ b/app-emacs/dashboard/Manifest
@@ -3,5 +3,5 @@ AUX dashboard-dashboard-widgets.el-banners.patch 352 BLAKE2B cb6b45429bffe3534e5
 DIST dashboard-1.8.0_pre20220406.tar.gz 191442 BLAKE2B 8b105d8ed9b31e7439cc55b85c9e0bb46739fcb26f9e1e605492a552cbcfe9799794be6239b6c622bfbfc2f850d20f2944f759010eb502bcb75edb570ae7e5b8 SHA512 b3b714bbee034fecbf1172dccd5eebc38373c11a510c532a7b9ba31cac79daafe7e9ccf7c5e622abbdb44817c966f100ec4f7a447e8b0370f9d7e66ff55e45ca
 DIST dashboard-1.8.0_pre20220809.tar.gz 192857 BLAKE2B 22a7be748b3308282deb7e0500269a0aa809c2c6a5e57e984e83ca13803b7e55364e2f5619380444a7daf320c1bc6da26daeb0451efc3c20fc82148e55fa7f3a SHA512 10e2cdd724731b0c5ae195f8a8b3c9ba83a4c6a0d5fba00e7ecc224b22673296ca522642d179449e68d852b06789665e2c5bbfef84dea5e878110ee9e3b23dce
 EBUILD dashboard-1.8.0_pre20220406.ebuild 942 BLAKE2B 2a70f0ef23f0a1ac9d9ff84e7afbd1a486784789dc59166d402fe594d125d422ae5934c211ee6b68767175ee2271571f8310da64b89ec53f4a08222554b2af8b SHA512 f6286832963ed13041b2ec00c5d1d587dd1827c518b73643df7dc0c23ba7655bd6b6a446ecbde056a2b5f44dfb003546b7c764c26b4361a97ea2ed9ff45b468c
-EBUILD dashboard-1.8.0_pre20220809.ebuild 944 BLAKE2B a2276742592ff602b7766765f4180df69dd5197e68299d712baca5646c93a10628bf3e0a99f3330bdb553623b6b43ee528bcac3456085cf691d521597e7adb76 SHA512 be89c56fb04da3e5e56f2b0845b0f6a2757cb27ae86cb5e8a54f817d25b89fdac9f43969cae9e9a9fb82e19fe78a5534509a71b8be706c02c83e90728c7719f6
+EBUILD dashboard-1.8.0_pre20220809.ebuild 943 BLAKE2B 516d1a6170c97e8a565939c5c9dadd458a17dd3f2e939b6b9e622be11300c247bca972f4464d68a817eaf5b748c9e23456ba41b9158b3bd55034bc9509f802c8 SHA512 e4b040f2a245450e6f6c1ae32bf424eedbb679b691b47a3895d3c785016fbfcdff32d7c27f9fd1779fd1aff58d6674f69f0187ae05ba134556b34989bfe589e6
 MISC metadata.xml 564 BLAKE2B fd3eea99e99ad926d6600df608f5b04f3a44a690a10ffa74a32314838360c637fb618bda7d600236d6ce2eec59a11cac37231941334da756e893e9561acfc933 SHA512 56071ea793b85ba75b1139f4f3f43b69a418fad2ed5b2c23469f281deb47c2b09a1beefa3c13281ee2a001999823d955f600e29100885747f55544ce5af63ee9
diff --git a/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild b/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
index 1683e38fead1..8bf07d8ad8b5 100644
--- a/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
+++ b/app-emacs/dashboard/dashboard-1.8.0_pre20220809.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/emacs-${PN}-${H}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 RESTRICT="test"  # tests not in the repository, require "Eask"
 
 DOCS=( CHANGELOG.md README.org etc )
diff --git a/app-emacs/emacs-eix/Manifest b/app-emacs/emacs-eix/Manifest
index f5ff1b442b7a..18c460078c59 100644
--- a/app-emacs/emacs-eix/Manifest
+++ b/app-emacs/emacs-eix/Manifest
@@ -1,5 +1,5 @@
 AUX 50emacs-eix-gentoo.el 73 BLAKE2B 5554ab525a28595fc17488ece15cd4dfd5c52451de04c7e605d3901159ee97eaf5ae1403662131d99d6c400799063eeb442269740451c06515272153b898b0df SHA512 4e814ace69cad0598ae029555f6e251248c763a56203906f0908b35875f13bd9c537b8ac57357db9a80793ef20b34d2d2a26509065b7a41d3f68f9204fe1c1c5
 DIST emacs-eix-0.0.0.tar.gz 9522 BLAKE2B 12c91822b644cb3017b434ddc8a46c3eb9f8981ac45ff8e252ba937667e63e92f703f6c77a3675b2b89c6f8ef3188a785bcc7e1f122e2870c623d4330265c2a0 SHA512 6428ef15fa5b2367c727d63fd728e0d4aca24e4c0d8a27b566e664597b174ed94373285cc80979dac96bbfadd2ecdd3545170bd700a1130c41c39d3d8dc55b88
-EBUILD emacs-eix-0.0.0.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
+EBUILD emacs-eix-0.0.0.ebuild 576 BLAKE2B eb411e6200225307791ab5baed31a19963c2337fc3e4c171929648802253ab48190dc7a2c86b356daaf5b8bee44b9f4b17267de02c2ba5775a7a7e79217ea6a5 SHA512 8abbabdf3e1c94fc265141853f9b49949feeb49f225cf37f795fc430340344400a1d449d21d672dde9772519702a67d8b5f6b622ca44f62f584bf7c468311be6
 EBUILD emacs-eix-9999.ebuild 578 BLAKE2B afb242319e1005703019be2cd91ec94f30f703164ee1557827bbc09bb551cb93946c40aad960bd73f9062a5054c3787922f12fb02e8823573e6409d1cc49f1d3 SHA512 bd2b45805cb86668533bfb3780140afd5775eadd13edf5bd80428cd9e9b3e3fed8bbd9a0332c207f715dd2d0c674f874a0ac088fd5a71dcf299791d818bbbc77
 MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild b/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
index 2821ddbc8bc4..f75435d34cc6 100644
--- a/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
+++ b/app-emacs/emacs-eix/emacs-eix-0.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/emacs-openrc/Manifest b/app-emacs/emacs-openrc/Manifest
index b822d8659ac4..cd09a72180f4 100644
--- a/app-emacs/emacs-openrc/Manifest
+++ b/app-emacs/emacs-openrc/Manifest
@@ -1,5 +1,5 @@
 AUX 50emacs-openrc-gentoo.el 76 BLAKE2B d6feb9a58260c132884226add7fc2c6474d87ed553feebd1d322b580325676bcd4666300f98b9ebbf582f6553dd1e933c80f8fc401bc09f9f56b43c8fd5f8e15 SHA512 2232247e3aa041d742ccda3f47cbce6a82a191f9b4e2b8d4b66d2571be1fcf202fb954c4c9116c32958e9da2b26c86395c8996242a12dd335f4b3da8b1f49959
 DIST emacs-openrc-0.0.0.tar.gz 3453 BLAKE2B eadd1ca5f338263e3d7b5c562c7ba1afd8c68dd0a9dc7c682c7b9f8148cbeecb2d8de6c621c5a63262fdcee173bf001ea56a13e40224ece9c9627b2fa84f8bc9 SHA512 04723bb9f087b5da6cea46898af78c6308bebb9f1fc6ee872d9b054bbaafdcb9afaded4f31b318b2f8558e0831243d0006c923e33653fb418c35569112f1bbb0
-EBUILD emacs-openrc-0.0.0.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
+EBUILD emacs-openrc-0.0.0.ebuild 582 BLAKE2B eb7500e6e1fb0fd2a4608e9e130fa539dcfec1d8f7e6c829f49578b441a554473b8bd8a51d9944b93df1b05053aed75599cffc1feba7e1c1f41ed995cb61107e SHA512 a4ecd50f68c0203e80e6d7cbbd1d67e71f9118de1bcac7e87d93fe1e31b930088116cf880f3d13cdfdd8ad649882100862c7a6609ac2d4eb8b856b195f112060
 EBUILD emacs-openrc-9999.ebuild 584 BLAKE2B 50af6c74f66cdcac5228f6eaa6e439ccf4e346a1650db5b63b91bc682774092f99f4a4bf3d36354eedde82e8311e7916cd9656cb58e09e3b8169387fa860ec89 SHA512 ae6b5b376c9dc8131a22bc9667da649e6db3d86768aca51e2061ced0539b72a936807d9415d6513afb0f65088a68c9dd846cc6f3d68f7bff6d83241381ea54e6
 MISC metadata.xml 425 BLAKE2B 1f9b04402793c60cfeb44700c96bfd2e17752ccc58fa7ae5aad17c51d85ec905d0d7daa07e8de244927ee045a3c8c8819a1de99bd2ca7e199c84423012db4917 SHA512 0bbb059d0af21bd61657ae9002036689a933f9f8490f4bfcad8f3ecb8e13a59fc6b5b6e53c1d29f6cfd885b3affae714b38098737d3cf8f869fe9695f23bcbb5
diff --git a/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild b/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
index f312b46f306e..457894c72350 100644
--- a/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
+++ b/app-emacs/emacs-openrc/emacs-openrc-0.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/app-emacs/flycheck/Manifest b/app-emacs/flycheck/Manifest
index 84e189edb73e..22a4cce42833 100644
--- a/app-emacs/flycheck/Manifest
+++ b/app-emacs/flycheck/Manifest
@@ -3,5 +3,5 @@ AUX 50flycheck-gentoo.el 168 BLAKE2B e1a9855c04e42743261f2d1483772fac65c8c6a3070
 DIST flycheck-32_p20210825.tar.gz 1042020 BLAKE2B 1663340de24980b3a1e58929e327841b743495dbd5d5c8306f007d0dfa989707015ceadaf6e5cac673eddb45adf9ec05dc35d8cb35af322c9cde6644194dd75d SHA512 472e25956d804e7f7ba8ebda2e3a7527eaaf3aee47fa5bd43a46ae651f94d857657cf4594f5a1ed0c169ec0ac610139956d182818ffeedf2c4132a5583ca870d
 DIST flycheck-32_p20220328.tar.gz 1037565 BLAKE2B 385d73e9ccae06db09d23819600317b807b7ff8cf0679be510cac27d539e57374fffd67575687067e8d6beeae66472b2831a5ece4adbe7b85da9b484dc8b6346 SHA512 f2c5dad66a1bae826f1b48242d3b1202cf41615fa2eadba55c4aabbbd9616ca873ba93c8c9f53cbefc22587b70ed1a2cd4fcbdcb2d6caf13d0c21c4d36e4ffc7
 EBUILD flycheck-32_p20210825.ebuild 714 BLAKE2B 0c63e62084ee11a5ff191e396278c924d06e1ae10c8d4e6214cf92ddba242ac9be1fbcca05c14b1f6f053e76f04571b432c5b5581285f28515aae271a28654d9 SHA512 dc93f0bb77db8e332761264860b7433abd9548aa2f3634df7f2c7a80d7762cc6f36b384ca60a6765b17422fbd4abbd5af65f5377ede58d046a0a5b7a5f293c9b
-EBUILD flycheck-32_p20220328-r1.ebuild 822 BLAKE2B 50ac8033f7099049a4dab381dd478607bfdcb1f727a179bd3bf65d47dff5b88f3af66081f0df79b030a821c158b7a5c04cdcf825469940ec8b3a30ee54d68503 SHA512 cc06e0a78343bac1634613e39c00e52632bf23700bcea6a331357a8b78eb0303b02bdad0210cf52fb1cafe119816adfb208d991ca135254237179afce2cdcf9a
+EBUILD flycheck-32_p20220328-r1.ebuild 821 BLAKE2B 8e625441a2efc669c34c02026f89788d1ee748bd1341caa64db9efecd1cb97eecf6932fa54082df67ecfc2ab45d00893180a5a73e8fb45651d0b9941e13bae8f SHA512 f41e657c3f97405d86c4548d0a274a8a05d91cbd1733832e880eb513df87bb13a050ab5ea3c4575896ade6ea3e3cf83836f017df314c57e2811095ad105872c7
 MISC metadata.xml 909 BLAKE2B a1d56af4275d1d9dd4a1352981621332404a6d7f1205f7dbe503fae4f4c53cb7d9ab2639a1fd908350e27940ebcb1e2a808be05570d9fb96fc06261c067028fa SHA512 335378ba433d26c7e4992f8cdfc6dc0cb44f64fb28c86c715d602947c63d4ec147904063e3a64933a7d037f3a1ac9f271d2d7b66e065708b17ab3106a6010b2a
diff --git a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
index 9015b4fd9b4c..7e1acac18e30 100644
--- a/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
+++ b/app-emacs/flycheck/flycheck-32_p20220328-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos"
 RESTRICT="test" # test requires cask and ert-runner which are not packaged yet
 
 RDEPEND=">=app-emacs/dash-2.12.1
diff --git a/app-emacs/mmm-mode/Manifest b/app-emacs/mmm-mode/Manifest
index 2fe865da6f43..0c1b1a5fc0e5 100644
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@@ -5,5 +5,5 @@ DIST mmm-mode-0.5.8.tar.gz 176287 BLAKE2B 8dbcf1c1eda543ae52947c220d9adcfc497b06
 DIST mmm-mode-0.5.9.tar.gz 110564 BLAKE2B cafcd254489b1b494ddb236d4478f3c44845b1e91571c3c72e89568a15953558c8d341ceddbae111a4f9ee07844762883aa8e3b4d9c7838391bde97d3851cac3 SHA512 77a3ead553cec13537f5fbae15e04295b93f30d2e8e59eebb27820cb164204e35264a066bbd3cb0e86eaeb09c8574fd47c8164fae04b4e9e50786bdba119ab65
 EBUILD mmm-mode-0.5.7.ebuild 630 BLAKE2B 0f141a88344af6583ec398deb7ac5e08cfd3546e2137f2f456e56c802c7483a4da07e9585694aa0851370d74fad2350a1496a10e90dd5047289747434b16b068 SHA512 c00f0dca6afbcab6f2a4011fccfe4024128f8ba20b2be79c54c994c56f7524f3575c93230b4e76506a3a3b031d2dee25dd6972fe42bf54db74cb5dfa9420cead
 EBUILD mmm-mode-0.5.8.ebuild 578 BLAKE2B fd78560d596db952bed1915e51709cbfc921b2558b18327d8e7951fc4db0ba16e7300519780ea39bb428ff8ade26f827d4f1952885ff344b9240861f57bed958 SHA512 f231b03f7adb3d38315b97e70dc2ccd2a508dae6686dc3ce148d522d0a65f76fca9ed2888015799c3d3d92f497f993d59920dbb0e8ab381b0f5604d0244f6bb5
-EBUILD mmm-mode-0.5.9.ebuild 617 BLAKE2B f17b202315f18fd5fc779148334079bba16d8a8c3625b7bb44883c6ea973236eccaac47bf10fc1ebe8168fb202eccce05a4ef21089533ea72d0377b01db3decc SHA512 fd337647d7ded97a1eb446fd93ee60f3866881e11450b1ca1663768d90f11925404ee767ce897007fe7989413b6c67cb7bf5b767e327fcc03cf7a0d9db8a7879
+EBUILD mmm-mode-0.5.9.ebuild 614 BLAKE2B 439097a919d6b49a4a763314035385c25c539834220bc26e705ebf0b44ecfc5acc90e6e9c065c8e9d36a14d30552a69ab883ffb264f31120540c5e2a1d1848b6 SHA512 6e1a64a5b827e023a30d9b090a8d6d049fa6b60f9e1e26b21e98b13ef8b9047c33e4315dadcef76a5a7c20bf7d6321214d6609a3ff7551772e7cfa5ddc8c6f8c
 MISC metadata.xml 415 BLAKE2B ade4957533ff05ccf267e0b9ddc30949c8cb9dd06c9cd673fba932acbb932765bcabaa7ea9cadbb9bba64eea23b4d6df6be624d6a387a261bc678a89e86f76f7 SHA512 2ab1401a418ffd9682d350a90933983e9bd168422731f14faaa2ca96d51277048d5c86ac7d482beeb9c6af73746a22cde32280391311c64bbce366ef1df8d7ce
diff --git a/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild b/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild
index 84717fe6cb8e..f6f1ea69417f 100644
--- a/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dgutov/${PN}/archive/${PV}.tar.gz
 
 LICENSE="GPL-2+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-apps/texinfo"
 
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index 29dfa88864ee..c97f504ad6ae 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -8,6 +8,6 @@ DIST racket-mode-1_p20221216.tar.gz 322994 BLAKE2B 6a221162f27621dfece9679ab6dfc
 EBUILD racket-mode-0_p20220505-r1.ebuild 1421 BLAKE2B d8d9c2e37e67ffb52c0b50f8e8c728129c594397d0be95a5a69ef1bb9c3ce4e4aa6e5e002c46cb363cd63480e16d761d6c956aa9b8a41bcabf9c66bf4f5f1616 SHA512 91af53a6b7ac822e9a6813ae239802e7d632f96b6f94c2592746275c0bc78102e66932bba965b3d251e537c810b85379dd089d45cf3ce59c761ca64c75e5c8e8
 EBUILD racket-mode-0_p20220804.ebuild 1421 BLAKE2B d048795742225ebdddaa74785e3741be84eecbc6e3445f2fcd3bcc62ee3d72721b7fb529efd0d986a0522cdbf92d536e810c804d288c2f521541293a558849bd SHA512 81d3f3f45808d9352e5e741b971ebc44564ea6d3d4767d48c0e22724e601f3083a4ea1cbb0e9ef226c68ab62dc993dc2caf35acf3ce80439b0e1d3b0f80c05de
 EBUILD racket-mode-0_p20220830.ebuild 1421 BLAKE2B a56eb41b8d330df6841100a27ebff123c78296989375aa053c83b13cde2330dd44dc3ef2da5207032bbd3a20d82c7bf6f05132d1ce3c12278ead29c63eda6278 SHA512 c86597cabbcb14f4313b82facc84ac89410e595337a5e7fc9b7b59eeac49d9f75988c478132af7f3a51b1f3d0fa4b5a40a27502b497677c57a93d346a086c841
-EBUILD racket-mode-1_p20221122.ebuild 1426 BLAKE2B 1a1abaf924eea292f0bd7639f1a003f5a6404d689f283986d508d58c7ae9d221de1c3ba77b905e90bdaac6a36f31cd40f55ccaca9e06eafe772ba18cc6df5d4a SHA512 cccec3fd9068f2deb030c020e17c73b5a0eb0ea63ba45e676a955282a249196096c01a69f3d812c8ed24e335a7c15e92f151cf4ea323900f2a130d2cb76354ad
+EBUILD racket-mode-1_p20221122.ebuild 1425 BLAKE2B eee051502e3931acdc20f8aaa46eac87bf6b3d92d5b38d17f407d0ca4e29cee41091402413ea0fe4fe2a7181f5b5c5fe3f1bb298308e0a9092cdfa3d015bc921 SHA512 5084b70df824cd03f8ece1a802dcbd0e4621386a185b9a8a462465400a356bde6d7b2a634836fe8b4a3c56cd78904325f8c23b96261ea4b32f834cbc2a3f5203
 EBUILD racket-mode-1_p20221216.ebuild 1426 BLAKE2B 3217590a35f5f612226187e7112f9dd92eb5d5b9200144fa7476274908f71f14d25ccc198669cbbc86e14e34f63790b28da78f588382bd65f1a0d9e8e0c9b8a0 SHA512 df29b4ae6ee402cb768ccc123de9179022ca73f01fd66cdee3cb476e6f38266c708fa3482578b72d95a42e1e0b0a3c430f590d54218a2b8eda68b03feeebfb74
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild b/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
index 12cdb9b2cbd7..b2da6ed1f053 100644
--- a/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
+++ b/app-emacs/racket-mode/racket-mode-1_p20221122.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 4e05521d2961..4b5e45300a4e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 12c487328dea..0dccd4159b4c 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,5 +1,5 @@
 DIST nemu-3.0.0.tar.gz 151223 BLAKE2B a71875eb727eed13bc252cee072e1c5b25bf7ea106f51ddddfb8e8bfacf21e030b1c4045de2353d40121b78756b131de1a376891197f6d553430b4b30f53bf3e SHA512 59dae5364659dda5d7c05ba6378b6e20c5d2c5b619cb919c49036918a887574b75f5d568cbfa8f21ecf790778c9de55266f5c5e3e90cc991f613a6408b10a1df
 DIST nemu-3.1.0.tar.gz 164222 BLAKE2B 32600bcdcf2a4f963612a13d89375df2cb4a49a376aec694ada01a86f6c27d6c4198250834cc924bb20e7b60b11ff8643e3bbd30aa883b437cf7828ab00509f2 SHA512 b764e94133e4ab4f052fca77d3dbc64dbbd6a52349828e8ccfe9892f1a9bb290b6578cd8afec7bac84ac339daf9ae11520fce28e842bfa649178fe471014fad1
 EBUILD nemu-3.0.0.ebuild 2149 BLAKE2B ae883b72053d8dcd936c5e1db791ff17d441ce8870085f5ef6b7d63e248de8286a58e57b0a41c9a09d56be2e67a246fc38f2709dce54d11947f5a19649600dfe SHA512 e9f82e767f8ab091bc565f22fd1ca33f202aeb4c69a0d5abceb43b35992c7d4e353a63484bec1d9d776a9bba0bb246159f570cf645d0d3cbc09024bb0bb5f299
-EBUILD nemu-3.1.0.ebuild 1980 BLAKE2B 117f991d1927b4ad1eb6aa8f38e70ef19b0b174bcde9368c7bf41758df96cb5d1846ddde8dc1cec3ff61ac9239360ddcf6c34b6ffc9f3561408690b1e3ea1a7c SHA512 39a27a4f51a4377eb57f7c827f37769bf42140367c493e5a27e63767170b66e5a385da7b7d47f96e9c1c6c44faf901942218482edbc143b51332a50408760692
+EBUILD nemu-3.1.0.ebuild 1979 BLAKE2B 66843a5bde718a59b2d9b1c075c68fa96d1b4db50708b0f6fcc85827fc3ee26295bd29a121aad1cdfe0e25fc38fa1092b131c6e5bea887f369f54a157c8ce16d SHA512 63e337049da372d3028016a000393ba299ff231d657d53d7ea9c118584e5ef89a7f13ee6ed373858d27b58d479e215179438784c992fb6ca4f3ddae7dae18c75
 MISC metadata.xml 843 BLAKE2B 19a4b0e74eef4c9051bd56702d796f9787c06cc893cf5efcda947dca101e120bb77a30645dd2e53bb9fdff21d405fe1f8bc84ae96a9a4ceee1b44e23f172c5e1 SHA512 421cf43861f3b26409e2d9eb5e05f1cf4848070f49eaebd54f65974d909443f560b651e41031fcca819c460518c68253f49a1d7619bba7fecf2ca0defd5e0dfe
diff --git a/app-emulation/nemu/nemu-3.1.0.ebuild b/app-emulation/nemu/nemu-3.1.0.ebuild
index 76cd6572d0e8..9bd6d23031a3 100644
--- a/app-emulation/nemu/nemu-3.1.0.ebuild
+++ b/app-emulation/nemu/nemu-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus network-map +ovf remote-api"
 
 RDEPEND="
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dcf10e70c8da..c2e760553b7d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 0dd75d5999c7..c1a892770f45 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -2,5 +2,4 @@ AUX bijiben-40.1-meson-0.61.patch 978 BLAKE2B 35dfc7084a7b1795dd6c3b36434e94031b
 AUX bijiben-40.1-webkit-gtk-libsoup.patch 316 BLAKE2B 4299b59e9d50ee2fb858e27e5fa031d862d8630cbe73e6ff76ad2d033beec8a9f00162270d8deac855f163916fa388a1e59488cb9bccc4eefaabeaa69996a977 SHA512 f252bbf729ddf1e4fffdb939312b7756c87465ac21e73b79906557ea49bac4896d0834742eb7920206812cd6e247b6f50c8a4745aa6e4288e9e394209f9ce2c0
 DIST bijiben-40.1.tar.xz 687344 BLAKE2B 187e6d0af40649ef35453af4ce51f286196bfd0570370136611cd2191e6c0c6b578e95eb4b6edf448bac6ae7b93b729afef161d3cd4d2cbd9c40f873ed5004c3 SHA512 5d2e0694f9eddca9a152eac5c208b51a15d2a5651ab77c79c1bb94425c0f1541c916887c3aab5fb8b105ca50d0f14c432ac18cd8ac64d03e2a0ee46c91901f10
 EBUILD bijiben-40.1-r2.ebuild 1246 BLAKE2B 19e5b5b8a7e3c4dec8ebdfea0c4d622f259a4f1eb03462acb25e1bd0d0115bbe9680a03f45dfd581c19cffe0f2c8aafe8f09fd63a3a48fda5783d10d1d906c31 SHA512 5f55a8dec09c6bead11a9f4a18a20512c5febf70f691a2a79048f0c0c8e0719df327cadf1c2dbf2fce9ed57edb78fbaff199285f19bd682ba2fa84faa34f3e21
-EBUILD bijiben-40.1.ebuild 1182 BLAKE2B f9a379bc9575d2ca4f6d2f9646377810e30436f3e23c1c013ca857e3c10464a8ff82eef174ebcd8bbcf39e874d8df93c6dfb0a0357e85c16ee0c7272758cddeb SHA512 f2d46da1084c3edb9f9c0a1c13e788839a154b76b36fe7661c469ba1b923c031e308c8b3864b4d15060f822e073286a508dc62fe648bcefe3ba41dcadd17612a
 MISC metadata.xml 352 BLAKE2B 6b4663f449c7bc89e79e73ee48468119ca68a60098cc2704e669c343bb2412da39278d17cac49c7fdb3a8713670a9f47667547f93630752c1db8e3c7f03f6ddb SHA512 295962556d2723af978fe2b3f2887dd569ca437ad6248f321051a36c760cfc7ebab7336314198de376a328d2f474aa625a01da8550b065f6d8d5806f10ad141d
diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild
deleted file mode 100644
index 0756c1deabdc..000000000000
--- a/app-misc/bijiben/bijiben-40.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Note editor designed to remain simple to use"
-HOMEPAGE="https://wiki.gnome.org/Apps/Notes"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	app-misc/tracker:3=
-	>=dev-libs/glib-2.53.4:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.19.3:3
-	dev-libs/json-glib
-	>=gnome-extra/evolution-data-server-3.33.2:=
-	>=gui-libs/libhandy-1.0.0:1=
-	dev-libs/libxml2:2
-	net-misc/curl
-	sys-apps/util-linux
-	>=net-libs/webkit-gtk-2.26:4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-40.1-meson-0.61.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dupdate_mimedb=false
-		-Dprivate_store=false # private store gets automatically enabled with tracker3
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index c91407ff0b0c..4712df180d39 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -1,3 +1,3 @@
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
-EBUILD cmatrix-2.0-r4.ebuild 836 BLAKE2B e80b8f30b177e0c42113d24aee36c7de770055cca5ef7cecd6dbf94e2cd5eb752ef33e3f0f259d77ceaddf0ce0f3ebbaa46991a487f826594a6fd199f3060189 SHA512 2e1714a75144d1f7ea9a870a78bb2af2032599d55bd780d5d281579ab7b568a5fc38627705daaf179ee25cedb184563e7cf115ddc7a478d043716a44abb4c726
+EBUILD cmatrix-2.0-r4.ebuild 842 BLAKE2B cad780eda1c511ed045e548c61bbc11b9d03591b86f6a57c993f1161bdef9048d0e67ea26cfdd7b22e63696e8260b76249c0b2560295971fd693fcc94f0e48c7 SHA512 e0d42201a4a273a2f70fbb672192c2a64e9a62c291089b953a673cabf1c57abad20cacd95cbf5d27150be0923aab1d05938f22cdcab36aa6f94fe3054e29390e
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/app-misc/cmatrix/cmatrix-2.0-r4.ebuild b/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
index 6d2ecbb3ffd0..fc52c436c8d1 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r4.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r4.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
@@ -24,7 +24,7 @@ BDEPEND=""
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCURSES_NEED_WIDE=$(usex unicode)
 	)
 	cmake_src_configure
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 078af3b36270..58e1f43ed951 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,4 +1,4 @@
 DIST task-2.6.2.tar.gz 838933 BLAKE2B 47761b1d172f823b35cb5d44edda2ac8d37daf9c54c6e3af267b880bf7f6246c6fbfa436ff63179b415f22c4e6d4253768bb7e9321893ebeaf46089761f309ad SHA512 3c592552c1baada09ef4e06cf2266c9897ffae42a75998b70767f2cfbabd2e1de7d1a900f16f3b8eb164ce19637dabd21e246f84732a20a646f39716895cdf98
 DIST tests-2.6.2.tar.gz 222713 BLAKE2B e65e2da08264a0dcceeb839efdfad4733312d645fa0dad9eb9fd7e1f260ed21db3009f1c2b3c939dc1a1bf8cf4389f228a0ba05844483fcb5e44de82c2d33fb5 SHA512 98946332f898c4cf621e1dfb2b48761ca9496a43935aca45bf5965029d74f87ff37154693348f13aeed0b61836fab7d2a3cec8161ddd2f65ed9402162fe21239
-EBUILD task-2.6.2.ebuild 1450 BLAKE2B 71be676510265b2b326275c15445deb2147fef1e674e1250dd0eaf5f8484151651b23f057480b6492c38274387cac89bacff048d9a81e2d41e49e27b29d039e2 SHA512 f50076068d96231d6d25d19a6c980bf701b35a14400f17e0166b2802c54681df81735a689a386e021337cc6c050fd34d99a9e68d40a1778c5b20f416cbebbe97
+EBUILD task-2.6.2.ebuild 1456 BLAKE2B 9f51c2daa346a5046fe77c4104c153e3b489601a92c94924a959383f0b424bc6be92f5cee1ff935f8892ecb2582422ae79b515b104822c6c58e6e1883f2f93b2 SHA512 1ecefe50985e7d629fa1f374e4098e18ed17aa61817affba4580cf8e1043b83529a2ae4794cb1e0fca0cfcd7553dcb6ebe94e5e9616c6176a0d1bb324b22da92
 MISC metadata.xml 465 BLAKE2B badcadb52baeff2185feb43188a9ea41d29318865ca8102e67a509686c68d9d9ac249e0d7449bf5d193da80cbc31fc084c4b3d3892053e8082d5b5065f99faea SHA512 dc5f7df7b6d8860ed2ff4a1466dad80e8a1daa6db802262904fedd2d3ecd19a93a68dfb4216316d36d0a59caee4ffb813d6e6805fa486c4e8595f4abbc754b50
diff --git a/app-misc/task/task-2.6.2.ebuild b/app-misc/task/task-2.6.2.ebuild
index acaa34e50b1c..71c06cea727a 100644
--- a/app-misc/task/task-2.6.2.ebuild
+++ b/app-misc/task/task-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_SYNC=$(usex sync)
 		-DTASK_DOCDIR=share/doc/${PF}
 		-DTASK_RCDIR=share/${PN}/rc
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index 4777b8c53ff5..b07ee289e364 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,5 +1,5 @@
 DIST timew-1.4.2.tar.gz 1316841 BLAKE2B c451f37aeb32e999fe2cdca2eb5f234c7424b76f489324d5723a3649da37f53f5094989bdf8d5c2d27f5daa0d75c72ec4a01e3c19b8b064f28e4db82587498b9 SHA512 fe4c3def6b2cd78793dd97a38a61497b3910cd87a3315f826c64893b96a998bf30363f0df1892b74b718d03a279d51c1a636739225e101c5c126794e434076f0
 DIST timew-1.4.3.tar.gz 3188726 BLAKE2B ded92b2ba801023e7f6bc59c0fc17ce069c8279ee92f39280c50dabec0a2425b8612f73edf7842abdbb0b21772244eda325512070c091f32d17ff69cfcd844fa SHA512 89c98ad19d3a5ab5d4e02819d79e553cca4e93da99ec02bbf845b96b421cd084f6786de160e90c97854b50da49448472e9a4c7d23e75c8a93ecd67dda768b24a
-EBUILD timew-1.4.2.ebuild 888 BLAKE2B 41a2e83233277e5722567378b7337c33302b6319ade5605c9d3e32ed99896d523d1833f4ddc164e5345d4f83b5bee9af346f63b5d40dd59849e5c12ef7279263 SHA512 cb84813049c46eb18090f022e77c9eab56ecc4e72011bea60d12ed95f0e8f8b5e048fefd343c48bfa8eacdca447c3e83285f79b80ca9b4350af3e08abf5e1565
-EBUILD timew-1.4.3-r1.ebuild 996 BLAKE2B 5aeb90a9d4ae6b77af7c240df8f0097be60251daa3f6a09de100a82a356ca9ecc106793253ba5462c546ef8086874e8a40cf06719ec3d04e61597b6ec52d8c9c SHA512 66a71c369bf3566ae651c3260e919907a3d1a2a0d821ce8d82912c871a2140729da40644bb25d8405a0fb5d5c215f77ffdd5641c504a872e186f367eb5d6bc5f
+EBUILD timew-1.4.2.ebuild 894 BLAKE2B e49b99f272b8cdbf269a889d9aa1184fa8af8f67e849edc8f43cb41fa8190718b8c952a639234537e9ea5a886fa8e9fa02a64a0389bc0018fd0e5bcc08ec6926 SHA512 be5c84043f5e862fa90ffc0c634eb5672396d2c017f812c9d05b1ef89a370d8adc811d4fae78838a95ac15ddee0f72e0324b69e2a4ea569e4b8c49d1c7db75c1
+EBUILD timew-1.4.3-r1.ebuild 1002 BLAKE2B 7eb1c039c77f64171f4d04ebcd5f4599a7af210d077a8e2e36a5aa9eeba42f7e7e17fc4b6c207b2b3ee2d4dc803e39b2580fb35d7cfe9d287437c53684278c4f SHA512 c6fd2c0d7d6fca331fad0dece84d47bbc7a91efae08211c504d358884e2998398d6915be19410460268d120a194c3a81fa068df96d94d67197b69a63946156ef
 MISC metadata.xml 708 BLAKE2B 3b8781f0aad86446298f0bff09bc9be053865a114227341cbde00586dc678401ceb8ee7a20e6b03dd23c14dda678c882b18174f9d38fc0fa0d2a7260898ae0e6 SHA512 294c6b699e084282feaf9b1409dd12c8cd7aff0757dba80efcb261d68d4e29449a1f708628a6c80ceac819640144fa6a019f869bbe6fef7390d1353f97c8b86f
diff --git a/app-misc/timew/timew-1.4.2.ebuild b/app-misc/timew/timew-1.4.2.ebuild
index 3887d9064d48..ec2bdffe0327 100644
--- a/app-misc/timew/timew-1.4.2.ebuild
+++ b/app-misc/timew/timew-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DTIMEW_DOCDIR=share/doc/${PF}
 	)
 
diff --git a/app-misc/timew/timew-1.4.3-r1.ebuild b/app-misc/timew/timew-1.4.3-r1.ebuild
index f608f1a27396..4561f210ad0d 100644
--- a/app-misc/timew/timew-1.4.3-r1.ebuild
+++ b/app-misc/timew/timew-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DTIMEW_DOCDIR=share/doc/${PF}
 	)
 
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index 9ea620f13b0f..bdde396064cf 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -1,8 +1,4 @@
 AUX 3.4.2-functional-tests-Run-png-region-of-interest-only-if-.patch 935 BLAKE2B fda094d7e2b291a1efbcbc3a7219678d37e556891527e36480a877ac665d6cf094627f5b04a00f77d04978561ab818d3c255e29589fbc6107f587c269fc501f2 SHA512 db95fe5b6ea6a160ab9e31c41bd70198048ea183393fee44062c75d011254d8c6dc8c0a26c472a58e5f82543792e9a0f9c778cf08c768891a0760fab81bec65f
-DIST tracker-miners-3.4.0.tar.xz 7250524 BLAKE2B 9112c078899a7ab1aaab06d1c3ca0244410f21e13b724f1815e5334733bb851cf50c05ed424c80e62b2cfc5d7f16a1a065eeb6cb6a4befdb2d776cb7808e1cbc SHA512 0abafd3692c24683282f52e33a6b4d063a9d938b2f1b6dcb636409102890f6ebd9f33a8e406a482c1d16d26ebcf58874651d04f0c488b9d83e188feb6e5b1f91
-DIST tracker-miners-3.4.1.tar.xz 7244576 BLAKE2B a9f00a0f57b1af1a53b2552d4a1570a4c5576537c48eee9ebe2428e06170ff099e8876ec933bfe9f47adc69e7c61552e886aa2c3149bd3e02f37be8df844083d SHA512 2bd0b8450e1df40b4fa35b17f4209eba4f0d91a603b2d2f7b5bd6da07bcb60755b36d72b3b567ae6bf2d97c3a4294c8f14b1115825886c3f61528a092aa268bb
 DIST tracker-miners-3.4.2.tar.xz 7244308 BLAKE2B d7d24cf985181f1ab8be2e45b5f22ac32752a90cb4d5a5e74f172c1c1b8d75aaf99882ba1067bdac82670d9d98d2e4498965198770c1e1c626f3d81be329a89e SHA512 a63ebd12af1febe371f1e10e001f378ba57ccc7babe2b504157771ced6464d0c33e386512faa47383d89aa597fb5748dad82d17e9cb68def957b57ed29c47817
-EBUILD tracker-miners-3.4.0-r1.ebuild 4674 BLAKE2B 3fd61638ebecfd437528e4ba8dc17c856f97b17d1618d1c9e2683fcb9590252c3af75b7d5dd499cf4013a20d1446281a31eb290d0d6192837949c6fd444c8901 SHA512 7db59c7e8829ff6b438bd9304a6798c724cf781382dba27b5b8d707a07f9e623f01f701ed6feb56715e4365bf4d01c422d5c58e069df412be065275249759800
-EBUILD tracker-miners-3.4.1-r1.ebuild 4686 BLAKE2B 6a9d9fa5098442c3f4939760801035251279335784f43513b61db9d25e3353379d8261f854ed8345ab036f7f7e7e9e31a7d62d87d1af8d2672dcf4334fd55dda SHA512 83d353154484f205ec2896deaec41690a924dced9a063b3b52dac4ab6d2f2e0b63878538528eadb45b1f57de060d33b856694a70c1433faf6d8afc3ce0de02bd
 EBUILD tracker-miners-3.4.2-r1.ebuild 4776 BLAKE2B ddf1551ab857a2a7e958b516f96e183e549bc003cc3c0d507001483677e887cfaea939df6bef777b5673cb74c2deda26ca58c582bd9a76f1a69efe4f499f5f98 SHA512 f2df82f6766484fb7ba04ce4c4025f118e8e4092622c47a5516b5f6ce5f774eaa1d927f4941c5c47e88c8a50286a984849c07d0d447e60c98403ae87aef5ba04
 MISC metadata.xml 835 BLAKE2B a7f0c667be6eaaebcd62fd782c72831f8f95f778d2ff1ee36c278fc3a902761ca10d73fd7e6b15afa83d36a960d5f20dc765b62dc6f85022db01d9d0d356bcbd SHA512 9d348dbec07ab8e344dab0d6f3acdc48e91d80171e411353b233f8b49989f4152817c8ed522c234d5dd9a3849cdab3d46f41256702a5d50bbf1e591f112cddd5
diff --git a/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild
deleted file mode 100644
index e054d54679ed..000000000000
--- a/app-misc/tracker-miners/tracker-miners-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.70:2
-	>=app-misc/tracker-3.4.0:3=
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0
-		>=media-plugins/gst-plugins-meta-1.20:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	iso? ( >=sys-libs/libosinfo-0.2.10 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:= )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	networkmanager? ( net-misc/networkmanager )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| (
-				media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0
-			)
-		)
-	)
-"
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Dman=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		$(meson_use test tests_tap_protocol)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature cue)
-		$(meson_feature exif)
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker-miners/tracker-miners-3.4.1-r1.ebuild b/app-misc/tracker-miners/tracker-miners-3.4.1-r1.ebuild
deleted file mode 100644
index 3d001707d3b8..000000000000
--- a/app-misc/tracker-miners/tracker-miners-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-
-DESCRIPTION="Collection of data extractors for Tracker/Nepomuk"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3"
-IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps"
-
-REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
-RDEPEND="
-	>=dev-libs/glib-2.70:2
-	>=app-misc/tracker-3.4.0:3
-	gstreamer? (
-		>=media-libs/gstreamer-1.20:1.0
-		>=media-libs/gst-plugins-base-1.20:1.0
-		>=media-plugins/gst-plugins-meta-1.20:1.0 )
-	!gstreamer? (
-		ffmpeg? ( media-video/ffmpeg:0= ) )
-
-	>=sys-apps/dbus-1.3.1
-	xmp? ( >=media-libs/exempi-2.1.0:= )
-	raw? ( media-libs/gexiv2 )
-	>=dev-libs/icu-4.8.1.2:=
-	cue? ( media-libs/libcue:= )
-	exif? ( >=media-libs/libexif-0.6 )
-	gsf? ( >=gnome-extra/libgsf-1.14.24:= )
-	xps? ( app-text/libgxps )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	iso? ( >=sys-libs/libosinfo-1.10.0-r1 )
-	>=media-libs/libpng-1.2:0=
-	seccomp? ( >=sys-libs/libseccomp-2.0 )
-	tiff? ( media-libs/tiff:= )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	pdf? ( >=app-text/poppler-0.16.0:=[cairo] )
-	playlist? ( >=dev-libs/totem-pl-parser-3:= )
-	upower? ( >=sys-power/upower-0.9.0 )
-	sys-libs/zlib:0
-	gif? ( media-libs/giflib:= )
-
-	networkmanager? ( net-misc/networkmanager )
-
-	rss? ( >=net-libs/libgrss-0.7:0 )
-	app-arch/gzip
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	dev-libs/libxslt
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-		gstreamer? (
-			media-libs/gstreamer:1.0[introspection]
-			|| (
-				media-plugins/gst-plugins-libav:1.0
-				media-plugins/gst-plugins-openh264:1.0
-			)
-		)
-	)
-"
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Avoid gst-inspect calls that may trigger sandbox; instead assume the detection will succeed and add the needed test deps for that
-	if use gstreamer; then
-		sed -i -e 's:detect-h264-codec.sh:/bin/true:' tests/functional-tests/meson.build || die
-	else
-		sed -i -e 's:detect-h264-codec.sh:/bin/false:' tests/functional-tests/meson.build || die
-	fi
-	gnome2_environment_reset # sets gstreamer safety variables
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local media_extractor="none"
-	if use gstreamer ; then
-		media_extractor="gstreamer"
-	elif use ffmpeg ; then
-		media_extractor="libav"
-	fi
-
-	local emesonargs=(
-		-Dtracker_core=system
-
-		-Dman=true
-		-Dextract=true
-		$(meson_use test functional_tests)
-		$(meson_use test tests_tap_protocol)
-		-Dminer_fs=true
-		$(meson_use rss miner_rss)
-		-Dwriteback=true
-		-Dabiword=true
-		-Dicon=true
-		-Dmp3=true
-		-Dps=true
-		-Dtext=true
-		-Dunzip_ps_gz_files=true # spawns gunzip
-
-		$(meson_feature networkmanager network_manager)
-		$(meson_feature cue)
-		$(meson_feature exif)
-		$(meson_feature gif)
-		$(meson_feature gsf)
-		$(meson_feature iptc)
-		$(meson_feature iso)
-		$(meson_feature jpeg)
-		$(meson_feature pdf)
-		$(meson_feature playlist)
-		-Dpng=enabled
-		$(meson_feature raw)
-		$(meson_feature tiff)
-		$(meson_feature xml)
-		$(meson_feature xmp)
-		$(meson_feature xps)
-
-		-Dbattery_detection=$(usex upower upower none)
-		-Dcharset_detection=icu # enca is a possibility, but right now we have tracker core always dep on icu and icu is preferred over enca
-		-Dgeneric_media_extractor=${media_extractor}
-		# gupnp gstreamer_backend is in bad state, upstream suggests to use discoverer, which is the default
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="dconf" # Tests require dconf and explicitly check for it (env_reset set it to "memory")
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 3047dcf54504..878255621026 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,7 +1,3 @@
-DIST tracker-3.4.0.tar.xz 1876476 BLAKE2B 9745a496df30ebcd2f7e4a525bcd047d48ec4f68e12ef9775958e01939b538832e4d2622498a8ffd358d1a404c67365c70437e083497e8c12e1cbbb0c07713f7 SHA512 0a765d93cbe737a9cf902d1dc1ca00463065c1e7b3f93a7a8132919dfed97acdf80d99cf8f49b61e1a2bfc77a115f74e88731b3b0739651d2f727215c83f077f
-DIST tracker-3.4.1.tar.xz 1865584 BLAKE2B 78a1c461e628095ca134241d7f8580806f8de018608c991644422503a3af6bab2c317859624cb811dd2907f2965af3ab2cfb1a58fa35017ed6a71b24e68f3c97 SHA512 102d61abd98feb6e39575c3df25cd4604e89106ed928b8edb1a3adc1bccd41f4ab92fc8bfd33d96b48c3b2cf5a3d901130ac6bf6f657faebe7339fffb95eed26
 DIST tracker-3.4.2.tar.xz 1865236 BLAKE2B 31cdb33de38d9251fc60a71b31c539e3f045748fb5dc160656dd5187dce109da858bad5390864cda8b63466a5113e0a193e0799b662ec250a31cfdff79467e6e SHA512 2214bce7cdbaf1039b11986cf101f615337bbc450331ee703edcfd7ad62dee6e1db831c2c89bf341663cadcdaae6ee9e5a15f49a8087acaafd58b389292ef480
-EBUILD tracker-3.4.0.ebuild 2712 BLAKE2B a670dc4329a3b3c405de6de8364f5320517bd4d71f40e3fe431686da348960bcfe21d1b5e1c94374b46086c103ddad7b20f6b5b1c1c44fafcf244adc345143bb SHA512 ad46724e1bc79f9020fda1dc6a2522b1776e52589750ee1a73fb8ed257901256279995628dd42be07e6ca7e8400df480e59a4adcd8ed71d298ef2399369a92d5
-EBUILD tracker-3.4.1.ebuild 2722 BLAKE2B cb64e1bd58604bee50452fd42b3de2dc40d683e45f040d4c5eb5d5a7f12e7bfe504e3d512a0f7ae4bc1c4ed7c11c993b8f04f6ff67308815186d130b55e9d3d4 SHA512 b0bd6f0dbd19957d71090df2feafc894f8856ea19d611d06d3401be96df498d628582467cfa37ca45c0502d403ab6b6f84eaea6947104dbc900a5ef7de75a779
 EBUILD tracker-3.4.2.ebuild 2719 BLAKE2B a4caa1315e9d14230ad42831c539895ce780b57d916264cba54f7b590fde1419e3425e5e99571cb61ea174398dd2431c2a572fba5c9f2e53337645cc24051133 SHA512 05a8625f3d902548f8905c6debf810ad21f65a0f14417c80fe3d09ac0c429a26b12872904bb03ddd2d7a8df758565fe18b05d60af51abc9cff942f1bebc62abc
 MISC metadata.xml 586 BLAKE2B 8244e6f8d9491a0c224ed84f17ee6ad64b22e0c373243a319e7911739a7db6223ce47693ed5b31053b4465f35d20108db1469d74afcebb36b4516a53cbd7f98a SHA512 0a60b0e4b077bb03d02b7990511041695c5dff7a8a0972fa80abe9968b643ad5c2ba65182c079e8d5f3d1ef72a2c4dcc659d6ec283bf80813135c94cab2dddef
diff --git a/app-misc/tracker/tracker-3.4.0.ebuild b/app-misc/tracker/tracker-3.4.0.ebuild
deleted file mode 100644
index ddcbb79ded23..000000000000
--- a/app-misc/tracker/tracker-3.4.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +miners stemmer test"
-RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.4
-	>=net-libs/libsoup-2.40.1:2.4
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.29.0:3
-	stemmer? ( dev-libs/snowball-stemmer:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/asciidoc
-	dev-libs/libxslt
-	$(vala_depend)
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dman=true
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-		$(meson_use test tests)
-		-Dintrospection=enabled
-		-Dsoup=soup2
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-misc/tracker/tracker-3.4.1.ebuild b/app-misc/tracker/tracker-3.4.1.ebuild
deleted file mode 100644
index 3ec170a80cdb..000000000000
--- a/app-misc/tracker/tracker-3.4.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="gtk-doc +miners stemmer test"
-RESTRICT="!test? ( test )"
-
-PV_SERIES=$(ver_cut 1-2)
-
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=sys-apps/dbus-1.3.2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/icu-4.8.1.2:=
-	>=dev-libs/json-glib-1.4
-	>=net-libs/libsoup-2.99.2:3.0
-	>=dev-libs/libxml2-2.7
-	>=dev-db/sqlite-3.29.0:3
-	stemmer? ( dev-libs/snowball-stemmer:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/asciidoc
-	dev-libs/libxslt
-	$(vala_depend)
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.8
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/tappy[${PYTHON_USEDEP}]')
-	)
-	${PYTHON_DEPS}
-"
-PDEPEND="miners? ( >=app-misc/tracker-miners-${PV_SERIES} )"
-
-function inotify_enabled() {
-	if linux_config_exists; then
-		if ! linux_chkconfig_present INOTIFY_USER; then
-			ewarn "You should enable the INOTIFY support in your kernel."
-			ewarn "Check the 'Inotify support for userland' under the 'File systems'"
-			ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
-			die 'missing CONFIG_INOTIFY'
-		fi
-	else
-		einfo "Could not check for INOTIFY support in your kernel."
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b \
-		"dev-python/pygobject[${PYTHON_USEDEP}]" \
-		"dev-python/tappy[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	inotify_enabled
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	append-cflags -DTRACKER_DEBUG -DG_DISABLE_CAST_CHECKS
-
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dman=true
-		$(meson_feature stemmer)
-		-Dunicode_support=icu
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-Dsystemd_user_services_dir="$(systemd_get_userunitdir)"
-		$(meson_use test tests)
-		-Dintrospection=enabled
-		-Dsoup=soup3
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 695b1518d111..b6b2f0c88ce5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 2e935e9cf841..9aa1a3eb23d6 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,5 +1,5 @@
 DIST editorconfig-core-c-0.12.4.tar.gz 72141 BLAKE2B bfbd7ab2eb3ac1c73d387447e16c0888b4dce1318f14f1a511cbf1e5c34aecb31921955fb51a6c07a8a991fb388995971ceed22b4e53c53b1c56fddbbcccfdfc SHA512 e275d4f77fddd31717a588be15a67a630e693efbddc5e1cf7e9b116b1c1a700fa9bafc1322733aa73a009c78519e00083b151bbc4a5ad55128df2c7360f9a163
 DIST editorconfig-core-c-0.12.5.tar.gz 72272 BLAKE2B 044723047f8bc6ed0a4b3c5defbc43a0192edd0997dbaf9e9be6027d47f0d09c2bf4ba8141dda67ba541657a6c462afb86bb575a0eee586cf9a45581a5ff2017 SHA512 7d54c8c1ade8ecef5dc8f35e006f0e226455b7ed9541442a846bbebc26765e92abbbb29b991748164015bcfaff8764a0ac007e4384e163678a2922f7ca6b2e03
-EBUILD editorconfig-core-c-0.12.4.ebuild 1021 BLAKE2B c1701b2ee36f0e0c13450a0fb789bbf97776dd640ffb644c7e55daec1a91a791990905ad3570f4a2d4ba74b16fe65151a1fc6189b7ab70ea9fb59dbc701a6bbc SHA512 4d23b824021818a55c6544c7ce83a18463e91effd60aaec94b306da27ae6baf915d39e951e63ff89b1cb8ce695684fadea56b7658bc7e5b2760110b04ee135ba
-EBUILD editorconfig-core-c-0.12.5.ebuild 1024 BLAKE2B caed039c6593c40f85fdd874abb80e7956b7e81a2e035c6767260317b1feea95fb4450de9881803e9234bbe937e3518df092cba14a9bbcb1c5002f437133091a SHA512 559e8026ceefb5288ea136343709104b998aac5d1c42036fbabf90db3fcec8e77f3a44f607bda90bd1a6ca044f63b37771592eeb24a3298a4ccb73ff1082b3eb
+EBUILD editorconfig-core-c-0.12.4.ebuild 1018 BLAKE2B 4010d6ebf80a6c4065a2f8533976d6e89fcfcfbf9b7aba97b56ac045de878cb89ff5be64c728760dbe7dcf1a20bc0134b0042a4d2513fda5ecd9eac9477cc31a SHA512 e306e7345354fc0cf8dd33a818cd4387debe4c68518a3c363c3c0918b6a1731c89adf5a937daa3228c3f8ae711af81a4e08e06840d137e88ebc8981aeca30997
+EBUILD editorconfig-core-c-0.12.5.ebuild 1021 BLAKE2B 352102bb02208e9da6b9023475353641b901a12416a34c0434d81134c7a06895643d45bfcb2d15df70f370e3177d424db355553321bd0a22fc08ff14f9bb1377 SHA512 dc1f5ab07bcb604f6ccb3bba2b6152c763cc7eb3e4f528bc99142d4039ca84690cafca02ec3f03fcd12c93798245eb2630af4a4cacb004f823a014785592d2ab
 MISC metadata.xml 389 BLAKE2B 936516a5d13add9bcb0c94e20f3ea1eeb14119f2cae956c472848769907df123431f6dfa846bf82955a340a9c7f21bfe738203fe4a2bb6ea24ac22bf38d6e0e8 SHA512 5380c32b0d900044ce0d0562d6a71a0db840d01ebc48bdb34a5da2f61a8deff1a475fc03958796edb819d06f7e358a15c9fa4dcd20a91b64ca3c0e790746ad11
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
index a3246a626c2d..527bb600f9ae 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF')
 		-DBUILD_STATICALLY_LINKED_EXE=OFF
 	)
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
index af6a057b5e57..3b07de5cbc46 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF')
 		-DBUILD_STATICALLY_LINKED_EXE=OFF
 	)
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 1233ee4efe4d..ef187241dae8 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,5 +1,3 @@
-DIST evince-43.0.tar.xz 2908508 BLAKE2B 5f1a9a697693a64c2b54ae5d5499ae8993b02f2df0b1706d0335770037285bb13e2af5254d7ff65ae4abb5a0c8ed6e338c61306f47e121de8c6546407c8968d5 SHA512 dd50ba45c4eb56f8af1df38f7a12c3c13747a1053bb97c8600d85cbc398e340d7bc5db73f441b68cfb8294ab985be361e48605cdc5e3dccb051d917869a12ba9
 DIST evince-43.1.tar.xz 2909512 BLAKE2B 1695320814aca28df17e5bbe6f4000b0191b9b600895c529d4ccd5628335fc4dd4fa788ddfe54c06fe37da12705add93f7df99a8c0dfb1060b8fd497aabae596 SHA512 c12d7b6e961a74c8e31b604f232483576289ba9e5a37faa766f4e5aaa95bdcbf37cf98c1d28de45ad1728452b0a2408fe4fe245dc76289a21e7664c96237d09f
-EBUILD evince-43.0-r1.ebuild 3008 BLAKE2B bd02e94a2af046357df1662cbeb8cf156a8d724b19b39d65a04d84acc01b5cd6e39851ff8f639f4601dc4289d7f9f46a0957ac2752519018e6f3f6f7198b6877 SHA512 3b1ea33f550b19b6b92c465f3f6a85963f8d7b056cb5094f385183a09776e6f6980d5baee438c0ac90a139b7ea2fbc4dd33947d48e40862feb6a2df264bec15b
 EBUILD evince-43.1-r1.ebuild 3060 BLAKE2B d25fb961ca8a574a7361553b8fb77085ee7ebf074c9190ca749f52c71ba10f098f61d76c57538dd325f7a0365c9f75e2be7b7cf117820211a8240c83df5c7b32 SHA512 51bdae6754f0417817ec39166176b0d79811851e7d163f943441cbdcf6ab18250b8c2a3ca26be58a7db02d8caddbdbc7bafde6c3263ed4f7af9856cc1e040f22
 MISC metadata.xml 874 BLAKE2B be19d36175d5ca322e89689e69b18ae720b40450ce63fa3e5056c3b0af6f81be3481050b6a005db2d79f3c86b3de1eb7fabdde3d3ce9d84fffb13b13c5c04eac SHA512 d3128343855fd9c76ee8b68b19ec61a8ec479ee48c539bce17a09770f0f5661b8b1eb9d27ab0d52aaa450131b81f237fa54e8854ca0cbb3a2f487073b7107433
diff --git a/app-text/evince/evince-43.0-r1.ebuild b/app-text/evince/evince-43.0-r1.ebuild
deleted file mode 100644
index 8a00497139b7..000000000000
--- a/app-text/evince/evince-43.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.44.0:2
-	>=gui-libs/libhandy-1.5.0:1=
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.40:2
-	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-22.02.0[cairo]
-	>=app-arch/libarchive-3.6.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		>=app-text/libspectre-0.2:=
-		dev-libs/kpathsea:=
-	)
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-4.0:= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10
-	)
-"
-BDEPEND="
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.1
-		app-text/docbook-xml-dtd:4.3
-	)
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddevelopment=false
-		-Dplatform=gnome
-
-		-Dviewer=true
-		-Dpreviewer=true
-		-Dthumbnailer=true
-		$(meson_use nautilus)
-
-		-Dcomics=enabled
-		$(meson_feature djvu)
-		$(meson_feature dvi)
-		-Dpdf=enabled
-		$(meson_feature postscript ps)
-		$(meson_feature tiff)
-		$(meson_feature xps)
-
-		$(meson_use gtk-doc gtk_doc)
-		-Duser_doc=true
-		$(meson_use introspection)
-		-Ddbus=true
-		$(meson_feature gnome-keyring keyring)
-		$(meson_feature cups gtk_unix_print)
-		$(meson_feature gnome thumbnail_cache)
-		$(meson_feature gstreamer multimedia)
-		$(meson_feature spell gspell)
-
-		-Dinternal_synctex=true
-
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 75acd63dd658..ddecd2dbd1b7 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,7 +1,4 @@
-AUX gtranslator-40.0-meson-0.61.patch 865 BLAKE2B 79db4e5cc4f08822ce3a0f2237cc8216e763cd2de4f2383815062c6e1f4dea33298b04d56e18f5930962098f68fde1447bd96515f993a3ebe018809d92cca235 SHA512 6774f3a43e892e871b47ac6f44d6c4e32b03c72acf36419b757b1e3f029445b9c6d9aadffca8ad8c8cdb6a8a1d2f9396e73c6043379b58b4d0f74d3a6b0ea0cc
 AUX gtranslator-42.0-Revert-Add-GDA-6-compatibility.patch 802 BLAKE2B 9df62e77c9ef15ca038c6b4665a7738da7413020bcbcbb523d94fff1269c6cedc7007cb6818334850c569f5d08a2b65ca0ae8643842d9d904e9f06bdee2c2bd4 SHA512 2b582f943bed6f19fbe7124e814e366e58e63585d96eb79303410a0a92afa15e0866d103b290ef8920acf21592394f8eeb0a4b8231f6321438dbf110e19871d7
-DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
 DIST gtranslator-42.0.tar.xz 1526376 BLAKE2B 3d6834c201601415a1fb761bcef471a6c63aae311d22cb1ef5d615e20d124d05b165abb92590da2502b79456c9130e14dd7733746f5006a3c219aaf7f0505ba7 SHA512 785f2757360425b735948faca9eb8ef5f4433394f4fd99ff6e1f78f41d382c7769318ad8d329906910bcdd5a64b4ee0aa2df2e218a3c4b7576938e3d870077b6
-EBUILD gtranslator-40.0.ebuild 1132 BLAKE2B d18a39afdffb04a671590c994422457ea050c78e7024dd59338b7c8638ef6b4da6297eb6ebcebd542d93ed039177fd2e4ce4b8e0da495922246b735b5181a3e4 SHA512 a463faa8b570d2de8d13662c2ce5ed0b55f15bac63074fb44c2e6f54adbd1a0155c467353897a048186ce6705644130faee6b50ed1a4c3e75534114e2ada488e
 EBUILD gtranslator-42.0.ebuild 1149 BLAKE2B 8ed3f419fdb486022fd3fbcc488a7d1ab3b9e73dcff9a1c5312aef7d810d324971352f9045df601680a285d42389a2ccc350de73c4d84fd2cb6b7d9fce3ccfbf SHA512 6829ea8aab9665e5698144e20eb4ad5f4bb95db4d4f8c9fc1112990a41eb8819384e4436d6cbebe2b5c2ba0c68fb2fd2e896e4c74417b1bc83b60b17445e2a88
 MISC metadata.xml 846 BLAKE2B c244024e319608bf5c645ee2b6925965afedec192795bddfa491c2f04c85e08f001c4631f84f8dd952d9cc14dd2bc43bb3cbdd4b007edc6cb974e8798c50b35c SHA512 60cf7c8221d9104495bec227dc50a7126a1acfd221dee45c8e6dba723467d41e7401acfc3a9c066a36bb859622f2bbc2a05ac1feffd13b5ede45869b73ee35a1
diff --git a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch b/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
deleted file mode 100644
index a43a32eb4a6b..000000000000
--- a/app-text/gtranslator/files/gtranslator-40.0-meson-0.61.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
-https://bugs.gentoo.org/831966
-
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 11:57:43 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:15:0: ERROR: Function does not take positional arguments.
-data/meson.build:37:0: ERROR: Function does not take positional arguments.
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -13,7 +13,6 @@ desktop_in = configure_file(
- )
- 
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: desktop_in,
-   output: '@0@.desktop'.format(gtr_app_id),
-@@ -35,7 +34,6 @@ appdata_in = configure_file(
- )
- 
- i18n.merge_file(
--  appdata,
-   input: appdata_in,
-   output: appdata,
-   po_dir: po_dir,
-GitLab
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
deleted file mode 100644
index bb0973914e18..000000000000
--- a/app-text/gtranslator/gtranslator-40.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="gtk-doc"
-
-DEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.22.20:3
-	gui-libs/libhandy:1=
-	>=dev-libs/libdazzle-3.33.90
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/gspell-1.2.0:=
-	>=x11-libs/gtksourceview-4.0.2:4
-	>=dev-libs/libxml2-2.4.12:2
-	net-libs/libsoup:2.4
-	>=dev-libs/json-glib-1.2.0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.28
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-0.61.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index f6fbc03d0c2b..52ce63a58f48 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,3 @@
-DIST iso-codes-v4.11.0.tar.gz 14756251 BLAKE2B dd3bc5bae4def6338527a9c7c41f0ef9603eb2a2a7e4e2a95399bc4891a0d66fa323bb1f960263662cd6b4a42902defede64ad732f4a894d3073a7a68b5b9f80 SHA512 524be572c2505b0b2d55a7a0dd8d6bdff68edbc89c569652b11070cc6412881c98ea66a001193f1540153d44d6b41d921444a1d1a2bde6929bbe445eb369ea3e
 DIST iso-codes-v4.12.0.tar.gz 14977180 BLAKE2B 23590e9a4f246a0879e68c521ae7f72f4dd8d41ef85e7b6efaa4e4a29b7bf2e45d5e200ae14523e4ef8d3d4c8f45e783d4231a2a1c679be1898aa04528da30d3 SHA512 d0cdac626728e4de7c5bb2f8edd968a29380d49ba2b43ebe3820756591e46d4301859da7961ec9fc9e6832e18a9a0d5562ec02dd3d8a52bec7f7cbfc3190869e
-EBUILD iso-codes-4.11.0.ebuild 2644 BLAKE2B c8b95785c6ae2a195514e3fe98dd1118da05d82b1a9293b53117cbc13206dca1e1809286dae55acfd7d901779c4b0ba9f1720f599eddff56e04fc8a03d7195be SHA512 047f704e4a96c72e9f8b96a65af3119806f4dba691f5b55902381d250b07b32a6d54c252b41f42677b9135fc36040563424ef288703bb32f573fc16a31d7647d
 EBUILD iso-codes-4.12.0.ebuild 2650 BLAKE2B 51b7cdfc7f0c4b586be1883a3a2629ded51b919e0a559959f041d42a6b0a3d37f99eb64baf257039ef765a8ff14309bdb324231b16f545edda955fccb7a4beac SHA512 17f293fbe45c44750193146836a433efc0d88a97145cbf6b1a081f1f5a40028ba35235668096bd38e513855e43cc5759474e0dbfa0d38bfaa1338c7c02984e85
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.11.0.ebuild b/app-text/iso-codes/iso-codes-4.11.0.ebuild
deleted file mode 100644
index 9b99e0d3bc5b..000000000000
--- a/app-text/iso-codes/iso-codes-4.11.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
-
-inherit python-any-r1
-
-DESCRIPTION="ISO language, territory, currency, script codes and their translations"
-HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
-SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-"
-S="${WORKDIR}/${PN}-v${PV}"
-
-# This ebuild does not install any binaries.
-RESTRICT="binchecks strip"
-
-DOCS=( CHANGELOG.md README.md )
-
-# plocale_find_changes doesn't support multiple directories,
-# so need to do the update scan ourselves.
-check_existing_locales() {
-	local std loc all_locales=()
-
-	ebegin "Looking for new locales"
-	for std in "${all_stds[@]}"; do
-		pushd "${std}" >/dev/null || die
-		for loc in *.po; do
-			all_locales+=( "${loc%.po}" )
-		done
-		popd >/dev/null
-	done
-
-	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
-	if [[ ${PLOCALES} != "${all_locales}" ]]; then
-		eend 1
-		eerror "There are changes in locales! This ebuild should be updated to:"
-		eerror "PLOCALES=\"${all_locales}\""
-		die "Update PLOCALES in the ebuild"
-	else
-		eend 0
-	fi
-}
-
-src_prepare() {
-	default
-
-	local std loc mylinguas
-	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
-
-	check_existing_locales
-
-	# Modify the Makefiles so they only install requested locales.
-	for std in "${all_stds[@]}"; do
-		einfo "Preparing ${std} ..."
-		pushd "${std}" >/dev/null || die
-		mylinguas=()
-		for loc in *.po; do
-			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
-				mylinguas+=( "${loc}" )
-			fi
-		done
-
-		sed \
-			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
-			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
-			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
-		popd >/dev/null
-	done
-}
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index cf1e090d4202..7cfb7edbe8bf 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,5 +1,3 @@
-DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
 DIST libgepub-0.7.0.tar.xz 28536 BLAKE2B beeab3d3911353cb0cac78207cc9e18e3341afce94213757c8d246a2d01c42aa0eb37618cc066307ce2ec8f21dbb89982271f25a9552d6872d5e86a4345407c6 SHA512 2ab661a6379899ff818313205d818ef1239654afde9ebcc22fa55b5d961aee20dd9c8295a58ff1d1fb1ea281ddb6ee8644942a860b3ee9f6a4ba9d7447efc517
-EBUILD libgepub-0.6.0.ebuild 704 BLAKE2B c3485eba82259b93e4987a1fa49e288c5c061916371c441b425241216d485b40350da3bdc827dee2900bc96d876701c46965ad4d2dd04250268f3f7cc94aa6cc SHA512 c8646f48ba0be402b1f088badbc99c1d523a3315ccdd7c26c91474ca9f4394af99f70279ccd198e9358ddab2c651b6a5876a193e12e11b1e54b3afd641456cff
 EBUILD libgepub-0.7.0.ebuild 921 BLAKE2B acba85182bd5b84664dccfd678d985598d932f1aa65e9e10dd6f3ced8b97e79f4394743f157eea3540ff2e249f4ba1166f71f4bd3d5d54af2f6b0c4969ced24e SHA512 cc53f0090484e2befe18d0d2925d3ee50dbd63db15d71ba251d7d3db0c8ce4587e9ba705733e5d6a9813d98178ab7c929c5fed5661f3a537850eadd3e095fc37
 MISC metadata.xml 436 BLAKE2B d829d0b00fef946cbc3356048e1499b944197362474a044f916cfe128f99d9ac041924315c1fb845f6e823d37a710e1f420f2fcff41306aad89f65223fa1d63c SHA512 6753be33014461b9eee51648ea9086e00bdd8406468ca5914a0ba42102b130defc2f1a9e28be8f1ffd99056bd8ec6ede0c86f958ec7181131353d5e03ca9c43c
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
deleted file mode 100644
index 210032d1cffe..000000000000
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4[introspection?]
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_use introspection)
-}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 6919497d19ce..99723af08b95 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
 DIST yelp-tools-42.1.tar.xz 38936 BLAKE2B 9c068fb6c41fc6a9f22b1ffd632eeb648685b7bd09cad498910ddfa56696218ebaf643c17a6951756c88978bdae82c0622068c43e4f57ff57a96fa6d6b86a95f SHA512 e05a61d18179a9816ec38d1a2335091a3846cf74bb1ecec5374c9a13cc8962d14416208e04eec92f4ee43ec90e1992cc4a263bc4c267caac5d154a15f10d3006
-EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 278d2168f61a266497df7502b5d243f9ed5ae8d59a581c247a91124e370301aff7b28f826b5c7b78fbefa73d4af1cd100eeda2b7d05eb75f0bdde72d6a2b65ec SHA512 391128b9c1aa1a597ebd30852339f2c0b10feebab5f21dd0b00629dabb44046fb56c93696422fdf3ba02d5ac7b4cdd8e364b9d1f50f18b9a60579d769799936d
 EBUILD yelp-tools-42.1.ebuild 942 BLAKE2B 278d2168f61a266497df7502b5d243f9ed5ae8d59a581c247a91124e370301aff7b28f826b5c7b78fbefa73d4af1cd100eeda2b7d05eb75f0bdde72d6a2b65ec SHA512 391128b9c1aa1a597ebd30852339f2c0b10feebab5f21dd0b00629dabb44046fb56c93696422fdf3ba02d5ac7b4cdd8e364b9d1f50f18b9a60579d769799936d
 MISC metadata.xml 351 BLAKE2B 855082b254e97a1ffe3ea35ce22c13e7ce4f48439a13d4bf247b838e80b58b784fdfb7974428d61c8ecf2289a73fd53414ffbf695ce7f78601cb3aaf83e6a162 SHA512 4ed64fb35de4e069dd55c0b4affd587507bbb47560b1e632d425c660fb3edc79d89a36003039558aba832344584e1467bd734c4079197322be282cb77957d880
diff --git a/app-text/yelp-tools/yelp-tools-42.0.ebuild b/app-text/yelp-tools/yelp-tools-42.0.ebuild
deleted file mode 100644
index e39e783c10fe..000000000000
--- a/app-text/yelp-tools/yelp-tools-42.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome2 meson python-single-r1
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.38
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
-}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index b392c748f21c..d8d923a54466 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/lightline/Manifest b/app-vim/lightline/Manifest
index ae7f3aa12c17..b44b3dae0ae5 100644
--- a/app-vim/lightline/Manifest
+++ b/app-vim/lightline/Manifest
@@ -1,2 +1,4 @@
-EBUILD lightline-9999.ebuild 543 BLAKE2B 15bb8ad6c3ebbd1e89eb6357ba594045f94a0776eac486f415df8b529614856a0785d84d235685ec4c7f0d854e92330272c31802a10b949d666d14a7147421ac SHA512 f3cec9b22a25d7bf57aa8e42c4805530ad2988d9ad328dfcb7f017c1e0e54eb10c9d499f1a6cfd840b13c78a23c3f49d0af0870dc1919f4d49a61a8bf1deb6f6
-MISC metadata.xml 431 BLAKE2B 9dd02fca3ece8ea83e698c5e093e4fb39fdaf5e60d581fd156d245736250f823139eeeb992f30f11c7df9e9d7162c244d55d19ebfebb94de758d9222117f2478 SHA512 cdd6b1e82b71e3573dcebf16985b8533209c0eaab5423ce40e933de6fbcbd8d1c07e91907e7da90a19f39fde34bb4d3ff395afdd6ceda8697cbeaf0a83bf5782
+DIST lightline-0_pre20221005.tar.gz 40896 BLAKE2B 38b959844dc69717b6add908746a435134a402e3ddba36dddfa1d9500ff57b390c773a537e3e8dc244017fe779a7068f6404018bfc1ebd70379086aaf2721b4d SHA512 acccc145ed548a64915da586009759492852181561d4bf4181f0cdabd71c6356700bf007b0cd87a36ad67ea1482d9d6e1b9c23620b5617f9ed7d8b3d19246e52
+EBUILD lightline-0_pre20221005.ebuild 646 BLAKE2B 86739ab5317c9e748201b38a3cbc1e970e8d3708a667ea8e23bda2a51fe5b4a2665ffe93851ffe40aaf34805502c1dd15933b3e0e3652118d52a5dc741f2987a SHA512 989644528c7729ce546447077b31852bc6a338b096bdff300cc4d4581ab8f5d93466f97cced75716038f770e92e3fef84a17b588c69ae462f9348a202f8ee24e
+EBUILD lightline-9999.ebuild 608 BLAKE2B caf76a51771d2211ab1ca22e64a21a2f9a8c3967f054bb29da96b503e7d1c85052294e6c7ebddaaf160c38de11421c05a3446699cc7f39f05b07957ebb03fbfa SHA512 d677005cd2c7bfb82b5bccd2d417d1d1aff4caca3a68913e718eb97010e046ad8a400d05448cf95d42aecdb555dbffcd45793c56e5b99695d17f11c4d1c74600
+MISC metadata.xml 674 BLAKE2B deb1217d9aae7eef0ef6f3ec4e3f5531ebc415656542f767716921f267b5d89bafdc720d7bea92e170950b3ea72dbf2b98080aca7e53ab8c36f1c54a41f227ad SHA512 30aae437f2344780e796eab920b68902d23abdcd7712ff85dc920064bc9f7cf1790ee3bde4a9846314452876652d130fc42386331c803e9234d0e3daacbcc02f
diff --git a/app-vim/lightline/lightline-0_pre20221005.ebuild b/app-vim/lightline/lightline-0_pre20221005.ebuild
new file mode 100644
index 000000000000..3d0740e3d599
--- /dev/null
+++ b/app-vim/lightline/lightline-0_pre20221005.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/itchyny/lightline.vim/"
+else
+	LIGHTLINE_COMMIT=b1e91b41f5028d65fa3d31a425ff21591d5d957f
+	SRC_URI="https://github.com/itchyny/lightline.vim/archive/${LIGHTLINE_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}.vim-${LIGHTLINE_COMMIT}"
+fi
+
+DESCRIPTION="vim plugin: A light and configurable statusline/tabline"
+HOMEPAGE="https://github.com/itchyny/lightline.vim/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/lightline/lightline-9999.ebuild b/app-vim/lightline/lightline-9999.ebuild
index a73386531e33..73b4c0fdc1a2 100644
--- a/app-vim/lightline/lightline-9999.ebuild
+++ b/app-vim/lightline/lightline-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit vim-plugin
 
@@ -9,13 +9,13 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/itchyny/lightline.vim/"
 else
-	SRC_URI="https://github.com/itchyny/${PN}.vim/archive/master.zip -> ${P}.zip"
+	# LIGHTLINE_COMMIT=
+	SRC_URI="https://github.com/itchyny/lightline.vim/archive/${LIGHTLINE_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}.vim-${LIGHTLINE_COMMIT}"
 fi
 
 DESCRIPTION="vim plugin: A light and configurable statusline/tabline"
 HOMEPAGE="https://github.com/itchyny/lightline.vim/"
 LICENSE="MIT"
 VIM_PLUGIN_HELPFILES="${PN}"
-
-src_compile() { :; }
diff --git a/app-vim/lightline/metadata.xml b/app-vim/lightline/metadata.xml
index 0ea6591d4974..f39ddb87ffb6 100644
--- a/app-vim/lightline/metadata.xml
+++ b/app-vim/lightline/metadata.xml
@@ -8,6 +8,14 @@
   <maintainer type="person">
     <email>monsieurp@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>nex+b-g-o@nexadn.de</email>
+    <name>Adrian Schollmeyer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">itchyny/lightline.vim</remote-id>
   </upstream>
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 6cd0a08fb13d..1d9b4df085bf 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 721986b25a37..7ccb0a151e34 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,5 +1,3 @@
-DIST mm-common-1.0.4.tar.xz 290164 BLAKE2B 2731c501ed79d2481b9094639bad1971e5a27e6416a7433982481e939bd44202f7e5769f3a9dbe5b7fd2e09a3f7bd4687d7ce85d79dafa877f5cc3c333f9d526 SHA512 e686f19cb4d40a3dda68e30b98b43fca3db51b387e28f5569bef0cfbb1cc3a7d72503ec5dfa0f2621dd349ac4c9c21f0fe93bdda224026534c509fbb60400243
 DIST mm-common-1.0.5.tar.xz 290608 BLAKE2B fcd698e8122fbcbcefcc6cce9460216cb3c3eabb17b309a28b964c9cd99b1329f936070f54b888cf0712e4590b8fe99394a110997ff023ff07dd7a30e55d771b SHA512 bf681b4d63d5bf531a9315b0c8841e3815af276828d1828a3eb04dcb805cbbfbaac182f79f5e48688a7eef8666975b9079144e320093e4ee3addff48813e61ad
-EBUILD mm-common-1.0.4.ebuild 575 BLAKE2B a99bbda380391a48ae226f383c44eee5de37110d3f3af790c86a8ff4fee18dd959df212c70319b57064d0c7ed64ba5f160a8757e8930cb7e84c1de857b1f674f SHA512 944a5657f9cf14f98166418f3b0c869ed42b00d5c56767824ba6938c168b914224bc9d9242c6265a95bae550cf508a5e5ba154ebc5ae2707555d04fb5cfc7108
 EBUILD mm-common-1.0.5.ebuild 582 BLAKE2B 87569fdc784066ea74d334e1ca1979b47803c66830b5a85d58546a75d30eb558f5a5998702c48bd163fab4a771a6a3fdb1baa98eedea3d95a3029d904f3be120 SHA512 5aabcc2590f934c22984b4dd2f6b42ce34d6cb3dfc35eeb0edd29e00df51f7805f3c0ae721d7a457cd5ef65320431c0d42c1e4020671ecaa10506708e54aad63
 MISC metadata.xml 350 BLAKE2B 71cfcc31b82d4e5b436e057bb316fd64d708c1bb1db999e846e7aaac613b6c8a96df013b5f8a4e24f1d17e1d9174744a0e37dcfb7530c73714244287cd05c8e8 SHA512 51ebdb736b213dd635a99dc0ae4a5012eed8b28c1c1e7f5fba0db59b847368f18de2bb0e16c621e97331d23d1779d1f71f63c9f61fc0f10fb7f74fd439a914bd
diff --git a/dev-cpp/mm-common/mm-common-1.0.4.ebuild b/dev-cpp/mm-common/mm-common-1.0.4.ebuild
deleted file mode 100644
index cae8372119fb..000000000000
--- a/dev-cpp/mm-common/mm-common-1.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org python-any-r1 meson
-
-DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
-HOMEPAGE="https://www.gtkmm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="${PYTHON_DEPS}"
-
-src_prepare() {
-	default
-
-	# Include project version in docdir name
-	sed -i -e "s:^install_docdir.*:& + '-' + meson.project_version():" meson.build || die
-}
diff --git a/dev-cpp/muParser/Manifest b/dev-cpp/muParser/Manifest
index 1ebddcf1a782..ab21583f39fd 100644
--- a/dev-cpp/muParser/Manifest
+++ b/dev-cpp/muParser/Manifest
@@ -2,8 +2,8 @@ AUX muParser-2.3-export-cmake.patch 13652 BLAKE2B a83680f1214a6941a89f28fbdf0789
 DIST muParser-2.3.2.tar.gz 103979 BLAKE2B f892b4d440a1b7326be27aa0a2b703ccafc02de5e881ef4780e8907688cf7905284f3e5f5855ad2596683f1dad309d287ebae527d917ebf5e0dad045551df7de SHA512 8ef5c8b3834da3995a782b7364a4eb4197fb706bee4cadabe5511d2a9cf2912c3db6de422a91eff7f9690f8c9c355b9900335e940749d5c243cb732ac1992aef
 DIST muParser-2.3.3.tar.gz 112100 BLAKE2B 79a0a29781596f114aeea9756a5a2141eed19857c08d0a32093353eb049f8b179af577cbd07747d2b8093e448714397b47f36c68e54bbce22386f5ec06365bda SHA512 f7e01c83f6ffe71e240653c47fdb8f3152d7fdf61b5997a3c717dec50d0175065c4fc4241ec95fb35b60b968c5c965a820009163ebe84f0fa57d64b3a23226b4
 DIST muParser-2.3.4.tar.gz 112693 BLAKE2B 860c24d45140ad4339efcd5f5c221454c051565a1362907fd01499cfda0ef3c304333507c4d9c43644dac63e5fb4963fef6e3a2e565febf1a80807e0a0242c87 SHA512 5226fd666eaf3ff7e661bbf72e60114d0ceed10491ffa4ed2dd34cd669c6c21c037eff0388402d6b9d60b0a5a27b03ca35153e0c048328abc75dfd1eaf38ceca
-EBUILD muParser-2.3.2-r1.ebuild 760 BLAKE2B d4ef7432bf604bf572d0288def30e751e1e2e1cd805eae9e11661a7d4bd944b21f7feecca2f52210cc55e9816df971e97a7827f85e1bdba01979b8a1ade5700d SHA512 8b1f3729601ce7c4b1b0c9dac06d89ecbe8f81792190b5cf3bab1ea15e398c3e5317738a5d292a59dcafc43f6782f2d78f348143bb09eb1c75ef38ac32c246ab
-EBUILD muParser-2.3.3-r1.ebuild 843 BLAKE2B 395991416aaec947b2bccb86fdc7a4d0471078c8e46daa0120717bb4b608ed63346b3fd5f967862612c8b84cadb392dcdf677ef450f523b5aef559e504db2733 SHA512 402b6fb135656b387784bb3f4ddc15a93d75db612b715a778388914b564cdba2e6e3d9e81ca042d9a22502ef5170234c28adb13b9d8ea86b754a923ed1e9b736
-EBUILD muParser-2.3.3.ebuild 802 BLAKE2B f1d5b921fe5324a899c5ba4059f5fec3b957cee7072492c771026e043ed9e72c9b93c222708f334712f0fe8dedb470daa2604aef16537523f3cfb843c801d355 SHA512 0565d02b64d673345491379efaceee394d0455170c5287d89de23d12b956060a769ccbd062a8dabd48d4687e8dba474c8b25d5775383a0a623f6fe5f3b1b10b2
-EBUILD muParser-2.3.4.ebuild 756 BLAKE2B e441034b1f10fac4c4899feec1a6331b27c7f4052a82192ba491417121d45ccede74e116731c91adeafed19d2be9076156d1b27ef98cd7ebbdda1f7655a51079 SHA512 10a51aafb0c9ec081b1e88b47cfd5028523e1567bd599a13e34b29fe2aaa782994cc733bd4fef0948963ebe9f0c489f0079313dfbded615edd150e78cebe775e
+EBUILD muParser-2.3.2-r1.ebuild 766 BLAKE2B d6e020d1aa13605d5c536c7ff3b58896c6ce0508632a2f2e179967864a183bf0e1116a3e51fca65019c69b3e4454482fb57c2def00b6338ac9a9a361da07f851 SHA512 c19e25ac61184f2bf491b443e44c7210389555bcb89fbd627daa89922adb26bf75f48185e734dc9aa6e394a11f2bb6fed3119bcb8660cf756a8b52346f02922b
+EBUILD muParser-2.3.3-r1.ebuild 798 BLAKE2B 37f43990024c4428771ea3b61cd0a9ba1109e56348c83bc849375019a71ac98cc76dff50d81b47f4877474849e9609a8c7d5444f478492767a13c021d8d43906 SHA512 5ea937070a0a571d2da06cba7b6249329a8fbbb8a39c8394c8e7d29a222ea099cca68491c169beaf37657b1a2699d4567d1337eb7be74f375e90796dddcaa9be
+EBUILD muParser-2.3.3.ebuild 795 BLAKE2B cbe789a0ac294ddd3722eb55958e436babfb9585e9e8502e19680a96295cc199afcde1dd4b8cb8fbf30ba0780101d14b312035165261c8816676e3dee6c08877 SHA512 31650bf11f7c542c9d878e3234672741dd03c77707640283183e6ae8d93f97baff292575bcb7a0520b360193b53ea23c104bd085937955be091deaad22e5585d
+EBUILD muParser-2.3.4.ebuild 711 BLAKE2B 2a6aeb4df3e990c549bf23b8c9eb0f4f131b827d11ed45280491ff6434ca0656118249dae46322cd64ea5d36aeb4fade4aa7dc2171ec2043081ad6270a3c3f8d SHA512 40ded9a6dcbec162e6c9d726bd317dcd2eaf9ed72187ca7fab53355b8a7310742cbd93c78c6f6d62846159ca72ddb28cc9cca12d6393829ce9ff20383fcb3d66
 MISC metadata.xml 709 BLAKE2B 5d0cd5c59febf43e133ac02eda2385845011a02875825df5db2cfc357302e4a012d79ff569a3eb68259e43bd9b369534c9ce54762724c4ce7eb8879f61566f70 SHA512 97adfbf9f21d728f340d653c51f6f4e4937963418a910cd45b53bd3a0b99305b0f5736aed2f8b0facdd2de12c2df332f3def4d0ba6560e2ef31c9de1b58bc092
diff --git a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
index a7adf4aa3980..9023bc7bc987 100644
--- a/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 PATCHES=( "${FILESDIR}/muParser-2.3-export-cmake.patch" )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
 	)
 	cmake_src_configure
diff --git a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild b/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
index b5702ad96464..669ac8313f52 100644
--- a/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,11 +21,8 @@ RESTRICT="!test? ( test )"
 
 S="${S}${suffix}"
 
-PATCHES=(
-)
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_WIDE_CHAR=$(usex wchar)
 	)
@@ -35,7 +32,3 @@ src_configure() {
 src_test() {
 	cmake_src_compile test
 }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-cpp/muParser/muParser-2.3.3.ebuild b/dev-cpp/muParser/muParser-2.3.3.ebuild
index ab201cd8c983..fc2e66b58f60 100644
--- a/dev-cpp/muParser/muParser-2.3.3.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,11 +21,8 @@ RESTRICT="!test? ( test )"
 
 S="${S}${suffix}"
 
-PATCHES=(
-)
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
 	)
 	cmake_src_configure
diff --git a/dev-cpp/muParser/muParser-2.3.4.ebuild b/dev-cpp/muParser/muParser-2.3.4.ebuild
index 4dd7dfcdf406..d085086ce7f7 100644
--- a/dev-cpp/muParser/muParser-2.3.4.ebuild
+++ b/dev-cpp/muParser/muParser-2.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,11 +16,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-li
 IUSE="doc openmp test wchar"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-)
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_OPENMP=$(usex openmp)
 		-DENABLE_WIDE_CHAR=$(usex wchar)
 	)
@@ -30,7 +27,3 @@ src_configure() {
 src_test() {
 	cmake_src_compile test
 }
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-cpp/opentelemetry-cpp/Manifest b/dev-cpp/opentelemetry-cpp/Manifest
index b46ee6c4c561..7872dae2771e 100644
--- a/dev-cpp/opentelemetry-cpp/Manifest
+++ b/dev-cpp/opentelemetry-cpp/Manifest
@@ -4,7 +4,7 @@ AUX opentelemetry-cpp-1.6.0-dont-install-nosend.patch 632 BLAKE2B 4da2cd8238f4bc
 DIST opentelemetry-cpp-1.3.0.tar.gz 710030 BLAKE2B 56aa3213fd9c9ac5266197c2ca417f5ff181ca28016033c9320e63122eaf9a53bdb265e1778227a9036bc42f8837755a3009cb23610268bc03b9fb24b3844c82 SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836
 DIST opentelemetry-cpp-1.4.0.tar.gz 722520 BLAKE2B c34867846708218e5ffcff9cdaa275e0c43201f681a68ad697d9f83ac04b7fdc6cdb69d942274cbe200b241e407ba11218c7e92da4f9adf4490e89c06388347f SHA512 a2339c0f9b2dc0d4f1964536a844241436bd68774445a0eab6e89e51965e01d3c40d2aa776d751eb497c50e9fdaa4e0023095efb14c8abbd6bbe23a2596eb3c9
 DIST opentelemetry-cpp-1.6.0.tar.gz 790774 BLAKE2B 9512c092bfe49c9da82eff3950204c1f2eb654df2ed428e58ceb8877d15d80d9978fa6da37f7780352538c74de04bac69660528b255dfbce743f89b9d4020dd2 SHA512 ae0777451a3d2d676afd9f3142ab78c7afb08474f6038bd810ff0ee30fee6695e10100c901e7ffadf3faf16c7d19622acdea414cd720be8572f7720f2d528628
-EBUILD opentelemetry-cpp-1.3.0-r2.ebuild 966 BLAKE2B 256f46f7225b64a79a3e13e9582e0bfb275c5a22cb79f8f6ff619735dfe7a5ef6d4e6a8f2406fce71adb93ec546822c1366e9baa556f7e6e6322f168fe46c776 SHA512 83996a9639d03457037372443af6b48e4d0c75ec60cb8e9e4e9a29223d9b0081c1e9ec2150431e407290f22ee31cb5fcfe111eb9ca0b29c0988eff6eb3af7bfe
-EBUILD opentelemetry-cpp-1.4.0.ebuild 966 BLAKE2B 256f46f7225b64a79a3e13e9582e0bfb275c5a22cb79f8f6ff619735dfe7a5ef6d4e6a8f2406fce71adb93ec546822c1366e9baa556f7e6e6322f168fe46c776 SHA512 83996a9639d03457037372443af6b48e4d0c75ec60cb8e9e4e9a29223d9b0081c1e9ec2150431e407290f22ee31cb5fcfe111eb9ca0b29c0988eff6eb3af7bfe
-EBUILD opentelemetry-cpp-1.6.0.ebuild 1046 BLAKE2B cb86b4a44a71b6a6baf45e6f569f98d0d8fd0623d8ee1619508b18f04d975b37fbee2394621c1356b51011d05955a77c033c8d89aed6784aac7fef057fcf1980 SHA512 aa19910c1509533e5d4b9c54e046f84cebb06136e90d2995010ce4d7f5ff51acba2f8cf9f4c55e50b9059da6ed411166439cc64ac2f37eeb1343f03c92584d78
+EBUILD opentelemetry-cpp-1.3.0-r2.ebuild 968 BLAKE2B 846979a828ab1ea57a09b13e6216a3af6df0c60b410a082e5091104e2e2fdf04b0aec6aa12e222f801a65799f69e760e7052c1e5141f174ac0c9f8653db9f420 SHA512 ceb351b9b9faca5bd09e52fdbd1934725dd82bddd0da83388e2c1d6c4fd4fe8e9dcfa9e94f3eaaf81fa17fe927e963e93d6503c60dc45030f15a700747279e46
+EBUILD opentelemetry-cpp-1.4.0.ebuild 968 BLAKE2B 846979a828ab1ea57a09b13e6216a3af6df0c60b410a082e5091104e2e2fdf04b0aec6aa12e222f801a65799f69e760e7052c1e5141f174ac0c9f8653db9f420 SHA512 ceb351b9b9faca5bd09e52fdbd1934725dd82bddd0da83388e2c1d6c4fd4fe8e9dcfa9e94f3eaaf81fa17fe927e963e93d6503c60dc45030f15a700747279e46
+EBUILD opentelemetry-cpp-1.6.0.ebuild 1048 BLAKE2B 7d66cd95a49a8b3f93c4f7295723bbd7ceeb007dbfb6896d54d81597a218c21d07cb680d8d987b0c2e3a319d9e5a2f700f503f83a17d5d8315767210072a58e0 SHA512 bbebcdb4fd0dc514f20f226963ae1832a0e1b5a929613b96d00704daf9e11ac97e7c0f2556c8b296dc0473d6d8471cc20b8e4a77552a1722152fbaafb946dbfa
 MISC metadata.xml 396 BLAKE2B 4f1e0d0edd6e3c57c5e01d8428a4203113e0bbabb1c9e02c03c99998ce839edf422bb058c28fc0b1adec6655114fd89ef11dec4897cbde4fef61d80bd11fbaf9 SHA512 f56f523cb2b99bb75162d06a0be09e662cfd64b5b58b5f92f61d4384319285f0614965ee3d585e16067249b4b17f01bef566b34e5bbfd6faf5ba2574c233b982
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
index d37e2bfc376f..474f39a0b30e 100644
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 		-DBUILD_SHARED_LIBS:BOOL=ON
 		-DBUILD_TESTING:BOOL=$(usex test)
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
index d37e2bfc376f..474f39a0b30e 100644
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,7 +38,7 @@ PATCHES=(
 )
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 		-DBUILD_SHARED_LIBS:BOOL=ON
 		-DBUILD_TESTING:BOOL=$(usex test)
diff --git a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
index d007ad4f6418..36b801e978d1 100644
--- a/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
+++ b/dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,7 +40,7 @@ PATCHES=(
 )
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
 		-DBUILD_SHARED_LIBS:BOOL=ON
 		-DBUILD_TESTING:BOOL=$(usex test)
diff --git a/dev-cpp/valijson/Manifest b/dev-cpp/valijson/Manifest
index 9373e1e857b3..1d8544a829b9 100644
--- a/dev-cpp/valijson/Manifest
+++ b/dev-cpp/valijson/Manifest
@@ -1,3 +1,3 @@
 DIST valijson-0.7.tar.gz 2060214 BLAKE2B d2e1c58e37213e44d7d6af173691cad3853e87648948c229ea683bfcba8b19256b0230852b0537c2dbdd7084fcf1ac068e320c5f59a69e446610390b82e76474 SHA512 662e53bf1cac4def19792392cda7cbfe2cbadf77b768eb69b2dec693b16f85f32fa2e9b97eae36569cfcc9ac45f1e6338967423cf415d6bcd90372bc49793a2d
-EBUILD valijson-0.7.ebuild 1232 BLAKE2B e5ce135fe79b9e222a283141d23ce61c4c5784da29e4d95207d75273b5bc7f5443fb32974c0146810206c5f4a1c86a69b5bcfee032db89c55b909af2c3fb1642 SHA512 57de38cb52cffe8389ed9016748fd2b79dbcf98d35223ac9b6b2feb87c1cca255e86eb0782f3b30618fa625d33cf171a172a4e34bd47500812b6fb641e7e3ebf
+EBUILD valijson-0.7.ebuild 1231 BLAKE2B 94991d36e5f45c8a9b81d7fff6c8f594cf897378b01a8135c88bf95b25cf9efa55ffc0728062d4a3579eb0eb23f07b1e1ee3fdc6ea86f47ac3395ee292fba842 SHA512 d9d2a8d588f513aebeee3f95f0e533cf8bf69df7030f6d4d926f1dde127551a63a22a6d790772bf087975d8eec5c2f4a7b84d9b7fa0fb7e036d18673ffa6420f
 MISC metadata.xml 498 BLAKE2B 415d770e91c8304ace73ee5ff1ee079d7e1c09c6eeac26123e4ba4615194829a0c8bedfe27e2e803cddb101b30c3bd94b6003523fa0ec849972303b0f37f59e2 SHA512 dfaf020b039378127a159f2f8b66f1488b671817c34b77b01e19f24c117306c88801e26990fc434b4f9c23d1620631cf048ff9c281017135e46c7b7acbbfb8a0
diff --git a/dev-cpp/valijson/valijson-0.7.ebuild b/dev-cpp/valijson/valijson-0.7.ebuild
index 52fc96a2bad8..030b372e2a46 100644
--- a/dev-cpp/valijson/valijson-0.7.ebuild
+++ b/dev-cpp/valijson/valijson-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tristanpenman/valijson/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index dd29ea7aaa00..c1a40d87229a 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 51ec4347ece3..570be39c5e85 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -14,12 +14,12 @@ DIST mariadb-10.5.18.tar.gz 111568643 BLAKE2B 39067475c00c456d0cb5e79eef063665db
 DIST mariadb-10.6.10-patches-01.tar.xz 5240 BLAKE2B 4c41bbb5a81ecca3e9ccbdfb0861189575e5b3edfb1019465c8dbceee641a8bbeb3e54f061ff3ec44fb5ff3bca960419893429897db4a919177c390b44ef7e49 SHA512 aee039f5e771c840e2a5bb6f6f5fcbec06c0bbd7fd5ce155f0e6f3694595d5d2a0e38f25972c328fc9f69dd68354434e40c5e9a7b2d509d7ea795e097a57864d
 DIST mariadb-10.6.10.tar.gz 96453293 BLAKE2B 889d141ab9e0e9a0cd3fc9b191a15192170029a5fddcff8ebfe482cc3cfdfec6307c014fe09719c7c254a3941034f53ee7ff6187f3d502e3f3edb4d586dff8f3 SHA512 912219878e2201280f5927ee8a34dafe83ac2c3ce8c6fa3d90731d10fd693c369872aff840edc8329b82c53e9908fbdb1ba731ba140e2b99048edb5eb21f22c4
 DIST mariadb-10.6.11.tar.gz 94742041 BLAKE2B cb5ff7a9b44814cb56f715c92f9d136070872889c0fe2d27987f62f75b1c787ef4ece81ae8bad9a944cbb4c4416fc23587fdab366ad1181b319eb3a0bf40f91a SHA512 4b9e8e16651329f53eb19670dcc7f5dbb11ba84c28cca35bc7d216c5504b6db698ab65ce42c30a34ab967c1b14e6637c511ac4b49f2613b01f6dd615288cba98
-EBUILD mariadb-10.3.36.ebuild 41371 BLAKE2B 5929c368d56e1ef0cd523d122846063b04a95e8b515ce9f6e34857a87b1b07277f9df7a5a9847a718a67441b612f99ea27a0bfe10ec8ee53c3db0ab0a2e8c9ed SHA512 3d02c1b56a7b544920d15d24d07cc7c4ccb3cb5abff23c0be7c2ffee0fa1dcd9934e5eafe7807845614eaf281888689b6fbd98ec1b2882f90cd62df3aa82f547
-EBUILD mariadb-10.3.37.ebuild 41379 BLAKE2B cb03541ef835f6182e2e352acf1e65cfca5c3d787232ca98a8b399a460eeee551f380b31619850993fbbde7cb671d6a9dc712a3a2611c77017121a33b133a1ec SHA512 66699d299e8c14eddc4e1cb5f4577cbf9a172b27f78fee17f13a4cc856e29946903253d2969b2ae4bcc7c50829a59a8b5a3d877aefa2c76a38e72d877c7d3486
-EBUILD mariadb-10.4.26.ebuild 42074 BLAKE2B 974e0e0e1850d2b9f65b95a775b96962618e7eaea8ecc15391fb5073b52bfc484c718de92b444898811c6dee1e54af39ed9a7cea644d27d31c40cada756dd668 SHA512 971788deb4afac2bbe30400e9b3c6cfb61e78790216e073fd96d0ce45e78debf39479a8a8a12b88190c13d4b91907fe544faadc3566f37a7bd86e865f7f3ed1e
-EBUILD mariadb-10.4.27.ebuild 42075 BLAKE2B 4d6ba6cdac2b181f74ead953480814349f36dff06edb58f46402baf6b57496fe0c8fa64d6ea33f6e81c8604d0a1b2614aa16219dac6e50241c2180d7a4f6349c SHA512 467fd51045519228ad79283d9edb1fb2a9eedb350b5273f290f90df8af99f48197ed58cfc6d6a876fd6a55d21540eb2b33278abeea64b155c463e379296368a2
-EBUILD mariadb-10.5.17.ebuild 42033 BLAKE2B 4b3e529d207bc9750f609931e8f2029da0b55175461025adf08a067c857e2a9ba01940b88bd6f3fb5208f50936dc70513170daebf567abe28677981b063a0728 SHA512 a533a3c6cfd1ee389e65bbe64bfb80d9e65d7fc87bd676b77aac4e6137923c5fa2daa592bdfa1bf0e3c4a82e764f6cfe08100a518c339c707a2307faea9a9ee0
-EBUILD mariadb-10.5.18.ebuild 42034 BLAKE2B 62e474feaf051321f0856137cf020df8697598df87cbe383a63f291a51623b201ce08f643488b25a59cf5f93510532566d68f7a5f168b273a1e5a711384b0a1b SHA512 22b43c389ad4f5daab972bb1774a7f31bfd345a0e65a19a2d72b229b310f508ac2241e138175d3d0f563f1709161e9ed0e7ae804145fcd7d7cac172069035c41
-EBUILD mariadb-10.6.10.ebuild 42408 BLAKE2B d48615c7a9ee92eb9c5196ab95a6629b01d0eb33ffc7406f4ca6a05a366dc6372f70e52b58e48e520c2fcaf2e20f0294c68aac176e737b742cc0ad3047f83283 SHA512 7ffad01ed90afadbf2b08f6c862d526347599b0f1f2567701439d85a46eb15a582aa280669fd7fc88babf0508f55fd5dc5474e1b1e11ad97f2e5e6024b6560c7
-EBUILD mariadb-10.6.11.ebuild 42464 BLAKE2B ec68cb00d44f4d67e3b4b5b4bf45c36e6eb707d9bb692687ebe350c79b00789d1e06c83a0b804b1d19d4f07a1e2bec83f58fdbd0a8a8f639151a5d1ead66d44d SHA512 4932c5f69d17c5f058c1d2c71f69587e547ec484c5848b906117e78b4578ab93241b15ba4563e83c51f9d6cc6739f2fd4793157f417b2224b9823054892b3ac8
+EBUILD mariadb-10.3.36.ebuild 41377 BLAKE2B 1df517781b60e2cd178694b9d004f89d86a8252f3629fedfb861cc39cf7c2b1abd428caed88f0359a5dd26c1844a9dae6cd3608b2015414c6399eb35e49cd0e7 SHA512 a84b27c8c7ed92cbf9ad17be650a989412605898d74f26a54886cc6cee4632f8a28048dc2375691ae61d5cd36caa9114faf290877399780401011f3272d1aad2
+EBUILD mariadb-10.3.37.ebuild 41385 BLAKE2B c4e57ea7dc4ab3a2fcd7b48560a25539e2d35977ba4edc5122f1f12decaae4356cf8f5b5e5124f5b817e1516ee7c1a795fcb1867482847bfe87f687e2737097c SHA512 042ca6b44de7a733f3043e44e527ea16b6725438ddac8297455f347550ea529577ce1607544f885eac6bb79cf57cabdb2bd5eced27c4b888c6c018287e74d74a
+EBUILD mariadb-10.4.26.ebuild 42080 BLAKE2B b4e259549c259d2ec4653caeefc27ed588cb778f76212e185833ea4c0557f1f0634cc460c229768d0fe071ac395a73e5aba284d37dc1e58fc7a44a042026ff32 SHA512 066a19894c828e5bb6619958eab3c985c715b84bc6d09f6ba031227b14a84fef9cabe021bc555136b15e424d5a53cb652fecc929c1e66e2bffb4920d2f1469b4
+EBUILD mariadb-10.4.27.ebuild 42081 BLAKE2B 7dca7c8be92a53cd382a9680f1264cd156b52dd0bda7402fb9662af0064bf7786053aceb420d9012467f22075ef7dfc98e60ccbd53b8a9a92ebabef4108ba751 SHA512 194ba47b906477e2372c47415fb8e9f43ce1be147ba0e7bdc10c0304c17ba524e3a0f35a05b2413d3c629590f2ffd9c339ec1afb4675536bb75481658251885d
+EBUILD mariadb-10.5.17.ebuild 42039 BLAKE2B 4b6a08ef9a8673356833f4d9495b07f548a9f9b6e4dfc90af5fab478ef13f91f451bb444b1a132a9d3418b20ea2149621cb24e593529864c7338f1e211fe6284 SHA512 acc33064c0ce6aba4568f79d21e0124d7fcf3eb75755697f0986925fd196a770dc79b91237eaeb051027530da250fff40760477a96f2af476e1991dcb1834e82
+EBUILD mariadb-10.5.18.ebuild 42040 BLAKE2B 448c62e184d96dd5771e065e03a5b23dd8fd975661d6e96632d88740928e55b6d71d2793b2657a91411d52652287fecd165266d2ba59bb184eef3b4bd7fba5fb SHA512 5aecb9ef006b8077af9e49d67b24de48048915a738e1528036e0810e5884f2aefa94a7b005044fb275f6ee67e6e7f30bbfbac7cae943307039b195ef9647a1fd
+EBUILD mariadb-10.6.10.ebuild 42414 BLAKE2B ce19b4626b496ffb7b9390e88e653c5ec38e4e54774d6f5aa4bcd7b14da22250a7d91a84f92738e2cc283424a214862c96e3867d8b360b9e716ab78d4ebf0f0c SHA512 12a7284a5ed095c335a224acffebe5ba8f8968d6d4f5829e57582a36ecc84e28679545b740b490ff966789deb46bf1f1c43f1f241df54b2077fc30c46f72517d
+EBUILD mariadb-10.6.11.ebuild 42470 BLAKE2B 94b7544a108e1de979ca9de588df0c59b8df6349c7b00dbdbf49d6a61cd17804d70fd7c74c45ab44f3bb061d693ec76e3fa5e673f74e063e17ada77d3e109949 SHA512 0590699414bd5953bdeb3eca71ada8f93a1abcba7d7e293146a7b7fa3a73cef0101380d6017d33ceca99c2a68c229eb12f34de7a747211ea1f37fd87e8672893
 MISC metadata.xml 2602 BLAKE2B 7d388158062c76f40bca2feba53f292bbdab51cf0c3dba59ce2b74c3dedcb07cd7d4f1b5b52f7bf42c814dfc817a0670fcd8e39dccb2395337b46be98deda258 SHA512 a53f2612f8aea11cf7037847dc6f8b2acc87f710778b1bc18d7e1821c95061c1b08deefd3019789810eea2e5445b50c604b8686f3d491397793be3cbf86a35be
diff --git a/dev-db/mariadb/mariadb-10.3.36.ebuild b/dev-db/mariadb/mariadb-10.3.36.ebuild
index 64534e90d5f2..a4cfcfe57f25 100644
--- a/dev-db/mariadb/mariadb-10.3.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -273,7 +273,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.3.37.ebuild b/dev-db/mariadb/mariadb-10.3.37.ebuild
index f83d760a0376..1d555a27916b 100644
--- a/dev-db/mariadb/mariadb-10.3.37.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -273,7 +273,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.4.26.ebuild b/dev-db/mariadb/mariadb-10.4.26.ebuild
index f91f85b6e73d..26f337d76e62 100644
--- a/dev-db/mariadb/mariadb-10.4.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -287,7 +287,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.4.27.ebuild b/dev-db/mariadb/mariadb-10.4.27.ebuild
index 026feb6be378..5a6a7022f831 100644
--- a/dev-db/mariadb/mariadb-10.4.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -287,7 +287,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.5.17.ebuild b/dev-db/mariadb/mariadb-10.5.17.ebuild
index d870a1d1d3ae..384feb3be774 100644
--- a/dev-db/mariadb/mariadb-10.5.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -290,7 +290,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.5.18.ebuild b/dev-db/mariadb/mariadb-10.5.18.ebuild
index ce89a1bb7288..f939e9ffdea9 100644
--- a/dev-db/mariadb/mariadb-10.5.18.ebuild
+++ b/dev-db/mariadb/mariadb-10.5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -290,7 +290,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.6.10.ebuild b/dev-db/mariadb/mariadb-10.6.10.ebuild
index ce9a6a6f7e30..a67cb52a4a5e 100644
--- a/dev-db/mariadb/mariadb-10.6.10.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -290,7 +290,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mariadb/mariadb-10.6.11.ebuild b/dev-db/mariadb/mariadb-10.6.11.ebuild
index d495a241e226..31285154561e 100644
--- a/dev-db/mariadb/mariadb-10.6.11.ebuild
+++ b/dev-db/mariadb/mariadb-10.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -291,7 +291,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5212dda72f2a..b4e66357d267 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -12,9 +12,9 @@ DIST mysql-boost-5.7.36.tar.gz 52968383 BLAKE2B 4d5e4fcf8d56f4a1d1d54ee889d432ee
 DIST mysql-boost-5.7.40.tar.gz 53255386 BLAKE2B 1c367dd4d65a42713fb09943c4518c9be375210fee4e8e6b7b889dc32f0b429a98f132498ba8e6423d288f2936a97ec6c5098411d5f28adc608d04deeb068b24 SHA512 5c49ef65c00658786117cc489d80a6ed7517759b010fb4530508649ab6b4079bb8f1dbc70cefe5d179e1a003960d296b85210b161be4f8f18756a578a1a11365
 DIST mysql-boost-8.0.27.tar.gz 292184025 BLAKE2B 177209f3c62b0326ca9d021c751a701dec84c1b15c946ab0a68b1b4cf0620468eb3a1df77a918284007a0fde1aaa6a9767d0baed57936612813ef583df51c35e SHA512 6ef2426c0bee46bdf8e2fa5cb159d5ae19f0bed4f7c9bea9b33e0dd922b568c3c68ca063dcbcd7ea6904aaea31877c10064ea10b4bc63fb40d9f31778e3a7891
 DIST mysql-boost-8.0.31.tar.gz 334504577 BLAKE2B 0506472c732351a1055be9bbd81212e95280ae464af95cb5b579777dd8fad4634b099fa2830c3095066daf8c586f1d8cd2316e7268fb0d2577dd706c595c9102 SHA512 87b1678de8c2fd640fd6f3ae58266ea63fe240578330e3296d0e5fc209bbe9b0c22996214b6ca4cce8c0d9cc2f9897f4e6723d835b33fc4342983c82929c3d96
-EBUILD mysql-5.7.36-r1.ebuild 38652 BLAKE2B 333a8eb79017ae404fdd14200b579cd2680539053e4621c2531b27903cec2ffe29c8e84b6ff18a8b550650a2ed115d125f39d903ef482d92e7a9431bf899c5d6 SHA512 296ab25fbd2524af07b364ab6a1cb42ff05c3512512696a7e80640794f6246023377de8e016865ba47948a878b466a384afd073600c7c10fe7d2999bbc4c4257
-EBUILD mysql-5.7.40.ebuild 38648 BLAKE2B 5f3193d8a8a2e933f0ce4774c03bfdb328d4fd3cd45144eff596e347d521c8d3775183d2cdda3de540bd350394d57df0140328b9f9639317901959bc6ffab5fb SHA512 5ff695750b347f72e2fb76c5f8aaf26056a20e25f496b99d46624280362d2787aaf008efd08350a2444925c65a7c424ae03ef097efb0dfe1e155fd3eed35e6c7
-EBUILD mysql-8.0.27.ebuild 40682 BLAKE2B c0d13a9147d43dacdde913b82cabbb7de9dfced292d7e8c8ed7a828179771d80ffc449817afde1f3b911bbcf7c6fca54a14236051c8f1dcbeae7a452716d83e2 SHA512 96eac8041635265d1e6f0ab5d0e22f081963a4aaa193e79621e5f1c92c0911b1b986c47228be45b9fb97803af8b384c4305dc96657c08698a45ec4deb8900141
+EBUILD mysql-5.7.36-r1.ebuild 38658 BLAKE2B 2eece873ad50203679835aa5bb647d74431dffd808ec13ec37e52d49a312f78153bf41ed1d95adab9bcb60b229b177f6a6a5273d236718adcbfffd7699829542 SHA512 df6463dd75d6c7700dcc5268d307502bba26cc0fef0001695daec9ee5ef27a0fa8460a4391b69fc8e814ab362a10dbe4463e7cce84f76375ac77c0f2fbc15948
+EBUILD mysql-5.7.40.ebuild 38654 BLAKE2B f74b9e42d1d52f8a9485a29dc5cf42046b796a167169c910f7339fa92234eaa6aa47148edbf3146a4bc8290a7facdb7fe16ee29b72982326089ae161d2ecaf3e SHA512 934c1ed8eaa2cf92157c1014650c2c7e0424b01dbd770a455c3bb9b7536acd147ffc074a2485b2a93a003ab87598339bc16a1c4a8b937fd7e997d80dc3f6f4d7
+EBUILD mysql-8.0.27.ebuild 40688 BLAKE2B 763c9667eca03ff707b711fb1746010c7acfc66cf16b32baef9b952c12461f5fb1150cc52927e65022bef45ebc907038e5ebc1183c9b4db38a309e14a1d472f3 SHA512 324f3556d863be75000475282b9aa50b36f100270306bc4b43bd947bb7af3bd8519521cbc33444f0bdf4e9f3baf0fea209b5553a41cb4ffab6ec235092778297
 EBUILD mysql-8.0.31-r1.ebuild 40739 BLAKE2B c621bcdbb7ab73481511e606852b514800b5e0654283ebf7970cf2cbdc1267e1c1bd4d9e3150f8de9292c9e752576f9127625713b2d326efa99003af05335baf SHA512 470f6b7bbf9bd9f8a89e10907cf9658b4b9405ebd6b89091fc1b9c96355d0dc2b74b0fe3ff53347d20419bda8117298d1800f3f71c266274d6264d19b9f6e6fe
 EBUILD mysql-8.0.31.ebuild 40680 BLAKE2B 72062f49d651d2170b7b37537125a792c3ce2401e72b143710fb4fa0fd2f43c4887f2038185a91d5c33c3894ff52b134345df7c4ac1a34955b2971c000e205c3 SHA512 c47c1bf4222bb5f97599ed9cef7afb0d1bf75eb3db433369bcfd45143852413fa5b74998fb3570793352276d22c55684c2180775d86e04afb551b4913be09fe9
 MISC metadata.xml 1352 BLAKE2B 81b263eaa05ac8a0bd2cf0e84bf51ff4a07d8ca74e6febf8cbfea7b85f78a3d682549b1471c9d5a96ee21cdcfffcd4376246b5c9f964e73d7ebc68a4e026f5d6 SHA512 f9566f7d6c4892eda73587ac70eab66b98437d3a9512a7a036590a2347ef2a98946bf33bf22f6270b50a54966db31b079cf217dc6bcfe9087bb72ad95c9bb327
diff --git a/dev-db/mysql/mysql-5.7.36-r1.ebuild b/dev-db/mysql/mysql-5.7.36-r1.ebuild
index 482b873a518e..4679a6ef6089 100644
--- a/dev-db/mysql/mysql-5.7.36-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.36-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -290,7 +290,7 @@ multilib_src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mysql/mysql-5.7.40.ebuild b/dev-db/mysql/mysql-5.7.40.ebuild
index e22e7215d2bc..19f47c417c89 100644
--- a/dev-db/mysql/mysql-5.7.40.ebuild
+++ b/dev-db/mysql/mysql-5.7.40.ebuild
@@ -289,7 +289,7 @@ multilib_src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild
index 0a2cedce470c..87825505d12d 100644
--- a/dev-db/mysql/mysql-8.0.27.ebuild
+++ b/dev-db/mysql/mysql-8.0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -202,7 +202,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index 4736e5c68949..b036dd55e64b 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -5,5 +5,5 @@ AUX percona-server-8.0.26.16-gcc-12.patch 1381 BLAKE2B 04ddb2969f759e7ea2df5d368
 DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8 SHA512 86c296511c0766145097625a62bf099c3d155284d250ad6e528e788bc90b2945838498dfe473c6c6c78d1694b6fba8e19f7dee0d064a043841e6231603fff668
 DIST percona-server-8.0.26-16.tar.gz 532328971 BLAKE2B bef32f7a26261f3b0d89bd9b95b826101e2e84c662ce2200a2d9d8a612d949804d233905db71bfab5aa04458e7773231659d67ea09e08e68df8ef5eca4391f39 SHA512 9ae60e2d81dfaabc214692cd0919c2fc3ba698bd0a399e42df662766c1d67714f6f3cfe6416019b26e7866bc59b78d99fc5767f64ede1ca8e5a344995c1ff4c0
 DIST percona-server-8.0.26.16-patches-01.tar.xz 8144 BLAKE2B 28a4eaec657c09a6f8290b654dd5316d44a4cbf94e418edee3754742f21df56a058de9332c15abbb7c8bbd3ed6fc63e48e6c5fa77524dccf44ff1d5a89085a6b SHA512 4a128a89abc1f48582b0c6ab841643fa0b7e018eaa32414e775705cd1e8c2dcacecd334face9db33775ca3a2a862528e1cc7f2bfd8b259b7367f0f2ebdee52c4
-EBUILD percona-server-8.0.26.16-r1.ebuild 43016 BLAKE2B 2805a36675d92157fc89b0e5045e8f384503a757698624716ac169e541c9347ae90fd7e208b1aa71391cdd82111a42299a7ccfce0d395008e0bc76fd5e8707ee SHA512 324b5dcd327fd0ee79f5272cdf67d645831b146a8b330099b1fe72c2c8115fe000b99019f8ba7ae7a8cba5b1253d2fede41363d042acb4c3450326a98153e840
+EBUILD percona-server-8.0.26.16-r1.ebuild 43022 BLAKE2B 2828bb4c30149c1a3ec7a489d2c4b8940c1f9226c08adddaa247c4cdec879b709d415c351ddc70f29fda365f5f25ab7c8785d9c2be0815695e47912a403313df SHA512 103b7e38a03e195905eeaf7ca1427fba8aa5ad554f3cf27ec2910a97b6e989f917d8e6fb7a73eedcbf2741d15dfdd09fa3ddabefd9913094e604b4a4e93d788f
 MISC metadata.xml 1011 BLAKE2B 59166664921919352aa3bd37c1b8b8e9f5fe142698db249105908afd61f4747ddcbffa3a7f22869381126cbb9f609eebde2d103b0dc283410cbbc6fa67a4964c SHA512 aef0bef1758e147e1a7120d5147388501efe7d3bc56dcb464521fcff8ee99052213415c2388b19aa4d4252120f9e56f1edfacd5cd8ced8bcec5422b8e7df282c
diff --git a/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild b/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild
index 47b4afb78e18..1d61ecef9370 100644
--- a/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild
+++ b/dev-db/percona-server/percona-server-8.0.26.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -221,7 +221,7 @@ src_configure() {
 	CMAKE_BUILD_TYPE="RelWithDebInfo"
 
 	# debug hack wrt #497532
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
 		-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index bf0ac10b3fc3..79bb076f474b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream-glib/Manifest b/dev-libs/appstream-glib/Manifest
index ceb2dedc4fcc..25b3f3a60b40 100644
--- a/dev-libs/appstream-glib/Manifest
+++ b/dev-libs/appstream-glib/Manifest
@@ -1,5 +1,3 @@
-DIST appstream-glib-0.8.1.tar.xz 2320596 BLAKE2B de8d68c541cd6700fff0bc22a71d59510ccf584ac1380e2aed3e5aa122825cb3087d65b42ac1dc35acbd4b171382d9560545cdeaffa9d6bda721784444bf7a36 SHA512 32462a32ea25c945abb8d9084af1c84850f264b3a2136c6f54444e0168acf0d74ee450f8cbf483a504e417dc29b85a2e9bbc0a5bb8a217296eccacaa02db5ef5
 DIST appstream-glib-0.8.2.tar.xz 2320880 BLAKE2B 6c3c90298ae8bf362caea8c46643afaaab0bb0071271f5244eeca9356ed96a6a956c1b2ffa4a8500201e4bc494a54a15b3db4937b81c6f5f8b80f83299ac58ee SHA512 c9c21049ab43f5da8595aa07a3c2e097163a05b5e0fc030e4e3326136cd18127f04ad9edf08c12aea823b89048b43808cc60759cc26fcf2541cd9c1acbb29e28
-EBUILD appstream-glib-0.8.1.ebuild 1605 BLAKE2B d55cffcb667106deac403387b10d8c2e73d24edebe82fe82f660d523956488cd0f1ec4463ad502f8b2650dd0ed344bad96c1d79a16edd531284416111ca3ab84 SHA512 530ce1b46428e187db62432028f987d17388c9d025051fd77c6ba27eb39a86aaa74f79dce7a9065440f272b1170cf21276ca31472dbb0e5f07999da58b42d778
 EBUILD appstream-glib-0.8.2.ebuild 1605 BLAKE2B d55cffcb667106deac403387b10d8c2e73d24edebe82fe82f660d523956488cd0f1ec4463ad502f8b2650dd0ed344bad96c1d79a16edd531284416111ca3ab84 SHA512 530ce1b46428e187db62432028f987d17388c9d025051fd77c6ba27eb39a86aaa74f79dce7a9065440f272b1170cf21276ca31472dbb0e5f07999da58b42d778
 MISC metadata.xml 518 BLAKE2B 86626ba74aa4910c2c6148a1ccfbfa7239ee49dbd2ae570f033226a5b145eecdfe0fbb89381a33a7bd03f98176a009ac5d6a67a725b221f2a1005ae17de4907a SHA512 8dc91556a745b2fa694171daf8080a986a42040ce088c6c320a6287660f288522b77d701fae78bf1b16f3d9e0d20b03a8b27c849e561b6b48c5529c71bcce554
diff --git a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild b/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
deleted file mode 100644
index 8dd04ed40ecd..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg meson
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib"
-SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk-doc fonts +introspection stemmer"
-
-RDEPEND="
-	>=dev-libs/glib-2.58.0:2
-	sys-apps/util-linux
-	app-arch/libarchive:=
-	>=net-misc/curl-7.56.0
-	>=dev-libs/json-glib-1.1.2
-	>=x11-libs/gdk-pixbuf-2.31.5:2[introspection?]
-
-	fonts? (
-		x11-libs/gtk+:3
-		>=media-libs/freetype-2.4:2
-	)
-	>=media-libs/fontconfig-2.11:1.0
-	dev-libs/libyaml
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	x11-libs/pango
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	dev-util/gperf
-
-	dev-libs/libxml2:2
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddep11=true
-		-Dbuilder=true
-		-Drpm=false
-		-Dalpm=false
-		$(meson_use fonts)
-		$(meson_use stemmer)
-		-Dman=true
-		$(meson_use gtk-doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/asmjit/Manifest b/dev-libs/asmjit/Manifest
index 464a8cd53279..a0b25d1c244a 100644
--- a/dev-libs/asmjit/Manifest
+++ b/dev-libs/asmjit/Manifest
@@ -1,6 +1,6 @@
 AUX asmjit-2021.11.13-gentoo.patch 1936 BLAKE2B f809f2f5f9ab8a916d7a5f1a025f94694164c16b85cf65dbec54dea0cae2fe75a438ed393dfa6977f3cf43fec49de32e0b6dd346bb0b5cbf861555977f0fc0ff SHA512 cf0e207c6580061abaefbe3d0655a9d0bac8be4784bd0eb53e9689f97e95a9a90f48391a2394dbb36a7ea4b3fa168927bb140238917c21c08b8b86fcc1b83fec
 DIST asmjit-2021.11.13.tar.gz 717251 BLAKE2B 2bcad7234b0cab2d60c9fcd09149c93397595ca4859cb415378dabf52f8660de3aa5de40ee192fca814ee62bfc690ae8260c2f54faf10eb52c3ed3d63d1f4258 SHA512 2774168ff0847b3c29aee87325f12e431693c70661f8c10e0dc0d6530a3683d51ca472ef993e88c9d4e179494b045b2e75c22d6eda19b0c75e19843b69162da1
 DIST asmjit-2022.07.02.tar.gz 974040 BLAKE2B 28f2d23bcded48f1526b8820a5c9c919e014bdd6e8095762ba37414d2a47dc5665d89c4ca43fee9b216d5dfc71ef19835ce04f6dccc500451f204033b42be20c SHA512 c1196edb656833caa6d4d6817e34e4d2320ecda06bc6b531a0ff73f9e3786a98dad3f2348884de4e272d0e6853bb7b1eaab3feaa5d4430f28c3c9339ded1a58c
-EBUILD asmjit-2021.11.13.ebuild 661 BLAKE2B 20dcaa8acddd4db8ed4ff99bfc8e2eb45ab20f50a3403713b38353eb3399a8a67e05b6fe26c9dd9307fbfc8de051d77ca52ec91fa408164e664555ba2d822a44 SHA512 4184f9ba6e02374582e655b14149a484655c9beb9ce6f02ac6317ddace4227bb26ffbedd4070cdbfe895d3836ea3360a8c3f15642385fdcf16cc6f33865cc389
-EBUILD asmjit-2022.07.02.ebuild 604 BLAKE2B da662656882298b12cb927792d3abc323e0f8f977ffb09d9b8f4a2e7a12008bf1f0f9f7bfe7f3b9c028fa00fab6b9492a5758dfafabdc24ad3d594c9e7e30b83 SHA512 83f3ef7434568c4c463aebdcc3fc4050b83575bd0c118dac295349d8953f0a485bf05fde9ffa8f34901db97ba6d5da3e88755aeef99845b3bc0505f2e65a1e1e
+EBUILD asmjit-2021.11.13.ebuild 672 BLAKE2B f7d903d461e1fcf85a0882f0a6aad9dd533335b618cd18260c1263abbe5975f7d862cc0bc0fe0baab20cc962834c220f89a5e92665cd29496ca8997cfcf1c927 SHA512 2df18d55d0b61f2b159313a9ff54a127c0dd3aa652d11d58c623e66e6bc167e0f43d1e7ec20e5d16320e717fe78ee8acb8981b05b0115c2299ec216bf6682e74
+EBUILD asmjit-2022.07.02.ebuild 615 BLAKE2B c0c31019398808d6889f4aea1e1cd07a0ef925baa79eebfc16ae305120624bb3e6593c289e6cc8d9bbb616e4ac4e7c7d977a5f2e7f71b6722db2ab29c7b3c3e4 SHA512 e36296272c928f22608403ceec5db4e356e83a637c386fd7bb769ccf84aadc0eb693cfa6521c3d49cfc8ad772fd403592ee1fb0a9239c2e5bb374b57b1efed46
 MISC metadata.xml 326 BLAKE2B 33b6a6c08e1c2d3427bd6106ba3d354c2b5cce4ea529d955d558839ce1b2446ed0980f0a149f4706d89abdbf61d98e99cf5c30dbbb58e30a9c8c659b33992c6f SHA512 753ce999cb3a5a181bdf8efa874269cf31b43c836a8e2ac709fc64429ca003fccfafc38bdd0fc1ddfbc92a45baea64370568b96ff4435eed0df636eab6d41d34
diff --git a/dev-libs/asmjit/asmjit-2021.11.13.ebuild b/dev-libs/asmjit/asmjit-2021.11.13.ebuild
index 27da2e68b8b3..95281b54c698 100644
--- a/dev-libs/asmjit/asmjit-2021.11.13.ebuild
+++ b/dev-libs/asmjit/asmjit-2021.11.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ PATCHES=(
 )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DASMJIT_TEST=$(usex test TRUE FALSE)
 	)
 	cmake_src_configure
diff --git a/dev-libs/asmjit/asmjit-2022.07.02.ebuild b/dev-libs/asmjit/asmjit-2022.07.02.ebuild
index 909111795e67..a436e9b2a3f1 100644
--- a/dev-libs/asmjit/asmjit-2022.07.02.ebuild
+++ b/dev-libs/asmjit/asmjit-2022.07.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}"/${PN}-${CommitId}
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DASMJIT_TEST=$(usex test)
 	)
 	cmake_src_configure
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 8b6741d7b1fe..ff24c9b0a4db 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,5 +1,3 @@
-DIST gjs-1.72.2.tar.xz 620380 BLAKE2B 5ea15bdf25c36fa0236f03adea5b2261db3923190005754119eacd070830e7baedfa842ab273219055f67f7af535d31d5844c76eddfb03a8ec1cab57297ec258 SHA512 0dd10f40e8811bbb79c541cf3dc4e3759c0e025485e4b8ad2870dc30ac8030573300bc178c78bf2d396b86733e36b33210bfbdeead6a314e592d5b3c250a16a2
 DIST gjs-1.74.1.tar.xz 638536 BLAKE2B 375abcaa20a538cfa271f7dcf6f3715e4324ff5a4a9482ce0dd7f78213598a715ebc034f701fe458876f841f72802db4ae2aabf0abc04dc4ac5bb39c917741fd SHA512 346667accb589df0e6a045e30782017eab928115f263d36d521b61b0af38fd268bc518b8ab5ec78e5d25e0194b744a2ee59e65668da679e138b2122858ce0614
-EBUILD gjs-1.72.2-r1.ebuild 1928 BLAKE2B dc02cffd8627c6d0c0a2f92e181699832ffb7516e72c73afe5063a1550f625f7d4071ce556647e0f9ed2f88c33cdea9404f0d0ebee73837cb16afd4efd0f3c6f SHA512 2b396a9d78a2043b04074e3de859cc854c01071971b346ed6521531c082c42b2fe9b034b0a298139e26e522cafb77c36051ac1449d7b10bf99ef842d55908420
 EBUILD gjs-1.74.1.ebuild 1960 BLAKE2B cc9f89f86583adacec4aee0d6d74696ff81a65356f8b455964c27d1910af46ea2365c8d4cc6586be739048a206447538476feccd324be373d47f8a8a22d65cb1 SHA512 304297e1c12d5dc1b86e09aa78ccd00fbf1a8137e2802e1852c0998b4aeef6f56adc92ee65e4002f6bbb0b2a6a567c8658690600d8705dfaeb1c100751a0d1c2
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
diff --git a/dev-libs/gjs/gjs-1.72.2-r1.ebuild b/dev-libs/gjs/gjs-1.72.2-r1.ebuild
deleted file mode 100644
index 62bb94cec789..000000000000
--- a/dev-libs/gjs/gjs-1.72.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome.org meson virtualx
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples readline sysprof test"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	dev-libs/libffi:=
-	>=dev-libs/gobject-introspection-1.66.1:=
-	>=dev-lang/spidermonkey-91.3.0:91
-	cairo? ( x11-libs/cairo[X,glib,svg(+)] )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	test? (
-		sys-apps/dbus
-		>=x11-libs/gtk+-3.20:3[introspection]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	append-cppflags -DG_DISABLE_CAST_CHECKS
-
-	# On musl, it's required that either gjs, pixman or gnome-shell to be built
-	# with a larger stack otherwise librsvg fails to render a particular SVG, as
-	# a result we fail to get gdm or gnome-shell running (greeted with a fail
-	# whale screen). The bug has been reported to librsvg. This is ideally just
-	# a temporary workaround until we understand what exactly needs a larger
-	# stack size, as it's not sufficient to do just librsvg.
-	#
-	# Please refer to:
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
-	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
-	#
-	# TODO: Find an actual fix instead of increasing the stack
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	local emesonargs=(
-		$(meson_feature cairo)
-		$(meson_feature readline)
-		$(meson_feature sysprof profiler)
-		-Dinstalled_tests=false
-		$(meson_use !test skip_dbus_tests)
-		$(meson_use !test skip_gtk_tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 85fb351d368c..740b01373f68 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,11 +1,8 @@
 AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923c8bb54ead80d829aeb7a5c8a42c62e960e7305bc3fad69c67fd21e1c9f20b5c9002c0319cf3d77992b9cb71912c9b813b723e0a56aaea38330ad SHA512 ccd92d2f1fd495618ac788ffe6b69acec05a521a0ee8ff2bacb1dce6e283a04bbc2a10e61b37fc29f3893003fa154fa0d30bc37ed266b3f813200cd8ed17c116
-AUX glib-2.74.1-gnome-keyring-cpu.patch 3930 BLAKE2B 3da62efaa538e4685475b730626b9d76777874908340a55244e83cd70eaf6b731b5c363155b12db20c6fcf3a7692db047ca6cba65ac03f6c7f2b894af7da2ee8 SHA512 662d12afab80fb3d4af854d0ad1b477cfd27194ea86cbf5ad254a2997381d4eb327554a25d8a397b948c38011aa85d026d8ee477ce959553d292330fa01dd318
 AUX glib-2.74.4-implicit-func-decl.patch 755 BLAKE2B cfe3d3950d30c2ff0e4f21803bd10a50ef3b6bc355a5a2c7ab7dc7369d648fb3a7e3c3f4f21108104541bba1c5871d05b0863949626479c69586de602fef4f02 SHA512 91d7ec10dcd33b0cb2675dcf0c1e39ff17f9b2c5497c54e89b42a6a997b13ca9e0fa97ba146623cefb2020b40c4f6ef1c884741fac2bd41a05f338fc95363650
-DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 DIST glib-2.74.3-patches-2.tar.xz 23576 BLAKE2B f3746bdf961890d9f4e7ad20b107b83b7ceb8dcc36e288c1d526bac31a0e1dd9d1f13323f512355085c77d186ad66c3f52c1154f34c1d6fd6a5e64a074b2920c SHA512 945c131c27f02044db6154f0a63f458d6317c8a4e841fb392947b16756e25d92adeb2b34d793c9e19441b825d1aee71ae9b08fdcbefa1bc9de1d5af9e903e82c
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
-EBUILD glib-2.74.1-r1.ebuild 10172 BLAKE2B 0920ab3c5ac1187ac6c31c6b9531fe7f5f0b4027a9f084f8620d4a0579b07baa10cf9f93fcc16bea2362bd7b43a25e67e77225702d1e2a35dc47b63e2bbe5b17 SHA512 1644fdff2f7031251b0f5b9e9d71f4ef522660fefcf9c963be73f911b9a283c7448657fc68f5dc679658861cb33c63ba5c0bd4785ecedee1429220e415e5fdb6
 EBUILD glib-2.74.3-r3.ebuild 10421 BLAKE2B eb8f55fb189bbd9cbd593f80042d78f5c9f158457105754805514adb91ed05d2db5e83aaf8e81558ba5f94028892aebe75f32cc8875fbc5d736fc66d1198b885 SHA512 ad7247cb30611ef5e88f96dc9ade10c0e0b92169f153eca520e68f1c299c449d8467830a135cfb418b33a2a3a6d7187b0b7a470cd0a97a9440e28494e6f2dc94
 EBUILD glib-2.74.4.ebuild 10257 BLAKE2B 08bac71147c7f055d248a7790354a925f6a26af1affcc71cc2c1b786a8264e79161dd6264d54cfc5f169e56556eb4cf56541466624471907beb2c17a7dfee8d9 SHA512 7b96b443085c060e3daa720852668a4c5616ca045d44d1fc8e1481451abfff5ec6d792152b0340bfa2523a209a0cb22de4b8f605d3730a07dc6633beaa70734e
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
diff --git a/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch b/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch
deleted file mode 100644
index 8cb07a2803f3..000000000000
--- a/dev-libs/glib/files/glib-2.74.1-gnome-keyring-cpu.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3029
-https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 (backport PR we've used)
-https://bugs.gentoo.org/878995
-https://bugs.gentoo.org/878351
-
-From e2f283d7c8c5ab3aeb2f281a27ec7c0f24b86868 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Fri, 28 Oct 2022 11:21:04 -0400
-Subject: [PATCH 1/2] Revert "Handling collision between standard i/o file
- descriptors and newly created ones"
-
-g_unix_open_pipe tries to avoid the standard io fd range
-when getting pipe fds. This turns out to be a bad idea because
-certain buggy programs rely on it using that range.
-
-This reverts commit d9ba6150909818beb05573f54f26232063492c5b
---- a/glib/glib-unix.c
-+++ b/glib/glib-unix.c
-@@ -108,17 +108,6 @@ g_unix_open_pipe (int     *fds,
-     ecode = pipe2 (fds, pipe2_flags);
-     if (ecode == -1 && errno != ENOSYS)
-       return g_unix_set_error_from_errno (error, errno);
--    /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
--    else if (fds[0] < 3 || fds[1] < 3)
--      {
--        int old_fds[2] = { fds[0], fds[1] };
--        gboolean result = g_unix_open_pipe (fds, flags, error);
--        close (old_fds[0]);
--        close (old_fds[1]);
--
--        if (!result)
--          g_unix_set_error_from_errno (error, errno);
--      }
-     else if (ecode == 0)
-       return TRUE;
-     /* Fall through on -ENOSYS, we must be running on an old kernel */
-@@ -127,19 +116,6 @@ g_unix_open_pipe (int     *fds,
-   ecode = pipe (fds);
-   if (ecode == -1)
-     return g_unix_set_error_from_errno (error, errno);
--  /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */
--  else if (fds[0] < 3 || fds[1] < 3)
--    {
--      int old_fds[2] = { fds[0], fds[1] };
--      gboolean result = g_unix_open_pipe (fds, flags, error);
--      close (old_fds[0]);
--      close (old_fds[1]);
--
--      if (!result)
--        g_unix_set_error_from_errno (error, errno);
--
--      return result;
--    }
- 
-   if (flags == 0)
-     return TRUE;
-GitLab
-From 4526620d8c485f5dfba6ddca33f91670982f82eb Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 31 Oct 2022 09:17:55 -0400
-Subject: [PATCH 2/2] glib-unix: Add test to make sure g_unix_open_pipe will
- intrude standard range
-
-Now that we know it's a bad idea to avoid the standard io fd range
-when getting pipe fds for g_unix_open_pipe, we should test to make sure
-we don't inadvertently try to do it again.
-
-This commit adds that test.
---- a/glib/tests/unix.c
-+++ b/glib/tests/unix.c
-@@ -24,8 +24,11 @@
- #include "config.h"
- 
- #include "glib-unix.h"
-+#include "gstdio.h"
-+
- #include <string.h>
- #include <pwd.h>
-+#include <unistd.h>
- 
- static void
- test_pipe (void)
-@@ -52,6 +55,39 @@ test_pipe (void)
-   g_assert (g_str_has_prefix (buf, "hello"));
- }
- 
-+static void
-+test_pipe_stdio_overwrite (void)
-+{
-+  GError *error = NULL;
-+  int pipefd[2], ret;
-+  gboolean res;
-+  int stdin_fd;
-+
-+  stdin_fd = dup (STDIN_FILENO);
-+  g_assert_cmpint (stdin_fd, >, 0);
-+
-+  g_close (STDIN_FILENO, &error);
-+  g_assert_no_error (error);
-+
-+  res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error);
-+  g_assert_no_error (error);
-+  g_assert_true (res);
-+
-+  g_assert_cmpint (pipefd[0], ==, STDIN_FILENO);
-+
-+  g_close (pipefd[0], &error);
-+  g_assert_no_error (error);
-+
-+  g_close (pipefd[1], &error);
-+  g_assert_no_error (error);
-+
-+  ret = dup2 (stdin_fd, STDIN_FILENO);
-+  g_assert_cmpint (ret, >=, 0);
-+
-+  g_close (stdin_fd, &error);
-+  g_assert_no_error (error);
-+}
-+
- static void
- test_error (void)
- {
-@@ -337,6 +373,7 @@ main (int   argc,
-   g_test_init (&argc, &argv, NULL);
- 
-   g_test_add_func ("/glib-unix/pipe", test_pipe);
-+  g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite);
-   g_test_add_func ("/glib-unix/error", test_error);
-   g_test_add_func ("/glib-unix/nonblocking", test_nonblocking);
-   g_test_add_func ("/glib-unix/sighup", test_sighup);
-GitLab
diff --git a/dev-libs/glib/glib-2.74.1-r1.ebuild b/dev-libs/glib/glib-2.74.1-r1.ebuild
deleted file mode 100644
index cf1afe7d1d51..000000000000
--- a/dev-libs/glib/glib-2.74.1-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_REQ_USE="xml(+)"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
-RESTRICT="!test? ( test )"
-#REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# * elfutils (via libelf) does not build on Windows. gresources are not embedded
-# within ELF binaries on that platform anyway and inspecting ELF binaries from
-# other platforms is not that useful so exclude the dependency in this case.
-# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
-# these are used by GIO, which glib[static-libs] consumers don't really seem
-# to need at all, thus not imposing the deps for now and once some consumers
-# are actually found to static link libgio-2.0.a, we can revisit and either add
-# them or just put the (build) deps in that rare consumer instead of recursive
-# RDEPEND here (due to lack of recursive DEPEND).
-RDEPEND="
-	!<dev-util/gdbus-codegen-${PV}
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
-	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
-	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
-	elf? ( virtual/libelf:0= )
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-# libxml2 used for optional tests that get automatically skipped
-BDEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	gtk-doc? ( >=dev-util/gtk-doc-1.33
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5 )
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	${PYTHON_DEPS}
-	test? ( >=sys-apps/dbus-1.2.14 )
-	virtual/pkgconfig
-"
-# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
-
-PDEPEND="
-	dbus? ( gnome-base/dconf )
-	mime? ( x11-misc/shared-mime-info )
-"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# dconf is needed to be able to save settings, bug #498436
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gio-querymodules$(get_exeext)
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnome-keyring-cpu.patch
-)
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test ; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-		fi
-		linux-info_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		# TODO: Review the test exclusions, especially now with meson
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-		#	ewarn "Some tests will be skipped due to missing terminal program"
-		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
-		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
-		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		# desktop-app-info/launch* might fail similarly
-		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
-		#fi
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
-		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
-		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
-
-		ewarn "Tests for search-utils have been skipped"
-		sed -i -e "/search-utils/d" glib/tests/meson.build || die
-
-		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
-		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
-	else
-		# Don't build tests, also prevents extra deps, bug #512022
-		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
-	fi
-
-	# Don't build fuzzing binaries - not used
-	sed -i -e '/subdir.*fuzzing/d' meson.build || die
-
-	# gdbus-codegen is a separate package
-	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
-
-	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
-	sed -i -e '/install_dir/d' gio/tests/meson.build || die
-
-	cat > "${T}/glib-test-ld-wrapper" <<-EOF
-		#!/usr/bin/env sh
-		exec \${LD:-ld} "\$@"
-	EOF
-	chmod a+x "${T}/glib-test-ld-wrapper" || die
-	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
-
-	default
-	gnome2_environment_reset
-	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DG_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
-	fi
-
-	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
-	#if tc-is-cross-compiler ; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
-		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
-		#case ${CHOST} in
-		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
-		#*)            export glib_cv_stack_grows=no ;;
-		#esac
-	#fi
-
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-		$(meson_feature selinux)
-		$(meson_use xattr)
-		-Dlibmount=enabled # only used if host_system == 'linux'
-		-Dman=true
-		$(meson_use systemtap dtrace)
-		$(meson_use systemtap)
-		$(meson_feature sysprof)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		-Dnls=enabled
-		-Doss_fuzz=disabled
-		$(meson_native_use_feature elf libelf)
-		-Dmultiarch=false
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	export LC_TIME=C # bug #411967
-	export TZ=UTC
-	unset GSETTINGS_BACKEND # bug #596380
-	python_setup
-
-	# https://bugs.gentoo.org/839807
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /usr/b
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	meson_src_test --timeout-multiplier 2 --no-suite flaky
-}
-
-multilib_src_install() {
-	meson_src_install
-	keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-	# These are installed by dev-util/glib-utils
-	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
-	rm "${ED}/usr/bin/glib-genmarshal" || die
-	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
-	rm "${ED}/usr/bin/glib-mkenums" || die
-	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
-	rm "${ED}/usr/bin/gtester-report" || die
-	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
-	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
-	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# Make gschemas.compiled belong to glib alone
-	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
-
-	if [[ -e ${EROOT}${cache} ]]; then
-		cp "${EROOT}"${cache} "${ED}"/${cache} || die
-	else
-		touch "${ED}"${cache} || die
-	fi
-
-	multilib_pkg_preinst() {
-		# Make giomodule.cache belong to glib alone
-		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"${cache} || die
-		else
-			touch "${ED}"${cache} || die
-		fi
-	}
-
-	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
-	# file due to inability to create it and GIO might not look at any of the modules there
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_preinst
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	# glib installs no schemas itself, but we force update for fresh install in case
-	# something has dropped in a schemas file without direct glib dep; and for upgrades
-	# in case the compiled schema format could have changed
-	gnome2_schemas_update
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	if ! tc-is-cross-compiler ; then
-		multilib_foreach_abi multilib_pkg_postinst
-	else
-		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
-		ewarn "You might want to run gio-querymodules manually on the target for"
-		ewarn "your final image for performance reasons and re-run it when packages"
-		ewarn "installing GIO modules get upgraded or added to the image."
-	fi
-
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "2.63.6"; then
-			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
-			ewarn "to restart your session for \"Open With\" dialogs to work."
-		fi
-	done
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
-	fi
-}
diff --git a/dev-libs/libb64/Manifest b/dev-libs/libb64/Manifest
index ae152245462c..0206d3645d2c 100644
--- a/dev-libs/libb64/Manifest
+++ b/dev-libs/libb64/Manifest
@@ -1,3 +1,3 @@
 DIST libb64-2.0.0.1.tar.gz 15766 BLAKE2B 45e3cab768cae39758d146cd84b72a7644592e55553be9c11ed1e83c3acbf4ed05cd00bbd59371b9e71cd53012149f25c371769afba7fbdaafdf561a297247c8 SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23
-EBUILD libb64-2.0.0.1.ebuild 610 BLAKE2B 2632cf1b0032081695dafb68b00895f3fdfbb7013d47b45d20bbbf7904811604432621436859c57e1411badd1eed1bb6be43d305f669cf6308c0d61d4fb90dbe SHA512 d81de28d06153a70b8e91f7e211cf2a7f76f34eaf1e8aa223f2ea39b04d8ad392b00d57ec2c54f522fe717d3b9d9142eab0b4b17c93ee2ff2713d3b432f43178
+EBUILD libb64-2.0.0.1.ebuild 609 BLAKE2B efb2e4102ee5937b2677be95a20ad864252511fb16b9e3474d62946ea12989bc70ab11be2d2adf9a5db7441adadc4abcf86be71a709fbb82962c6f9930a97968 SHA512 53f7f7bcd25f915b6ecde878d296a4f79dc59527d97943644ce139d1d9cf9e1ee3b43cd32882e95961675e1370507d943d1cf969afb6c359ec408edc9f744b51
 MISC metadata.xml 324 BLAKE2B 4facc65e9fdd438bdbccf080a7fe6f062c584c8323ee8f91d09e76d9a1705aecd03dbe549f2b771b6fde97c9cadeedcba3020725dea0e30acbe6d50adbe70438 SHA512 0a8fcca46711348953a3e381a5a7065d5c38dcb3c5cac6fc9b67f6191fd08658fd11f5a82107d7feeab3ebbf5053891ceda1ed14e00bde7aeb86bce160c2e094
diff --git a/dev-libs/libb64/libb64-2.0.0.1.ebuild b/dev-libs/libb64/libb64-2.0.0.1.ebuild
index a99722ebba95..d51f3ea296c7 100644
--- a/dev-libs/libb64/libb64-2.0.0.1.ebuild
+++ b/dev-libs/libb64/libb64-2.0.0.1.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
@@ -11,7 +11,7 @@ SRC_URI="
 LICENSE="CC-PD"
 # static library, so always rebuild
 SLOT="0/${PVR}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 6a21f53ac0cb..3212f893f878 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
 DIST libcbor-0.9.0.tar.gz 275405 BLAKE2B 7e78722650c702552dda4844615c454989281abe8c45ba3c9168af16e9d440a1b7e4e0c9afd89faa48e74ba85dcbe0c7733eec3e44fdafc0ca340e97574fe274 SHA512 710239f69d770212a82e933e59df1aba0fb3ec516ef6666a366f30a950565a52981b0d46ca7e0eea739f5785d79cc21fc19acd857a4a0b135f4f6aa3ef5fd3b0
-EBUILD libcbor-0.9.0.ebuild 1458 BLAKE2B 7a856dff5225faf458389ba27b887f4cf8afcd631c477bef0a713f05903bf68d0abc457dc32e0d46d61cf5bf8b5a2a26a5528c38737a4e36440b74aa9bea5d10 SHA512 93a5fdbe32f541326fa20706c454aa5bc1b2f0bb3f48e9c1030b846ade098e270b8bbd783d4770dbfe2399bf2c9b23889176bd9258f6cc42678f9533ad35c3c9
+EBUILD libcbor-0.9.0.ebuild 1455 BLAKE2B 120dd3a9adbbe739093b9b26b56f4085f7d923649ccb4616cba254f24fba5bae14bcd5c4620fdf8ea58909c2426d6629abd6cb36333e65019a0d38cff5bdf081 SHA512 5ac698770687f298e55eec8f7d6d176e0f6d0b8baf33128faec055a0cdaca8c076ec3cbb15e9baa640ffbeac28765bb309f25995cd1cff4334a437f854ecec05
 MISC metadata.xml 430 BLAKE2B f478d98c9495fbb0946ec5d193e489f8f8a3c0a4ecbbac58ed2e3a79124d65741a54dfdc1a73f41dad39c596511aa0873ea38d2ba22d45b75a9600a122886f1d SHA512 ae7788a8a66d6f5333ee22601ff1ac202d279a7dd2aa245231440bb8a48e83d64361d4c105e331c217b8be096d9cc6d76f3878d4132e8060bc1fdcb7e8a64b18
diff --git a/dev-libs/libcbor/libcbor-0.9.0.ebuild b/dev-libs/libcbor/libcbor-0.9.0.ebuild
index 9d2172da0ce8..44cb6de4d07c 100644
--- a/dev-libs/libcbor/libcbor-0.9.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_BUILD_TYPE=Release
 		-DCBOR_CUSTOM_ALLOC=$(usex custom-alloc 'ON' 'OFF')
 		-DWITH_TESTS=$(usex test 'ON' 'OFF')
diff --git a/dev-libs/libgaminggear/Manifest b/dev-libs/libgaminggear/Manifest
index 68a902d24242..75aef6193b3b 100644
--- a/dev-libs/libgaminggear/Manifest
+++ b/dev-libs/libgaminggear/Manifest
@@ -1,5 +1,5 @@
 AUX libgaminggear-0.10.0-doc.patch 484 BLAKE2B 9a63685991e322157ba941ae167ce6dea78a20bffb85662c5a7c2cb6879950dd9e085be83a53d4d13294f73e23cf7e1661c357e1140e5c0903942531a5676f7f SHA512 c5fbfb231f075f34eb4237edf3de6e335ff735513b72a41fd602422dc9f0fd511f66b4c087bfd0dfc68ebda8d1bc0b70a6eb35e5e3158c50b7a5d641e78ada01
 AUX libgaminggear-0.15.1-cmake-3.13.patch 613 BLAKE2B 4f2690aff5f33555a5fd446cc3ae8d9f7a417fc8753f2b8f77451394b1ed57d3be277e8d0bb02cb573a0efce3b15fe00f1e9f37139b0de24a78c3aadd70c67ed SHA512 e9a9173f9d5749803b88be2fdc4f5d2fd2207131622d558316428c791983f76ba477c645b2a410a7536b5614c141fc91dc9b51e84e3ff3d8167589e7bfb95a4a
 DIST libgaminggear-0.15.1.tar.bz2 111959 BLAKE2B 6a8d5cd01adcee1d870aada9f20b229e95975a013bfb8076c8135a7b4cbd5f2043b68ad481d0df1b369f560c2ea2172ff2a542ca61ce30317deeeb66a5aa2588 SHA512 a6635a74557f276ab65eda4610ba8a053fedf10f9d898a1dc875082a36b2822544f61fc7a274691673670b12d4de968aa4921d102a588f3d0777397730082990
-EBUILD libgaminggear-0.15.1.ebuild 1072 BLAKE2B e1c177e6a86973bbb2cdc162d83395ed45a906638fb75d1ef60b8d5df82234822247675d28e71223ee38c5b8e18a2b513aa7b994146ae4094b7db65395ab9985 SHA512 5ec36b2c5589bbe336fcbeb95653eb6d1230624cb46c40da6f8b677e0fc66b571398aacf66a80a4e14ec25387e629e3d148bed40440254b252f49b80427f3996
+EBUILD libgaminggear-0.15.1.ebuild 822 BLAKE2B 4bd0df1c38579fe3cfc6ce1bcb90be8a53d2ec41a8569f6a2d06e16637af83107df1b2052d15283954ff15e1326e39d45fd5a8f2c448ea9da0cd130262a5b8cc SHA512 8dff85713d8dbc6a7ddfb7fd0b05c738902266a3a6d57dd91b720bc06b262947f80aef63c455a9d36e3a9561b3dc33283cbf0b8c6a8c9ce8b0c23d63423bc0b4
 MISC metadata.xml 251 BLAKE2B 9647e79cad0b6505c23b13c0837f3c2832bfceaa49b658d6c9bf2a171adfe24c5ce619e0a9bf9cf6a00aada0151051c0036a61b7c45cb32f392b2df764db84d5 SHA512 11e5c997a70338f3d5c9611467e9f3313faceac3c93669812ca4609c5222c1dfceedb67f83f15a624e493f8d4775946566f8d8640334a0555cd35c6594b5086b
diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
index d840aa57f738..2a564652addf 100644
--- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
+++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit xdg cmake
 
 DESCRIPTION="Provides functionality for gaming input devices"
 
@@ -39,30 +39,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake-3.13.patch
 )
 
-# Required because xdg.eclass overrides src_prepare() from cmake.eclass
-src_prepare() {
-	cmake_src_prepare
-}
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_DOC="$(usex doc)"
 	)
 	cmake_src_configure
 }
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index 8b34496defc0..bedd5ae9d7c5 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -1,7 +1,3 @@
-AUX 4.0.0-autoskip-network-test.patch 976 BLAKE2B ce6866636be48e553621a18dcda5ca122f204ad074d7472c740ea8db8cb283fe8f6ab63e2bc3862fd2c0725446c7c2969bc2f431bd175d9d2b96f68c401f3e0b SHA512 6f47d66e243dac3162b3e89e5fe893de7d87cc8dce9893534a12e76f1e9b830a18cdf3a9f6a26de89094841d1874843da301ed10f35e0b7e6d9ae4b2bca07f54
-AUX 4.0.0-vapigen.patch 1153 BLAKE2B 1462b72ad3d25d4d5eac255d49217d74ef2cab67c740dc1feaaafa671977eaa92557c623c4f37f8cc4f76ee05018f040dd3604b6eb413bdc46830f77e2aff8c0 SHA512 0aae04a26f68e63b30911d3a76dd0569823ea11e247c14a34f81a15686caf33ea2834368e8b545faa1d0bd5f66e749916722e2cd77feef151c5cebd6d0fec1dd
-DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
 DIST libgweather-4.2.0.tar.xz 2752164 BLAKE2B 9cc51363d6a2a09497269760701e0e0c1beb68c0096262fb6e2885414f838b41c151df7b057def457fdd49f9036d853ab624a9683a5cf57bbdefaed5376fe69f SHA512 cd95c6714575c0afc52455bb99c9116af27716868648debe0e5309904cfaf7516cf2379e415b3d9dd57b5dd223bae8e8acbaf705a3867dad8f75aec22eea908e
-EBUILD libgweather-4.0.0-r1.ebuild 1713 BLAKE2B 8e879bfee3e337eb3e6967e1e1d015db133319268a4b9ac07d1b8c8cff67563f685142f2888eaab92ab1230b5da8a8559abbe701f670abb0794c5b830bdac24a SHA512 02adc00aff1fefeb298f1f31e0a8638cbe3ad0b594e9411a555afad824da294c74754075ee79c94e4220a581fdb3edf628400ecd5ebbc93f55ac6371d530fb4c
 EBUILD libgweather-4.2.0.ebuild 1984 BLAKE2B 7c4b6b4420eb124e0c2e781a10114dc6e01c0bf0e95b34a83b7ddd11ee9b6ee7cbca9206842aaac2d7b55990c48215cdc89ff8e08d29de9498c47c12605ab9c8 SHA512 fbf751746493b6129ebca83d8a2acfea661436cbc4b27bf89cda46a5469702b91af1f10ccac90d698d05f819aac5f4dda04b7a848eb3c64ff1ae911b18bb6a14
 MISC metadata.xml 352 BLAKE2B 3726dfdf7269138db7992dbab72db960ed2362a8c753362376f28fa37e0849ef89f74b132dea4c63120dfb777f27566aea12f5dc92ddbeeb5a3b8139d4feeb9c SHA512 06dcfdd1ba301e34b2b9a23f3cdb5a686daa8fcc7a2caa8ac921eade3e805589ba2bb148da5f64f95f93d62dda71b5e19f37b33f1e35201c61bd8e0bb996bbf4
diff --git a/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch b/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
deleted file mode 100644
index 3f27906de012..000000000000
--- a/dev-libs/libgweather/files/4.0.0-autoskip-network-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 87c0d202977c212a6b7fd360ceaa295e422de87d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 30 Aug 2020 10:35:13 +0300
-Subject: [PATCH] tests: Skip metar tests when METAR_SOURCES couldn't be
- resolved
-
----
- libgweather/tests/metar.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libgweather/tests/metar.c b/libgweather/tests/metar.c
-index 7d6c7c04..0b3025a2 100644
---- a/libgweather/tests/metar.c
-+++ b/libgweather/tests/metar.c
-@@ -142,6 +142,11 @@ test_metar_weather_stations (void)
-         g_test_message ("SSL/TLS failure, please check your glib-networking installation");
-         g_test_failed ();
-         return;
-+    } else if (msg->status_code == SOUP_STATUS_CANT_RESOLVE) {
-+        g_test_skip ("Could not resolve " METAR_SOURCES " - network sandboxed?");
-+        g_object_unref (session);
-+        g_object_unref (msg);
-+        return;
-     }
- #if SOUP_CHECK_VERSION(2, 99, 2)
-     g_assert_no_error (error);
--- 
-2.34.1
-
diff --git a/dev-libs/libgweather/files/4.0.0-vapigen.patch b/dev-libs/libgweather/files/4.0.0-vapigen.patch
deleted file mode 100644
index d5c4ca12623e..000000000000
--- a/dev-libs/libgweather/files/4.0.0-vapigen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.gnome.org/GNOME/libgweather/-/merge_requests/176
-
-From 98b505675f631c1fabbbcbcee2523f8dde8e7e3d Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 20 Mar 2022 12:19:59 -0700
-Subject: [PATCH] meson: Use dependency() for finding vapigen
-
-This allows the vapigen binary to be chosen by overriding the VAPIGEN
-environment variable.
----
- libgweather/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 08311af4..7148f5ca 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -211,7 +211,7 @@ g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'
- build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
-
- enable_vala = get_option('enable_vala')
--vapigen = find_program('vapigen', required: enable_vala == 'true')
-+vapigen = dependency('vapigen', required: enable_vala == 'true')
- if enable_vala == 'auto' or enable_vala == 'true'
-   build_vapi = vapigen.found() and get_option('introspection')
-   if enable_vala == 'true' and not build_vapi
---
-2.34.1
-
diff --git a/dev-libs/libgweather/libgweather-4.0.0-r1.ebuild b/dev-libs/libgweather/libgweather-4.0.0-r1.ebuild
deleted file mode 100644
index 8f5a335babca..000000000000
--- a/dev-libs/libgweather/libgweather-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Location and timezone database and weather-lookup library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather"
-
-LICENSE="GPL-2+"
-SLOT="4/4-0" # subslot = 4-(libgweather-4 soname suffix)
-
-IUSE="gtk-doc +introspection test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.68.0:2
-	>=net-libs/libsoup-2.44:2.4
-	>=dev-libs/libxml2-2.6.0:2
-	sci-geosciences/geocode-glib:0
-
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gi-docgen-2021.6
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/4.0.0-autoskip-network-test.patch
-	"${FILESDIR}"/4.0.0-vapigen.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/pygobject[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	gnome2_environment_reset
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use vala enable_vala)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use test tests)
-		-Dsoup2=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index 10463388a14b..7eef222678fd 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,7 +1,4 @@
-AUX libpwquality-1.4.4-musl-fgetpwent_r.patch 1260 BLAKE2B e9c9df60e0e1ba022185393f044190e0539950e5bf1f58a9c1ade2174fd8d04158b8834c8581bcd3818a7c95206a2dc288176dab21a31a809792ebbedfa4bb94 SHA512 e9f6fc0e21128eb306c9ad777d6b034f01e5d5a751c055fe6cc3f2f9ef03a3e4b718ebcf1f549922ffe4356e9c0bc8225e194c94bcc37c29b200f982c3179700
 AUX libpwquality-1.4.4-pam_pwquality-include.patch 1208 BLAKE2B d7899e6caeb8a1f4515026165d9a321e0a7840b45e4f2472a8562f7a88e35c80f7295349491f3a0037da1ff12e7c74e99236c4ef1d3334fbc477bf393bf3954b SHA512 e570c7f036a1182e43c63b852040468b0dd45ca115ff98f62bc4d3bba02b0c368cd9b1e857e39ea5fcd0b74b265cc7baea529359593512d896f65c6b658afd27
-DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
 DIST libpwquality-1.4.5.tar.bz2 433961 BLAKE2B f5326996ab607bf9d24de446d9714987ad259fd2222bc54983769abc298969e2e9a4cee78f2a5c5d963bd0e5f57ea3aa346b0ce108b465a8da82810486b37e36 SHA512 91a6febbf40047e553b6051df727857df7932c816638f15118a46b8286527a80446ca4f6a050d2b1f4e33335bf4b75290751ce358fa477cb9d06fe89a450d647
-EBUILD libpwquality-1.4.4-r2.ebuild 2270 BLAKE2B 71cf75507263df789ca13a713a71d2f1e716e9be9e3a2da76d45dcff65b57ce0382c63518d33cdab866d9d42f374f5970e7316b6bb0d4377311e248ac96a5bd1 SHA512 302c531cb70e24bb615d40a37bdb076a8a3406462a21d40493f85c82224657292b1b52520012f9d37878c1c27c1bc14e958916d60f03485c5ecb47885c966a07
 EBUILD libpwquality-1.4.5.ebuild 2156 BLAKE2B 5cedd1a77379f2c2c3bc263f630e4946245b6690fdcf5430d5c80fdc34c7c0008d47e341410beb7ce3df0ff16b016fbe470209a606aab6e4390f05399632e28d SHA512 df6efa806659ac5ad7e795b03b2e48324c07002a3ffc4854927c419db2c8aecc16d183206d399bf391f9b0952ffe99406b00a6e5b9ddc3b36d370084abf9a2e2
 MISC metadata.xml 354 BLAKE2B c7c1c6aad6af351f12d42c720fe4372aa0966601624454febad3d0ac2c40b069acfaae7f1c77c41546c701a8ad1e242bd715f421ed2103e9c48cc5a63d7e44fa SHA512 41ecf39d00ced11f91831aa04bbca66d0a409367ae87aab765c94dbcdfc4dd8900f707b767e2fe76ad1eaa62c33e2e571027c7e5112e799104029bb773d812df
diff --git a/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch b/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch
deleted file mode 100644
index 6cfb538103ae..000000000000
--- a/dev-libs/libpwquality/files/libpwquality-1.4.4-musl-fgetpwent_r.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/libpwquality/libpwquality/commit/9084c1b032161cdb53d5f66132a91bdc207faecf
-
-From: Noel Kuntze <noel.kuntze@thermi.consulting>
-Date: Mon, 24 May 2021 14:15:34 +0200
-Subject: [PATCH] pam_pwquality.c: Use pam_modutil_check_user_in_passwd instead
- of fgetpwent_r (not available on musl)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,6 +97,11 @@ if test "$enable_pam" != "no"; then
-       test $fail = 1 &&
-         AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality])
-   fi
-+  AC_CHECK_FUNC(
-+    [pam_modutil_check_user_in_passwd],
-+    [AC_DEFINE([HAVE_PAM_CHECK_USER_IN_PASSWD], [], [have pam_modutil_check_user_in_passwd])],
-+    []
-+  )  
- fi
- 
- if test "$enable_pam" = "yes"; then
---- a/src/pam_pwquality.c
-+++ b/src/pam_pwquality.c
-@@ -98,6 +98,9 @@ static int
- check_local_user (pam_handle_t *pamh,
-                   const char *user)
- {
-+#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD
-+        return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS;
-+#else
-         struct passwd pw, *pwp;
-         char buf[4096];
-         int found = 0;
-@@ -136,6 +139,7 @@ check_local_user (pam_handle_t *pamh,
-         } else {
-                 return found;
-         }
-+#endif
- }
- 
- PAM_EXTERN int
-
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild
deleted file mode 100644
index ed1efb848323..000000000000
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit autotools pam python-r1 usr-ldscript
-
-DESCRIPTION="Library for password quality checking and generating random passwords"
-HOMEPAGE="https://github.com/libpwquality/libpwquality"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="pam python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	>=sys-devel/gettext-0.18.2
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=sys-libs/cracklib-2.8:=[static-libs(+)?]
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-musl-fgetpwent_r.patch
-	"${FILESDIR}"/${PN}-1.4.4-pam_pwquality-include.patch
-)
-
-src_prepare() {
-	default
-	# ensure pkgconfig files go in /usr
-	sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
-		-i src/Makefile.{am,in} || die "sed failed"
-
-	# Needed for musl patch, drop on next release
-	eautoreconf
-
-	if use python ; then
-		# bug #830397
-		export SETUPTOOLS_USE_DISTUTILS=stdlib
-		python_copy_sources
-	fi
-}
-
-src_configure() {
-	# Install library in /lib for pam
-	configuring() {
-		local sitedir
-		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
-			$(use_enable pam) \
-			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
-			$(use_enable python python-bindings) \
-			$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
-			$(use_enable static-libs static)
-	}
-	if_use_python_python_foreach_impl configuring
-}
-
-src_compile() {
-	if_use_python_python_foreach_impl default
-}
-
-src_test() {
-	if_use_python_python_foreach_impl default
-}
-
-src_install() {
-	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}/usr/$(get_libdir)"
-		mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
-	find "${ED}" -name '*.la' -delete || die
-}
-
-if_use_python_python_foreach_impl() {
-	if use python; then
-		python_foreach_impl run_in_build_dir "$@"
-	else
-		"$@"
-	fi
-}
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 0e593156fcae..389122da2b0c 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -3,7 +3,7 @@ AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
 DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0
 DIST rocksdb-6.17.3.tar.gz 6651009 BLAKE2B c032bdf61d93a35e84c65146ad6d1f8639e9f36a323c142fe4131b501051bfb9c4c4edb13b69c86e35740117029996bb4c94887ea690d1957926bdfd347c744a SHA512 085adab94b7eb22859b4119b0356f148231800413571e932a7248967b1866d40a0be4b8265f2a9c6c21c600d3b2254c36e64ce7851171ff7c439a17306a84981
-EBUILD rocksdb-6.14.6-r1.ebuild 1167 BLAKE2B 5a363861d7ee4bd6288b5720d4742a9acf65b0935a3fd96caadf70832e9a1659678bd2b3adf7098c9b291dca5122e67fdb05977e4b6334dd4bd94871c4b020d4 SHA512 3b3f8595b2a376a2c09c6595c38c7f53ee0011b8535ab7b4cfafabe270ff830c98d390dde7d1e8c5a54a615ba2e298b66fd69aad2e7036ff705f12e91b80c00c
-EBUILD rocksdb-6.15.5.ebuild 1159 BLAKE2B 044f63cea6a65d2e4edd7a16eea61c8bb77faf346443ecc1b7d9e41747a7fe52a1bd45d3663acde188fde63405be75927c550b471dbf05f5ed1a29c39d529bb3 SHA512 9d4a7374293868883600b82ab4ddd0e0928aa7eeb6bda56845376f4fb93cad80e7d2a44c45297a13110756e48409a67e85ae7a6b49d813b0e0e34ccf2e0bd065
-EBUILD rocksdb-6.17.3.ebuild 1220 BLAKE2B 75e7df60533eb9793f8c5a95f795a2b7c47097624ce7f8bf7b5c3648f3cd71a09625a6ab25ebdcd38e7152c00fc174eafe25af982cff30c8b8b96da555977e29 SHA512 2d739631429ad720c697082b45ed6fa4e622fc1ac20c975a93a19142a9eca0db2a39bb786a81906177c3063096baceed23efb1570b7192cf5324ed28823d3990
+EBUILD rocksdb-6.14.6-r1.ebuild 1173 BLAKE2B c620620fbd584890c23fb80984b0fcabb04da9c202b6ce1f48b27e00f7b441b775c97682d6a729e384c619a4ad55813d79fb33835c64a7cf030aa9ca66262d8e SHA512 1715fcf299acf7e5cf95d8d9287b2ee3902c75da131a15777656dd8f8fffb565b4c6843c386a80d5f194dd99f2a1a2c419f82411334b81126fb81fcea3361891
+EBUILD rocksdb-6.15.5.ebuild 1165 BLAKE2B 84e438b8cd56f29ba7d6b4d47117ec0931c8da2c412a1ed3536b3345972f74fe6e6d6827adb2216040f9df6c8b00541058f3aedd755eedf8a384d2f2121e4a05 SHA512 8c2da7ef9a842834d92eb870e4473aba73867e216cd532abfd96b1c17eb078d1152fbb07a04d18b3ec5c9e8e2c5b5c8e21ff240ef9dd3c25cecb82247433b0a2
+EBUILD rocksdb-6.17.3.ebuild 1226 BLAKE2B a4a7dba717e80d47482f6bbd3a5721b63b300effc061edb58ef9991f81c3d6c90ad06ecc1f8a3343a27c342525cc7ee8aac613388509be9af461c795cac573ea SHA512 bd741ba0fc0b4978d455b658409e297d07317fb16aa4b6406e107f189331f097d28ca3300d2a20990993be0741b376563b0eb604f23ecac75bc6019938a599f6
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 3ec9e9aee852..aff46d621617 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ PATCHES=(
 )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF
 		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
diff --git a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index cb835069c451..adeb2e8a46e8 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ PATCHES=(
 )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF
 		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
diff --git a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
index ce510723b0dd..8da4d0066c99 100644
--- a/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.17.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ PATCHES=(
 )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DFAIL_ON_WARNINGS=OFF
 		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
 		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 12d3912d8265..84d4ee19326d 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -10,10 +10,10 @@ DIST simdjson-2.1.0.gh.tar.gz 1618798 BLAKE2B 019e04ae5c5d0e43bf81734edb72d969d9
 DIST simdjson-2.2.2.gh.tar.gz 1623231 BLAKE2B 1caea4b5224194770af5b43c82110faf9fd17450935af67e3f9e6d3da164ffd3d40a4cca49a4d1b3007549835ecb838b6788e97059548dfa86b206ce240bdbd9 SHA512 a11698491d12aac3b92dae0fd994d0809910cf5c88550058c84035aa3bec02ab4541ab99e12db6605581f6ba61d7951a2cf3988fc20a467f4993f35d24cf2a76
 DIST simdjson-3.0.0.gh.tar.gz 1628275 BLAKE2B eef18be927c50527885f6e042ef22317b7e6da6a77d652a4415b98ec7fda227a1b3b798774c12b587a1a011b16c4011a0656f1bf1a20886432796e64076f4775 SHA512 4ea58cd4d059f5e83734f8f084056a58a587529e13df5c47fbb42b141052688f8517ab4e7d6cd4581c6b560f8804968fa0c9c7184b1d8d54e45c280302a069ec
 DIST simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
-EBUILD simdjson-1.0.2.ebuild 1842 BLAKE2B 0ec96a582374f90cc251c439d53efa12525eb1972690ad375230d52c46776e596163709fb8153b7dd659dc050bf2b10f4808b4ae59aecd6c5c7b1d2cf6bb9276 SHA512 c5456dab7147fb0c12ad614510d4cd4113393488e81b07e1df4b8eeca2e51b6c5743bb96b441f4b162d9af0311b39fb8243921b68483cc1b721058bde82afa12
-EBUILD simdjson-1.1.0.ebuild 1843 BLAKE2B 277dd893ec0192e28d5f4d6b9827b4e77137424494a6343d5d80d19b03de810a30769537175fea60bd7cd6eb9cccb470f743c4539dea6950205d455dae5f0260 SHA512 b866ed3ee6f160c534384addf22a6fc5c82825c5c0fa99515e4a220254abff566ff7f2d97ffec6479226120a2fe571bc41a7df304cfdd54fac353f4f0c100387
-EBUILD simdjson-2.0.4.ebuild 1846 BLAKE2B 518b0373b05e663bdc1f15220cd1cd712aea0e3afcb36225f1c2c5855292a1e3339e564ea8dff1f08a4f7282d649ad3ecd0b76192ffd785a9fc0b8e120782845 SHA512 d56d1753269fd5bb568d65697fc9320708088d48b61c6009fa90910740211e1ed2b4b890f90dcf33ad5d10eef7cd7fce7034e3fe39a99526240b2d53e4b83a88
-EBUILD simdjson-2.1.0-r1.ebuild 1847 BLAKE2B d55871b794b0182455e6b76256a4f419d53f76f7e0d4e1888ae377672537a3fb4c3f39a0eaa02fe7e706ba064e491ca145713bf95ec1dc8bbe659527b8483d55 SHA512 b9578e0e6adc1251ecc0927263778a79f8c9b853692a0b99a52275e9a5b7e4482ffb9fb04f50b600f4ae3e46a7ea9e6c59dbbab2aa0121d02d992821757a5384
-EBUILD simdjson-2.2.2.ebuild 1948 BLAKE2B 57a0584a67609a2b9d0f770eb8d8afbacba3703efd95f2a637ea8d9ceea1bc3ebefa67ae6d91bf0b7e1411937b690e160582e1c204d15210d0ea9753a7d548b0 SHA512 7872d6151ce862e9aa1db794c5881ee30a9a22233ba572fd87186abd19fdb05ccff0cd3cd8f2e60461cc022580a74daee6550c439434e32a6f18bb11e13a8e8a
-EBUILD simdjson-3.0.0.ebuild 1967 BLAKE2B 178ba82680b3af401cfe1dbb3f1a0668348923a7142252503e9952b30d1843fd38c6d19e913cac0d22c159eb07ebd5061a7b7177ddfb48301f06ab9343e8c9d1 SHA512 027959194f1270605e19cd7271f909e0b0df228bfb5db283f39278124c8c752209bc3d92a6db1adbaa06f2f4640e2e5f7d39758f705431f8d226c767d0e5a3b8
+EBUILD simdjson-1.0.2.ebuild 1839 BLAKE2B fc2bc3413800226d36441303e86ef41cda386973c1fe14715a19e882edc2b62d747ed0f7c82f701576e187b9e6084bcad6a1bf3c7ebbfd6c27c399795e1697cd SHA512 e74e183c513bc86f5ea1220a3263c3c56f8d3fc88f571cc19228da0ae47ab795348975321da4d7c3ccbd1cda6b68aa400fa7e645ed0cba69b915df55592cceaa
+EBUILD simdjson-1.1.0.ebuild 1840 BLAKE2B fc07d21ada13362809c103c3a26bdf94d7d10f8e4fcfad777eb87dea8ad8afedfbc01a5a3fd196b9190ff87993c189d380e02f251447e531ac07146b400c1577 SHA512 ea79f39b24c464a001e5267903a79dd2319c69be7b31c8adaa93a97245ce8fc49ccbf421a8ad0ac6d9b759e15dc060a9d34a33a25bb3e79273f647d69512da4d
+EBUILD simdjson-2.0.4.ebuild 1843 BLAKE2B 90704b2bcebe4c080fe0040b9a9c3f81603cb45672f8fc3aeb481db90a14afbc9ae50e88d42fc6c8f3438fec2815745330ce90b4f26924534a317dacddcd7b55 SHA512 6dbdedb80be6df26a7e46919dd76a24ada3c379a7373f478604a7994a0ce8c04e844f6e306ad96184c165781529217f576f2a1bcaf790aa38095c26c906f6842
+EBUILD simdjson-2.1.0-r1.ebuild 1844 BLAKE2B aa90bacd942a5db753dbf8275603d02d73147e9f71811972b8605b59a8a5456c36e8f03a951788ac897260f1bb1a13edbe1de1e9fcef1ca3afb957a08e30ae6c SHA512 66b2f5ecf1acc3506729651484c226d5c26940a69e73cf5d59b17a05bbc3674d376f0047a85b3603899a78c1bb2d9f191304a953267de90489d19a8d415d89f0
+EBUILD simdjson-2.2.2.ebuild 1945 BLAKE2B 2d7bb2b2da38dc6c923d395bc4feb2cff237e1b01afd18bdbe941cc56e2f6bb4cf4e0cfe4fe68c80b976008ab1e86481b3248eb60563c5f8b945fc7d8143cffc SHA512 a1ea8f1c3319bb27d0cd48f73958d2c62da7900a2bfa80ff569a5c515b19249eb712045bc8d487249d772b9c1623b2e8bc568579f26e257c21df06fcbea4b40c
+EBUILD simdjson-3.0.0.ebuild 1964 BLAKE2B 89bf9c2671fc0e48f87f1fefeff9b20d1bc542a558a4b0384fa9648734f7379f24a3e7fe1923ca841a18f07156e0e8f272657dbefbb15c87a5511eb7b668ac9d SHA512 a38498978068f2d8292464aa0e7fd0de2ef435c8457abfe1fa21534b213c634e6a0f54141713710a24b0d2cc6a7298c875efab81dd33b247a3b7ed6e08306f96
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-1.0.2.ebuild b/dev-libs/simdjson/simdjson-1.0.2.ebuild
index 71e7e89153e9..e4fbf9055959 100644
--- a/dev-libs/simdjson/simdjson-1.0.2.ebuild
+++ b/dev-libs/simdjson/simdjson-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/simdjson/simdjson-1.1.0.ebuild b/dev-libs/simdjson/simdjson-1.1.0.ebuild
index 6f9106ac1e38..65bd48189585 100644
--- a/dev-libs/simdjson/simdjson-1.1.0.ebuild
+++ b/dev-libs/simdjson/simdjson-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/simdjson/simdjson-2.0.4.ebuild b/dev-libs/simdjson/simdjson-2.0.4.ebuild
index b8e15288e648..e10cd8aa1dc0 100644
--- a/dev-libs/simdjson/simdjson-2.0.4.ebuild
+++ b/dev-libs/simdjson/simdjson-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild b/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
index 55fc98496a4e..a0cc3eba3666 100644
--- a/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
+++ b/dev-libs/simdjson/simdjson-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,7 +60,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/simdjson/simdjson-2.2.2.ebuild b/dev-libs/simdjson/simdjson-2.2.2.ebuild
index 976892c2f0c0..39d05eeab9e9 100644
--- a/dev-libs/simdjson/simdjson-2.2.2.ebuild
+++ b/dev-libs/simdjson/simdjson-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -61,7 +61,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/simdjson/simdjson-3.0.0.ebuild b/dev-libs/simdjson/simdjson-3.0.0.ebuild
index cac6dd3f9eba..96531492db42 100644
--- a/dev-libs/simdjson/simdjson-3.0.0.ebuild
+++ b/dev-libs/simdjson/simdjson-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -62,7 +62,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSIMDJSON_ENABLE_THREADS=ON
 	)
 	use test && mycmakeargs+=(
diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
index 70da1b6a7474..10ac1e22afac 100644
--- a/dev-libs/thrift/Manifest
+++ b/dev-libs/thrift/Manifest
@@ -1,4 +1,4 @@
 AUX thrift-0.16.0-network-tests.patch 1184 BLAKE2B fc1737e6169a480718edeff366734a01cee43626f84a0785b0f7fe2cdad4ef964da5ef9c685d8c8fee32d8f719e1f4eb7c260a6c6a960e8fea89898a59cd6f16 SHA512 248de672f603c94919bf67890715a037030d378c80ec7dc849ee3677392353d89903e35ed3c0144ab3e1ff371bfb6eba861d11332844fec99b87bcb3476a1a7e
 DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
-EBUILD thrift-0.16.0-r1.ebuild 943 BLAKE2B c71eb6f0d62c7c5a50eb42f27410706e84cfa12d374ff15343d5c0f189b9e0d92a742e824dd04b8fd0cb1c23dad884495538874cbd12644ea85734be2660179a SHA512 52985cc93cca5104a19dc20be727fbaebfb8a04ff1ba7957e53c95d3037f288b859ebb367f93673f4c93c97d909945f21ec67f835eb2b2ea63d1d9bc9e2115b4
+EBUILD thrift-0.16.0-r1.ebuild 945 BLAKE2B a6afbc4a551e9c1d73a89e0ae50d905965ac0494e9fcc4ea6ef01da760080fb34ebd7fe7f05fcf15343bf66828424fbffaebae8dd335962de533eed91479fc9e SHA512 7a5ba87a5aef42656f60173975643c9a30e98a906a81c0434671e517139b085f99b3e400cb44ef7df3852547381ed64c9a2d46e4cf446da6fdee61886ca9d82c
 MISC metadata.xml 489 BLAKE2B 2b2c924951cd9c5dfa2a9d4f50f4a74b3f422d853fdf61248424500d792f87a9348335a80e54c2c110039274060ec8df87f3369c8ff81c3dc8d515cb7de58fa8 SHA512 f15102234cb9eb25272e4d1788b7cdd4274ef9c5ad0d2af3521533d86a4145b0f2789385ce9663f9d0aa9161c218d357cc76d56e5c47ed597c56f7ac35d8a373
diff --git a/dev-libs/thrift/thrift-0.16.0-r1.ebuild b/dev-libs/thrift/thrift-0.16.0-r1.ebuild
index d4db37319da1..22f3fc9e88b4 100644
--- a/dev-libs/thrift/thrift-0.16.0-r1.ebuild
+++ b/dev-libs/thrift/thrift-0.16.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -33,7 +33,7 @@ PATCHES=(
 )
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DBUILD_CPP=ON
 		-DBUILD_C_GLIB=OFF
 		-DBUILD_JAVA=OFF
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9fbc9a091962..a7233cb0d54f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/json5/Manifest b/dev-python/json5/Manifest
index c7c3228ce31b..8ca43d1dca5c 100644
--- a/dev-python/json5/Manifest
+++ b/dev-python/json5/Manifest
@@ -1,3 +1,5 @@
 DIST pyjson5-0.9.10.gh.tar.gz 111356 BLAKE2B 457bce2988d9e5848784fbd0c75603aa77b7f5d08c71f9849f7459728985ee69085bd5d0d471ae1d9c2291fa2293eedc4be2535da333821a77b01ba3d7e9c1bc SHA512 5e5b04739a47c64b642060a969b11547a7f5490ec9031d526bf90d838f1879958f1fae61644f5ecf67a936dcb7b57ce18de3ee86bece44204758d0eff5e5b8ed
+DIST pyjson5-0.9.11.gh.tar.gz 111445 BLAKE2B 038ac1fab6e56e6dc45dc9bff1fc5e0da21c594cb0ac1f6d888f0207fddace9663b0dbd6abbfabce857cb9fcb40348002b10a6b4133e2f2ebb2081c543e1ad9c SHA512 aca3f38cd79d4bf52ceaf1b3dd27e30bf7598fa0b369216ac820f0c913797ebf542c9eaac17e562ee07006bf83c09210c799bc1b715c7b6e7689d2dcd702d414
 EBUILD json5-0.9.10.ebuild 576 BLAKE2B 0d6f496a3fee5b10a42c2be9b1b06ed5fb5ccadeb39f24acfd7a7d4df15f1b7fc68c6658e05faca2525bb103fe7341c02c4290711adcf91451f899e7db362043 SHA512 6906d8cc480b90d112172e168af8ba346f845f8bf1fb17f11faf2c7007c0850c91bd963dfba5d199d04960cbefb9800782a1c90f1815858628dd97d469bec091
+EBUILD json5-0.9.11.ebuild 576 BLAKE2B 6f7d133f63be6042c8a508f1318a212467b27a8ed7e0749dd1d8cc87a0163661ab627afd31e7d86272af4fcc826b5ade42ddfb78d4b7d218f111a89dce73dc98 SHA512 6f05c13048b902d4813417cc69c760a1de2dc7100e0d977c2d031d1e32d2613c4f326139707566e7a9635de4a6907576a5a90a29758b58e23c38b5fd253f96af
 MISC metadata.xml 502 BLAKE2B 9dc70229a26364dfb51ae26cff9817bcf82c47391d9fe3b6a4b11b79848f786989c62d6c3cbbed9b476da82dcbbbe9e19bf738d860ed423c3c9731c646314cf8 SHA512 257bb6f3e18053e852d693bef7eaba9e40ef5fb25ef449a275a7fbedd9a4247217bcdd016f0b3a93658ada922882bacd723235b2ab46c81dfd8cb42fe933ac74
diff --git a/dev-python/json5/json5-0.9.11.ebuild b/dev-python/json5/json5-0.9.11.ebuild
new file mode 100644
index 000000000000..981593fae9ad
--- /dev/null
+++ b/dev-python/json5/json5-0.9.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=pyjson5-${PV}
+DESCRIPTION="A Python implementation of the JSON5 data format"
+HOMEPAGE="
+	https://github.com/dpranke/pyjson5/
+	https://pypi.org/project/json5/
+"
+SRC_URI="
+	https://github.com/dpranke/pyjson5/archive/refs/tags/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7341f113470..d71a2a559a17 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index f1fb74b5aadf..92c8218b0a64 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -3,8 +3,6 @@ AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7
 AUX bcc-0.23.0-man-compress.patch 704 BLAKE2B 0eceb68e7d7a09b948d24e98c833031751421c829ba99564499b4e4ded9f0bc505b60a2648de7287185d85d847b65f3b929dd08b3fe9f97b1a7aaf9868750ec4 SHA512 7f7c4f4292ab5334201506ba523adc1c9a8e87cd3656a896cf31fe7f48f25e84bb52552f7d02d12442784a72cf7bcb01dec8a63eb2679aa9d84ff935f94d1863
 AUX bcc-0.25.0-cmakelists.patch 358 BLAKE2B 0159aa6e483bd5fab0bc920e8416a94a43809d99a29344b17321bc92890614f99cba1bb8bea02522b890be456904250ef2875d2d88b3f6d55022ad2d4ad2910e SHA512 9521e22cb9318b56601e1d27362903d63fcd8954b7539e6e92db267406d8aed6be8261b62f02d186edb82d548d64578bd99674f93c86e36e1fdd43332dc1552a
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.24.0.tar.gz 4640711 BLAKE2B 91d333c21c55de6a0ae78f9bb0b003803578525746e63ca5047896c0b2ed03ee880e03a84511470576e888e46559c67a8ebfdfe49d8785d094e2361bb20c5c2e SHA512 951672e3a8e5ad56eedf513477317ec3d3b4cf2d594bbfce20f3d19ddf7ce255e9dcfc69d9b05bb765a16e769c8e42d7c57071ddb86fb32437f527d3d25d19b6
 DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d
-EBUILD bcc-0.24.0-r1.ebuild 3059 BLAKE2B c3461a5ecefbec5f6fc562c99ff805c82da52f009fe387d03417e36d4b3b9b1375fe113000b24f394586fd6a7a15ec835980cb2f9f480140f591d49b6e0a101e SHA512 4ac0e89395db194ac1ff5a2a18db37e4d18bebc49ed46266d2438622e98e58b86f6d466d440f20d99167b282b543acb1e4973192eba9aa9060469077bcacf6e9
-EBUILD bcc-0.25.0.ebuild 3066 BLAKE2B 16c5271454a4a20a56d2709195bb3049c2bec1692048c7fbd90b2510506645a6b14e8090bec44c395ea8f63b6b3500950ba680ebc93549652874b043de524476 SHA512 777b5b40a28fddec53fd48a3b94b7b8c8fead28e1480eef6068b905666a6ff5e1ddd4d154a0dc2c65f6361d8d642c9b17cf179dd2f1971a10c93dcd4dfb8fb7a
+EBUILD bcc-0.25.0.ebuild 3063 BLAKE2B 2d17d42ab8e990464edc581a9b000b5e84e64a435612cc8fd85cd5c1ee6449a90bc3c0a7b4a9fe8effa471ddbdcb4076c2319905a7c03c63997eaa438854fa82 SHA512 b5002cd2ce4e33fe9ccfce8fa4370e8697860f23a776b2a276c5607902176599084afd67a81b8b655ff4d3c343605d91eb0328a23b1a0c7a102af8051b096a85
 MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9
diff --git a/dev-util/bcc/bcc-0.24.0-r1.ebuild b/dev-util/bcc/bcc-0.24.0-r1.ebuild
deleted file mode 100644
index 86a3d50ede4f..000000000000
--- a/dev-util/bcc/bcc-0.24.0-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-LLVM_MAX_SLOT=14
-
-inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )
-"
-
-# tests need root access
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/elfutils-0.166:=
-	>=dev-libs/libbpf-0.7.0:=[static-libs(-)]
-	sys-kernel/linux-headers
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}
-	lua? ( ${LUA_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-	"${FILESDIR}/bcc-0.23.0-man-compress.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	# bug 811288
-	local script scriptname
-	for script in $(find tools/old -type f -name "*.py" || die); do
-		scriptname=$(basename ${script} || die)
-		mv ${script} tools/old/old-${scriptname} || die
-	done
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		-Wno-dev
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-	local -A rename_tools=(
-		[trace]=1
-	)
-
-	local tool name
-	for tool in "${ED}"/usr/share/bcc/tools/*; do
-		[[ ! -x ${tool} && ! -L ${tool} || -d ${tool} ]] && continue
-		name=${tool##*/}
-		[[ -n ${rename_tools[${name}]} ]] && name=bcc-${name}
-		dosym -r "${tool#${ED}}" /usr/sbin/${name}
-	done
-
-	docompress /usr/share/${PN}/man
-
-	newenvd - "70${P}" <<-_EOF_
-		MANPATH="${EPREFIX}/usr/share/${PN}/man"
-	_EOF_
-}
diff --git a/dev-util/bcc/bcc-0.25.0.ebuild b/dev-util/bcc/bcc-0.25.0.ebuild
index 3587e236d298..f4e7887f0085 100644
--- a/dev-util/bcc/bcc-0.25.0.ebuild
+++ b/dev-util/bcc/bcc-0.25.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -94,7 +94,7 @@ src_configure() {
 	local bcc_python_impls
 	python_foreach_impl python_add_impl
 
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DREVISION=${PV%%_*}
 		-DENABLE_LLVM_SHARED=ON
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 302348984ae3..25e8d74ae1e0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -8,6 +8,6 @@ AUX bpftrace-0.16.0-install-libs.patch 8507 BLAKE2B 84842c5c400e2921d40f32ccd27e
 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
 DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
-EBUILD bpftrace-0.15.0-r2.ebuild 2011 BLAKE2B a75a7f4cae8e951f601c701d48711bf2fbd188e701e0ce7da3464a037c769dde8629e1204f59cc8bd4c40c736df21bc2ae31e20eb060c41b8b8669572484b9fc SHA512 72d9c91320971a103d85f26c61c6cabe4a2b11a7fcccac72355f4d0079a1229a29ce5d73ba6a2d941a689f3647d6340659ce54cf53615d909b63a7e31a5d6367
-EBUILD bpftrace-0.16.0.ebuild 1764 BLAKE2B 4e9ec9f34e60760be3a63ba0ac68f4f326c7133c66c7f0e2c125a1817c0aa96c87061e1b87b2973d060f8e18e64dda6c72aea3ddca8f0ba4520ec4d59b155fa9 SHA512 e9d51dec614c824b760c386c31c3d752cae17c611043838989f6827e39d2be6b018e4e83b511a289670595375a146da26fd6f161685b5f61ef646ec8ea6d3f75
+EBUILD bpftrace-0.15.0-r2.ebuild 2008 BLAKE2B c947ed7d7ffe63e6d8f67b8de5a62ff5053aa3ffeffde602c32aac7dace1916d9ec288c3f1a3077cf6833b8ff32459f6c4e2879bf6f8e392535d3527029a4660 SHA512 f1ca5e2650bb0caa191f65af578fe52126777080ce852cefc21af513ae77103c9ef555902eda60675234e7632651621ff4c8f68fcb4b83491c411834014d9875
+EBUILD bpftrace-0.16.0.ebuild 1761 BLAKE2B 6063aab19e11dac9ef47dad4fccf3d68579a5c1e376a08d4ff90178b3a30b611a7b0caadcfd03a04bdbb187c2964454add99c0faafb1c9eac050176f00a42cfd SHA512 90d75e5321956831364d74469c6d5c7252a6c7b87296a4ab50dac0c4f14dece22911c402186572317c9b0a9856672ca2a281f724eba385fa9abf4d142d711399
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
index b4161428fb8c..f0998d9f30ca 100644
--- a/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -74,7 +74,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSTATIC_LINKING:BOOL=OFF
 		# bug 809362, 754648
 		-DBUILD_SHARED_LIBS:=OFF
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
index f93bf5ae5f47..50e8366f23c0 100644
--- a/dev-util/bpftrace/bpftrace-0.16.0.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -74,7 +74,7 @@ pkg_setup() {
 }
 
 src_configure() {
-	local -a mycmakeargs=(
+	local mycmakeargs=(
 		-DSTATIC_LINKING:BOOL=OFF
 		# bug 809362, 754648
 		-DBUILD_TESTING:BOOL=$(usex test)
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 2337fc93dd75..62dcd790dcc2 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,7 +1,4 @@
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
-AUX 41.3-webkitgtk40.patch 1005 BLAKE2B 59b4d5d197be0837f166ddebbaa63abd235934398b6df3c7a715ce05a13c006e20fe83ab91604ac2fce2a737e46812011f8dac7158b2b77cf1f85742a949ca17 SHA512 8afaea3f0ae6ebb64b5ea4518f091aee6fa90f63badbcfaef5d06d411300d93027c8e64ce3f3e4fcee7e7a31c53627afeaf0ce1c83797fd348163277a88726c5
-DIST devhelp-41.3.tar.xz 2303068 BLAKE2B 1c08931897a7cd1d15028d9394479297d6fffc48412aa31cc739380405b8588fec47fddbea803c80d44eb23d2fa84d5f9a42aa8b061859d459e450ccd76ee82d SHA512 91251f1d8c0380f16768a1fed2d0a0a19935a646613a966c48ae70e52bfe8b6aa0c683d2b371d9e25dfdfcaeac687ea2c83c2bfd5f4f35394bb4576e6f98b48d
 DIST devhelp-43.0.tar.xz 327508 BLAKE2B 455015ec115610f27c2a1d9c3a8a21f50d8b061de7524371d892aba35173278f3aabe623b0b6770437b1501e6af795a9a12c9cc3ae238d8691d00e27388ae1a4 SHA512 92f147659754480ac4aa02f21558572d4bb8a034251225d344a8cae16824d9c14071751dfca6439f98dc7f7884fb35ef2d9c708e42f11bb6b3dfd8648b784654
-EBUILD devhelp-41.3.ebuild 1947 BLAKE2B 8299890f3c1e0b01aa9f058831d4a423b88d0b8daeebc4b896b15f33d12c7dfecee66f0e8f7c14051cdf979f7ee5ae24163b37ee2d1a2a9e906429b9dad4531a SHA512 861738789082d443f1641869cac127d2ed44bc628f9f21be1c69e8384e594265a39aae0a82cd8f6e2b0fd43da6dcffe15a0f92f88faed31a0c03e78794546615
 EBUILD devhelp-43.0.ebuild 1903 BLAKE2B 4405c67a49372fbfad42d753b91e3418d3035aa29e12108c0fdef54d7cfd64b400c88bc33f977cd194c2a11b7739345bbed703f0cc4671e1e57e9574c9a2cb69 SHA512 d6828cb09439ee09304f88195b09b9fc3f1a2cb2659e1af4fe8d8ae340d37f092c324f5f5d8a945d7363e4a19db19ca75838fc8b8c6270ae52fee73239882887
 MISC metadata.xml 443 BLAKE2B 87f4012dd8dac2a075656c3da08e1c95b7d14d2182d0309c8d55136ed8acb86309f5eb76b3fb0330964bd3484d99a1b7545da30e8210b53a52ac07bd00ef6327 SHA512 5cb45a90194fd472afb7abef7907d4e77b7bbafb35d9bcf901ef6e26b36203200777b1a7f96fe504801ac52920e1fc0ca7a1411b15ddc92fa51997cdf640d368
diff --git a/dev-util/devhelp/devhelp-41.3.ebuild b/dev-util/devhelp/devhelp-41.3.ebuild
deleted file mode 100644
index 05c30d523608..000000000000
--- a/dev-util/devhelp/devhelp-41.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
-IUSE="+gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} ) gtk-doc? ( introspection )"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.26:4[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( >=dev-util/gi-docgen-2021.6 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/41.2-optional-introspection.patch
-	"${FILESDIR}"/${PV}-webkitgtk40.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dplugin_emacs=true
-		$(meson_use gedit plugin_gedit)
-		-Dplugin_vim=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/devhelp-3 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/files/41.3-webkitgtk40.patch b/dev-util/devhelp/files/41.3-webkitgtk40.patch
deleted file mode 100644
index bd798e8ce7cf..000000000000
--- a/dev-util/devhelp/files/41.3-webkitgtk40.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From bdb13ad7f18c90d6409da713ac49dc3995d2dfe2 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 3 Oct 2021 23:52:27 +0300
-Subject: [PATCH] build: Don't automagically depend on webkit2gtk-4.1
-
-That's the libsoup3 using webkit-gtk SLOT that we don't have. Patch it out,
-so it wouldn't be picked up automagically once it's added or comes from some
-overlay.
-
-This reverts commit f9d52aad23914df9dcb404723d1c99cf7b4e1eca.
----
- meson.build | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 307a351a..64dc385a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -46,12 +46,8 @@ lt_revision = 3
- lt_age = 0
- LIBDEVHELP_LT_VERSION = '@0@.@1@.@2@'.format(lt_current, lt_revision, lt_age)
- 
--webkit_dep = dependency('webkit2gtk-4.1', required : false)
--webkit_abi = '4.1'
--if not webkit_dep.found()
-   webkit_abi = '4.0'
-   webkit_dep = dependency('webkit2gtk-4.0')
--endif
- 
- LIBDEVHELP_PUBLIC_DEPS = [
-   dependency('gio-2.0', version: '>= 2.64'),
--- 
-2.35.1
-
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 50509a1e7199..209ef730140f 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,7 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
-EBUILD gdbus-codegen-2.74.1.ebuild 2197 BLAKE2B 5feb327a7db8b4d345f3b1383be73dcbbf6da3d86815c8c7994bbe405b43cc92ca855ae9277ff688eca859aadcc7271bed531e1fc3ffcc329ae7caf37a976648 SHA512 8842a8eab75118b9ac6ed0843568f1e352ce31d06dd77d87512d4da2cfa08d31658bf29a6c0705cea1062f13633739880e07091f2ca5147dda97c7625f2bc433
 EBUILD gdbus-codegen-2.74.3.ebuild 2197 BLAKE2B 5feb327a7db8b4d345f3b1383be73dcbbf6da3d86815c8c7994bbe405b43cc92ca855ae9277ff688eca859aadcc7271bed531e1fc3ffcc329ae7caf37a976648 SHA512 8842a8eab75118b9ac6ed0843568f1e352ce31d06dd77d87512d4da2cfa08d31658bf29a6c0705cea1062f13633739880e07091f2ca5147dda97c7625f2bc433
 EBUILD gdbus-codegen-2.74.4.ebuild 2202 BLAKE2B eb85c4f2db7889ab2c6004a458c2680c166d86aee139c7eefeed475ca5b66e03ca4d610afb0a7b5836f7e99bd06a4a94371586770b2e683b4374ec84b7af835d SHA512 a3d5a08495c43067cf1707a36217a43975e6da57a178e3cce676efbadb70d7d60c53c5788f73c329021bfaeb4f0cfade1e582239c50ed108681c753b368093fd
 MISC metadata.xml 345 BLAKE2B 91a0526be5ce32d4aa4ea0827c78b2d2d45beae9a8d467916448a0a6b5459fd457e44ac900182654826328b34d37999bedb3ade42e80db92312e50f34d940014 SHA512 b11e427345fab56c77cb1f4f96473645b69054012e86840e2ca7dab221cf55041a1add1dfabce155274acf18488ac79de8149d405213daf39b807f679d4ac752
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
deleted file mode 100644
index 99d18cefbabd..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.74.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index fbe584a1cb1e..11ad8147842c 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,5 +1,3 @@
-DIST gi-docgen-2022.1.tar.gz 2515101 BLAKE2B 4eacc1c63fa9456f4a7465b1917c3c46a654546fc9c8a256bb0e83b415d0af8e8b6cdd29cca610dff00568c82f7a0bcba4f18ff7c32820689647f7604dde1be3 SHA512 823f6b5b598b0f52e748622f9993524b840f71d6f2dc157ea3b931564a0ec59c43cd79386936d525118c9a62de380bdff70fd01405d088ea873ab35ddbafb210
 DIST gi-docgen-2022.2.tar.gz 2515533 BLAKE2B d624fe287628ca01cb5746a08dc43bb97375ca538524481f5ee068fb3484e4526c875f374e01ffff02345d13b2d966dd54ad01c8f4e692116fac050cf5277d94 SHA512 adbcfecb6cc93785d372fa877e02b1fe08f9965fea52256a63c988a95f100738f564ae64c971a4a7ddded6ef792609d2a8e8e9461d81e982816abe96c2139ee9
-EBUILD gi-docgen-2022.1.ebuild 946 BLAKE2B 74af13d1f4dc78db668ad4d99d01811fb1f1a1bc781ef0883ea6c13eb4558d1718d1c84c25fdfef0e41604e3d6f3f6d1aeb66c424476f5dbef260d95593ed999 SHA512 0fdfe58e935e3d8e9cc84ed4d51a07e8f6131cd8126d1456a7a94c336154ecedcbfd49eb3793cf449c1a5e7c70437785af9ae1756ab0bc7dc9cf681a679fa293
 EBUILD gi-docgen-2022.2.ebuild 987 BLAKE2B 125c2419186be21de8d35f08a9b93c2170d44956ae2db682dcdffa18ab5e7811c65e08baf27afa42f44929e2abc9a817ff9465c265579795c5780141f55ac917 SHA512 da4f91957acb70e21dae4c419633727a25b083a28971ac549551c45092c8fedf27bb6da0771c0a0152c54b2a5cb3d28e2633af445c2706ee451cb684ef34c1d7
 MISC metadata.xml 350 BLAKE2B 157af2fde028e5332e19fa28df298bd81e9aa0d61981ed034f4a270cb41de1ed1b8aa96c1537c4ea6e6588811d08456ba65678c47747bc744ceecf45531bdb2a SHA512 6aab61ec8a175dd2d6a1010753d1e70df2e7a030d708acb61ee4158dc0d2afc214aed20f0e01fa565c7b463617305f2a2d3347e5e80259f9b5b2e03383870c80
diff --git a/dev-util/gi-docgen/gi-docgen-2022.1.ebuild b/dev-util/gi-docgen/gi-docgen-2022.1.ebuild
deleted file mode 100644
index 83b320d3e34e..000000000000
--- a/dev-util/gi-docgen/gi-docgen-2022.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="A documentation generator for GObject-based libraries"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/markdown-3[${PYTHON_USEDEP}]
-		>=dev-python/markupsafe-1[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2[${PYTHON_USEDEP}]
-		>=dev-python/jinja-2[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-		>=dev-python/typogrify-2[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index fdeb5e95fe80..4384224db346 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,5 @@
-DIST glib-2.74.1.tar.xz 5189452 BLAKE2B 58d977a5d2a100aa9125f2009ae66c6f27232dff70159433076552bdb64f9a6a93d7cb705feba890ee43d6f16d4766f6f1d5502c2e01eeb7e88d5ed0dd205d5c SHA512 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
 DIST glib-2.74.3.tar.xz 5181732 BLAKE2B 46c37be9519866af040b2aaf35129a9cfae6e2c74636c01755b901002fa77f4e2305025691d7a8279acfbae1298a4b5b1e095b333bed3b067e9820547b6eca97 SHA512 a9aa7e84187abb57aeeff9c7f4c4125be742a510ae5d39b6b62696ad1a715c36b353c6c14222caeb1e87bed930fb54184dba77118b991c42f1857a292c6aa77b
 DIST glib-2.74.4.tar.xz 5208484 BLAKE2B 01a2818e63469019abcd1215fa85521b9a2e55644040e8fe2797f68cabe897a191ae2c1cc2ab75d5ba9980d63adbfc00636b295ee942d70579e7eba1e1f49502 SHA512 912f6b0559fcb5ad55fa36837a348228b8e2498c490271204ced9f2e4a9eab804de4745f3ec439a198eb275d7263f18bc670f45460e2be55a2cbe45466b02fc6
-EBUILD glib-utils-2.74.1.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
 EBUILD glib-utils-2.74.3.ebuild 2332 BLAKE2B eae0be3ecd001de535ff7db1483b93bdcc5405ed13935073cec2c4c92755bbe6628f86c9477396b54280384f16487af9b842dd92b7214e8e127e7affbfd68520 SHA512 2095a7aa280bbff2ce40745fc1e349fcc8fd890634b4303ff1b65b7410d0f8f30e6ff05f7f580650b48dbdc2c682a82475d0cf1c6e791da6c20eea2a259f9ea1
 EBUILD glib-utils-2.74.4.ebuild 2337 BLAKE2B 18bc9fb02fa545f8e1489f6fb6938cf04c96b90d60b4bc952e090c9cb8cfabf6d51737390328766d13960f8b49d40cd27d53103671c429c6678796905d910d22 SHA512 a59def4f3fd86e78ed8b1fb6f90deacb20066bfbbcabc919644df2f2e4a2d72b55cdd92af23c833580034323f1568360f9be2c9a8da2d81b4c042e0bffcba7ca
 MISC metadata.xml 401 BLAKE2B bdf1884a4dcf8ab8362a86ed6559bb887c026bc315bd8cbfca0b5d8def8102636965da5af0f1871096704309a4a0919028d02f168a91830aa4ed911c6583d103 SHA512 2eaaccd9c6bd6e059b3acf34c964857a9e541f2eedd191c0fa35eca3499242349184ab01becca40791ac1dcdf02ba4a75369ea9c69fa5c21f15d878b1c28c453
diff --git a/dev-util/glib-utils/glib-utils-2.74.1.ebuild b/dev-util/glib-utils/glib-utils-2.74.1.ebuild
deleted file mode 100644
index fb40867171aa..000000000000
--- a/dev-util/glib-utils/glib-utils-2.74.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index fc4457f44681..62619f96c17c 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-builder-42.1.tar.xz 13276028 BLAKE2B 657e362ab9a2df1c70d9071ecc010747e5c73bbaa1c0d903778720e4fe874361013cfca3fe162328dfae180502c4fcc68ee01f04d1329add874b9e8db41abcd1 SHA512 a04a71efb163808ed4bfc446334b8f9cabe33cd33c977c9047e4fb00042b18cf7095217b2e287a45efda863ef479fce11435a2d24d489ba1816e3f36a561244e
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
-EBUILD gnome-builder-42.1.ebuild 8921 BLAKE2B 0b79471710a2432aa121e87e2d43bb9cceb61d70fd7d08afe99d6751f26c7bf2a5961b066c6d48aef2551b74c4f56339820fd19fce26b774c6c606d572d7f467 SHA512 882919890160bf663592ddaddd866f1c5cc9d3a10be5e96a6548cc9e379962b7a62cf958510948556261ac2239ac23ce160cefd47b1a236e77662e3696a97291
 EBUILD gnome-builder-43.4.ebuild 8735 BLAKE2B 37930fe1c3340606d871d8afd616f6f4b23f927c8f43ec5ebd7aa5e16f6f2991b60361a591573c978c7838dd3f9331fee7e099364704097437ab4a900c050913 SHA512 930c11e15e38094838822d11a3e3c05ef5ac272aecd6811709689fa641f89fb6e08fb3f3135ee16bd2d1f33f95f74623263c396d8101110048838dbf6c870d2f
-MISC metadata.xml 1302 BLAKE2B 4b3d7db71bc6f2845edc145cee644fc57679da608056d2d2e8e364d1b0ea8bc321a3a61bd432a3aaf2df0214d3cd6371deabae63e8a0b7b71a01f8db00ae1ad3 SHA512 43daeda3e037db0d11071d0011ca8122d0f2ee990f4d0bf44eeba9636c1d7518615053ce5698ab1e60e44ef6651f5c0aced8d2f233ff057e97b2d8fe1da84df3
+MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-42.1.ebuild b/dev-util/gnome-builder/gnome-builder-42.1.ebuild
deleted file mode 100644
index 2de7aa0f466d..000000000000
--- a/dev-util/gnome-builder/gnome-builder-42.1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-DISABLE_AUTOFORMATTING=1
-FORCE_PRINT_ELOG=1
-
-inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
-
-# FIXME: Review licenses at some point
-LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="clang +devhelp doc flatpak +git +glade gtk-doc spell +sysprof test +webkit"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	flatpak? ( git )
-	devhelp? ( webkit )
-"
-
-# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
-# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
-# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
-# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
-# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
-# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
-
-# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
-# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
-
-# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
-RDEPEND="
-	>=dev-libs/libdazzle-3.37.0[introspection]
-	>=dev-libs/glib-2.69.1:2
-	>=x11-libs/gtk+-3.24:3[introspection]
-	>=x11-libs/gtksourceview-4.0.0:4[introspection]
-	>=gui-libs/libhandy-1.5.0:1[introspection]
-	>=dev-libs/json-glib-1.2.0
-	>=dev-libs/jsonrpc-glib-3.41.0
-	>=x11-libs/pango-1.38.0
-	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/libportal:=[gtk,introspection]
-	>=dev-libs/template-glib-3.28.0[introspection]
-	>=x11-libs/vte-0.65.0:2.91[introspection]
-	>=dev-libs/libxml2-2.9.0
-	webkit? ( >=net-libs/webkit-gtk-2.26:4=[introspection] )
-	sysprof? (
-		>=dev-util/sysprof-capture-3.37.1:4
-		>=dev-util/sysprof-3.37.1:0/4[gtk]
-	)
-	>=app-text/cmark-0.29.0:0=
-	flatpak? (
-		dev-util/ostree
-		>=net-libs/libsoup-2.52.0:2.4
-		>=sys-apps/flatpak-1.10.2
-	)
-	git? (
-		dev-libs/libgit2:=[ssh,threads]
-		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
-	)
-	dev-libs/libpcre:3
-	dev-libs/libpcre2
-
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
-	${PYTHON_DEPS}
-	clang? ( sys-devel/clang:= )
-	devhelp? ( >=dev-util/devhelp-3.25.1:= )
-	glade? ( >=dev-util/glade-3.22.0:3.10= )
-	spell? (
-		>=app-text/gspell-1.8:0=
-		app-text/enchant:2
-	)
-"
-DEPEND="${RDEPEND}"
-# TODO: runtime ctags path finding..
-
-# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
-# appstream-glib needed for validation with appstream-util with FEATURES=test
-BDEPEND="
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-		')
-	)
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.3
-	)
-	test? (
-		dev-libs/appstream-glib
-		sys-apps/dbus
-	)
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
-extra capabilities beyond these expressed via USE flags. Some of these
-that are currently available with packages include:
-
-* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
-  plugin out of the box functionality.
-* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
-  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
-  highlighting and symbol resolving support.
-* dev-python/jedi and dev-python/lxml for more accurate Python
-  autocompletion support.
-* dev-util/valgrind for integration with valgrind.
-* dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
-* dev-util/cmake for integration with the CMake build system.
-* net-libs/nodejs[npm] for integration with the NPM package system.
-'
-# FIXME: Package codespell and mention here
-# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
-# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
-# jhbuild support
-# rust support via rust-analyzer; Go via go-langserver
-# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
-# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
-# stylelint for stylesheet (CSS and co) linting
-# gvls for vala language-server integration
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtracing=false
-		-Dprofiling=false # not passing -pg to CFLAGS
-		-Dtcmalloc=false
-
-		-Dwith_safe_path=''
-
-		-Dgnome_sdk_version=master
-
-		-Dchannel=other
-
-		$(meson_use doc help)
-		$(meson_use gtk-doc docs)
-
-		-Dnetwork_tests=false
-
-		-Dctags_path=''
-
-		$(meson_feature webkit)
-
-		-Dplugin_autotools=true
-		-Dplugin_beautifier=true
-		-Dplugin_blueprint=true
-		-Dplugin_c_pack=true
-		-Dplugin_cargo=true
-		$(meson_use clang plugin_clang)
-		$(meson_use clang plugin_clangd)
-		$(meson_use clang plugin_clang_format)
-		-Dplugin_cmake=true
-		-Dplugin_codespell=true
-		-Dplugin_code_index=true
-		-Dplugin_color_picker=true
-		-Dplugin_copyright=true
-		-Dplugin_ctags=true
-		$(meson_use devhelp plugin_devhelp)
-		-Dplugin_deviced=false # libdeviced not packaged?
-		-Dplugin_dspy=true
-		-Dplugin_editorconfig=true # needs libpcre
-		-Dplugin_eslint=true
-		-Dplugin_file_search=true
-		$(meson_use flatpak plugin_flatpak)
-		-Dplugin_gdb=true
-		-Dplugin_gdiagnose=true
-		-Dplugin_gettext=true
-		$(meson_use git plugin_git)
-		-Dplugin_gjs_symbols=true
-		$(meson_use glade plugin_glade)
-		-Dplugin_gnome_code_assistance=true
-		-Dplugin_go_langserv=true
-		-Dplugin_gradle=true
-		-Dplugin_grep=true
-		-Dplugin_gvls=true
-		-Dplugin_html_completion=true
-		-Dplugin_html_preview=true
-		-Dplugin_intelephense=true
-		-Dplugin_jedi_language_server=true
-		-Dplugin_jhbuild=true
-		-Dplugin_make=true
-		-Dplugin_maven=true
-		-Dplugin_meson=true
-		-Dplugin_modelines=true
-		-Dplugin_mono=true
-		-Dplugin_newcomers=true
-		-Dplugin_notification=true
-		-Dplugin_npm=true
-		-Dplugin_phpize=true
-		-Dplugin_podman=true
-		-Dplugin_python_pack=true
-		-Dplugin_qemu=true
-		-Dplugin_quick_highlight=true
-		-Dplugin_retab=true
-		-Dplugin_rls=true
-		-Dplugin_rstcheck=true
-		-Dplugin_rubocop=true
-		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
-		-Dplugin_shellcmd=true
-		$(meson_use spell plugin_spellcheck)
-		-Dplugin_stylelint=true
-		$(meson_use sysprof plugin_sysprof)
-		-Dplugin_sysroot=true
-		-Dplugin_todo=true
-		-Dplugin_ts_language_server=true
-		-Dplugin_update_manager=true
-		-Dplugin_vala=true
-		-Dplugin_vagrant=true
-		-Dplugin_valgrind=true
-		-Dplugin_vls=true
-		-Dplugin_waf=true
-		-Dplugin_words=true
-		-Dplugin_xml_pack=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize
-	if use doc; then
-		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
-		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
-		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
-		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
-		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
-		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-
-	optfeature_header "Code beautifiers"
-	optfeature "Python" dev-python/autopep8
-	optfeature "C/C++/Java" dev-util/uncrustify
-	optfeature "HTML" app-text/htmltidy
-
-	optfeature_header "Language support"
-	optfeature "Rust's Cargo build system" virtual/rust
-	optfeature "CMake" dev-util/cmake
-	optfeature "Java Maven build system" dev-java/maven-bin
-	optfeature "Meson Build system" dev-util/meson
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-
-src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
diff --git a/dev-util/gnome-builder/metadata.xml b/dev-util/gnome-builder/metadata.xml
index fce17174739e..1ee6ce692723 100644
--- a/dev-util/gnome-builder/metadata.xml
+++ b/dev-util/gnome-builder/metadata.xml
@@ -7,11 +7,9 @@
   </maintainer>
   <use>
     <flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
-    <flag name="devhelp">Provide API docs browsing and integration via <pkg>dev-util/devhelp</pkg></flag>
     <flag name="d-spy">Provide D-Bus debugging functionality via <pkg>dev-util/d-spy</pkg></flag>
     <flag name="flatpak">Enable support for flatpak applications using <pkg>sys-apps/flatpak</pkg></flag>
     <flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg> (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
-    <flag name="glade">Provide integration with <pkg>dev-util/glade</pkg> UI designer for Gtk</flag>
     <flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
   </use>
   <upstream>
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 89a58b1a6d1e..b15244b62ff3 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-22.08.3.tar.xz 1081608 BLAKE2B 8456d92f4d0092e4cb488400834d99d64c9034f979881fe8abd92cf6f9f8d920a34e5113ee5241aefbb5a9c6439077a1e648f1a6727cae5b4c9a89c4c3dfecc0 SHA512 c12ae5fead616f55a16f85cbf5c7fab6c39b89a14cd947fef1756c616690a92824e1cfa19428650d02ef3432e5618e81850bd635597451128981476a16f17218
 DIST kdev-php-22.12.0.tar.xz 1082620 BLAKE2B 967059556ba873e15af714a657d059023ce07fa52a85861952deec589a6941236da7b552872c039f9b6221d901d79128dc2a329b9b4c7a4375ac1724120d0ad1 SHA512 14dbf524ad7aeb4909afe023a350d8afb536ca109d443e940e9545d65c4b98e0546b4c890ec1dbdbccd4f3967a0540c20c61e7b3d48d4da51afecb6ae8e0fbbf
 EBUILD kdevelop-php-22.08.3.ebuild 1222 BLAKE2B ab2d9383c00f792416c68fe5c8cb667842708b2dda41e3cbae2c7b2dccbd4a297e238ba6e8cd4ff47584725867a0ed439c509ffeba1c02817d5486b3a532198c SHA512 71b76c6025a79bb02cb5917a817806ed0aafcae6708ec39c9ec3168adac7d2fe7022149e7b1b7b75594f2a76cf3c006a5610fb88c47265538cdaafe72ea1a195
-EBUILD kdevelop-php-22.12.0.ebuild 1225 BLAKE2B 19915447c614f4dd86026a927ee6e1b3484a96c1c4c33a63293942b19ff087e1aab65b0c82a7942c1c08839e991c038d5c5b4e9088fd1ee7cbe1015e187767ff SHA512 0b024a957a6a151a6fe9d4739ce6821afdd0b50ae0d3e959c3b07ebd969cedd830d58ce54080cceea720b3ab294aaa7a6b967197883ccaea2545159ae7f3b1d9
+EBUILD kdevelop-php-22.12.0.ebuild 1224 BLAKE2B 6258b6470310b54093f431b0d007ef9cc28164e23efd2e05ca88602c4dae14684c22a3122a4a1b6c49693834dc60e523db44c0dce4721a64ead94897e966924f SHA512 84e72a7657e7d8cbb955795edf7f2ba375f93065e90c63c0ff40cdb8ccac033dffa1bc2d0e2c78d932215797a69b1eef7035f6a39f7f253bd4e9ba829556970d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-php/kdevelop-php-22.12.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-22.12.0.ebuild
index ed80d4526073..6cda98c5fcf5 100644
--- a/dev-util/kdevelop-php/kdevelop-php-22.12.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-22.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 # remaining tests fail for some, bug 668530
 RESTRICT="test"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 965830f45d7f..d5ba53e0098e 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-22.08.3.tar.xz 1091148 BLAKE2B 9825263a060eac750192324c27f09bbdd99aa81ebe3c26379ff4ee6e2e0ef945d20ebf736c0885657aac05afd385a0076173d4f0a1ef7460f471cc2696e74412 SHA512 0f0de58ff92167d618b80a92515728b24851e78f548f16708c3e203723818dbb60e40939df2b12678cf17715c964440218b210307d33bda04fc8d177c87e4655
 DIST kdev-python-22.12.0.tar.xz 1091048 BLAKE2B 72fa9cf9a17e05dadc79f1997e952430ef771a0075100a3e73f1e7415f62458e6cd34f0e901d2ca7e44cdd6251547a63320ccde0ed19e3f127f6f966d0c47c04 SHA512 d19b0fb4d1518adf9882962a79053178dad571e0d7841dd895ad089dd5e55916263317966bb3ecd0b59254cbad598025a74e259596821e12e2395ee27ed53766
 EBUILD kdevelop-python-22.08.3.ebuild 1225 BLAKE2B 1a8c0d6dc4d42e96194726e91d56423cda42bea2ad336e9d0368e7f4acd8ce3d027ce8f7d62d6a836cebfac827577af16d3d76b0f9bc611c2a3a1f19d7386d45 SHA512 15bf42bc1404709ffa6e2098107bdd0b5f7c0699d3dd2491b8acf3384331f8053d31491caee544e32eb0929638f913462880f3ea1bc0e11b51d68573fe49765b
-EBUILD kdevelop-python-22.12.0.ebuild 1229 BLAKE2B 9664135d87a6c21cce08babb01163a89dd5a3e71104cc5802028be0d4a108d8c6a12861f3c2a018e1a7c79cbadab504abb05baf363fa1b825b7219f854bc6ff0 SHA512 6b63b8e4f9f255d689eb96f6c8c7eeeb09a3270e30e6ad96339a110dc0069f100ef2a4df1a9af7ac8048478136df9a438f3bc2736229aad8dbec82a972784f58
+EBUILD kdevelop-python-22.12.0.ebuild 1228 BLAKE2B bd8e6d7787252a74313a2ce75a3b8b4756310ab643da384e767101e4064d03f1ff06c9a3c4170bf513a0f74827dca1356c2eaa3c5e9e1a1646e5a2c56d316a1d SHA512 c2efab1592a70d8ceeb6feb6f22c103bb3a41bbff94728cadad3f5f7a582d9f4b88cb460eda8bae653e9fdf2092916969f41152d6f7b7fc3a127e96d196eb2d0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/kdevelop-python-22.12.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-22.12.0.ebuild
index 48a1ab94381f..36e4689407d2 100644
--- a/dev-util/kdevelop-python/kdevelop-python-22.12.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-22.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 IUSE=""
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 987a39586cbf..83446fc19f17 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,5 @@
 DIST kdevelop-22.08.3.tar.xz 8451936 BLAKE2B 61e6aa657687a3e8459385c164c084157a231aef3457b030ea9245dd8cface0407bcd64c7bad14216b16ba14236b8bf30ddd58e08b2f681dcb22797d0dade18e SHA512 757c073ebf43245dbd8ded85465244a3f6237e9d097aa52620b01a003136214ff692c7752224a039718a00c76b31b74ee255195535254ed04aa51e29628cfb58
 DIST kdevelop-22.12.0.tar.xz 8623184 BLAKE2B 5601977232e99fe8431d36dda24320ed08f9298e9524878b0c5473074b0386fc9e056d1b2aa723c452113ceca7e97c8673977936902a2e0c4689b5b3ff8572d7 SHA512 1390b18aa495f66ead6b2e777d41563401f47d8871a740323918a4593bbb96fbae55144286a60ce68026b78da1244293239c09fc5ed77499e6ac9fd592b11808
 EBUILD kdevelop-22.08.3.ebuild 4134 BLAKE2B 68033467cb14798c1c93e06e31ec4850b1311a24ac0961fc247e28c46ec33a2835393139099de78e5c1475c051cf112f567d37b03e93c34f0020c1239fc5d44a SHA512 7e58fd6cbae79799cf3e0852589513a4cc3924d82d4e912566b9b76cc41745eb9d3e6a2701b3cd44b8c9740ee283c3691f4353553dcbf5f29f1d6fe71d507126
-EBUILD kdevelop-22.12.0.ebuild 4137 BLAKE2B 1c26dfbf5cda0ad32deeca06a699ef64b26ec366f72cdb32ae1ffc745d46628c12cfd8faedd595746aca6a9f07d96aa1f1bbc0d817973907692d721171bbb446 SHA512 f5bc60915fb1d22db6ece53ebfc8ad3b01be4122daf934d543dea9620be21d7e6fd94051223de3860dc2d03ef985b3cfef96c23f2edd6acb3203bccbc27e2431
+EBUILD kdevelop-22.12.0.ebuild 4136 BLAKE2B a43bbd7f4accb8175d176837d90d8a8d48fa9028dda9b0ee42aa61c8abb8f00a52bc019ed9722f8a5d442465bf488df18a1ec9b909f7ee1a1569419392d70b4a SHA512 269cb22097bc258c2430937fa2f3f73a3f9a61c49b61b5b3d356bd033596bf1becd65f403ea8eaf12eea8a914b499b8ac084684835cd63d14fb26adc7168c26c
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-22.12.0.ebuild b/dev-util/kdevelop/kdevelop-22.12.0.ebuild
index 07f4a330f775..7dc333aba30a 100644
--- a/dev-util/kdevelop/kdevelop-22.12.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-22.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ HOMEPAGE="https://kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="5/57" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
 
 # see bug 366471
 RESTRICT="test"
diff --git a/dev-util/scap-driver/Manifest b/dev-util/scap-driver/Manifest
index 688e20d2125c..bc0053f38e55 100644
--- a/dev-util/scap-driver/Manifest
+++ b/dev-util/scap-driver/Manifest
@@ -1,4 +1,4 @@
 AUX 0.29.3-fix-kmod-build-on-5.18+.patch 2363 BLAKE2B 8e5a89b68fb67076d01a7dc295157d2f2542a2db84460a35ed3162b77ff860097f1761317b93dec6aa0d6294b4414e445fd2c94df700bb5d738210982174f595 SHA512 f7c1e57cb05de1a97a3332055f6d6f74a637f38281a4e98b202cf84c9dd02b90e0b4fee3dbc44653760231ce55ad396aec3018b3b239249b6a37b018f672fba4
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
-EBUILD scap-driver-0.29.3.ebuild 1820 BLAKE2B 1294e946005f0e9c29ed71ecdbd54e05f63535e8a6c70ef92c58fa1659aa58a69fe6c151a72bb25d53d3b6e59af962b29040490ea6b853c187717311f9ae1124 SHA512 770c9142d3ea4956ada90533a7c70a38d91d42b8b9710a088cbeacca82a6c2953a19a8373825a0b79c2a40dca985d8cd5db2e861e5521c3bf61411a6a953714f
+EBUILD scap-driver-0.29.3.ebuild 1819 BLAKE2B 37e02a10023da73915c48db09bc6203d6e9ce7d76abfa1b57fc5ee25f7130c95d11d94f3cd951cbc5e484c6f8ba91b32a7c9d6b9994c21fdf88ee92783564a33 SHA512 58eb46539115e7ab9a69618fb55678c4f8aca5b0bdd0d8beb613da29e7c506a168781b8d9d8a4ca37fae164b2787bf088eaada40d3eb59a8f490c50a4b5e101d
 MISC metadata.xml 494 BLAKE2B d0bc754d3af2488b9dc7672fc63e962f4c885d88a819e4332bd1c25f84c967e2e1cd8489122490a864cbfd930225b3dc28c8bfad4426750c030dce6ef5a08b4e SHA512 b77b7c103cfb606333814af210a0fae1f7956ddd9d3c3a044b0bebf42553f5ffe99d04549fb9c5e40fce33e9d23761830b4944b2cd83bd8ca2193f9b7da60fc0
diff --git a/dev-util/scap-driver/scap-driver-0.29.3.ebuild b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
index 4857fc219e82..53e97a4e1765 100644
--- a/dev-util/scap-driver/scap-driver-0.29.3.ebuild
+++ b/dev-util/scap-driver/scap-driver-0.29.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/libs-${LIBS_COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 x86"
 
 RDEPEND="!<dev-util/sysdig-${PV}[modules]"
 
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index b07a2446bcc5..e10abfece99a 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,4 +1,4 @@
 DIST falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz 816972 BLAKE2B b47ae6a7677935500ebdab8aea7f4c49ef50b7175ec097e7213a1f041ac2b5aa642379924927ec12c84271016e9ab9d191c0c1d4ffacd6ade58b7a03c37f9221 SHA512 65e5916e5f9507fd867a5e9ba3b2670a1b73b7672a22479d3019e948a52ad74441d7e2ce1c74ebd0fdbd1ce66808efa49f285bd5180bceae9d4e6730a60787ce
 DIST sysdig-0.29.3.tar.gz 306984 BLAKE2B 51e9a0a085fa91d65963fd33e00b139d97d22b551de8ca85e48b4af73991897378970dfde54754a970e79300f06a54bad1d9c8fdfdb44f24150d0b21077e423f SHA512 1dbe1195f245921c671ed2343325aee79fd0cde34681b9cab445135662d3ed7c84884e46b2270c0e868b5de1a3f2800b84e8bf9fcf0dfe581dd17e2e633f46d8
-EBUILD sysdig-0.29.3.ebuild 2037 BLAKE2B 80952b562f59739320d4d936daf83331903c896692caae41d058acd18879ca22c7f5efb44d48eeb8567ecf1922bc879184bc9109832246661337b8d4ea75033b SHA512 d7876cb3eed6aaa2d43d01dd36e280cd77385cb80ed524f7cca91dcac83336c5586a2bd005bc632c1c1d5d7096ba33573632438b78cf09836b35bc7d5562fe7c
+EBUILD sysdig-0.29.3.ebuild 2036 BLAKE2B 2e627eb9d5224dd46437f81088cc4dbe9b2f508c971a068d99392e71cede611f8114bb4f77c61a3ed29885cbb75c2ec5ef31ca23515aa27b3704437c35059a98 SHA512 91370d43f8e83da898c948704f09555ad6c75763e76d70fa37c8ef3a4b7a74dec626df1a759e2a8f6babe2b025959fbce2e2ccc257ce59379fbdd05998910af7
 MISC metadata.xml 671 BLAKE2B 553dbbe2ea2a56f5a88bb0276b3f97c5d4d8d798291eaef42d5aadd842cf5cbbb770515729c9779890f9227f7cc96fc8e35457009f066cfb43993b02c7406d7a SHA512 4d0b92b271bd4ceb86db363a29cd465124ab71ec6941848cafec4ebba0232a52bf62a4128d8cbaf5a7a6c9350aef29e4a797b6a659d5d5896c077b0b5df9f73d
diff --git a/dev-util/sysdig/sysdig-0.29.3.ebuild b/dev-util/sysdig/sysdig-0.29.3.ebuild
index 2c0745f73303..6cb3d07ab2bc 100644
--- a/dev-util/sysdig/sysdig-0.29.3.ebuild
+++ b/dev-util/sysdig/sysdig-0.29.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+modules"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 51fce747604d..d373825e9ccb 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,6 +1,4 @@
-DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d
 DIST umockdev-0.17.15.tar.xz 491152 BLAKE2B 40334a0279e81e1af3eb01acafd85c638e8a04af20e4c5b6b64229d89ffcfa231d6ef9e760d24e0cb957fe654252d18dca8579490e52a4c05769163f8a33ac96 SHA512 722339ae0726b00a4ee5fa428f063c5b59f0bad14a8fe24d97276a55dc66c569289c62c4ee5ebdb75a62339444a35468c8c1a33759d76fdf022a1eb4905c0465
-EBUILD umockdev-0.17.13.ebuild 1250 BLAKE2B 2ecd27e301fa8e28e8c03db4f6c7644a0490404a9773fd6d6ca3d25d98e4ba46f7f77e2e8ed916c53e6cefa1a6b82be1a8fc895bffa8ba092ebccfc01791d01b SHA512 5bb160f21af26aafae9845c40bb6e7d9e4a222d6e7d12ed35dc483be18c44a4099b5a706a2f6d23e906c0733ef9ec561968426e470c09023af79128e416b5dda
 EBUILD umockdev-0.17.15.ebuild 1250 BLAKE2B 2ecd27e301fa8e28e8c03db4f6c7644a0490404a9773fd6d6ca3d25d98e4ba46f7f77e2e8ed916c53e6cefa1a6b82be1a8fc895bffa8ba092ebccfc01791d01b SHA512 5bb160f21af26aafae9845c40bb6e7d9e4a222d6e7d12ed35dc483be18c44a4099b5a706a2f6d23e906c0733ef9ec561968426e470c09023af79128e416b5dda
 EBUILD umockdev-9999.ebuild 1257 BLAKE2B 19d58ec0f691fea74bcc95630ece7d34296b2e7472121f64933ed052d967054bfec118ccb6d42db36dd334410653572b1beded3143f32fba1194d00316113863 SHA512 4709d411f6792a51077caa75c638dec6ea764d9c59bc75f4d7442ada8455e74f9add0e584a4740c1fde979109de1b41a05b4a070d4219b4665f5979821190822
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
deleted file mode 100644
index 5e679a5c7ee1..000000000000
--- a/dev-util/umockdev/umockdev-0.17.13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit meson-multilib python-any-r1 vala
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/martinpitt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/libpcap[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/gobject-introspection-1.32:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	$(vala_depend)
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_setup
-}
-
-multilib_src_configure() {
-	export VALAC="$(type -P valac-$(vala_best_api_version))"
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --no-suite fails-valgrind
-}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index d83655fdbc61..876a02081adb 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/python-gitlab/Manifest b/dev-vcs/python-gitlab/Manifest
index 84f830d536bc..0994cd6f4a1e 100644
--- a/dev-vcs/python-gitlab/Manifest
+++ b/dev-vcs/python-gitlab/Manifest
@@ -1,5 +1,5 @@
 DIST python-gitlab-3.10.0.tar.gz 254166 BLAKE2B 74b1a200e4ac1e99d5fc89b3906e8e623e3e7c210b0483e3947f24b882e61ce4ca9dafd43cfb047e4fa848c8970429ff0391db7c750d452db0ca4f5034bb772f SHA512 5dc0fbe826fe1a07833a8d443721e540b6b6e8c35cf100286b9a1a964f2f8b4faa34df2eff9888507c6ba1835857216a73084f860343a494eac9f1353a28f327
 DIST python-gitlab-3.12.0.tar.gz 264005 BLAKE2B 64215b0c2950b1d238ff0e69e88de463ce2645d7c3911963e516b50874b49c4e822f8e27625fa33e6d27a703cc3bb3377151a9bc9c49b0b49ee7bc57db5dfd65 SHA512 76f55945a821553b4b477629dea674956459836df227e70817480b031559317ec97fef6c332d0dc42c4dba0d556ed1118e1cded8f116f4813bebe411db9e7a47
 EBUILD python-gitlab-3.10.0.ebuild 1005 BLAKE2B 7d897737438900546e7ab0eefccdac9a731544bbfd4e41fe0c6a77372793a477701e3fd54dd609b8a5b667666db034edfc3ab93d90e12518d1bdab1358d7f171 SHA512 70fc32d8e420ff8bf62ba40a1b55f1c5491f78cdda72aa89c555e75bc5cd6b5f8b5000cc53a51eea427aa5e5539824cc4893586b9e8154a27630d42fb8133bcc
-EBUILD python-gitlab-3.12.0.ebuild 1014 BLAKE2B 6d21f5d8fc23d7236fdcae3766444070212a66012543954f53bcc0088433dde0b1f3c9e6c3272a829e9a9d42fbf06fefc3bd128627ed0e5738b0dc9ea50b13a0 SHA512 a3c59ec930f41004313add48536568f478ee62fdb1e22846ddbc87384aa7eceadaa3dca4ad6e62426ea694ffeb7f24b0546a4910f55a03bc8c75009b4e7b769d
+EBUILD python-gitlab-3.12.0.ebuild 1017 BLAKE2B 94b5b14a09a831cdc9a4382c445d9e8d5109a655245dea9ff7d85f2380781a45f9e9fb221ec7724e3bc49b389599f640fead8a8201970c8ec56e2ceaabc8c122 SHA512 1e6fd9f992da4d1370d7d66f3b55a9f4708a6b52fb01d254bd2990e05289f7c49b4122f450127d8020a52dcb8bffed8b7216661d503db48bd815238bd091fe5c
 MISC metadata.xml 470 BLAKE2B 518fa0e83235989c148eb47ba245fa950891065facf62a0b18bd6df89fefc9f43b469d82742f235bceb44e42489e70e25721ef7fde1b88406432679546a310b6 SHA512 338fd6f83361c69ea09c89b88490ba773110f85ea28daba484cd196379562df52536998ef7a1e0456c15b53b6b8ed07b9e5a715f7bab2f14b44809a26a80ccb4
diff --git a/dev-vcs/python-gitlab/python-gitlab-3.12.0.ebuild b/dev-vcs/python-gitlab/python-gitlab-3.12.0.ebuild
index 87ac1ae0b2f5..c435a2a21883 100644
--- a/dev-vcs/python-gitlab/python-gitlab-3.12.0.ebuild
+++ b/dev-vcs/python-gitlab/python-gitlab-3.12.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index d969449830ce..ce89a0f99a55 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 310b70f448b2..54be6a10d617 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -2,6 +2,6 @@ AUX wesnoth-1.16.6-fix-build-with-boost-1.81.patch 1907 BLAKE2B 8c98e374f17ceb8a
 AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
 DIST wesnoth-1.16.6.tar.gz 518250360 BLAKE2B 3fc5f5827beacc309a42d1d135eadefbace57866397eed4e3c5618ba6372ae31fc0350b2180c1323872ae59789ca67cd1b4a973c2257c7fac59508af93e0b758 SHA512 fcf9e50ce065f7c8d2b940eec88de27f18c3adbb9c7ae238bf6821eef233a45c2bdc7a58d5cd2abc4f37bcab6e503aa72d46f623c882c711d9f06b2826340bf5
 DIST wesnoth-1.17.11.tar.bz2 421068195 BLAKE2B 43106bb72c6b4a39b4995fb9804733e5420b636db08254e75e7698c58740b84a33c387194bf048247bddf1808f73d0d07b3816f18687390760fb5fab7c2d8449 SHA512 8208ae1c02d5e6a9fe50a2cf533d3b0b207151e5b877c98b003117641ae3c46ad31dbbe4bc46481f4f30382ae65b0183d7636452de5f6d42c8bd48d040f3dd5a
-EBUILD wesnoth-1.16.6.ebuild 2294 BLAKE2B 62b4cbe66b8f06e4b4fd3f502b4f5808ba3d1d9e114004e3c7c80ccd903f82e1a2ea4a51470d7b38467ce9f20e5e6b73b38711ba5652d443f55872d2e133a3af SHA512 40a414cdce3528956fbd769283705c4b44665027793c5b0f6f1e7b014bb348fad108f54bb57f15c1274017421e3f5481e2a41814e1326bc006cb9e2fe9487aec
-EBUILD wesnoth-1.17.11.ebuild 2203 BLAKE2B 9c5f81f08b619e228052ca7bc4c8d667524a15df4e8d81db47a3a54bc3165f53ee07db38f593debf37f0d4fbee1af4242147e7843f1a0e47923f082397fec4a3 SHA512 4776a5abc4f2d048e4f628d29ee5ebbe4a372dd4d6e049965b4c583258f09c3c8e688175d99121228a842b314ae91a6f40086f1e8d1aec5d8f2034c78be5cb27
+EBUILD wesnoth-1.16.6.ebuild 2319 BLAKE2B c86c9cec4ad90a28f213774a1a096b2e2d2390710f53e40e501ba6a0bfa3b7a7784a64bf79b7d864ecfd8fea7c70dfa8d7ddb37a6cdb367f9531a268f9a80bac SHA512 10c1f6aaf81dbb1accf909461a256ba4d2fdea608375802006584d77188a07b67cc5d81528c7174ecdb9329902baf610b789cf3ae56034bbd0414404de92bc84
+EBUILD wesnoth-1.17.11.ebuild 2228 BLAKE2B 8e2bd9e6c1be1fb0e30c554222afcad7ca2cd852b4dfe4dac74f23f081e868a9119813421fb5c82c603dd8c67bdcb90077f8c1efd5923e3ff40267db5ee1c527 SHA512 14e94c5be518cc7d0fa7df9f2f93436e0fae1c402ccb80712b495dd5c5b59f2c46e49b1d08841de08a7472e2970dec82f8686d7003a839be9648a7e429a2e166
 MISC metadata.xml 475 BLAKE2B fe3a0b92f39b2158ec38fe2d7528463bb243cc44df562f7ad450227b35bab1d59a1638fe1d702cd70358a0137851e08be1878d590afbcc28dd19176b2a7df7fd SHA512 6293671db448eef2a211ae8dbb88624a42ac46712331db441a55d44566e7843f820047dde7936d725fea6d24a8196223e30712ffbd3864e63614f7f849cda6b4
diff --git a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
index 1a92e4f2d992..f8edac88d9d7 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -67,8 +67,10 @@ src_prepare() {
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
 
+	local mycmakeargs=()
+
 	if use dedicated || use server ; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
 			-DENABLE_SERVER="ON"
 			-DSERVER_UID="${PN}"
@@ -76,7 +78,7 @@ src_configure() {
 			-DFIFO_DIR="/run/wesnothd"
 			)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="OFF"
 			-DENABLE_SERVER="OFF"
 			)
diff --git a/games-strategy/wesnoth/wesnoth-1.17.11.ebuild b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
index 5724bdef29fa..834aa1c3259c 100644
--- a/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.17.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -65,8 +65,10 @@ src_prepare() {
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
 
+	local mycmakeargs=()
+
 	if use dedicated || use server ; then
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="ON"
 			-DENABLE_SERVER="ON"
 			-DSERVER_UID="${PN}"
@@ -74,7 +76,7 @@ src_configure() {
 			-DFIFO_DIR="/run/wesnothd"
 			)
 	else
-		mycmakeargs=(
+		mycmakeargs+=(
 			-DENABLE_CAMPAIGN_SERVER="OFF"
 			-DENABLE_SERVER="OFF"
 			)
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index a0338a871079..5a13eab4f7aa 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 85ee95ee71c2..1027b54334e4 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,4 @@
-AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83
-DIST gnome-desktop-42.4.tar.xz 743212 BLAKE2B d0e5ce93aa476b2e2c4252480fb315ce8c1802622857c7fb0af90804a621c3c358772b70957f902941b0fd75c58aa575e36ee7d960ade1409caa1f06df9e958d SHA512 6e2648aee7e7b7800276ba1f6b32a0918f6dfbd35a60a5fd22239efe75b3bd4cbed14458ab2d1b0ad0ad295428feae5342a64f2cf83505196eccb17720a26756
 DIST gnome-desktop-43.tar.xz 764256 BLAKE2B 68e13477034bb16d1c8dbe22ae940bb6711c53f93230b93ac4b6be3e61a1b60f223c9177ab004d6cd0876feecb1a71d922779f9901f914359e7aac1650a55363 SHA512 01244bf397d8ef4d9424ef9289789efde148c38f4588fe3a9094cbdd4612c56fbbff079182d6c85083462d2f3ae9771e463c5cb86995a1aef29b2f5cfd023713
-EBUILD gnome-desktop-42.4-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
-EBUILD gnome-desktop-42.4-r400.ebuild 1749 BLAKE2B a38edb5e5388c49417f1e117867de92bdd17bdd9ff088156561c966f195a335a029e719366414ddfc7b7b9b3a8d36d07f17ffea68119511bdaad06e33b2a2969 SHA512 d0c864187121ea620fbfed9492537476527885a54e8c7b03a6fd024bb50919c6747bb262e402e9466a7835523043c68d3a837216842ec4f0f7b7ad26ae9bb3d3
 EBUILD gnome-desktop-43-r301.ebuild 1785 BLAKE2B 7f51caed130f4ca53a2ca9bce3b9442c281b021aee8e33b921c74d6c59b428555f6e06418cc41bcb9f88ea633728b795619430d13b6acdc65d589f45385d18fb SHA512 e4c56fbee4d4c6b32c35148291b48404d25247db10153c0d2f237c8880df85f9b94feb66db99b3986deda1af48f9adfe84a2f0836a6d5231a32f3bca4ccccc92
 EBUILD gnome-desktop-43-r400.ebuild 1712 BLAKE2B e3c486930c1af903d011b09a7568b06eded3f35fd033d4a45cf77906714935653eb50129863f033c633390ccdddccdf9f74571d242144248d897aab80ba5d746 SHA512 c20db4dd5f8a31e6c97976a3f5058aae9c4412442a08b3af7ae5c60bba565785db614ca87741aa5ba010594d52fd605db7a49ae87d6a947b663c29196dee6a7c
 MISC metadata.xml 354 BLAKE2B 18259186f2894236db115d9b1bd16b94d6b9edfe189133039c6ad5bc9729c6e9292539ec385d2d957b8905b50d59db7ccddb50c37bdbc9722a7851b14038e035 SHA512 b4c5c0643dc3168dd0b6345687a6c85f4526a1cba2664e8ee7d2eb15b251a7d388e6f4f4669ed8da00566d262d31815ecbd157b9f560b14e151dc9da346fb714
diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch b/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch
deleted file mode 100644
index f697be9db1fa..000000000000
--- a/gnome-base/gnome-desktop/files/42.0-meson-Add-optionality-for-introspection.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/139
-
-From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH 2/2] meson: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
- meson_options.txt            |  4 +++
- 2 files changed, 30 insertions(+), 22 deletions(-)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index a0fb11f8..375cf57c 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -125,17 +125,19 @@ if get_option('build_gtk4')
-     ],
-   )
- 
--  libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
--    sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
--    export_packages: 'gnome-desktop-4',
--    namespace: 'GnomeDesktop',
--    nsversion: '4.0',
--    includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
--    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--    identifier_prefix: 'Gnome',
--    symbol_prefix: 'gnome',
--    install: true,
--  )
-+  if get_option('introspection')
-+    libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
-+      sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
-+      export_packages: 'gnome-desktop-4',
-+      namespace: 'GnomeDesktop',
-+      nsversion: '4.0',
-+      includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
-+      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+      identifier_prefix: 'Gnome',
-+      symbol_prefix: 'gnome',
-+      install: true,
-+    )
-+  endif
- 
-   pkg.generate(
-     libgnome_desktop_base,
-@@ -255,17 +257,19 @@ if get_option('legacy_library')
-     ],
-   )
- 
--  gnome.generate_gir(libgnome_desktop,
--    sources: introspection_sources + libgnome_desktop_headers,
--    export_packages: 'gnome-desktop-3.0',
--    namespace: 'GnomeDesktop',
--    nsversion: '3.0',
--    includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
--    extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
--    identifier_prefix: 'Gnome',
--    symbol_prefix: 'gnome',
--    install: true
--  )
-+  if get_option('introspection')
-+    gnome.generate_gir(libgnome_desktop,
-+      sources: introspection_sources + libgnome_desktop_headers,
-+      export_packages: 'gnome-desktop-3.0',
-+      namespace: 'GnomeDesktop',
-+      nsversion: '3.0',
-+      includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
-+      extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
-+      identifier_prefix: 'Gnome',
-+      symbol_prefix: 'gnome',
-+      install: true
-+    )
-+  endif
- 
-   pkg.generate(
-     libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e17e7330..c4db6eaf 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,6 +17,10 @@ option('debug_tools',
-   type: 'boolean', value: true, description: 'Build debug tools'
- )
- 
-+option('introspection',
-+  type: 'boolean', value: true, description: 'Whether to build introspection files'
-+)
-+
- option('udev',
-   type: 'feature', description: 'Udev support'
- )
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
deleted file mode 100644
index 213db2dcf6c5..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-42.4-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[introspection?]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? ( virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/42.0-meson-Add-optionality-for-introspection.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=false
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		-Dgtk_doc=false
-		-Dinstalled_tests=false
-		-Dbuild_gtk4=false
-		-Dlegacy_library=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	rm -r \
-		"${ED}"/usr/share/gnome/gnome-version.xml \
-		"${ED}"/usr/share/locale \
-		|| die
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild
deleted file mode 100644
index ec390679df10..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-42.4-r400.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="4/1" # subslot = libgnome-desktop-4 soname version
-IUSE="debug gtk-doc seccomp systemd udev"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection]
-	>=gui-libs/gtk-4.4.0:4[introspection]
-	>=dev-libs/glib-2.53.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection]
-	x11-misc/xkeyboard-config
-	x11-libs/libxkbcommon
-	app-text/iso-codes
-	systemd? ( sys-apps/systemd:= )
-	udev? ( virtual/libudev:= )
-	seccomp? ( sys-libs/libseccomp )
-
-	x11-libs/cairo:=
-	>=dev-libs/gobject-introspection-1.54:=
-"
-DEPEND="${COMMON_DEPEND}
-	media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	seccomp? ( sys-apps/bubblewrap )
-	!<gnome-base/gnome-desktop-${PV}:3
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Don't build manual test programs that will never get run
-	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dgnome_distributor=Gentoo
-		-Ddate_in_gnome_version=true
-		-Ddesktop_docs=true
-		$(meson_use debug debug_tools)
-		$(meson_feature udev)
-		$(meson_feature systemd)
-		$(meson_use gtk-doc gtk_doc)
-		-Dinstalled_tests=false
-		-Dbuild_gtk4=true
-		-Dlegacy_library=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index c3da10ca5cf7..ebc4cfedff50 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,9 +1,6 @@
 AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B e734dfb341143f3f246d268ff479a528fa09d6c5e496611e06e4ffea914098349eab2b2c5a4a55e8b47e5032b68bf6b929b76a1aa899402953cdcc1d3cf0589e SHA512 faffde0cd940ac6a8dabdab09ea38bd126e11822e75df5adf1a0bb3b055135a8c52abbb6ecb4d71476899ec0c5d8a78ba0075cb84cfebafe6c3aa5310dfca308
-AUX gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch 4505 BLAKE2B a61199b8da339dbe9bbe7e8941a56958f5a69fafeb95c6f7027c483e35b193854560ad12f2df45dd8374db1abcefd9bfb8dae5b5381be3215755f907a73726ec SHA512 468a73b69f441886d1ce5e0e5f263ea695170a3610f6124100e3eaed1d8dd62c3439193461620d6f8b18c81d2066163ff2c1839194ebcfeec424868163f46997
 AUX gnome-settings-daemon-3.38.1-build-Allow-NM-optional-on-Linux.patch 694 BLAKE2B e4f32a376c2b1c55a396504e98c8a69d512bb9161a854482aa877023a2761e59d3fc682d724398ffb53bc138b010c33276071359d42ac19bcac2d9af87d42eef SHA512 618ad312b54709d0f95e5d881c2896c156246ae41eee1925f76b0a398b7ce6815a7466f8587f2291b07f7a34d1a3e1afb7df33823d9b52ebe8ad46a3f5f1e84d
 AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb15e998de9f5fddc956dab862552ecc3734083391f124ef577dd2efb70e29efd230511cca83536dcd8c32118ecebcfe52b2927d6f0094540ec73a6ae23 SHA512 9c4b1e1b63b1a6d97eed962969704accca2fc53763a4b7806e2a3e4ff49ecc7d4a0d7f8253ff2e33d83e766908d852721ffa33f363aed7d04c20002bfdee173b
-DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c
 DIST gnome-settings-daemon-43.0.tar.xz 1453808 BLAKE2B 365a1fe4d253e84b9fc355331688951e1428eaee421afbe052a16226c7006a420f28134b5fa02929bbb1d4250af243b02594444a4bdd208e5c41ed9e63e5f979 SHA512 8cc3ed73fa66d2cf72621db78be68e4fe01f292ab3987aff8cc67a1c67d910622e306c2d3e69a8dca5ac6517c8e57883faf02aec871c7aa1f1348d13ff1900a3
-EBUILD gnome-settings-daemon-42.2-r4.ebuild 3719 BLAKE2B 4662c0b1bbbf16de1e2eda9b79508020af0dca49498c2aa26ba23ca70e94578af349af41b7e73b7fde2a67839ac53b96c876b2224578013be464879df4a65133 SHA512 e4f09bf4043ce51d712a4d9883cf4e2bb8b84162c83367f705623eed209cd6292b9db3bbf7ad330a1bb0e0cef40d19578ecc82b0250721f7f25b10bb841ead86
 EBUILD gnome-settings-daemon-43.0.ebuild 3541 BLAKE2B 485f9c2d6127a221d7cc2426a94dd58101b78129ce5dc7df583c29c9951838629cbbfb38876fef39ec786b54c2e998a40915c688d18e67770c7618267c42afb0 SHA512 eac98da5025105cffa80ac31345a4ed7cd9bd1b57556133dbde93e8b010c825fe65a570784c2a35e9aab0836dfd70636f2c88b9067a4a6c35611bbf4e59e51c9
 MISC metadata.xml 663 BLAKE2B 27a0e4135576aeea4c6b962c90d894df06f92b3b015fab78246724ce7ca2f985cfde730f1f9c91f0cc01733f274c0225816e24fac2fca40c585b1a8667fd7d4d SHA512 e21c9dc181f13228662a2a91d7d8e0fedc6270f818a79308e270c9de788011379c155e835534ebb5dbd5f3b07a9e83ec618d9d85f81f46784007b380c6a7ef18
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
deleted file mode 100644
index 658f4a3f48ee..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 12 Jul 2020 16:30:59 +0300
-Subject: [PATCH 3/3] Allow udev optional on Linux
-
----
- meson.build                   |  4 ----
- plugins/power/gsd-backlight.c | 14 +++++++-------
- plugins/power/meson.build     |  6 +++---
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 21d9341d..0a527513 100644
---- a/meson.build
-+++ b/meson.build
-@@ -138,9 +138,6 @@ if enable_gudev
-   gudev_dep = dependency('gudev-1.0')
- endif
- config_h.set10('HAVE_GUDEV', enable_gudev)
--if host_is_linux
--  assert(enable_gudev, 'GUdev is not optional on Linux platforms')
--endif
- 
- # Check for colord
- enable_colord = get_option('colord')
-@@ -203,7 +200,6 @@ endif
- 
- # Rfkill
- enable_rfkill = get_option('rfkill')
--assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms')
- if enable_rfkill
-   assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found')
-   assert(enable_gudev, 'GUdev is required for rfkill support')
-diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
-index ca5f2723..f58f5343 100644
---- a/plugins/power/gsd-backlight.c
-+++ b/plugins/power/gsd-backlight.c
-@@ -25,7 +25,7 @@
- #include "gsd-power-constants.h"
- #include "gsd-power-manager.h"
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- #include <gudev/gudev.h>
- #endif /* __linux__ */
- 
-@@ -39,7 +39,7 @@ struct _GsdBacklight
-         gint brightness_target;
-         gint brightness_step;
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
-         GDBusProxy *logind_proxy;
- 
-         GUdevClient *udev;
-@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
-                                                gsd_backlight_initable_iface_init);)
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- static GUdevDevice*
- gsd_backlight_udev_get_type (GList *devices, const gchar *type)
- {
-@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight,
- 
-         task = g_task_new (backlight, cancellable, callback, user_data);
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
-         if (backlight->udev_device != NULL) {
-                 BacklightHelperData *task_data;
- 
-@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable       *initable,
-                 return FALSE;
-         }
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
-         backlight->logind_proxy =
-                 g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                0,
-@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object)
- {
-         GsdBacklight *backlight = GSD_BACKLIGHT (object);
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
-         g_assert (backlight->active_task == NULL);
-         g_assert (g_queue_is_empty (&backlight->tasks));
-         g_clear_object (&backlight->logind_proxy);
-@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight)
-         backlight->brightness_val = -1;
-         backlight->brightness_step = 1;
- 
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
-         backlight->active_task = NULL;
-         g_queue_init (&backlight->tasks);
- #endif /* __linux__ */
-diff --git a/plugins/power/meson.build b/plugins/power/meson.build
-index 69e619f2..6c6ea939 100644
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -24,7 +24,7 @@ native_deps = [
-   dependency('gio-2.0', native:true)
- ]
- 
--if host_is_linux
-+if host_is_linux and enable_gudev
-   deps += gudev_dep
- endif
- 
-@@ -66,7 +66,7 @@ gsd_power_enums_update = executable(
-   native: true
- )
- 
--if host_is_linux
-+if host_is_linux and enable_gudev
-   policy = 'org.gnome.settings-daemon.plugins.power.policy'
- 
-   policy_in = configure_file(
-@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir())
- envs.set('TOP_BUILDDIR', meson.build_root())
- envs.set('LD_PRELOAD', 'libumockdev-preload.so.0')
- envs.set('NO_AT_BRIDGE', '1')
--envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0')
-+envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0')
- 
- if get_option('b_sanitize').split(',').contains('address')
-   # libasan needs to be loaded first; so we need to explicitly preload it
--- 
-2.26.2
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild
deleted file mode 100644
index 3669dd83b3bc..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.2-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-	input_devices_wacom? ( udev )
-	wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# <libgweather-4.2.0 because of libsoup:3 transition
-DEPEND="
-	>=sci-geosciences/geocode-glib-3.10:0
-	>=dev-libs/glib-2.58:2
-	>=gnome-base/gnome-desktop-3.37.1:3=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=dev-libs/libgweather-4.0.0:4=
-	<dev-libs/libgweather-4.2.0:4=
-	colord? (
-		>=x11-misc/colord-1.4.5:=
-		>=media-libs/lcms-2.2:2
-	)
-	media-libs/libcanberra[gtk3]
-	>=app-misc/geoclue-2.3.1:2.0
-	>=x11-libs/libnotify-0.7.3
-	>=media-sound/pulseaudio-12.99.3[glib]
-	>=sys-auth/polkit-0.114
-	>=sys-power/upower-0.99.12:=
-	x11-libs/libX11
-	>=x11-libs/libXfixes-6.0.0
-	udev? ( dev-libs/libgudev:= )
-	wayland? ( dev-libs/wayland )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7:=
-		>=x11-libs/pango-1.20.0
-		x11-libs/gdk-pixbuf:2
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	modemmanager? (
-		>=app-crypt/gcr-3.7.5:0=
-		>=net-misc/modemmanager-1.0:=
-	)
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	media-libs/alsa-lib
-	x11-libs/libXi
-	x11-libs/libXext
-	media-libs/fontconfig
-	systemd? (
-		>=sys-apps/systemd-243
-	)
-"
-# logind needed for power and session management, bug #464944
-RDEPEND="${DEPEND}
-	gnome-base/dconf
-	elogind? ( sys-auth/elogind )
-"
-# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
-BDEPEND="
-	sys-kernel/linux-headers
-	dev-util/glib-utils
-	dev-util/gdbus-codegen
-	x11-base/xorg-proto
-	${PYTHON_DEPS}
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		gnome-base/gnome-session
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
-	"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
-	"${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" \
-			"dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		#-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
-		-Dudev_dir="$(get_udevdir)"
-		$(meson_use systemd)
-		-Dalsa=true
-		$(meson_use udev gudev)
-		$(meson_use colord)
-		$(meson_use cups)
-		$(meson_use networkmanager network_manager)
-		$(meson_use udev rfkill)
-		$(meson_use smartcard)
-		$(meson_use input_devices_wacom wacom)
-		$(meson_use wayland)
-		$(meson_use modemmanager wwan)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	# Don't auto-suspend by default on AC power
-	insinto /usr/share/glib-2.0/schemas
-	doins "${FILESDIR}"/org.gnome.settings-daemon.plugins.power.gschema.override
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index fe2b51aab7d1..9baab3d30c2e 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,9 +1,4 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
-AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
-DIST gnome-shell-42.5.tar.xz 1930668 BLAKE2B 0442ef92588e9891082c024d1e3b4ddb105a01ef5b7913ac8f1d2cac1af1c2ae8efd18184c511c554e41d8c0540c8712b7ef39ba1a9cac8c6c9336bb7b4cb320 SHA512 575559b99161b7045b04fc100cde719bbca83d90f78b673acc2189f3bb5104fd14f40da7d19611b154976f1c006e0dc2ff8cc124dc816da765c933fdda0624d9
-DIST gnome-shell-43.1.tar.xz 1947824 BLAKE2B d03bf5e970a92762724e5e1ab534e610f73b1c4af48b42fd676304f0d75808fcf5ba21ab9b9a0503cc2a806b826340d7d441da4b3ce51b881ffd4cb08132ae86 SHA512 1e41f0ce38b285aca1f9189fdb50e4d409232554da73e9c08e21b5888d35bad3e2bf4a47e93fdf20798ea6f63864223088b78cab7c63fc1105cd955701ea2e81
 DIST gnome-shell-43.2.tar.xz 1946776 BLAKE2B 0b581ed84bb3b8804cb4b5be07ae6be479f1092abf4c018d140edc81dcf0f88dc6c3321f591bc55c16e2141b4dd59e353c1f244749de13e4571a5b5aba6ad57d SHA512 f25754b60696723db3db4141eb14fda88f5d913cc8a9d7270a34b9a1493f9bd4caadf45b142fd0bd82f594d9fb47980c3b0242bb58ee184a61968f0d1f09bfc4
-EBUILD gnome-shell-42.5-r2.ebuild 7512 BLAKE2B 38c7c58e13fb94ed45205192c6da4b6f98c0bd9bd7f0b3e05cf873904e3560b5018885fdfc84f0c799a92fcc5d2314c07f1797a4dce02b29e72883eee5ac40ef SHA512 a27b74b05f7a9540eecf73fce261fd0434c8d86a321a7d53db7b11c496892b7be55f671e2d2edfacec25c8638308bc74f264e45b589f6d52e04328560941704a
-EBUILD gnome-shell-43.1.ebuild 6433 BLAKE2B 621e39f822dfa659dbedaebcdf8eb3985565b3648646522458227f7ad455068bae108c016133236f04ce4c496c4cf725009a893e9b5f6e6aaafdf95fdbd92b27 SHA512 41ffd85589ecbb2e59a7364631eabfc51c435004916db3418c218371a974790b68aa6d679866b5ae63130d7336a6b2b13e4582ef1216b6291ea7a4d16c7e6194
 EBUILD gnome-shell-43.2-r1.ebuild 6431 BLAKE2B c27b238c78ca891a742ba28018f34dbd0106f2e31881176c966ab565cab1b0d0eb1f545f0280d57e01e55cb3779539069d361505131277c36a6352623736f729 SHA512 c7da6032b1ffb4fdccee9bfa8ce1e4f55044e1f38bc349de2089ae4b2ad7f6211b9060278e36b34d4d6d338d97333db586394671c940174ea1fdaf728f83443a
-MISC metadata.xml 1187 BLAKE2B 112179de090fbd712f5af966853e0837f7b0cdd78e377fce9c8d3c6078e17ac98acfaabf93dfc738a45fb78a94f82903f5d8609bdd7f3769877e6ac24a5424a1 SHA512 f679fd454c50795c347235ebab1ce8b2e070c4afd797ce574226dee7aae25991a00e2c98000b11178f8aa943af1be8652b585937f8cab41ef349b6ee7b897d05
+MISC metadata.xml 957 BLAKE2B d2325c60974cb52f548436df192a77963b5353cbda67f65b9966829d2d5c4159c73bfc8f686255050546a9b384864d3ce9b6c9cd9d26d2d301fa78d50d5c8d9d SHA512 abe6d6768f8c4e090c0fc8d494c00551e76dd2b7409a99c8bf59d8353966dde305ce9fc0c1712d87c2e342a5e7b75b1f9ad7972e2a2bd0a6c0cb598a859cd13e
diff --git a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
deleted file mode 100644
index c7fe07dd69de..000000000000
--- a/gnome-base/gnome-shell/files/42.0-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d7cfd7bff4f9fa9d8528f72d4275e07551c6b288 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH] build: Make bluetooth support optional
-
----
- js/misc/meson.build | 2 +-
- meson.build         | 7 ++++++-
- meson_options.txt   | 6 ++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 582562711..ec9c62645 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set10('HAVE_SOUP2', have_soup2)
- jsconf.set('datadir', datadir)
-diff --git a/meson.build b/meson.build
-index 8d7478f9b..79d340840 100644
---- a/meson.build
-+++ b/meson.build
-@@ -93,7 +93,12 @@ x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
- 
--bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req, required: false)
-+if get_option('bluetooth')
-+  bt_dep = dependency('gnome-bluetooth-3.0', version: bt_req)
-+  have_bluetooth = true
-+else
-+  have_bluetooth = false
-+endif
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- pipewire_dep = dependency('libpipewire-0.3', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index f0f2ecf6c..85fc58ea4 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Enable bluetooth support'
-+)
-+
- option('extensions_tool',
-   type: 'boolean',
-   value: true,
--- 
-2.34.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-42.5-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-42.5-r2.ebuild
deleted file mode 100644
index d7a5b587215f..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-42.5-r2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer/pipewire support is currently automagic
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.7.5:0=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.71.1[cairo]
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-42.0:0/10[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-video/pipewire-0.3.0:=
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib
-	)
-	systemd? (
-		>=sys-apps/systemd-242:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-atk-2.5.3:2
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Optional telepathy chat integration
-# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-# <libgweather-4.2.0 because of libsoup:3 transition
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	media-libs/graphene[introspection]
-	>=dev-libs/libgweather-4.0.0:4[introspection]
-	<dev-libs/libgweather-4.2.0:4
-	x11-libs/pango[introspection]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection]
-	)
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/gnome-browser-connector )
-"
-BDEPEND="
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/42.0-optional-bluetooth.patch
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
-	)
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-43.1.ebuild b/gnome-base/gnome-shell/gnome-shell-43.1.ebuild
deleted file mode 100644
index 093284d2a739..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-43.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="elogind gtk-doc +ibus +networkmanager systemd test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-DEPEND="
-	>=gnome-extra/evolution-data-server-3.33.1:=
-	>=app-crypt/gcr-3.90.0:4=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.73.1[cairo]
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-43.0:0/11[introspection,test?]
-	>=sys-auth/polkit-0.120_p20220509[introspection]
-	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4[introspection]
-		net-libs/libnma[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib
-	)
-	systemd? (
-		>=sys-apps/systemd-242:=
-		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
-	)
-	elogind? ( >=sys-auth/elogind-237 )
-
-	app-arch/gnome-autoar
-	dev-libs/json-glib
-
-	>=app-accessibility/at-spi2-core-2.46:2[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-libs/libpulse-2[glib]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	gui-libs/gtk:4[introspection]
-
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated from inspection of the output of:
-#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
-# or
-#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
-# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
-# Each block:
-# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. xdg-utils needed for xdg-open, used by extension tool
-# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 7. IBus is needed for nls integration
-# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
-	media-libs/graphene[introspection]
-	x11-libs/pango[introspection]
-	net-libs/libsoup:3.0[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data
-	)
-	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
-	media-fonts/cantarell
-
-	sys-apps/xdg-desktop-portal-gnome
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection(+)]
-	>=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-"
-BDEPEND="
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17
-		app-text/docbook-xml-dtd:4.5 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( x11-wm/mutter[test] )
-"
-# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
-# dev-lang/sassc
-# app-text/asciidoc
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Hack in correct python shebang
-	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dextensions_tool=true
-		-Dextensions_app=true
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use test tests)
-		$(meson_use networkmanager)
-		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
-		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
-	optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
-	optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
-	optfeature "Weather support" dev-libs/libgweather:4[introspection]
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index 8cf603b229be..3ef3d305b308 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -13,10 +13,8 @@
     provide a visually attractive and easy to use experience.
   </longdescription>
   <use>
-    <flag name="browser-extension">Ensure the presence of extensions.gnome.org native connector <pkg>gnome-extra/gnome-browser-connector</pkg></flag>
     <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking and suspend support.</flag>
     <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
-    <flag name="telepathy">Ensure presence of telepathy chat integration</flag>
   </use>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-shell</remote-id>
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 19d6613138c8..9bac509d5606 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,6 +1,3 @@
-AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95ea1afba42bb85d29624bcd7c1b573496c6eebf2541c224cd978eff6e6b7b9640a58b0d9361a7b919e SHA512 ceb03541b0c1991ec1f4d933e7b6c0741cb8d36b3083945763a8ea91bfe271c3395e715e52f9a6724a132baf7792fbfcd97a0e43050eaeaa72d50a6388d61e3a
-DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
 DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
-EBUILD gvfs-1.48.1-r2.ebuild 3918 BLAKE2B 6250f10bd9de0db9a23707bb8ab3e97c18886b51a6076edc635aeda25c9d157926ae558b93015dcc039bdf2c27cdf3045e7a47104b3a6cfc99913cf403c5f047 SHA512 0c199aad98c83b0fc6a845e5f49dcdd8deb7372cab9ed6422065f51db373f49e6077a7f6c6fd2ebf6df839b15a3d3c3fae72c0889dd58e67b13f8578a2756036
 EBUILD gvfs-1.50.2-r1.ebuild 3908 BLAKE2B 8c277a085fbdaf12f7667c8c27079f0da1966e2b6a213f109e5adb974f649a9610287845d89c8b64c9c3405b6d01d8bcdc09715423d2678b8437d230924ff851 SHA512 afbabfd1b5be102d375c372e96db748f9e92cdd7b9177869b0ed4ae832f8ff5dff0451f694c5f973aa44a17d4e61fc06aa6ece18452a0e9a0292ddb302162262
 MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1
diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch
deleted file mode 100644
index 20e03388d7c6..000000000000
--- a/gnome-base/gvfs/files/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/831840
-https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133
-
-From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Fri, 21 Jan 2022 08:32:31 +0100
-Subject: [PATCH] build: Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0 where
-it fails with "ERROR: Function does not take positional arguments".
-
-Related: https://github.com/mesonbuild/meson/issues/9441
-Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599
-(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0)
----
- daemon/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/daemon/meson.build b/daemon/meson.build
-index dffeef3e..bdc506fe 100644
---- a/daemon/meson.build
-+++ b/daemon/meson.build
-@@ -366,7 +366,6 @@ if enable_admin
-   )
- 
-   i18n.merge_file(
--    policy,
-     input: policy_in,
-     output: '@BASENAME@',
-     po_dir: po_dir,
--- 
-2.34.1
-
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild
deleted file mode 100644
index 305bbb54a8d6..000000000000
--- a/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TMPFILES_OPTIONAL=1
-inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
-
-DESCRIPTION="Virtual filesystem implementation for GIO"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-RESTRICT="!test? ( test )"
-# elogind/systemd only relevant to udisks (in v1.38.1)
-REQUIRED_USE="
-	?? ( elogind systemd )
-	cdda? ( udev )
-	google? ( gnome-online-accounts )
-	gphoto2? ( udev )
-	mtp? ( udev )
-	udisks? ( udev )
-"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.65.1:2
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:0=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap
-	)
-	http? (
-		dev-libs/libxml2:2
-		>=net-libs/libsoup-2.58.0:2.4
-	)
-	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
-	udev? ( >=dev-libs/libgudev-147:= )
-	fuse? (
-		>=sys-fs/fuse-3.0.0:3
-		virtual/tmpfiles
-	)
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:=
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
-	gnome-keyring? ( app-crypt/libsecret )
-	bluray? ( media-libs/libbluray:= )
-	mtp? (
-		virtual/libusb:1
-		>=media-libs/libmtp-1.1.15
-	)
-	samba? ( >=net-fs/samba-4[client] )
-	archive? ( app-arch/libarchive:= )
-	cdda? (
-		dev-libs/libcdio:0=
-		>=dev-libs/libcdio-paranoia-0.78.2
-	)
-	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	net-misc/openssh
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	test? ( dev-libs/libgdata )
-"
-
-PATCHES=(
-	"${FILESDIR}/meson-0.61.patch"
-)
-
-src_configure() {
-	local enable_logind="false"
-	if use systemd || use elogind; then
-		enable_logind="true"
-	fi
-
-	local enable_gcrypt="false"
-	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
-		enable_gcrypt="true"
-	fi
-
-	local enable_libusb="false"
-	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
-		enable_libusb="true"
-	fi
-
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
-		$(meson_use policykit admin)
-		$(meson_use ios afc)
-		$(meson_use afp)
-		$(meson_use archive)
-		$(meson_use cdda)
-		$(meson_use zeroconf dnssd)
-		$(meson_use gnome-online-accounts goa)
-		$(meson_use google)
-		$(meson_use gphoto2)
-		$(meson_use http)
-		$(meson_use mtp)
-		$(meson_use nfs)
-		-Dsftp=true
-		$(meson_use samba smb)
-		$(meson_use udisks udisks2)
-		$(meson_use bluray)
-		$(meson_use fuse)
-		-Dgcr=true
-		-Dgcrypt=${enable_gcrypt}
-		$(meson_use udev gudev)
-		$(meson_use gnome-keyring keyring)
-		-Dlogind=${enable_logind}
-		-Dlibusb=${enable_libusb}
-		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
-		-Dinstalled_tests=false
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	if use fuse; then
-		tmpfiles_process gvfsd-fuse-tmpfiles.conf
-	fi
-
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_giomodule_cache_update
-}
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 484576f497f9..d31afa61a17a 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -2,6 +2,5 @@ AUX 2.40.0-clang.patch 4657 BLAKE2B 4a04d3f14bbc0f255b4f243f5e482b4e5aff7a1c25ea
 AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
 DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
 DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.40.0-r1.ebuild 1237 BLAKE2B fa027c28549b2458b8beb9db18ed4f2de24aff23d88e5ee11c99225bfe4dc4bcc9494d6cd304f98bb119401e06ce91ce1bbe81f8ebb3edb111939502dc35b4a0 SHA512 073209f56c4fa66b5f2f57ed0b913d686b4e5e6e9cb694ca22c169685f0c77436664defee690e2bbfc27b6f20a78ff80892c11df40205653fad143fa78314f65
 EBUILD libgtop-2.40.0-r2.ebuild 1270 BLAKE2B 9f09fc210bced6a1c73ac676ed89a62812edf5806d556cf926e6d60f1addb327fab28a19b8a969d60d5b0a577da1c11f61c70437bd399fa18d3d7e0f44c9b9f5 SHA512 7c7da01945cc8f076ab6562950c7f73505d2f526b52bc195c72b6829fb1cfc14dd37f60e00617830f95ef5cd65150f1fbe70076247f873cd965c818da3533038
 MISC metadata.xml 348 BLAKE2B a3b76adccaf7cac9d18f004f987e5931ad391a4c73b16dd18ea008761d1ab8d0d343b50281278a27ec1a621c211babdf72db28513bec173916488a64b7b1cb26 SHA512 b99cbbcdb86b81c8280e14ba5d31e396ba6de133334ebeb827113c34a24f03a365c0e40934f6dc39ecfb76be17452e4c50694e1ef3b0358853708dfda040c28c
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
deleted file mode 100644
index 553d12ec96ad..000000000000
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/libgtop"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.4
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems
-	"${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48
-)
-
-src_configure() {
-	# Add explicit stdc, bug #628256
-	append-cflags "-std=c99"
-
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-	chmod 4755 "${ED}"/usr/bin/libgtop_server2 || die
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 6b946ce4764b..51632534f7fe 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 05acea75cb74..841fb6bad83e 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,9 +1,5 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.44.4.tar.xz 4784388 BLAKE2B dd5b7094af9c66b710d61de282ff7e223fd87524f0135b7fc2c962d7829a8ed25a90a5fa73d155b692e28d9d18807f8c8731efbfb32613e2e1a020008739beae SHA512 385137f1e412b5c5bcd496d493da4657f8bb6e72519f6e62ab1a683c729082ea0ddcf7b5dae8c0cdf37cb279a1cf59ffb6dd61009c693001d03a0d54264e979a
-DIST evolution-data-server-3.46.1.tar.xz 4843728 BLAKE2B 1053389277c9b8f83c80db382ba14db974a0674e75f728ac24a21e49f2c744c0239d19f380487487a2798db85706c5c0a7cb867508726e40034bcdcbb46da6c1 SHA512 6dbb9b192c46fdec25eb3587f90c5c2f3de902c80996d691978be519d7f7aad9946d3282c44febcf498bb8d497b639f3afeeead3f032bbb0cd1ddb380a0ca5e7
 DIST evolution-data-server-3.46.2.tar.xz 4883032 BLAKE2B 530f2cd40716373a0d865edadefb5789dae3b894f202ecfc55d2d2e9f1409e59e2914065e7247ac0749d6af54de7705720347d7f9d93a5376c967ec804c9e805 SHA512 570a14ea21c18be8626530562483c1f112c6f773b4502c7c16005abe516dd35d810985ed3cd4c89b993e5169474791ff3694999ef41a6fe53e2309450c7c7341
-EBUILD evolution-data-server-3.44.4-r2.ebuild 4510 BLAKE2B 6c70a5ced1a2c2a815898b45728162a852771f9e2dfa2b77decb8844ae7a48b3a05ac1770862136bf0b5e104365254c080ff1c66bce10dcbb6d6b30860b5f81f SHA512 2cc50e79bbaf8ba95b8cdac5a20b20aa13a89db78cb99c7fd5cd67cfd2753cdc1e6fd275a253acd1b337ab77d5295b8755e5d1edcd2830ce10498ee551831c7c
-EBUILD evolution-data-server-3.46.1-r1.ebuild 4212 BLAKE2B b5b2981a0e49a90ca0bda3a23062fa0477c5661b2abe22da8d285de07ab5fde839ef05d2629919e5ed7b709e0a8dcd5dfd7d8e5eec899479dc66875204d2009c SHA512 60aa44f3a42ebd385ab7b0267bccedf8e1b1eba315dbdc4fb894b00506abe45546398391fc9db2e68e59a5d623156a797d15090a7b99c3c720d78007894e7a36
 EBUILD evolution-data-server-3.46.2.ebuild 4206 BLAKE2B c471d66dfe280b8a754fbb7f0836250ed321a1ac8fb71ae74c29e65594c4c6a3e7994a27d175adfa26b06c01d1bb9137e63b6cfe44cb6988e3e649bd9bb95c20 SHA512 910bafb93514bc1d209949d10edc13aa91cc914f92b834c29d6a04d2c7b3082efe82f4989ecadf01ba1f81f9bac822fc3757f406adbba30bd68833dd1b0ccaf9
 MISC metadata.xml 962 BLAKE2B 212d69424f3276f40cbd92843968374de95e0cf3b5263a0fe815628aa5fa9a3618c7104abbc0e4bb2f0a9ab6b36a674fffa36c6d020ae7ffb6fe34c6f3c035f0 SHA512 49350cc9ee65c76c248a99fb7adbfefcea02eb1c43673bb8e010af1fa78767dd2d99beb625a0164b2a2b8e8b366478b4dc1309c2044b77feb017f4bdeffa2d92
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.44.4-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.44.4-r2.ebuild
deleted file mode 100644
index 56c045697201..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.44.4-r2.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake db-use flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-# <libgweather-4.2.0 because of libsoup:3 transition
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4:0=
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=net-libs/libsoup-2.58:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4:0=[gtk]
-		>=x11-libs/gtk+-3.16:3
-		>=media-libs/libcanberra-0.25[gtk3]
-	)
-	oauth? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.28.0:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? (
-		>=dev-libs/libgweather-3.91.0:4=
-		<dev-libs/libgweather-4.2.0:4=
-	)
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		net-libs/libsoup:2.4[vala]
-		dev-libs/libical[vala]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[vala] )
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_setup
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_enable
-	if use oauth || use gnome-online-accounts; then
-		google_enable="ON"
-	else
-		google_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DWITH_GWEATHER4=ON
-		-DENABLE_GOOGLE=${google_enable}
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.46.1-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.46.1-r1.ebuild
deleted file mode 100644
index 348929897272..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.46.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake db-use flag-o-matic gnome2 vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/64-11-21-4-2-27-2-27-4-0" # subslot = libcamel-1.2/libebackend-1.2/libebook-1.2/libebook-contacts-1.2/libecal-2.0/libedata-book-1.2/libedata-cal-2.0/libedataserver-1.2/libedataserverui-1.2/libedataserverui4-1.0 soname version
-
-IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather"
-REQUIRED_USE="
-	oauth? ( gtk )
-	vala? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
-# glib-2.70 for build-time optional GPowerProfileMonitor
-RDEPEND="
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.70:2
-	>=dev-libs/libical-3.0.8:=[glib,introspection?]
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=net-libs/libsoup-3.1.1:3.0
-	>=dev-libs/json-glib-1.0.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=x11-libs/gtk+-3.20:3
-		>=gui-libs/gtk-4.4:4
-		>=media-libs/libcanberra-0.25[gtk3]
-
-		oauth? (
-			>=net-libs/webkit-gtk-2.34.0:4.1
-			>=net-libs/webkit-gtk-2.36.0:5
-		)
-	)
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-4.2.0:4= )
-"
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend)
-		>=net-libs/libsoup-3.1.1:3.0[vala]
-		dev-libs/libical[vala]
-	)
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gperf
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Some tests fail due to missing locales.
-# Also, dbus tests are flaky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
-src_prepare() {
-	use vala && vala_setup
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	  -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-	  -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_GTK4=$(usex gtk)
-		-DENABLE_CANBERRA=$(usex gtk)
-		-DENABLE_OAUTH2_WEBKITGTK=$(usex oauth)
-		-DENABLE_OAUTH2_WEBKITGTK4=$(usex oauth)
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=ON
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index a06c6627cae7..47624b0139e3 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,3 @@
-DIST evolution-ews-3.44.4.tar.xz 691396 BLAKE2B 69344bec9dffe21e54e77325929b791cc89072e9a2a2f9a0fbcf5551c1f8b13c90c4a3c2bd934956c4e1b73b306fbdd6827c6fb4ef7aee182a3bdbeb450d124a SHA512 0326b274fbcc3630ccaf6517495ce22409706f0ad16c11b189f91c27ab8921a639bb07296d51063e71cb706e66bd861044adbf146b16f9fca4b4cd9cde6edb65
 DIST evolution-ews-3.46.2.tar.xz 694936 BLAKE2B 548fdcaf0e0b9964bbb8b854a7aa7cd83f52195ddf6d9ba70b35ef9ea6f6c7606a967f3a3eece36bf7af3ecc3d7d2dfb8e6a701a6c18e85fe2523c8a3f04fea8 SHA512 dd669b8d562849d588f88dd40f981e0401a046cb5489b00894082b04462fadc43581dadb0eee87077b63998a32e80cb66ae9a5c0de99c7079bb5cbc5aa8c37bd
-EBUILD evolution-ews-3.44.4-r1.ebuild 1560 BLAKE2B f17aeee022f634c5f649d199a737508e40476732b3640664e7cc32a09d456d5b6be9f332cccb182df37110edce2f60277f06830d106b5f0eab9c773113b92967 SHA512 a0ef1eb981174aa1a43e68464bd8d074b683331387c12b0c96c4f8a847df08480ee8b94b5b317cda5e4883d74c098b936bb6dda82ad9c2d2cea06536ba1fc0c5
 EBUILD evolution-ews-3.46.2.ebuild 1567 BLAKE2B 1aa3d892b4630a0bdc82fc969865b83ff4fb6d44701bd210efcee1b49bdc4d74f41887602b3a35ea2f0acbd3b7eb976cfa15e8d6325981a6bc6a53e847a9c3bb SHA512 abe4d29d7668bea13bee0afc5f886c33854b192a6fed3f171ab1d6f93fafe7fced46ca2261f38f2b0b7b1f675feadb8599be8f157214df73779df5d79b00cc98
 MISC metadata.xml 354 BLAKE2B a6cf76e87956f2418a25c83542af3e5efe415943426b03750b2572129b06f977f900207a1eef805b7ae463a84204d12bf286ef9ed0a5b6990cbac2c77783260f SHA512 9f06dce58e2dfdba0a22f8a711d5fc98aba9ae1d130173bd7ef8effd0bb3c1cf046eef712f7ea7bd55c4382ca01e78d7028419ce41812d33ef38a1329978af56
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild
deleted file mode 100644
index 7dc1e38985c7..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 optfeature
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="test"
-
-# libical-glib currently (2020-02-29) oddly behind USE=introspection
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.62:2
-	>=dev-libs/libical-3.0.5:0=[introspection(-)]
-	>=dev-libs/json-glib-1.0.4
-	>=dev-libs/libmspack-0.4
-	dev-libs/libxml2:2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.58:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	test? ( net-libs/uhttpmock:0 )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test !test? ( test )"
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-}
-
-pkg_postinst() {
-	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
-}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index b3247efeb602..0c03e1123e0e 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-boxes-42.3.tar.xz 1235916 BLAKE2B 69a52117b0ef459b4f6c11287f3961283c0493522875958ae65cf1838d9359b60e1c376bf86c1bc1899e69b6b9aed72a32aa39c7e687afef6a23de50d599b8e8 SHA512 2c455830b76cffc647838b797dc7667d9dec0be45658972075b203553bd73bb54dd6b9b22891da9eb12bea7f157b26980a172685a10e1d252f32014f38eb8805
 DIST gnome-boxes-43.1.tar.xz 1231472 BLAKE2B 1c7bd9094e7ddd8f5062ccd4660f72f2b3069cf3d66f45b8713e0880f5e5d8976eb4c1c8d4dfe8418a7a51e9b1ae0b9b5c85996e179a932c43748b308819d2d0 SHA512 25865c4bb1dfd47552001eda18ba901f9501a22978ef382bd7edcb31493cc284794506f5e2ba4f28d72e6ddb35e5c6e9b5646ccc4d2e87bf41e8620c102d335e
 DIST gnome-boxes-43.2.tar.xz 1235424 BLAKE2B f99106ee7a8744a92a6f749230802a882a96489a2b2047b70ec07263b2f03ee0fcd910c907e2307a09c78f85784849bf87c20e901894e7c9692dfa77a0182a18 SHA512 edddf5980adf6bce516a4fd35be14e7b261c6cf886f1f1e7fc9cd79089b8320e781c98f2a040babc1661af6ae1f331dec3a2ecd728bcdb26d9a9031175c8e1be
-EBUILD gnome-boxes-42.3.ebuild 3824 BLAKE2B 93dec56a7f89da46efc01714308df91c0b05d3b2a61ce0e2463dccebdc6acd0b052a37f2fc78c7066852df31038654987f8c2141716f32a2e1e7b4a53edf1d92 SHA512 8ea8759a431affc9ab7bb2425cc5a4c206cdd5834a2a9620bcefff2c6ba17303fbacd37380ce1d038acf989628768276466aff5ba5bc0ac2b4be932ac4fe3ff1
 EBUILD gnome-boxes-43.1.ebuild 3487 BLAKE2B d181b659c3d14080391233e7edeac328b948b9cfc2283c9731a503f045684f7e695dd9bfc6844fcb0f0fb7ce7d55c482cfdecf77d171bda5a5e343d677178e3a SHA512 ef77513cc638c73f99874fd2dfd97087dde9249ad122783ea1dc3222bb27b27a200c54cf2bb10306d7c94302551fc5b5b1550b7dc7f6893e0211b7a5efc92092
 EBUILD gnome-boxes-43.2.ebuild 3488 BLAKE2B ff7a7557238b24d40cbd26d4333c88134374039e4f4d69c4ec9d2c748ae0602738830ce40cc8e44480381dc1ed2c991f20405c1e090ec83e75d6c07b8ed89140 SHA512 d7c79122f7d173d94b5cd9912f97ec81d955ab2643b571a5fb03c3a7cefee02fc0f412c82cfee7a9c109d54e89d2bc38ae410956bde8f19ee12f60229e1ae2e6
 MISC metadata.xml 352 BLAKE2B 285b6e588965df3d070f92552b36941c6346a9fde3dce831baa82d42c8ca23f62cc027e5984a27fc87bffca8181c2d13a52b064729349daef0aa815a566a885e SHA512 09baca6576a90ca57b6e0935879f1630550efc9d591b425d6944b28b1184612b34fcdbae6d835d98812c89ec7a47415af9a01678be16f35a52933bb7c374131f
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-42.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.3.ebuild
deleted file mode 100644
index b3c5e5202a3c..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-42.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="amd64"
-
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.24.1:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=gui-libs/libhandy-1.5.0:1=
-	>=sys-libs/libosinfo-1.7.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-4.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:3
-	>=net-libs/webkit-gtk-2.26.0:4
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( >=net-misc/freerdp-2.0.0:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	app-cdr/cdrtools
-	app-misc/tracker-miners:3[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-		-Duefi=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index b8a49ab5a02a..4a4ddb125f00 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calculator-42.2.tar.xz 1199392 BLAKE2B 68b6374ac6f86e6d0db29e8839e5b302e1a8d6bc47b7d42c54195e463cfb36d3db6773a771dfb7694fa2c310181b12ddbd171b26b081e9fd9fe8c7b0595ddaee SHA512 81f644a6be66a6ca051c0adbca06eab61bd09f219385631ca2d66fff1c250c01080b3f401ff20b4ee296c0999481c8f1dc1d105521d7995ff682b8e1158ada5a
 DIST gnome-calculator-43.0.1.tar.xz 1205840 BLAKE2B d3044efb5307505485dd55c3401d0c21cc379bcfc6fdd4f0285d093c05e76f9c167c5bd65bdf899c7f3aed892258b65538020a70e690eeb459147e6bea15a94b SHA512 94ec47a03dac017801e9c499aceb2f5f6fd1c79966657c79b123476dc7f3a4a2c3e179c80763e965207b58427157cd6e072260bd79ab98a39eb011cfe3ef7c72
-EBUILD gnome-calculator-42.2.ebuild 1584 BLAKE2B b21da6ed256f9436e223f13034e59c907673d5dbaa867e8684b9a6fb19f2578552af42af5ae0fa474e9224bfd318c563e34c75718c1e158fde140a95126dd5b6 SHA512 504bc8be6d8ef877b1f92bf493d83bd2d5ce6cfe6b57fb148ba0ad2ed915f37885dd5de83310dd1046e039a0f3c810ec5758a53ae12145460de0a2eb92a37739
 EBUILD gnome-calculator-43.0.1.ebuild 1534 BLAKE2B d707ce5beebe31b067a40a0895c5277a4836ff05b707fe96b7668996f094139b1710df8b745a0a94b456d512843dff82f22882d06fb7aaf0e37fdffead3bfd41 SHA512 d1d606416b6f099f71925c97a7e2f8748ec95953d3123307a4933e7f993cde039e4ad764646f3a1e4ae5756117936a99adc21c2c7ebd940b1e3ad5bb684e897c
 MISC metadata.xml 553 BLAKE2B adbc4947ab50307c4bf5fca7e9b6cf2db5394b9e3a335d2de56a0678af3f1674d0641835179d2ffad62050292e02874add35125918f922b66fddb64c7e949941 SHA512 960975bcb5b0bdecc83cd80eb8d0d70845a1080a9c2490aa674cf775a44925b9196953a20c88a4197feaf8e8107f98acb6843164292cafb92bde5d1de18242ee
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-42.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-42.2.ebuild
deleted file mode 100644
index 267503ea8c05..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-42.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson vala virtualx xdg
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
-# altogether, thus we need them installed by gtksourceview[vala]
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	>=dev-libs/libgee-0.20.0:0.8
-	dev-libs/mpc:=
-	dev-libs/mpfr:0=
-	>=gui-libs/gtk-4.4.1:4
-	>=gui-libs/libadwaita-1.0.0:1
-	>=gui-libs/gtksourceview-5.3.0:5
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	net-libs/libsoup:2.4[vala]
-	gui-libs/gtksourceview:5[vala]
-	gui-libs/libhandy:1[vala]
-"
-
-src_prepare() {
-	default
-	vala_setup
-	# Automagic dep on valadoc - don't bother for now
-	sed -e '/subdir.*doc/d' -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddisable-ui=false
-		#-Dvala-version # doesn't do anything in 3.34
-		$(meson_use !introspection disable-introspection)
-		$(meson_use test ui-tests)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index f11bfd7f688c..fcdcc5ed59f8 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-calendar-42.2.tar.xz 578276 BLAKE2B 44684f7c1b6db6865bf0b9bc7096a990212b086d7c2e748cb41e4ac6ced4a1bec0e14f5ed3d6253f49006f4e736666578ded9cd6cd84533fcc03316c5a437b4d SHA512 6ab72017dc0230dc396c7c19cdeab633744b6a44ac4a5c2183389cadca1507bf696c5cdf39def1c0158fb0be5f1988f2a30a6fc2ea0090d6fc341adc45daddbe
 DIST gnome-calendar-43.1.tar.xz 423132 BLAKE2B abc68034794343a644bc61165195aa0bf5ce85d741cb5f5fdf32128e857938eba085a7a4dd7321b1c02eab6c02dadbfe00a063738ba976121e36168151b01c2d SHA512 a527cb672794a8ce452f6bd0cc389547c8293cb18ce94fc80c47d171926fbc5901f02761f723a853bf83af359fbe276e4c634ef47f94e7d72d73e25b2d725483
-EBUILD gnome-calendar-42.2-r2.ebuild 1180 BLAKE2B a74b9e76b24b3ac1166faf349097a02647aaf29292f4ef7b4b4cb03ab01dde3b0b734b2f5ff2fe849b941da81ec93b56e4ee191ea6d59b6786207c82b7a89839 SHA512 88f104ded09ca692e6b39d8a8a824051c406cc3456fb868bd6aa9f1f4ff6ea2fe56fdeafecaa5552ab34d397a3f378ec37f1b03ecaf71c9d6031fcee6baa1134
 EBUILD gnome-calendar-43.1.ebuild 1022 BLAKE2B 17006fcf9e46f1ff9078032e3d0e88713bbb6c952101e5fbe5b775dd8df1e57994b81c1af4d40d631bc4a443b0cf1a7815bbfdff3423ab258c0e38d5bd40329b SHA512 6ac456f9d60de4f8d5ac752604f0f633c56978d397340b73e6dabfa0e88bec90c4a06be53bc652c2fd7ad9dffedc3e4517af88333cf460cb062915c805da6898
 MISC metadata.xml 641 BLAKE2B 5cdd6f1f7445a7120c135c9401ea6bacaa6386ab797191e293ce6fddb1ecd2f7829c6854f39d5ca085ae6c7c0c6f737d59da26fa8104398e3ca81c451430510a SHA512 9bd92483720db367fdeee389c7b5a0ef7c2a8c3c9970bac891ef3978c0cfd3357588b5df1cde8276763742d3f4f81dc41ea221e74a4b03618f2a5f2bb2226432
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.2-r2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.2-r2.ebuild
deleted file mode 100644
index 958720c039d7..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-# <libgweather-4.2.0 because of libsoup:3 transition
-DEPEND="
-	>=dev-libs/libical-1.0.1:0=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
-	net-libs/libsoup:2.4
-	>=gui-libs/libadwaita-1.0.0:1=
-	>=dev-libs/glib-2.67.5:2
-	>=gui-libs/gtk-4.6.0:4
-	>=dev-libs/libgweather-4.0.0:4=
-	<dev-libs/libgweather-4.2.0:4=
-	>=app-misc/geoclue-2.4:2.0
-	>=sci-geosciences/geocode-glib-3.23:0
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 11aa5e2d8825..1714f7a3fc02 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-characters-43.0.tar.xz 582892 BLAKE2B 20ee1a5f12242797c2c12a0ed32d809210f059dc40d986eab754e966b40625eb90544fc494867969ca426f4b0891a378a22ace52d0a1bd641c803bdd75d4c4c2 SHA512 0bb86c7763b4930695f089a65723873ec736d78fd04b56cd54fa5785c62271e3490413232c6ebd27171855f125cd1732e7357ca819227f128efed057c1c8a8c4
 DIST gnome-characters-43.1.tar.xz 584444 BLAKE2B 6920bd10fe794143b4ff8920c0c81fce2649493d827201f4e47c46a3defb3fd8cadafdd9c7eacc35be7a9978b3d9047f64c5318c2582d3d87de6e1afe5bfbd66 SHA512 75fb25b7d6c2984a0d59887e0c408c0dc210061fa1e0cedbffefd8ef8b4b610a7db1c248926a5b6473fc0f806937e953e9e72a39b2a880c4871399226f3a77f4
-EBUILD gnome-characters-43.0.ebuild 884 BLAKE2B 116a5697c731f3063e5c21b1be3e1ba346c192f9ecda7888991dfe6452e9202bd7f72478ba3537a3fbf75d6548b813283eaff6c8fbbec35a26a3a06e44255ed9 SHA512 7020766751532af3414b8729d67f392fc27a2d9c66a35ba2a51447125a7dce3017c559d247981fdb80ff041bce8b4f372a968b429ecb7689c50c7fc6721daae1
 EBUILD gnome-characters-43.1.ebuild 884 BLAKE2B 116a5697c731f3063e5c21b1be3e1ba346c192f9ecda7888991dfe6452e9202bd7f72478ba3537a3fbf75d6548b813283eaff6c8fbbec35a26a3a06e44255ed9 SHA512 7020766751532af3414b8729d67f392fc27a2d9c66a35ba2a51447125a7dce3017c559d247981fdb80ff041bce8b4f372a968b429ecb7689c50c7fc6721daae1
 MISC metadata.xml 357 BLAKE2B 1b9479f7ff139fec94e455e917e8376172adfb49ad580d6f3b612aef623a4c5617fec2e3528eb51da1d6ef39a8e37bebfd0b1d06a36173231e4e5d10b06fcb64 SHA512 34fc6316a9dffd2c9c1f671ed5e771663ea340e6cb4d933da98a8fa75932917cb827f94cfdb76e8a2a3ead67d957d94fdcf8b34924ea012b0288257a2e18e69f
diff --git a/gnome-extra/gnome-characters/gnome-characters-43.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-43.0.ebuild
deleted file mode 100644
index 05970c5e7447..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-43.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/gjs-1.50
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5:=
-	>=gui-libs/gtk-4.6:4[introspection]
-	>=gui-libs/libadwaita-1.2:1=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.36[introspection]
-	gnome-base/gnome-desktop:3[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 58b9c07a2ebd..62c694877eab 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-clocks-42.0.tar.xz 360968 BLAKE2B de66b802dbce8e57a97594c76e8fe5f7a4d65c1426d3c45217f3eb1e27e553fda9f1484b83827e6f44db10c8623581c7e1cd79f0bd79352966f67345e59fcf30 SHA512 f642cb4a626de2a97ad78c25922bb933bdac917d363097fcf5149310111abd11834410b48bfb4fc9cbae06f0ab30b0a5200d45304ce292b5a9558a90b922edb4
 DIST gnome-clocks-43.0.tar.xz 366872 BLAKE2B 1886d8e75b3d1b006a247bb044faf996d1788fdae65d4e825aeada1a2912bd6b58aa244da4088fd7f709c5a87fd788b92c45b9b116e462403d7929395cf0d6ac SHA512 703876a67000fa3a2b5e7bec70451a725aa4ed33aa2392a4c7fafc6ad287dd5591ee24c9aed20961739e9caa1f15ec404da9a2fa42e524dedaf75210d00b4fcf
-EBUILD gnome-clocks-42.0-r2.ebuild 1189 BLAKE2B 781bcc923949f34fa28f363fdb8827a6ce36883ffd6dea5db6c0b0c88657fc6d0e03fd48814dd879c7886f64f121b9fd8e905d50a577619c578f5c86dc4bf346 SHA512 14f0cf8e48f9a39930fb87c25db1670cf6c27ba08414078022b3ded165bbf373fc78c04fc1d31a9da097b59558379069e715281c6d39c3a79958e113dca6d3fc
 EBUILD gnome-clocks-43.0.ebuild 1155 BLAKE2B ba9ad0cce1dbfd5615b7cb65463640b82322f7a0e85590819dccf39c2a92abb511210b9fada5633858bd16b4c0b9b9b71a0adaf3b85ad0062853611f736940f6 SHA512 5cd67829426345a42a47ed5edb1eb77cea1b45e3fb90d9421bbe9f9879fdab30097cd8599290bebeb54ecd24d1a07f42a077f2daf2400601f0f450f09f12f0a4
 MISC metadata.xml 353 BLAKE2B 56683a94c749b3a561421a0ecf799afa6361bfc860330b8f1bfd252d9101b5abcf5b03a07195113556362a91a48fcded621c578a0ad1603b72df95da88dc2c55 SHA512 9dab4b3242926c635c5f503e0eb8ae3e14a585dfe548d0cfe90d60315c9c26af1550a54034dfeae279a3cb076c4ef23b5f50546d2a537e480956d02605a936ab
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-42.0-r2.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-42.0-r2.ebuild
deleted file mode 100644
index b56e1fea0cc0..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-42.0-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_MIN_API_VERSION="0.56"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.68:2
-	>=gui-libs/gtk-4.5:4
-	>=media-libs/gsound-0.98
-	>=dev-libs/libgweather-4.0.0:4=
-	gnome-base/gnome-desktop:4
-	>=sci-geosciences/geocode-glib-1:0
-	>=app-misc/geoclue-2.4:2.0
-	>=gui-libs/libadwaita-1.0:1
-"
-DEPEND="${RDEPEND}"
-# <libgweather-4.2.0 because of libsoup:3 transition
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	<dev-libs/libgweather-4.2.0:4[vala]
-	media-libs/gsound[vala]
-	gui-libs/libadwaita:1[vala]
-"
-
-DOCS=( AUTHORS.md CONTRIBUTING.md README.md )
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dprofile=default
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 87f84e792420..d8ffe8366701 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
-DIST gnome-contacts-42.0.tar.xz 343312 BLAKE2B a86bc70301a4f04bf7be426802e75d412abfa468555172233c5b540fcc0e630c433607ebe2a5dbffa58d49ab23773deb6099f88fdfa06f44f767d3fce57821bc SHA512 09a0d70a1550136717c4f837f2e4526928559de4bccedb71b34a216d99c36886bfd5786fcc3487198c488b4778046453d0069da55ab283ef87513c2d668a11cd
 DIST gnome-contacts-43.0.tar.xz 380348 BLAKE2B be226024dd8369a3c3df9766d6860912fee5a698ee4e0754d773afe16d7f787f3d8a73485c9a31b091514b7de3a835e3f4e37b6c11fc746e1a5f681e07af58fc SHA512 ee2cfc4ad2318f27b0e6597eae501a6e2240b4de8ceb7982c4942a6ff50ce6cd56d06f5d324ac04f82dd8e7086dc82426fb3aab9c194cbfa490b5bab98ba0469
-EBUILD gnome-contacts-41.0.ebuild 1680 BLAKE2B 891fb0c7fcc4c5a1a5744d7fa209a900c037251728c60d8f7e499cef884dc992454098635b8384b374d0e84446de822a38710a0b4f7303b7a64859f8d18b86fb SHA512 3b08a5e0776e5dae1de23c25670bf597f73f3649d3b9025ef4bdeb75de64be793f838e09a88f7c5269f8c17b684a27fd3382feaf4b7ec985e4fdb1841bf55ed8
-EBUILD gnome-contacts-42.0-r1.ebuild 1631 BLAKE2B 3f23aa6ec6dab61f717413e7242a624ad5d718a7aa5d5a45fead6fef99c4d1a1cd6dcdd299ebf526db26b8475f502c56aca9c006c98754f8193c621309b847e8 SHA512 98ead7b2fe61f95a2637f9c80d7fefedcab45c039a82b4fb0e88714c4d68708ebee04400d42e04443226c801e0b0fd3f5b68c7dbd23226ab21e1ccf107df7ffa
 EBUILD gnome-contacts-43.0.ebuild 1427 BLAKE2B 33e41dd445b40245ef44a6b899c95a82d54411bb10af40751fad1a7c7c99e65b26fcefd33b9d896136162bc025e469b1c797fd5733a4a1d0661538d88b042692 SHA512 635871f233f240240f36ce3c90804b203033425dc0f732d7e4b3b784f0778949c89aaea3a42137ba1bfb8ed32429ae23ce60bcfa2b3c2045f3ab87d13e785bd0
-MISC metadata.xml 438 BLAKE2B 555b7a9b34e0bc5baed49798e2f8e3dcb3be6ff413344247c85b025b90aa1c72d058197694bd6c71531665592a9d7ca34a6862d929684e15fa520b06a3c9f9ab SHA512 70aee26b4a1edd51e40db63b641929d7d62ba8b0d19e91c6e50e8e5e31b88c81546f59cbf180b967ba1b863cf4f4e812d0be27711db4301e852a40593f9044f2
+MISC metadata.xml 355 BLAKE2B 6d811582ca403c9ed2cdcbe419ed8c61b3fed44f40708e8782096bb9ae77be1aa0c3405c26c24402a2125c6ec48b17d9d2c717912713c795d20aee24afc6b6cf SHA512 71b01df222501597cda34ecaba0c282d6769e6e909892d1522f8f18953cfa0d256ea8992219b30dc6d0a476a51b48080024d3eba421814fce7777283e25f0813
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
deleted file mode 100644
index a243a8f0640b..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	net-libs/gnome-online-accounts[vala]
-	gnome-extra/evolution-data-server[gtk,vala]
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	>=gui-libs/libhandy-1.1.0:1[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
-	>=dev-libs/folks-0.11.4:=[eds,telepathy?]
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-base/gnome-desktop-3.0:3=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.23.1:3
-	v4l? ( >=media-video/cheese-3.5.91:= )
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-	>=gui-libs/libhandy-1.0.0:1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature v4l cheese)
-		$(meson_use telepathy)
-		-Dmanpage=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-42.0-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-42.0-r1.ebuild
deleted file mode 100644
index fd163a137688..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-42.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="telepathy"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-1.54
-	dev-libs/folks[vala(+)]
-	net-libs/gnome-online-accounts[vala]
-	gnome-extra/evolution-data-server[gtk,vala]
-	>=dev-libs/libportal-0.6:=[vala]
-	telepathy? ( net-libs/telepathy-glib[vala] )
-	>=gui-libs/libhandy-1.1.0:1[vala]
-"
-RDEPEND="
-	>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts]
-	>=dev-libs/folks-0.14.0:=[eds,telepathy?]
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/libgee-0.10:0.8
-	net-libs/gnome-online-accounts:=
-	>=gui-libs/gtk-4.6:4
-	gui-libs/libadwaita:1
-	telepathy? ( >=net-libs/telepathy-glib-0.22 )
-	>=gui-libs/libhandy-1.0.0:1
-	>=dev-libs/libportal-0.6:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcamera=true # Ignored
-		$(meson_use telepathy)
-		-Dmanpage=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
index cdcc86526dad..6c5da1f9230c 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -5,9 +5,6 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <use>
-    <flag name="telepathy">Start chat from contact details</flag>
-  </use>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/gnome-contacts</remote-id>
   </upstream>
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 69e4fae9dc87..39951221a6aa 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-shell-extension-gsconnect-50.tar.gz 852893 BLAKE2B 2da626ac3a2c6a06b01a6d502a63a208c0bd603ba2d989b254c57d4feaaf693134b5fd176449eb2465be1d910eb8bddd5398dbe2fb00b9bfe0bec6a428f074af SHA512 39edad97388f8c228d9698c7f2fc51ea04d74f5e3bdeb16f387dc2f5bae87966c6d1a3d7eaf06cc1d095638df1254c3b796875d403912d0c39424965b395cbc8
 DIST gnome-shell-extension-gsconnect-54.tar.gz 879104 BLAKE2B 7d666775fc1ddf3ca76f59d2047b85cbc35f9953883941d1bca93f8711dcbf7ed5b8be697c300c13edf2195ffab10aa8f7edc7cbc6fde3d09797155f47349706 SHA512 9a3cae1cfaf3cc66dde3de1d74f68df7817abce86a8f68d6f93151f9e750d797ad75667bcf532f818c1b6d5ddc57d2721225aa6bc499b46593f87c5721e98622
 DIST gnome-shell-extension-gsconnect-54_p20221214.tar.gz 893022 BLAKE2B 474162056f1bd03a9c3e8d23017abf22f0c617284525e95db60abf74b13b850d005eeb2c2c13fa702e3fcd0b58c4dfc281fc08412f60c8676ceb852641861038 SHA512 b54ef8137cf2cfc2cf78d95eeaca63c059cd831c34799df51939dbf38ac67c2ddc03ef571dbf1e5a76ee79c8a4de5e44b7bc859feb2b9e8fe2193d01f8aad2a7
-EBUILD gnome-shell-extension-gsconnect-50.ebuild 1620 BLAKE2B 15ba267f572861b7a9507109dd7049b6aba070588f915a54f03549738f894253b9347324d48a60f9c91e6373a93a431493d135f10a972c72ab0c28ab5a11adf3 SHA512 7e31c5bfb4f93dadf3bbe916233be2952ea6ec21056022d44e20476131643189610251574dc806e6e51e985e6602918111a63645aa46d749912f8db7e720ffc4
 EBUILD gnome-shell-extension-gsconnect-54.ebuild 1620 BLAKE2B ca285eaf91abf9cc15bfa2f0b55f69c22afa19f9a06379ea6568fc686d5719d5561a2065b57b15a3ea9e01691fd9dd486ea3ec2d4e95963651cbb43c25df49d4 SHA512 b270a29ea6059821b1de63201878c0dca25000b9d9eb9a1f8225af79db280e260775f43e803ef26f3240682d7dcc329b249a6f129da6c87f3e697825aef0729f
 EBUILD gnome-shell-extension-gsconnect-54_p20221214.ebuild 1707 BLAKE2B cb3e82d4adc52b6583a51109a1b57f3533cb9698bb0774e09ec8d63edea3ed5979042a7a98543a6dd63086e90b798663fe00881d9382b709531db8ca94979347 SHA512 0c7ad9f42e1e1cb57beeee8d9ef2d50c7a0d000df5ee07505053e6dbe1434471c5a64b94bdc782a3f38034cf794e092a826d9f2cd73f9a05083c6228f5610bc9
 MISC metadata.xml 452 BLAKE2B 02c45d13a2b727e30dd453b3c2fa3c516eb274aaacc07d61eb64fe58d2d08b6cae80222e5b2a1e17e8052b6ebaa68f746cf7967bd40beb48af482c9132e58271 SHA512 02d9c013882ebc191cc9ecf62f9b5362b15e547cf8a080a91fa9b3332fc9adc7eb61602cbc78c8964df736d0245efd2fd8cedc5ccd0d862b3d014dc7df242deb
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
deleted file mode 100644
index d4af643b52fa..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/GSConnect/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.68
-	=gnome-base/gnome-shell-42*
-	gnome-base/gvfs
-	gnome-extra/evolution-data-server
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	# https://bugs.gentoo.org/694388
-	meson_src_configure \
-		-Dinstalled_tests=false \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_pkg_postinst
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_pkg_postrm
-}
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 6b6159f48331..e8ac7b351403 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extensions-42.3.tar.xz 225332 BLAKE2B 4a5d26ac0f8563d6e9c607ad06998470257c1c25a8d2f50207b4fed48f785b983be0fae9a6590a36652c25c1f685679af37dcbd4d5edc7d6c9ebaad0946766b4 SHA512 60b7f7d85536c2d00b69383a3c5fffe8ce13e09555c533ccbe024bcbfa1c90d97e69491d9066c5c2da64719c23990cdf88f07076ca4494841a5489deb33de7d0
 DIST gnome-shell-extensions-43.1.tar.xz 226868 BLAKE2B c96902c01d5260c916e139eb31dbf71fc2dc054d18c2222898d530ee9f28cfea6a745d38cb7f4e54a7ee4a5ce8da93b5e25eebc52e6518ad99d1eae64d3e14dc SHA512 9901e738a5af5a6139da8fc928b95e5afef6e7b80b24e3284603fc4341e588d738b9c16a7bcba2a3e79af2729c468fd756b584394559b2794b335e656c092bae
-EBUILD gnome-shell-extensions-42.3.ebuild 1793 BLAKE2B 154b897688f44ce9666a2ed25b5d79e4e98020f4147532ddd0325ad18a161712f724e5391a8fbf4bd1d78a66590395c2bbb81e568335a5940139879c6272e10d SHA512 dc2527a2ea9e53682c0057712c1bc183e9365f262c5838e5bfab8895a7c887583ec794a91440ff69cba0cc559ed8f03f5e6750433585ca4840cbfc4ed3f9a774
 EBUILD gnome-shell-extensions-43.1.ebuild 1814 BLAKE2B ba39dfa8b72ce95da6b33dce8edf22e5e87f930bdf91e3fddeaaf68d14adaa40b0ed0ad9daa858b1a8067832938d7ae3fb9d201db9d02844f82b2b4a45b64db9 SHA512 5d75448f8804f69fbf50a902fd6236b6414ee5d41adad4f495725ecf8066c6d4a224bd9d3f80606f8f281988f9f4dd3195d00e64439e5b05ef52c0847ad6bced
 MISC metadata.xml 363 BLAKE2B e448f61e99452c5ea32f80387d2f196bdef4003dde0423ce50202cf458a038a7b3f7d44c14d168bab0bf78c4e8c1588c9016423106eeaa5982e1cf03aaf273d1 SHA512 f548760594f1331da0aebaee8db91568697c43e04ae652cbba7beab199bc47173706c4e399928bfb195d355ab56820f24a36bb7eb57b47a31df3a335318e7078
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild
deleted file mode 100644
index c9a61b00860a..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org readme.gentoo-r1 meson xdg
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1)*
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	>=x11-wm/mutter-3.32[introspection]
-"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the gnome-extensions-app (included with gnome-shell),
-https://extensions.gnome.org/ web interface, or modify the
-org.gnome.shell enabled-extensions gsettings key from the command
-line or a script."
-
-src_configure() {
-	local emesonargs=(
-		-Dextension_set=all
-		-Dclassic_mode=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 5596d5356c8f..ed52dfce8ee1 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-frippery-42.1.tgz 78867 BLAKE2B b86940dc8ab2851452886125d43e54865a757f9513323c70a91e8f6ca61553cc480c3cae2787e3a05158e49901206d6fa34a3a3162f0efaebb966827a787f898 SHA512 a60d63a1f9d083d4f21e5d3eed320bc83eb597e8a93570dee8d26db4596b6349d4d300c7183d55fc3f188ae72e2d4f8d0a6a745447bfbeca3e155710866abff9
 DIST gnome-shell-frippery-43.0.tgz 78879 BLAKE2B e7cf6edfbe6b9dfd6ced3da661ce63b30c828926d52229d91d18c311eb088ad102b7329b3ed646522a2185d5d2a3297db8967e6edb1c3122b9b5038123656b3f SHA512 3e506bb7fce42532315c760e58e5dc890c05a64a19050733e0057ca294d08011e5f786be6339c27d90739189d01b27d43cf027115700b5458637b3b2e63702b5
-EBUILD gnome-shell-frippery-42.1.ebuild 920 BLAKE2B cf866454cad31318c136d517c622d78edabbab3045182a9246f7a10bf0d9d13aad098e43c5ac04eb3509703d48c39781e94d834a8ee085158b4730e56d8130e9 SHA512 3fe78239e776f951a7401c56d587eb18ecf734b2270f8ce6fb51aeff388b7512002e505443699984a86ba2f116d44e305d6328b238df8c195d49bb81751aea4f
 EBUILD gnome-shell-frippery-43.0.ebuild 920 BLAKE2B abc49789abe32dfa9d903b05cc762238b76a9483958a4966f1dbd1bc38cd31ab1d3f6e86b69e765cf63433794a3f809391e62837ae1ab1cdda4b550918b9a903 SHA512 8e4d5ec43079e2b4c735cb82e56bd2e0b216de3b6407fefca6b5236a7057cf42ac437c11532dd2a7fed67d199cada5120d9d72ca6ea48823e51a0582ae7b3609
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.1.ebuild
deleted file mode 100644
index ae80b2801b6e..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gui-libs/gtk:4[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-42*
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 47c41c211aa7..9aeed0529c5e 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,10 +1,8 @@
 AUX 14.0.1-install-user-help.patch 749 BLAKE2B 954bae11770bccdbf5babea1c06cc829ef069777a52542ffb683ca0709300edbfaa452aea7da44497b900dc653c00b129bcdca0ee6808e6d5f610d43437858d6 SHA512 c1fedabf8eff11256cd4a93130db028c3e599f6f0fd249ff8a4533c1ebf7d3f8c17422b3765dbc047f25bd9c4725c43212de585642a246338c7fcd1c78c3d914
 AUX 15.0.1-fix-file-conflicts.patch 291 BLAKE2B 4ad2a65c731372de5553386bbe3136d0d2ff8dd76d27370f62d707eda83908169bb610d1e9d9687ac2a7e2f51681c07b2b446e92dbb4371b47c39a523f14be40 SHA512 9e9887b295f8b4b817904d2bdbd4dd0944c59daf4dfe1fbd1746e8db70088e40e8410965c10e8a24184407710ad19ae5fc93185e73ed7759a89aecb4ccf73a58
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-15.0.1.tar.gz 1938073 BLAKE2B 0a6b6e76bb60648c591354394d2dfb78f56508dbf7d0b62edb945b8e79b6cbe7f333e7245d374fae9476986e06aee99bca53fe05da6a2e66629e33941fa79bd5 SHA512 77a6cd6bfa4465140a1014c8b1a9783acf6feb656925f319627f3fe5a0e091fa1819d82e3f5ca4f9eaa0c6e6bf8ace66ae6895360b9574a8f9ac7a347c37e103
 DIST gucharmap-15.0.2.tar.bz2 1480065 BLAKE2B 9fa5c024d05b25da2ec5d8a93efd2428ca0e47e88e3c5e701995664a548775ae6061fbe1bc4671c15595151a68a3e186544f671b683231461f9be02a86caf11e SHA512 5b345cd0cfe5c588ae062f402c66b45fbbdd03705c4c4900a2314ff19562279436712e19d7143d87cbf6db49e10cba825dd37c0a57aba8b1c1fd9a3e7dbe363e
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-15.0.1.ebuild 1689 BLAKE2B 80ac27781c43f371aeac686e6d64fc9056c5a3470232419d7452044146f913167d24ff74efa52b990e928b7bbdaef8f68df881b2bafeca0c87923e8d38678fba SHA512 190e36f01b3ee3cef9d43f3f811629b7f6006ff12364142977c6c9456cad4cb0bbdbf741000136198cad68ac0da512394cb450e60f266b1d41b09fe6baacbfe2
 EBUILD gucharmap-15.0.2.ebuild 1648 BLAKE2B ec70386adba013c80daecb509de5b8ed8e183a0fd8e67794f6dc57ec861658a091d504e0e5f5f319b833d499c30f32cee38ab6f1638c8155402750fb0f0cc0df SHA512 0aeb2a7324103c2fa0c6c40f97fc4ca856cb47c855dc0380545733b460574516b81ed3159d43c9e12f480e60ec8242d53695643346c1fb0a4c5e63cb80719283
 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.1.ebuild b/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
deleted file mode 100644
index e988b0cc98c1..000000000000
--- a/gnome-extra/gucharmap/gucharmap-15.0.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-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 d9ad6c00eaa3..778a38f90842 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,3 @@
-DIST network-manager-applet-1.28.0.tar.xz 1894104 BLAKE2B f8263b49b215cf3dbe43a5247a3b04ca77288fe6e7098c08af2346d9cdf7c5102ee1d1e611ce03b322e22dc3a34991aeb45d6544b27e38f113da72674d3b9341 SHA512 1e594c6a8ecfd7c92e718238f036f95c0706a70699b9836ba4ca3b6b033db1b36a08ef4778e6615cfd0cfcaec120063a67c642734c45d71aee86b17a5de4b647
 DIST network-manager-applet-1.30.0.tar.xz 1880076 BLAKE2B 9fb663baf40760818055fb89528d593c53fb6c3884b375712e44967250b294651ce2d9d16fe080a7f64cd111fb3581a3fc56e6e9478ed1765f3bc42303995686 SHA512 2c0acf1942c0d238b28a2d9d39f8741f376dd16defefc776852c63f79c2e8e01974c3a485dc6382d5a239b8308eb12bb668f1c327ef27e7fc228d1ad03498b7d
-EBUILD nm-applet-1.28.0.ebuild 1210 BLAKE2B f78db29034888a55c91f5fdc240da1fa898dc5584034ea8bc82d498c2144e7b6fc3ae641ca0ac86149279c16e73f2ad7aabb42b2d535d621af8055157315d62f SHA512 477a8ddb4e64e698a09caf7b03d5cf39e05a2c8673eee826904e34729fea50df944fd5b359d62ded5d580f187fd3085566b8c137db7e2da9ba49e2257f89216b
 EBUILD nm-applet-1.30.0.ebuild 1313 BLAKE2B d0d64ed4e8119b3db642270d906895655695f837bfa733d720dde63e2fab54bbe35b791bbddfedc8a2dfb1dda16a61e56dc7ee0423612e60646ad811191f2388 SHA512 16c942c8bc1a9aa00cca2760fd344717d3ed680949aa4558721193c157b83d75a9524ad31e1f3f6ded6dee622dbe5f6c1dbd1bab1056389e7ed7cede2ac80b61
 MISC metadata.xml 564 BLAKE2B 9eae8bd089e03562bfd24679336b0110f4b856d998570e453d3abf602c66cede48be22d231f778d0acdf9206400e94a8c4d942082fd7443297c2070000a85f46 SHA512 5041d7f87d1501e1c6f6d4d9d2e37762ad068ea789f9a38813d2a7c83a72a03eacc2dae6d2876b308cdf21634233e326aba2d046f56856991609f5a4c9bf501c
diff --git a/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
deleted file mode 100644
index 86440b232736..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.28.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome.org 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.38:2
-	>=app-crypt/libsecret-0.18
-	>=net-libs/libnma-1.8.27
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libgudev-147:=
-	>=x11-libs/libnotify-0.7.0
-	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
-	appindicator? (
-		dev-libs/libappindicator:3
-		>=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 ubuntu no)
-		$(meson_use modemmanager wwan)
-		$(meson_use selinux)
-		$(meson_use teamd team)
-		-Dmore_asserts=0
-		-Dld_gc=false
-	)
-	meson_src_configure
-}
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 7ee3853ff6d2..4a95309ecb54 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,5 +1,3 @@
-DIST sushi-42.0.tar.xz 81668 BLAKE2B c37290fa9b2040d2f0a2e7519c654d5e78125b469c34eb24cfe6d9b37a9a00857215f149c33aa2d753734b33187f47da7bf73ebbe23ebad5551abffe20291a3d SHA512 203510d793be56b73e59553ead555d863919b4f8ebe9f0b46d01a887685fc0d210b81b739bd7dca221a91d3c9d4c2885b84851c2445a1ab00720e1fd2f59c817
 DIST sushi-43.0.tar.xz 81552 BLAKE2B 13ca7ec446aeaae454bb0a8c874a786914211a9b27d423189846aba9adb844b224a7f0cb6d95b2e6c4d71043a2b592d14ce9998a9732150517aa18b14b4f2c25 SHA512 0a909f685e49bbddb7fc2cf17338eba08723a796e1e42f09ed404487620437b36c2bdaede3efbb6bd49cd7efde0141e971ac9869f73c0c30bea9b6658978b19e
-EBUILD sushi-42.0.ebuild 1351 BLAKE2B 34a9d481054c67c915bf0315fc554b7e50134238140259656e5f1d7da04c1d0484de1cd2dbe74dba993c46ff71e9abb51a3b7b7c4a76a1c55513572c8f04081a SHA512 3324cd7ef6c1bad685354e6e1a4bc6a04fd99a007f9b842e626bf9b400954b6cff5298ba14d73967b9aefca3eed73bb9b6e2f5c75856ada4408c96cab405442b
 EBUILD sushi-43.0.ebuild 1380 BLAKE2B 26da757c342299ae1c4c1e5c34b673dea62129c3ebf8aac30da1c8e0ab30c699069fd98e76d562a5e2a242c3a829b799c6903da53f2091f0f58da6ecab26a611 SHA512 f72b60816abade25cdd7ad7b99f0aeae7f5e437c14ccf7673b8bf2b24407e4e68a4a3fa91910263d2af32ed640136ede1fcf64220aee3520c8f2c842cf9f459c
-MISC metadata.xml 478 BLAKE2B dc29d2b83122d040cf394dbfbfd13f6e998bfb7506e7fc10ac7f475d818987029f6daaf24b19a3dee87a858731815091e6dbe0fdad1a535b780dbc169ddc3d78 SHA512 75a4e98b2ba0b9324619a3b8ddbb92315e96f8a00375e82553f01a1bedc81fdb90c66bca29eb717f187258e6ff118376ad8542c840f15597134462d622620977
+MISC metadata.xml 346 BLAKE2B 6c6e45a4f1642d9a57f42d8ad9578ecf50e678289ea8323b0e77a374b4482fc00425e2e3e1c3238f5d6cb60d393cfa472b4b865a74bf0d048feab7e7c5bc85f0 SHA512 886866cd0386728871c2200495893c7844cbd46c2507c64a2d796888292f2a348724510b843617164ac616b9d0d793ad4e9f0ff1e66066209c12e12e50e031a5
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
index b65b12ba32f8..efb590b96027 100644
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/metadata.xml
@@ -5,9 +5,6 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <use>
-    <flag name="office">Support viewing file formats such as generated by <pkg>app-office/libreoffice</pkg></flag>
-  </use>
   <upstream>
     <remote-id type="gnome-gitlab">GNOME/sushi</remote-id>
   </upstream>
diff --git a/gnome-extra/sushi/sushi-42.0.ebuild b/gnome-extra/sushi/sushi-42.0.ebuild
deleted file mode 100644
index 45d17675ad3e..000000000000
--- a/gnome-extra/sushi/sushi-42.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-IUSE="office wayland +X"
-REQUIRED_USE="|| ( wayland X )"
-
-# Optional app-office/libreoffice support (OOo to pdf and then preview)
-DEPEND="
-	media-libs/libepoxy
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
-	>=dev-libs/glib-2.29.14:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
-	>=x11-libs/gtksourceview-4.0.3:4[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	>=dev-libs/gobject-introspection-1.54:=
-	>=net-libs/webkit-gtk-2.34:4[introspection]
-	>=dev-libs/gjs-1.40
-"
-RDEPEND="${DEPEND}
-	>=gnome-base/nautilus-3.1.90
-	media-plugins/gst-plugins-gtk:1.0[wayland?,X?]
-	office? ( app-office/libreoffice )
-"
-BDEPEND="
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		$(meson_feature wayland) \
-		$(meson_feature X X11)
-}
-
-src_compile() {
-	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
-	meson_src_compile
-}
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index a71e73ea51b7..8840e7954195 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,5 +1,4 @@
 AUX zenity-3.42.1-webkit-gtk-4.1.patch 440 BLAKE2B 0e9db4203c2785dfa1fc70b24f22cb30fad4134e7b5fab83deded81a4797334596b9bab58f8a7d80fd86442fea178fae75de9705c92743b5dc4249c05cc3bbcd SHA512 f52a095d1028c2f50e9590e28191338b6f86498ec54230da0b58de25e31b891211ba8003db73d57b6280ad75b8414d86fa328cd65bd21a539255de0ebddfa71f
 DIST zenity-3.42.1.tar.xz 3091752 BLAKE2B 7364ce9175efb7d4954956c1c2bd347ffd8060f02be3c21ec65525ee84e082eeffd8af3cb72b3f051f401a9ff90595c0a015223efcd96b6069e9bc3d276de16e SHA512 a8239e7dde351f3d3f75a59c95588f672c69333d4a53d50465d05fb73e61d1bbff6aca89acffc35a8d6802f465048ad2cbd7421bc3e3200a5a393ee3c9319106
 EBUILD zenity-3.42.1-r1.ebuild 1238 BLAKE2B 857b57f9138fbf39b235ae5adaaa3c2aad4a43a3d58b157ccf0e6fb48a29057849e7f1b4f8ad48056c437192e9855ed8b82e5129c0a75708fa2c662d0b4f1bf1 SHA512 52657a71fdbf83146c588fc0c368a2ca6bd0185bcfd403d346c8378dd60928b17f35dc69f5b0a0b634a2f74c555f51178cd06ee94c1052eb3de0fbcf901d8e69
-EBUILD zenity-3.42.1.ebuild 1182 BLAKE2B c78305f887de89912e8c437301649399a55ec0994b5359c0dbc201db8efd30925d2bcc4e709df884734e3b3f0d55728c9cd44e5681189be9b890d429e71a76b8 SHA512 03ef2a3e6cf1e053d0e6defa2836718ba1c6fc1225ab47a3e861ec0520706539ec84ccb4b2ab1c8b1807e513803c974d4297660dde5db4fb3aa0b1b56b9100b5
 MISC metadata.xml 347 BLAKE2B dd11bec372a4f6b097616b3c45d4c2e0a44cf7ae3e4c26a48e6387ef14b3804662be64ef99ad179f7633a458f523e9054cc93eb691fe27893712492256bf4a99 SHA512 11676155be5f2b698f5b71920df5dc1121517ba63b20467719673c4b4a297c04282398fd70d00a9a3b712f080b784b780e0cb96c1186607e5e688b3f2f78846f
diff --git a/gnome-extra/zenity/zenity-3.42.1.ebuild b/gnome-extra/zenity/zenity-3.42.1.ebuild
deleted file mode 100644
index 2c6860c366be..000000000000
--- a/gnome-extra/zenity/zenity-3.42.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=x11-libs/gtk+-3.16.0:3[X]
-	>=dev-libs/glib-2.43.4:2
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-	x11-libs/libX11
-
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use libnotify)
-		$(meson_use webkit webkitgtk)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
-
-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 5e53b6b20117..d8b34c0755b0 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index f2ea34237b4f..40637e160c35 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,5 +1,3 @@
-DIST amtk-5.4.1.tar.xz 58024 BLAKE2B aa65a5b8e9e4105d0ba699eef7e505ba3acb95a7014da1217b9569b68cb1ae7e7abf6debc1bd79935baa376e5a36ef197add3c3d326d97e89c7107c42ff4e582 SHA512 6257295c9c4756de622df48dd915cb591e5f3bf2d5d17dcb26f835e69c885d50e48a2634d8f7b9537638e7bdc531462670697823301ca2d257403192f6f8062c
 DIST amtk-5.6.1.tar.xz 58472 BLAKE2B 3c31ba010c2711f8b85cd704de1595100f17b2f3471b2d6036bae1c414f5af669b11105288bcc70b07e035334575bd8e0ac35f9bf6d69affe2ba1b5491408df2 SHA512 668519d2977e951d6b5d78add44a3f829ec169ff115be1aa4ab986e902b06653568135a3793653725a4aad95ec82cb171f0e8d16a2f83485659a14ed3e932c34
-EBUILD amtk-5.4.1.ebuild 860 BLAKE2B 770b34f2620e6c958c17f363314c59c4526f715c3a688e70e7c407f8a83903cacd942ead4379e21398ac39edd33223838540e9e7fa577717a50a6334c5224e4f SHA512 3437c34a86062b3b553c8b187f40f61f27e58366e8fb0217a1c78ae26c74b8d4f440381433701755700eed3208e930887fdace1941e5d0ecff22a5a45441235a
 EBUILD amtk-5.6.1.ebuild 823 BLAKE2B d5b5ce2b050fefb6ed57875c4fe8c1379df82f7413f562aaacc4f4835c90901220880d83bbdb0d0360d51ec288d63907b64c8f43f84f4f926b81c366963c3b80 SHA512 d76d6d9e8f3289cb063bd68010ba954c9ab8cced5de37fc97cc57d66cd8f587e8d10d4898e82f32ae6ab7d3f2700dd8f3cc6928a12c8d88eb732155741e2378d
 MISC metadata.xml 345 BLAKE2B 393354c336121233ace1e2f95bdb99432e52a9f96ec6ba1a8dd7688c38d426be8ccbee73fa182f4b463956b343cb23497b12a689d16779127881d1f4dd0e2aa8 SHA512 0052f2112bb9123acdc71c66d599c7556e8f8a076d58d02801cc534c7ef70e8f196186cb90702c77e6441c316d1895aefbebb4d06ade698ece7822bed304c664
diff --git a/gui-libs/amtk/amtk-5.4.1.ebuild b/gui-libs/amtk/amtk-5.4.1.ebuild
deleted file mode 100644
index 666b60e2a119..000000000000
--- a/gui-libs/amtk/amtk-5.4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 meson
-
-DESCRIPTION="Actions, Menus and Toolbars Kit for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/Amtk https://gitlab.gnome.org/swilmet/amtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="+introspection gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-3.22:3
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection gobject_introspection)
-	)
-	meson_src_configure
-}
diff --git a/gui-libs/gdk-pixbuf-loader-webp/Manifest b/gui-libs/gdk-pixbuf-loader-webp/Manifest
index 6a56fdb97118..17f3b480d334 100644
--- a/gui-libs/gdk-pixbuf-loader-webp/Manifest
+++ b/gui-libs/gdk-pixbuf-loader-webp/Manifest
@@ -1,5 +1,3 @@
-DIST gdk-pixbuf-loader-webp-0.0.6.tar.gz 23691 BLAKE2B 0d9ca0898bfd7f1df79883825f0e4f37c3fca578b8424f80a7024c4906567492d1c1dbf5165bd8864ac56a3d6babeb6c8cadd9557e158f355549f70b76c44666 SHA512 983adca9d7b8542e7f657cbd6194275775aa330e8f7de1575cd68f666a2f17db6065434b5e595daba986986d4b276a349937d7dc2f662d82a27ae1d9f6fbb70d
 DIST gdk-pixbuf-loader-webp-0.0.7.tar.gz 21718 BLAKE2B 3087bf7a83830eaac0c2d5b4462f076b0421f124246d818073511dbafcf313548fb81c1383a50c088b68ea3b224a9633e98ee4f719e4d6443daedc7bc65982b8 SHA512 08da9e6d3fd546aa79715dee7cfd153a1bbb70deca6a0cf52e9ffacf6e29882b3ae041c424a024bcc7b6689e9cf12ba0588a58d0542a71f069ef5367e0f38528
-EBUILD gdk-pixbuf-loader-webp-0.0.6.ebuild 1068 BLAKE2B bcdc906a64d931d26355cb47b8841fb3cdaa9f9420c788487caa06cb1c78803f1657187b5a75e7ad2a22de3b8f4a9ef74bb362b933ea601ac2c94517d63556de SHA512 bc89118260fdc3ad86cbfd10345c980f0153b54e12818824b8e4220805cbfe0ee45b8bd2daea712b2f81b7874b1a1d1f71605f4fe5820b67c47df801fc44134e
 EBUILD gdk-pixbuf-loader-webp-0.0.7.ebuild 1075 BLAKE2B 1f444a2ab9b796432f969baf73e2a5f71715686834422858bd6b51769630d1518332f519adc4c273a81cfa33186e930ff77f74fefb8504b086deddd3fde20068 SHA512 5f1d3676f8df2ed3944e3d3c1b8eac4e38f042023407c9f828aa1308f92e1b72d071c9bc81b38d0b10fb858df552b2441cfc3621f279f0b0fd2b1d70ae35379b
 MISC metadata.xml 343 BLAKE2B c0eee217ce892c71a14f8960f96d2be35bb4dbdd0592b193d8a6c5663dff8b7a849b676ca0d54093c8b9932c4c0fdaa89c713c878a40d58629170f004493dae9 SHA512 4aff98d342ab95dd3d577dd87bc7e3f2a3177478b7b167488c6156de55b57c9e02c29e4d6d0975bd6023b189fce1a51c7c09fe9cc0eb4b550b9576a65b1c6a6d
diff --git a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.6.ebuild b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.6.ebuild
deleted file mode 100644
index eae0116ac185..000000000000
--- a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson-multilib
-
-DESCRIPTION="WebP GDK Pixbuf Loader library"
-HOMEPAGE="https://github.com/aruiz/webp-pixbuf-loader"
-SRC_URI="https://github.com/aruiz/webp-pixbuf-loader/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/webp-pixbuf-loader-${PV}"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>x11-libs/gdk-pixbuf-2.22.0:2[${MULTILIB_USEDEP}]
-	>media-libs/libwebp-0.4.3:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	# Drop handling of pixbuf cache update by upstream
-	sed -e '/query_loaders/d' -i meson.build || die
-}
-
-pkg_preinst() {
-	gnome2_gdk_pixbuf_savelist
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_gdk_pixbuf_update
-}
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index d12c238160a8..0d9d9a83e0b3 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,7 +1,5 @@
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
-DIST tepl-6.0.2.tar.xz 142916 BLAKE2B 584d4ccec446f94590020e569f1a2b28d4b10a2452479c2c521c05927a094d01b28d81e2271dc8f4e1aa0a66976df64cead357f5487f78944c20ceca5c542742 SHA512 8b12418ba9e18a3aa1772692d196583353d98d73a007b35d93d2c605efceb5064e556968e5612f326f6b447ced0cdd66c130b6840c98ec067e1ba7da930fa4b4
 DIST tepl-6.2.0.tar.xz 147960 BLAKE2B 6937e5cd8a863b29f21bcd36eadc6e617da061f22e82c971bf72de0f7f742534d84be85107866cf621266af95f4f4c0c9c2456631fe63d47fae02574d6223b65 SHA512 694264bfc2d984de37619ffec603387fb1ac5053377f1de2b6b0313e0739f9eacea07845c5bdaaea64a5cf185c6ab0987a115bb4def55d69861a06f06d2d3b13
 EBUILD tepl-5.0.1-r1.ebuild 929 BLAKE2B b919d3aefac8169ec2412485a219331d79ed0748f578183e5145755b3b6c038dad19e84780dfa73e0da2eb0a4b923d58fad9e0611630310400d0faa122da1021 SHA512 4a6caadaf99b71899edec65ad36499be8867444f46e63ed037258ba5067c4ba8d9d32411522ed07456cde904d21bd0866631c4e0955602a839630c77ccb02144
-EBUILD tepl-6.0.2.ebuild 1019 BLAKE2B f58002c28919d00a1453d73be9914fcdb1b385329b0d474dd5413f2e1bafc2b459483d129b8569f1f661c1d1ddf4b836d587b4ec46e417fdee0a57a6f5903b63 SHA512 8440325e63229634e5dbaef034cf8842287ed6fbdf4912e0b8f1aee694a534c1c1ddaf5002aff5a38653aa3f690cd46c5e7b424b5b5c1ebdb61ffb3ac8b1756f
 EBUILD tepl-6.2.0.ebuild 1040 BLAKE2B 08839427df17c61cd6c602e785f68327d17e11bf4a11915a5cfc8af975946539dfef3a85bfc8dcaf46cd5df2349684ca0cd5be4d100462e762baba4097fdeccc SHA512 3e4ceb44093833c68be0a24366ac23bea8980a8289d2b6127cd6248b0c55d830d9c5048a51a22dcf625fa8915c32b769d7cb81b63da5082abed4a7aefa9801f1
 MISC metadata.xml 347 BLAKE2B bc56bb2de6891718ca6ca27b5b08a2bc8816939983b0bfc9b3dd7658ff7f88398032a0393acc89fc09b9be0052418f659d5239a8542e2f11d77375a934a315cb SHA512 323f8f3815cc535b5002fecded4df28861183998ceda9d717cb4e50a6d5c7f3e480aea1d8bc0e3c74eade11a20ac61eaa1cd25b17ab90a065753e28fe6537d07
diff --git a/gui-libs/tepl/tepl-6.0.2.ebuild b/gui-libs/tepl/tepl-6.0.2.ebuild
deleted file mode 100644
index acdb00a4b06d..000000000000
--- a/gui-libs/tepl/tepl-6.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org meson virtualx
-
-DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
-HOMEPAGE="https://gitlab.gnome.org/swilmet/tepl"
-
-LICENSE="LGPL-3+"
-SLOT="6"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="+introspection gtk-doc"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.62:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/gtksourceview-4.0:4[introspection?]
-	>=gui-libs/amtk-5.0:5[introspection?]
-	dev-libs/icu:=
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection gobject_introspection)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/gui-libs/vte-common/Manifest b/gui-libs/vte-common/Manifest
index 936d5b38f0a3..454533ac28fa 100644
--- a/gui-libs/vte-common/Manifest
+++ b/gui-libs/vte-common/Manifest
@@ -1,6 +1,4 @@
 AUX vte-common-0.70.0-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
-DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
-EBUILD vte-common-0.70.1.ebuild 1930 BLAKE2B d25a4e21e0fbf154f45cf90ecf458f95bee4bffbf0544642f8b69c3997c170c3fcc30d684afb57c0d9ad5197b6bd6a692e6ed80d012f9a4875b15bbbc127e148 SHA512 51c987b876433b6da66470ba60f548cd6062e6e9ff94fe61d6f6315a7d746106a15c2e0f07d88e0d6fb7ddeae23b62ed2c1929fc7f52df0a46e3dfdbfc608a64
 EBUILD vte-common-0.70.2.ebuild 1888 BLAKE2B 621a97e67e638b22853a893fb6673fe01a3b751b2f9cffc0e57fe8ec80e4d32dc274150550d0f8e699c53744ceeb99aaaeb5172b18b72b4e35e9c9c650fbce3d SHA512 4ccbdccc9de019328bb6df1ac8731417a777d02cd9804a6ef9439dc3012acd18729372716fa0fee9e58b27628cbdb78235cc97145cde2564fa505c79ffdf1cee
 MISC metadata.xml 524 BLAKE2B 2a7e14b63adff1385d2a1260d238c0f35854cbd7ba0579a55edf0c6367e37fba80c99fa21b911279c6b7eb7ff4d122f56d02cfc463076614adec2eb059666b68 SHA512 60c71846ff7745c3f3d4c2fb0c9b0214c7fef04d221d2b7e568d1a63b2bff56d49a442072aa5aba48b9247c1a60b1cdf3ca8e3766986e9ef1a38ee659fb65437
diff --git a/gui-libs/vte-common/vte-common-0.70.1.ebuild b/gui-libs/vte-common/vte-common-0.70.1.ebuild
deleted file mode 100644
index bcbd205fe22a..000000000000
--- a/gui-libs/vte-common/vte-common-0.70.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org meson python-any-r1
-
-DESCRIPTION="Library providing a virtual terminal emulator widget"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/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.52: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
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/vte-0.70.1"
-
-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 1b15688d0eca..02026e805c5f 100644
--- a/gui-libs/vte/Manifest
+++ b/gui-libs/vte/Manifest
@@ -1,7 +1,5 @@
 AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2d95448f4ff7031142050e9286ff854a19095bb56cec471d50585302ac08ca7a1d40ad068c013d8af142b0165d4c8d2112 SHA512 a3dd31fb4fcc9c2e725cfd64bbc63def63c1c1a85b6896b4a82083d6ff985df885c3a587e8c3c001de2acae476cb950f05a1e31b33bb263ba4895d25fa1e275b
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
-EBUILD vte-0.70.1.ebuild 3229 BLAKE2B c1b6ff5632939c5f4b98ed334317d7964abfa9a24b856b3e28a0025da4954ba4b0876970e2140f502f2addbab8b8e088f9454d1e5e88eb88529999107df26bb9 SHA512 70998abd4db6e2a54d273c1982eaa9e980c90261ee637a715cedb1b4c335a231cc7ad55650c858c46f942e0829e898f6904e36dec26ef45e4d68aa121d157c81
 EBUILD vte-0.70.2.ebuild 3194 BLAKE2B e5e2df15c92a667392a3ae091e7685c184390e86143fd20700ba34976d49b90f7c840680ea5b078d27309c212415aabfa06d04b6acf45f626900777ec9d9b896 SHA512 52ea803ec04f7b6bfc519876b5cfd7a1c492866d41eb3989a3255809660558ab47e59352bb62d3a66b45ee0456ca6e6f784a95e403935e3c735eee5a572a559c
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/gui-libs/vte/vte-0.70.1.ebuild b/gui-libs/vte/vte-0.70.1.ebuild
deleted file mode 100644
index b9a9e6e4b905..000000000000
--- a/gui-libs/vte/vte-0.70.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..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 https://gitlab.gnome.org/GNOME/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.52: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/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 2bf0febc305e..94f8e63a883f 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 204ea33f5884..7771e9072843 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,7 +1,3 @@
-AUX 3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch 3533 BLAKE2B 299189598870deb1031f1c060b96727c03f26bf5a92a91eab2bd1e174d68d572cd3418bc298387a00b9096d1c17db144d97124d7ec46a948d1fa402d1e43ed8d SHA512 6f235d034f92efc91be319709728436f3cd109fcdcea4432f6c96f8da94b66b6e45681907a59a098eb949bed1188d6714bbb5476ae924e858c8f5f0f28179166
-AUX 3.44.4-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch 13915 BLAKE2B 6d75a8a8d9097e74712149d48cb2872de1aaa39290c37ef371c7be45ed783c1c88d6fdf1f60015848b149f4f2c92e6931a4e20b0a9e7af444180d0b3cb7690e5 SHA512 f679b25d5b0f257c3a5aee5a6fc8fa26776e2f11a3874a91a26772b8ebe98b5cb3e1058d17faa0336fbb28a714e6ab28ef6cc5666ce4d1b63ac0ba6ef5e81220
-DIST evolution-3.44.4.tar.xz 13130588 BLAKE2B ffb6da420acbf7be7e5eb6fad44bcb9f00e9c52f99314a4f8e8e35e898eaac8a8fdc511328fd519fed5ac9ef98e63e326cfc7dde324919c1cc6e60ff17b3ad76 SHA512 1c2a30e00e4f9226ced2617cf5a69f33db914d5a94dd22223c9dc12e635952a52e2fac395d49de70c70c21004fb0d87e3ba81725aff924bb0b386ffb4901d058
 DIST evolution-3.46.2.tar.xz 13295660 BLAKE2B 7dda0049f8579cef35367435f90e31977d33b389fe823bc5e7677566bd6d3d73ef414b3419041c9183f4fc9e95ff944e5a8664445f8371c5518e40703bca8981 SHA512 f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734
-EBUILD evolution-3.44.4-r4.ebuild 4271 BLAKE2B 06acf352f5365427448ccda1bb9cccfec50f56ef0d55bbf5b56bfe4f58d6de606ffc4af4392f4c9b805a48fefe4322c4a62ae87eb46c6c04d5c672ec6c162a89 SHA512 27a1e3ce07b730f6e2c6df74bfc2b2295bd458027f36d7e9f88846223ac1b119a5ca7a0de33f9bfb6b8bfc05108018dc615b69159ddf145386c97eeca18129e2
 EBUILD evolution-3.46.2.ebuild 4101 BLAKE2B 3f8582edc0911c2e9fbfac04d6237043716ba0c15199fe822c63b49af3df58e20893ae8e16cfe512f6afa67b4fea25ca284e7f52fbcec533ba65a8a5566fc29e SHA512 fc23022c2bb0434a29a258b49e4cac1d274400f395429ad8ae097d2f43f764dac49a840bd6f32a7dec7fef20e99f0ef7f8877526ae97f07ffa64ebb875285b19
 MISC metadata.xml 1174 BLAKE2B 745a372088a3891dee71c205ef8d512df56e338ca41cd91d861938447e1cf42f0305fe27e385b7e4f391dd26cbd5173bdba9e158b65cec1260fe9c45382465c4 SHA512 d19c6775d576c35458674c301bfc5502e1f8f62cee76fe46aa749507fd9c2a1494a21a6c9a5886f8ca7e3b2e107b3e28dee448c8ecbd999cf3c3bb800c03f405
diff --git a/mail-client/evolution/evolution-3.44.4-r4.ebuild b/mail-client/evolution/evolution-3.44.4-r4.ebuild
deleted file mode 100644
index daf6f5460468..000000000000
--- a/mail-client/evolution/evolution-3.44.4-r4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake gnome2 readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# automagic libunity dep
-# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
-# <libgweather-4.2.0 because of libsoup:3 transition
-DEPEND="
-	>=app-crypt/gcr-3.4:0=[gtk]
-	>=app-text/enchant-2.2.0:2
-	>=dev-db/sqlite-3.7.17
-	>=dev-libs/glib-2.56:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.28.0:4=[spell?]
-	>=x11-libs/cairo-1.9.15[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/libnotify-0.7
-	>=x11-misc/shared-mime-info-0.22
-
-	app-text/cmark:=
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	bogofilter? ( mail-filter/bogofilter )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0:0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spamassassin? ( mail-filter/spamassassin )
-	spell? ( >=app-text/gspell-1.8:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11
-	)
-	weather? (
-		>=dev-libs/libgweather-3.91.0:4=
-		<dev-libs/libgweather-4.2.0:4=
-	)
-	ytnef? ( net-mail/ytnef )
-"
-RDEPEND="${DEPEND}
-	highlight? ( app-text/highlight )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
-# call; if needed, set them after cmake_src_prepare call, if that works
-
-src_prepare() {
-	cmake_src_prepare
-	gnome2_src_prepare
-
-	eapply "${FILESDIR}"/${PV}-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch
-	eapply "${FILESDIR}"/${PV}-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=$(usex gtk-doc)
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DWITH_ENCHANT_VERSION=2
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DWITH_GWEATHER4=ON
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_YTNEF=$(usex ytnef)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-		-DENABLE_MARKDOWN=ON
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_test() {
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch b/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
deleted file mode 100644
index 882448e2f07c..000000000000
--- a/mail-client/evolution/files/3.44.4-I-1969-EShellWindow-The-New-menu-is-not-filled-after.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 080791256d78a6d97384b4eef0d411cdc73feeb0 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 23 Sep 2022 11:34:51 +0200
-Subject: [PATCH 2/2] I#1969 - EShellWindow: The 'New' menu is not filled after
- start
-
-Related to https://gitlab.gnome.org/GNOME/evolution/-/issues/1969
----
- src/shell/e-shell-window.c | 45 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 43 insertions(+), 2 deletions(-)
-
-diff --git a/src/shell/e-shell-window.c b/src/shell/e-shell-window.c
-index e7be30feee..86c83e5e1e 100644
---- a/src/shell/e-shell-window.c
-+++ b/src/shell/e-shell-window.c
-@@ -47,6 +47,7 @@ enum {
- enum {
- 	CLOSE_ALERT,
- 	SHELL_VIEW_CREATED,
-+	UPDATE_NEW_MENU,
- 	LAST_SIGNAL
- };
- 
-@@ -120,6 +121,17 @@ shell_window_toolbar_update_new_menu (GtkMenuToolButton *menu_tool_button,
- 	gtk_menu_tool_button_set_menu (menu_tool_button, menu);
- }
- 
-+static void
-+shell_window_toolbar_update_new_menu_sig (EShellWindow *shell_window,
-+                                          GtkMenuToolButton *menu_tool_button)
-+{
-+	GtkWidget *menu;
-+
-+	/* Update the "New" menu tool button submenu. */
-+	menu = e_shell_window_create_new_menu (shell_window);
-+	gtk_menu_tool_button_set_menu (menu_tool_button, menu);
-+}
-+
- static gboolean
- shell_window_active_view_to_prefer_item (GBinding *binding,
-                                          const GValue *source_value,
-@@ -160,6 +172,8 @@ shell_window_set_notebook_page (EShellWindow *shell_window,
- 	g_return_if_fail (page_num >= 0);
- 
- 	gtk_notebook_set_current_page (notebook, page_num);
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- static void
-@@ -463,8 +477,8 @@ shell_window_construct_menubar (EShellWindow *shell_window)
- 		main_menu, "visible",
- 		G_BINDING_SYNC_CREATE);
- 
--	e_signal_connect_notify (
--		shell_window, "notify::active-view",
-+	g_signal_connect (
-+		shell_window, "update-new-menu",
- 		G_CALLBACK (shell_window_menubar_update_new_menu), NULL);
- 
- 	return main_menu;
-@@ -544,6 +558,11 @@ shell_window_construct_toolbar (EShellWindow *shell_window)
- 		G_CALLBACK (shell_window_toolbar_update_new_menu),
- 		shell_window);
- 
-+	g_signal_connect_object (
-+		shell_window, "update-new-menu",
-+		G_CALLBACK (shell_window_toolbar_update_new_menu_sig),
-+		item, 0);
-+
- 	gtk_box_pack_start (GTK_BOX (box), toolbar, TRUE, TRUE, 0);
- 
- 	toolbar = e_shell_window_get_managed_widget (
-@@ -1133,6 +1152,24 @@ e_shell_window_class_init (EShellWindowClass *class)
- 		G_TYPE_NONE, 1,
- 		E_TYPE_SHELL_VIEW);
- 
-+	/*
-+	 * EShellWindow::update-new-menu
-+	 * @shell_window: the #EShellWindow
-+	 *
-+	 * Emitted when the 'New' menu should be updated.
-+	 *
-+	 * Since: 3.44.5
-+	 */
-+	signals[UPDATE_NEW_MENU] = g_signal_new (
-+		"update-new-menu",
-+		G_OBJECT_CLASS_TYPE (object_class),
-+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-+		0,
-+		NULL, NULL,
-+		g_cclosure_marshal_VOID__VOID,
-+		G_TYPE_NONE, 0,
-+		G_TYPE_NONE);
-+
- 	binding_set = gtk_binding_set_by_class (class);
- 	gtk_binding_entry_add_signal (
- 		binding_set, GDK_KEY_Escape, 0, "close-alert", 0);
-@@ -2049,6 +2086,8 @@ e_shell_window_register_new_item_actions (EShellWindow *shell_window,
- 				G_OBJECT (action),
- 				"primary", GINT_TO_POINTER (TRUE));
- 	}
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- /**
-@@ -2126,6 +2165,8 @@ e_shell_window_register_new_source_actions (EShellWindow *shell_window,
- 			G_OBJECT (action),
- 			"backend-name", (gpointer) backend_name);
- 	}
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- /**
--- 
-2.37.4
-
diff --git a/mail-client/evolution/files/3.44.4-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch b/mail-client/evolution/files/3.44.4-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch
deleted file mode 100644
index e7fe8acd07a6..000000000000
--- a/mail-client/evolution/files/3.44.4-I-2001-Mail-Update-preview-s-iframe-height-to-match-.patch
+++ /dev/null
@@ -1,417 +0,0 @@
-From 44ac716d199b1c0a07a92014d2d64c28a077f876 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 16 Sep 2022 08:47:07 +0200
-Subject: [PATCH 1/2] I#2001 - Mail: Update preview's iframe height to match
- its content
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2001
----
- data/webkit/e-web-view.js                     | 60 ++++++++++++----
- data/webkit/webview.css                       | 32 ++++-----
- src/em-format/e-mail-formatter-text-plain.c   |  2 +-
- src/mail/e-mail-display.c                     | 69 ++++++++++++++++++-
- .../e-mail-formatter-text-highlight.c         | 14 +++-
- 5 files changed, 140 insertions(+), 37 deletions(-)
-
-diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
-index a8f99c4668..058b4e578c 100644
---- a/data/webkit/e-web-view.js
-+++ b/data/webkit/e-web-view.js
-@@ -772,6 +772,38 @@ Evo.EnsureMainDocumentInitialized = function()
- 	Evo.initializeAndPostContentLoaded(null);
- }
- 
-+Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
-+{
-+	if (!doc)
-+		return;
-+
-+	var ii, iframes;
-+
-+	iframes = doc.getElementsByTagName("iframe");
-+
-+	/* Update from bottom to top */
-+	for (ii = 0; ii < iframes.length; ii++) {
-+		Evo.mailDisplayUpdateIFramesHeightRecursive(iframes[ii].contentDocument);
-+	}
-+
-+	if (!doc.body || !doc.defaultView || !doc.defaultView.frameElement)
-+		return;
-+
-+	if (doc.defaultView.frameElement.height == doc.body.scrollHeight)
-+		doc.defaultView.frameElement.height = 10;
-+	doc.defaultView.frameElement.height = doc.body.scrollHeight + 2 + (doc.body.scrollWidth > doc.body.clientWidth ? 20 : 0);
-+}
-+
-+Evo.MailDisplayUpdateIFramesHeight = function()
-+{
-+	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
-+
-+	Evo.mailDisplayUpdateIFramesHeightRecursive(document);
-+
-+	if (scrolly != -1 && document.defaultView.scrollY != scrolly)
-+		document.defaultView.scrollTo(0, scrolly);
-+}
-+
- if (this instanceof Window && this.document) {
- 	this.document.onload = function() { Evo.initializeAndPostContentLoaded(this); };
- 
-@@ -857,9 +889,8 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 				local_width -= 2; /* 1 + 1 frame borders */
- 			} else if (!iframes.length) {
- 				/* Message main body */
--				local_width -= 8; /* 8 + 8 margins of body without iframes */
--				if (level > 1)
--					local_width -= 8;
-+				local_width -= level * 20; /* 10 + 10 margins of body without iframes */
-+				local_width -= 4;
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body", "width: " + local_width + "px;");
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container", "width: " + local_width + "px;");
-@@ -869,7 +900,7 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body",
- 					"width: " + local_width + "px;");
- 
--				local_width -= 2; /* 1 + 1 frame borders */
-+				local_width -= 4; /* 2 + 2 frame borders */
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container-nostyle iframe",
- 					"width: " + local_width + "px;");
-@@ -881,19 +912,15 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container iframe",
- 					"width: " + (local_width - 10) + "px;");
- 			} else {
--				local_width -= 20; /* 10 + 10 margins of body with iframes */
--				local_width -= 8; /* attachment margin */
--				local_width -= 2; /* 1 + 1 frame borders */
-+				local_width -= (level - 1) * 20; /* 10 + 10 margins of body with iframes */
-+				local_width -= 4; /* 2 + 2 frame borders */
-+				local_width -= 10; /* attachment margin */
- 
--				/* We need to subtract another 10 pixels from the iframe width to
--				 * have the iframe's borders on the correct place. We can't subtract
--				 * it from local_width as we don't want to propagate this change
--				 * further. */
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container-nostyle iframe",
--					"width: " + (local_width - 10) + "px;");
-+					"width: " + local_width + "px;");
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body > .part-container-nostyle iframe",
--					"width: " + (local_width - 10) + "px;");
-+					"width: " + local_width + "px;");
- 			}
- 
- 			/* Add rules to every sub document */
-@@ -904,7 +931,7 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 				var tmp_local_width = local_width;
- 
- 				if (level == 0) {
--					tmp_local_width -= 8; /* attachment's margin */
-+					tmp_local_width -= 10; /* attachment's margin */
- 
- 					Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".attachment-wrapper iframe:not([src*=\"__formatas=\"])",
- 						"width: " + tmp_local_width + "px;");
-@@ -913,7 +940,7 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 						"width: " + tmp_local_width + "px;");
- 
- 					Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body > .part-container-nostyle iframe",
--						"width: " + local_width + "px;");
-+						"width: " + tmp_local_width + "px;");
- 				}
- 
- 				this.set_iframe_and_body_width (iframes[ii].contentDocument, tmp_local_width, original_width, level + 1);
-@@ -926,6 +953,7 @@ Evo.mailDisplayResizeContentToPreviewWidth = function()
- 	width -= 20; /* 10 + 10 margins of body */
- 
- 	traversar.set_iframe_and_body_width(document, width, width, 0);
-+	window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- }
- 
- Evo.mailDisplayUpdateMagicSpacebarState = function()
-@@ -1294,6 +1322,8 @@ Evo.MailDisplayShowAttachment = function(element_id, show)
- 			window.webkit.messageHandlers.contentLoaded.postMessage(iframe_id);
- 			Evo.mailDisplayUpdateMagicSpacebarState();
- 		}
-+	} else if (elem.ownerDocument.defaultView.frameElement) {
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-diff --git a/data/webkit/webview.css b/data/webkit/webview.css
-index 0d21253644..5b08388672 100644
---- a/data/webkit/webview.css
-+++ b/data/webkit/webview.css
-@@ -12,8 +12,8 @@ img {
- }
- 
- body {
--  /* Use margin so that children can safely use width=100% */
--  margin: 5px 10px 5px 10px;
-+  /* Use padding so that children can safely use width=100% */
-+  padding: 8px;
- }
- 
- body, div, p, td {
-@@ -38,21 +38,21 @@ img#__evo-contact-photo {
- 
- img.navigable {
-   cursor: pointer;
--  margin-right: 4px;
-+  padding-right: 4px;
- }
- 
- .attachments {
-   background: #FFF;
-   border: 1px solid silver;
--  margin: 10px 10px 10px 10px;
-+  padding: 10px 10px 10px 10px;
-   border-left: 0;
-   border-right: 0;
-   border-bottom: 0;
- }
- 
- .attachment {
--  margin-left: 8px;
--  margin-right: 0px;
-+  padding-left: 8px;
-+  padding-right: 0px;
- }
- 
- .attachment td {
-@@ -66,21 +66,21 @@ iframe:not([id$=".itip"]) {
- 
- .part-container {
-   height: 100%;
--  margin-top: 2px;
--  margin-bottom: 2px;
-+  padding: 0px;
- }
- 
- .part-container-nostyle iframe {
--  margin-right: 10px;
-+  margin: 0px;
-+  padding-right: 0px;
- }
- 
- .part-container-inner-margin {
--  margin: 8px;
-+  padding: 0px;
- }
- 
- object { /* GtkWidgets */
--  margin-top: 2px;
--  margin-bottom: 2px;
-+  padding-top: 2px;
-+  padding-bottom: 2px;
- }
- 
- .__evo-highlight {
-@@ -175,7 +175,7 @@ th.rtl {
- /***** PRINTING *******/
- 
- .printing-header {
--  margin-bottom: 20px;
-+  padding-bottom: 20px;
- }
- 
- .printing-header h1,
-@@ -195,7 +195,7 @@ th.rtl {
- /******* ITIP *********/
- .itip.icon {
-   float: left;
--  margin-right: 5px;
-+  padding-right: 5px;
- }
- 
- .itip.content {
-@@ -204,7 +204,7 @@ th.rtl {
- }
- 
- .itip.description {
--  margin: 5px;
-+  padding: 5px;
- }
- 
- .itip tr {
-@@ -228,7 +228,7 @@ th.rtl {
- }
- 
- #table_row_buttons img {
--  margin-right: 5px;
-+  padding-right: 5px;
-   vertical-align: middle;
- }
- 
-diff --git a/src/em-format/e-mail-formatter-text-plain.c b/src/em-format/e-mail-formatter-text-plain.c
-index 7c6befda6b..3858bcdb3d 100644
---- a/src/em-format/e-mail-formatter-text-plain.c
-+++ b/src/em-format/e-mail-formatter-text-plain.c
-@@ -111,7 +111,7 @@ emfe_text_plain_format (EMailFormatterExtension *extension,
- 		string =
- 			"<div class=\"part-container pre "
- 			"-e-web-view-background-color -e-web-view-text-color\" "
--			"style=\"border: none; padding: 8px; margin: 0;\">";
-+			"style=\"border: none; padding: 0; margin: 0;\">";
- 
- 		g_output_stream_write_all (
- 			stream, string, strlen (string),
-diff --git a/src/mail/e-mail-display.c b/src/mail/e-mail-display.c
-index cc38c65957..c60ab45cc5 100644
---- a/src/mail/e-mail-display.c
-+++ b/src/mail/e-mail-display.c
-@@ -83,6 +83,7 @@ struct _EMailDisplayPrivate {
- 	GSettings *settings;
- 
- 	guint scheduled_reload;
-+	guint iframes_height_update_id;
- 
- 	GHashTable *old_settings;
- 
-@@ -537,6 +538,43 @@ initialize_web_view_colors (EMailDisplay *display,
- 		e_web_view_get_cancellable (E_WEB_VIEW (display)));
- }
- 
-+static gboolean
-+mail_display_can_use_frame_flattening (void)
-+{
-+	guint wk_major, wk_minor;
-+
-+	wk_major = webkit_get_major_version ();
-+	wk_minor = webkit_get_minor_version ();
-+
-+	/* The 2.38 is the last version, which supports frame-flattening;
-+	   prefer it over the manual and expensive calculations. */
-+	return (wk_major < 2) || (wk_major == 2 && wk_minor <= 38);
-+}
-+
-+static gboolean
-+mail_display_iframes_height_update_cb (gpointer user_data)
-+{
-+	EMailDisplay *mail_display = user_data;
-+
-+	mail_display->priv->iframes_height_update_id = 0;
-+
-+	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (mail_display), e_web_view_get_cancellable (E_WEB_VIEW (mail_display)),
-+		"Evo.MailDisplayUpdateIFramesHeight();");
-+
-+	return G_SOURCE_REMOVE;
-+}
-+
-+static void
-+mail_display_schedule_iframes_height_update (EMailDisplay *mail_display)
-+{
-+	if (mail_display_can_use_frame_flattening ())
-+		return;
-+
-+	if (mail_display->priv->iframes_height_update_id)
-+		g_source_remove (mail_display->priv->iframes_height_update_id);
-+	mail_display->priv->iframes_height_update_id = g_timeout_add (100, mail_display_iframes_height_update_cb, mail_display);
-+}
-+
- static void
- mail_display_change_one_attachment_visibility (EMailDisplay *display,
- 					       EAttachment *attachment,
-@@ -1353,6 +1391,8 @@ mail_display_content_loaded_cb (EWebView *web_view,
- 			gtk_widget_grab_focus (widget);
- 		}
- 	}
-+
-+	mail_display_schedule_iframes_height_update (mail_display);
- }
- 
- static void
-@@ -1475,6 +1515,11 @@ mail_display_dispose (GObject *object)
- 		priv->scheduled_reload = 0;
- 	}
- 
-+	if (priv->iframes_height_update_id > 0) {
-+		g_source_remove (priv->iframes_height_update_id);
-+		priv->iframes_height_update_id = 0;
-+	}
-+
- 	if (priv->settings != NULL) {
- 		g_signal_handlers_disconnect_matched (
- 			priv->settings, G_SIGNAL_MATCH_DATA,
-@@ -1599,6 +1644,18 @@ mail_display_magic_spacebar_state_changed_cb (WebKitUserContentManager *manager,
- 	mail_display->priv->magic_spacebar_state = jsc_value_to_int32 (jsc_value);
- }
- 
-+static void
-+mail_display_schedule_iframes_height_update_cb (WebKitUserContentManager *manager,
-+						WebKitJavascriptResult *js_result,
-+						gpointer user_data)
-+{
-+	EMailDisplay *mail_display = user_data;
-+
-+	g_return_if_fail (mail_display != NULL);
-+
-+	mail_display_schedule_iframes_height_update (mail_display);
-+}
-+
- static void
- mail_display_constructed (GObject *object)
- {
-@@ -1611,9 +1668,11 @@ mail_display_constructed (GObject *object)
- 	/* Chain up to parent's constructed() method. */
- 	G_OBJECT_CLASS (e_mail_display_parent_class)->constructed (object);
- 
--	g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (object)),
--		"enable-frame-flattening", TRUE,
--		NULL);
-+	if (mail_display_can_use_frame_flattening ()) {
-+		g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (object)),
-+			"enable-frame-flattening", TRUE,
-+			NULL);
-+	}
- 
- 	display = E_MAIL_DISPLAY (object);
- 	web_view = E_WEB_VIEW (object);
-@@ -1661,8 +1720,12 @@ mail_display_constructed (GObject *object)
- 	g_signal_connect_object (manager, "script-message-received::mailDisplayMagicSpacebarStateChanged",
- 		G_CALLBACK (mail_display_magic_spacebar_state_changed_cb), display, 0);
- 
-+	g_signal_connect_object (manager, "script-message-received::scheduleIFramesHeightUpdate",
-+		G_CALLBACK (mail_display_schedule_iframes_height_update_cb), display, 0);
-+
- 	webkit_user_content_manager_register_script_message_handler (manager, "mailDisplayHeadersCollapsed");
- 	webkit_user_content_manager_register_script_message_handler (manager, "mailDisplayMagicSpacebarStateChanged");
-+	webkit_user_content_manager_register_script_message_handler (manager, "scheduleIFramesHeightUpdate");
- 
- 	e_extensible_load_extensions (E_EXTENSIBLE (object));
- }
-diff --git a/src/modules/text-highlight/e-mail-formatter-text-highlight.c b/src/modules/text-highlight/e-mail-formatter-text-highlight.c
-index d7c641c157..f1db9bf79c 100644
---- a/src/modules/text-highlight/e-mail-formatter-text-highlight.c
-+++ b/src/modules/text-highlight/e-mail-formatter-text-highlight.c
-@@ -135,16 +135,26 @@ text_hightlight_read_data_thread (gpointer user_data)
- {
- 	TextHighlightClosure *closure = user_data;
- 	gint nbuffer = 10240;
-+	gssize read;
-+	gsize wrote = 0;
- 	gchar *buffer;
- 
- 	g_return_val_if_fail (closure != NULL, NULL);
- 
- 	buffer = g_new (gchar, nbuffer);
- 
-+	strcpy (buffer, "<style>body{margin:0; padding:8px;}</style>");
-+	read = strlen (buffer);
-+
-+	if (!g_output_stream_write_all (closure->output_stream, buffer, read, &wrote, closure->cancellable, &closure->error) ||
-+	    (gssize) wrote != read || closure->error) {
-+		g_free (buffer);
-+		return NULL;
-+	}
-+
- 	while (!camel_stream_eos (closure->read_stream) &&
- 	       !g_cancellable_set_error_if_cancelled (closure->cancellable, &closure->error)) {
--		gssize read;
--		gsize wrote = 0;
-+		wrote = 0;
- 
- 		read = camel_stream_read (closure->read_stream, buffer, nbuffer, closure->cancellable, &closure->error);
- 		if (read < 0 || closure->error)
--- 
-2.37.4
-
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index e1dfdac0a0e0..a84e284454fd 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index 83f3007ea9ac..4784839ded29 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -3,5 +3,5 @@ DIST imapfilter-2.7.5.tar.gz 59441 BLAKE2B 0326a698f3be18da47c99cbe20e5e51cde8ab
 DIST imapfilter-2.7.6.tar.gz 58644 BLAKE2B 6fd5b8400527c3749cdb8a1df0ca0cbab7b77e8fa29e0bc1bd0eee95832aa16c9b3a586b4e4dc9f9632319febdc619ebe6b05e60c46fd8ccf430f6714900588d SHA512 c76a0986d338e2b74ccf38106e05d4c0a25789a6d80f0cb79ed4a165447a4c96cbcffb57e856fdfd465283feebca6445efba52e65289442a7f313d343c519083
 EBUILD imapfilter-2.7.5-r1.ebuild 979 BLAKE2B 372852b1f8937b324e948d26df05d0d05b2328c93ff5206fac20f4c26f453b3d434134b44e7e0e682399197e6897300d577a9193d08162f87334cc154bc3c643 SHA512 2fcab5d73524d8f29cbf9252b830d74f14c1a966729db36fbeadf5a127d8dce298043edad48a8a01929af09ba3829fb8a2bdadd2ff264394369787c0e2077bf4
 EBUILD imapfilter-2.7.5.ebuild 968 BLAKE2B cc04dd3b71945338e0a645787a0556cee83bc598fd8df5c4ceefbba4add9c93e57efd23fa7d728a2d4d2d2c3dae40cc71455ffe59b5c41314604365013443c89 SHA512 a2f08bb5f773fdfbb8cb70a4643c3f105e7533ebb9edf0c1dcbac36635c6928c01f1bcac6496a8f577b29e2639d80c899a2561f4fc8ccaa2bcb587ec8b901078
-EBUILD imapfilter-2.7.6.ebuild 1029 BLAKE2B 6509759d9c9946cf704f916efa3446035aff8c79c3a603b324f8f4d9a01ad709817b8d8a575c8e3af70f34bb55816eafe1480a13537c4dfe8cf86d8cd4e368eb SHA512 e5952cb723f67f962a3bf3a036c83578156c7dfacb824818aa14a44a3931fbc6b0f19871f326babbfb4b927d2ac114effed561852d22ffd3cba471c50b368ba2
+EBUILD imapfilter-2.7.6.ebuild 1026 BLAKE2B 30d15cf342c5c4ea7414f5a28abcc22c516281b7a4390629391839f59a0d07e2e32f0db8604e6b8787ba5568f41dda4f3277221d134fd8c5bcc2cee5de7d2bf3 SHA512 69b276bdd5ddbec51a04901412f321c67b09ec77a5fc11edbe665941bc2bcd988890b1bedd97bac57fea8c3f81f0e2afbca75b2ce1a38ee643128456163f579b
 MISC metadata.xml 493 BLAKE2B 26e3c22d49d62547bfe45fb39f153589cf3f2b7e7ea07a170b91e880bf3d337de8ae7be36bf684d3cbb72416a1442e896014cbf6ddba14cef95b680f2a5ea7e3 SHA512 9300b493b8728a141e05af8c343b776a93ee52a01a69694050b9ffb392770b81ddef37832c6b884fe51dc9ba3ecc41bb8ea4f9559f84dce1a71382bfe3d0e67b
diff --git a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
index d129899e7bff..110ca9f822a7 100644
--- a/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 32197228ce7d..100b388faff2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 628b55ff92e1..0d24a48ad901 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,3 @@
-DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45
 DIST eog-43.1.tar.xz 4649476 BLAKE2B 0c7225f8f7fd60ff66469c43a0d11c15fa26956cf22706ee5d2a8c06597a8b4ef51a7d3754cde968bf2f98301d5f59326db05213217c7012fe193c57f0ce04ef SHA512 10fd4f6ad07d5a0c13931cb47c3a16d208eb6aa107f288e32fa0f1fd711d17893be9d9980fa64fa530047da131ef4e10d729421ac46d3549a9ab731be45479bc
-EBUILD eog-42.3-r1.ebuild 1714 BLAKE2B 1ccacb64a090354ba8a30f496bee26fbf610b65cbffb174b54738d740cde984bff5e8536bd6c3f613b6f0c4891dea8e867c0c92ae7d0a48f656b88bece3f45cb SHA512 76631be76b513b99b5e7304166e756708111f53572c62cbe13c48040abddd7bd9c95d564e1c635c4c88d76acefdb7850d88627287aab7648966fadf429bc127a
 EBUILD eog-43.1-r1.ebuild 1743 BLAKE2B 630337daa4fb9cd659be52f28657f01f9fda9accdba105c882cc1a2991b7b88eb1c8bb17cdf9439ef5c0939e197a1c89caca03c2c71a4fcc0174d717ac57fc1a SHA512 fd1c1cfe444f3ee5f8dcf70c06c1f06dab03c307e10fa843b401aa464a9ad8b8de8507a5c7f98e09bc071269fe831c8fc0df0622873993e015612a57d834b78d
 MISC metadata.xml 580 BLAKE2B 7d6bf08b37ed06abb82e92621725ab2cbc9d0b28e5c50cd9dd25e449e98212da4911da450d5e80f6d2efd3cb65981b2726e69f48ae54fc7a0dd4363c896b9086 SHA512 3ae60a59ef2e07fd78b836eb828c0b9e37e49ea6115c52215b86dafff9cb6990567659a31cfb1e06e58890cf598c98065df1e473dc7994fef0ae950081c27a54
diff --git a/media-gfx/eog/eog-42.3-r1.ebuild b/media-gfx/eog/eog-42.3-r1.ebuild
deleted file mode 100644
index c0a5a6d07ec7..000000000000
--- a/media-gfx/eog/eog-42.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="The Eye of GNOME image viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
-
-LICENSE="GPL-2+"
-SLOT="1"
-
-IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
-REQUIRED_USE="exif? ( jpeg )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=dev-libs/libpeas-0.7.4:=[gtk]
-	>=gnome-base/gnome-desktop-2.91.2:3=
-	>=gnome-base/gsettings-desktop-schemas-42_beta
-	>=x11-misc/shared-mime-info-0.20
-	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
-	>=x11-libs/gtk+-3.24.15:3[introspection,X]
-	>=gui-libs/libhandy-1.5.0:1
-	sys-libs/zlib
-
-	exif? ( >=media-libs/libexif-0.6.14 )
-	lcms? ( media-libs/lcms:2 )
-	xmp? ( media-libs/exempi:2= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	svg? ( >=gnome-base/librsvg-2.44.0:2 )
-
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	gtk-doc? (
-		dev-util/gi-docgen
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif libexif)
-		$(meson_use lcms cms)
-		$(meson_use xmp)
-		$(meson_use jpeg libjpeg)
-		$(meson_use svg librsvg)
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dinstalled_tests=false
-		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 7fb74e388f8e..f22e2fd6a147 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -6,6 +6,6 @@ AUX gmic-3.1.6-makefile_automagic.patch 5327 BLAKE2B 0df03edbba289d327957a2e703b
 AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6fd4590a3c05c2d988e88d8ee62e79c8ac39adb92bee247dcb999ef7654bf9c558802781e9933cb6de4b078cfe7b06ab9 SHA512 1c7da7542005d76f67a553ddec1d9291e34ff99adad3aae6c9761dde8aa93bba8f79eb388072fd43976ae4e45bae066d4726d642698bce36aafbca5dbae009b0
 DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
-EBUILD gmic-3.0.1-r3.ebuild 4199 BLAKE2B 86c51b7eeea8f3153751bea398b02128d217b01b23c1c7e47af4c90b9a6898cd36822b93ed68e807908a34abf81d6f56c97be22b3af664db7bcaeda445e4aa74 SHA512 8bb787c1e4858461725a69f31e07760352580ddf6897a3cd364149e9a4706326f40464a5fdbc5e3d7d6ec31c242d008bf162722d2090384e20ec4a403b9e78d0
+EBUILD gmic-3.0.1-r3.ebuild 4205 BLAKE2B 71f6968b9f8b6b4a242c5995c5f521c29830bf4a438d6e67f1f1422a0d2f7093b8b6bbf02338cc97cd302dbcf218edcda2ed6d532fcbd6ccd4163f7d23454a1f SHA512 15715c804177eeabb7184996526a8b9ff7a03c2c62e8207b0f3439a3425847f5bb142aa9b5820de776b227b12e72849e5ca62b2750bbef389c6b67e78a0a3625
 EBUILD gmic-3.1.6-r1.ebuild 3509 BLAKE2B 0934a967523f764a803828dfdd37cc0e3ec0823058fda0c3e75c8f6f22c89e2c9d12c222681c747ece4b2ef63d3eef942285a180eedfaad96a07ff807249d921 SHA512 0180b54c193419f2c9bc382d1f59faa8fce136fc5d1ed87862b5107126133dd6424e7a930aab2c0eb414200be1676251c42924e99a17593ffb2d158919cc72c6
 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
index a595598fb299..bb07cf674b67 100644
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -118,7 +118,7 @@ src_configure() {
 
 	# configure gmic-qt frontends
 	local CMAKE_USE_DIR="${S}/gmic-qt"
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_DYNAMIC_LINKING=ON
 		-DENABLE_CURL=$(usex curl)
 		-DGMIC_LIB_PATH="${BUILD_DIR}"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5cf316e341a4..3061d5edb91d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 757d85f7a5a1..a5f26d9e4882 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -6,6 +6,6 @@ AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c7405
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3
-EBUILD ctl-1.5.2-r4.ebuild 956 BLAKE2B 8454ae19d44b2dda96c70f61a3fcc233d03ea074769e5d4766a7cd5d2f72ac6fb9b155b348cbe9774d003c352df25cc68edbc32954fd07387d31bbfc9b242731 SHA512 08cf15312934281f82985903c8106b012d4038dfc9fe4e1f2d2cf7439970a61d4e055eb06a88a0d91426a7847b0c747a755b4182dcb810be62765afe87806da4
+EBUILD ctl-1.5.2-r4.ebuild 898 BLAKE2B 0ebae767ba5149aabfe1338459de2b8557865a3e9e0c49a84c331382d023ed47a15b561060176036994f303f70a3a41bc967af94ea148eb4b0883fec31621bb6 SHA512 348985af0ad004e661838cb9c253713b55231d0c7a7c413f08a86ea07de4751c9949976b7bc2be702dc04b351d99dfced20383c64e32012ec12368af9b4e32f9
 EBUILD ctl-1.5.2_p20221224.ebuild 883 BLAKE2B a2f9265105aff276107cfe2b5af7d46273b94416a5bb823990086dafb107c83811e7152a3d55a9fc2f7e72e490193cb36e889c42e9345580d3cc3d8a8359fa30 SHA512 52e7ff1af1aa3dc56b74fd166d9b88ccd58f0155f8a738100e36d8b76a458111227bbc993e854fc90f2325dfb016632f6c4b8507d32ac51244cb54a30d8177d2
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r4.ebuild b/media-libs/ctl/ctl-1.5.2-r4.ebuild
index a63570fa6617..0276777c0657 100644
--- a/media-libs/ctl/ctl-1.5.2-r4.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,8 +32,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-fix-unit-tests.patch"
 )
 
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
-
 src_test() {
 	pushd "${BUILD_DIR}" >/dev/null || die
 	eninja check
diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index dcfe2a51950f..c782104a93cd 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,11 +1,7 @@
 AUX hamlib-4.4-fix-clang-warnings.patch 6673 BLAKE2B 26b0bbbc2c9bb89fe2707b0bbc7ff81c33104670f5bc157fe7063b5150786963fcd379fca620c7a457682f6b1d8bc9a13729ab442ce771500763cf91127a68db SHA512 1cfbff642826281d42226a5c4364b438602dc2022baf7b6bd7cc41d4cb1a0defec511a9c20d06cdf5aca6549e00ec11639899326ac03d4a6604a7440d813f7e9
 AUX hamlib-4.4-slibtool.patch 2414 BLAKE2B 798b95d72e57d1b68a1d26c36f631b084722a32ae3c20238f7cb2495412e200ee7e909d2e614ad27db7016654a6e662834b8c95f86dbec609754fe817a49a1b8 SHA512 743a5be7160e80453810873ea074fd62934524fcf7fc9b8e224c93a2876760c96793ebb13e6e40c32b648065b034a2355935862d540c6620babaeacb7fc2f88c
 DIST hamlib-4.4.tar.gz 2401399 BLAKE2B 4256b5b4374c62ef4fb957d29deda95aa9d15a8b52b81c5db1c07f3ebbf4c8e48c6c082769cef82c8457b3f813ac00ef7a37136615747f2c93e5275a112891e7 SHA512 37366ba180031de34da447c3d4e0086f156b893f57b5ab9bbc38b8e1f4bf9310fa1a9eb2a6d7884f1f11900dbdb811b4071e023aba571ea0ac5d07ddb122bf7b
-DIST hamlib-4.5.1.tar.gz 2588713 BLAKE2B 11b45fe82adc0bedfabed1847589ee67fe3612c8b2c34e0c91bbf33b237f2992c97ab266687f7173767bf01db81747ea1b710af0bd3fdb3aa5c4035190d35ceb SHA512 3fbfa18f3f04890eb0bb2ffef5347ffc3759fa276d613785a0e585dd3613837db4461eb79bf7e3794f6ce33dcae8a4357b3f27c8be44a9d838fcb82cb0a60753
 DIST hamlib-4.5.3.tar.gz 2590200 BLAKE2B 7c06a20a1185a2e413fee56231f3e0f6aa77a7585b9853896b00abb773e2e23fc5e97a8a3fbb873528282756ee674b1ca5b2b14f0fe8e6b9b8e8f7e8ffa223f2 SHA512 be3b58c7276c1289d85b4dc9054016757200fde06d66116f7a1687442e53bf322f0a3ae974c9b784cbd0bff0c64b901b97fac74184f4b4a0fdf1f5079d0ea509
-DIST hamlib-4.5.tar.gz 2568061 BLAKE2B 6ccb0c1faf8f64453c3696e75ced413048e7705184c7755fdde200be1d9b17f5495427ba492317cf7e75b5f373b859840d1d364db1f057c28f7779f8284fd96a SHA512 671da06aed54951ca810b4de7291a16de3a2f6ed54b8d024d4d9bfed9dfc6a21336c3cadd6f5b128c3ab54f1edd2b22db491b074b7759b9dfd9e71e1ce4055f3
 EBUILD hamlib-4.4.ebuild 2256 BLAKE2B 481a0b54d4c94bd232ebaaf099ff38a57052705363fc416b9b6d90581c65eb96e8690ac2f68bda6429ccc35936a9ec6c7a4f5b6dad3497c8b0a838399df04c5d SHA512 4ef6ccc5b5e9d289d29be6c89e641005b99c062391532ecce3708879d2c29868fe86645824a65de8fca16ed1e9c063291a2083d99d0b8468c90c95d7961fc274
-EBUILD hamlib-4.5.1.ebuild 2147 BLAKE2B 560831f12f948ffa3bba2a6b317999ccaff530b6b1ee8b18da0a6af254fd3a180b561bccda01aceed6f56da399c204533566f7bbea2263635318f2505e15591f SHA512 538d46e71035fe9c1b36060181110029b21004d2961fa0d2217816192bfc2faf528d538454261bf42e662f53fd82a3cc658fe47649b94d16ee837786716c854e
-EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B 78617b898ab4ffd67b5392a4d03810fda8fb550acb7e694e7725ec1465d983ec62b210882f80436e8b2464876cfda251bbf81417e784fd7d1f8ff78483e64aca SHA512 3eaac707ee37c64dac991cf9fa0ea0507fbb8594613880fc1fa6e4f1fa93e1f8905e9a75ed6fd245545ecea2e699b2b7d94bf26dc30cce386b884fc13da1649f
-EBUILD hamlib-4.5.ebuild 2219 BLAKE2B 933671fb2525421297a9c7693230daa3fc551d19eb000898dd70c1c321d2124ee9d8cad49cfdefed555d1a2c2e98aa8435bf034e5a1733b175e7ab3db26a9ece SHA512 7805a0332fa2795147c2dfebcaba2648740bba7d1cc7fed9a1566c80a17aaabe9f656263651e5a1041e849747352ee8a75c7fd9036907c27f005e78bb1b45c78
+EBUILD hamlib-4.5.3.ebuild 2147 BLAKE2B a92108f28aed0925de078c20284bd3c079fb920f36b07c3fa50db7398c071c30e1136441b4dd016496a0adf5ae19ed5a3d1ff6637b418b724fe7231fab0598af SHA512 ee006033ad578985bf4c76bbbfe1c0470aee0a94fc6ba23c9c48f3553e3af94d16d6913bd37ade3d444c408a972f3ba486c6e9ae659167c4f60fb15e4893ee57
 MISC metadata.xml 326 BLAKE2B ea402b17f863a6a0370743d2756c6c3c15a8d7bdfd0777db2cec56cc41dd93198ad36ff114f3c9bc265ea54228d87856f3edd35f9696ac5c89136fce4c5acf87 SHA512 84642d6397e97ea348a12d44a01015a51af72b40af5456416ac3477e55da9ef5ab1934f66b2fac0762c4b0483e20e92c3a49f334bf136de16b01043a15073f7f
diff --git a/media-libs/hamlib/hamlib-4.5.1.ebuild b/media-libs/hamlib/hamlib-4.5.1.ebuild
deleted file mode 100644
index a519e701d933..000000000000
--- a/media-libs/hamlib/hamlib-4.5.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/hamlib/hamlib-4.5.3.ebuild b/media-libs/hamlib/hamlib-4.5.3.ebuild
index 1b172b2c2880..c09e460664c0 100644
--- a/media-libs/hamlib/hamlib-4.5.3.ebuild
+++ b/media-libs/hamlib/hamlib-4.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 MY_P=${P/_rc2/~rc2}
 
 inherit autotools python-single-r1
diff --git a/media-libs/hamlib/hamlib-4.5.ebuild b/media-libs/hamlib/hamlib-4.5.ebuild
deleted file mode 100644
index 18a7511241b4..000000000000
--- a/media-libs/hamlib/hamlib-4.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-MY_P=${P/_rc2/~rc2}
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Ham radio backend rig control libraries"
-HOMEPAGE="http://www.hamlib.org"
-SRC_URI="mirror://sourceforge/hamlib/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0/4.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE="doc perl python tcl"
-
-RESTRICT="test"
-
-RDEPEND="
-	=virtual/libusb-0*
-	dev-libs/libxml2
-	sys-libs/readline:0=
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )"
-
-DEPEND=" ${RDEPEND}
-	virtual/pkgconfig
-	dev-lang/swig
-	>=sys-devel/libtool-2.2
-	doc? ( app-doc/doxygen
-		dev-util/source-highlight )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4-fix-clang-warnings.patch" # 880961
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# fix hardcoded libdir paths
-	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
-		-e "s#fix}/include#fix}/include/hamlib#" \
-		hamlib.pc.in || die "sed failed"
-
-	# Correct install target to whatever INSTALLDIRS says and use vendor
-	# installdirs everywhere (bug #611550)
-	sed -i -e "s#install_site#install#"	\
-	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
-	bindings/Makefile.am || die "sed failed patching for perl"
-
-	# make building of documentation compatible with autotools-utils
-	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--libdir=/usr/$(get_libdir)/hamlib \
-		--disable-static \
-		--with-xml-support \
-		$(use_with perl perl-binding) \
-		$(use_with python python-binding) \
-		$(use_with tcl tcl-binding)
-}
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	use python && python_optimize
-
-	use doc && HTML_DOCS=( doc/html/ )
-	einstalldocs
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins hamlib.pc
-
-	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
-	doenvd "${T}"/73hamlib
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/intel-mediasdk/Manifest b/media-libs/intel-mediasdk/Manifest
index 70be4381cc28..0bc15a8a6842 100644
--- a/media-libs/intel-mediasdk/Manifest
+++ b/media-libs/intel-mediasdk/Manifest
@@ -1,4 +1,6 @@
 DIST intel-mediasdk-22.6.3.tar.gz 11657130 BLAKE2B 3f63cf85716159f38f52cd0941cb716d9a25d2635e8b6da295a8fb78898ae007c3216148db580b94aa83742803effc0c1c2b0a431414a85f6feb44c93ae04738 SHA512 bd9fb9ca5b96bb2911db7fdf2622127f0dc3e86de8dc732bc6df6f4fcb343406e3ab14ffa5ce4595ed9b3bf19a73652681137fbe5b473c812c5b74554998a2b0
+DIST intel-mediasdk-22.6.4.tar.gz 11657778 BLAKE2B 3d95a685f5e4cc246367d046da8c8526264243321f0aacd2b9f6fbaed7eb0acdece1653801bd7cddd6b25338eecea6adb48b63a50049415621494cd481d455a1 SHA512 350347df8fd997a9043299faaee6fa6c8f67d3a301722c40ef8aab10bdfe6c01e7a2773c0add4617c98434e46030603ac56d4778074550498a128c7fb796c5a9
 EBUILD intel-mediasdk-22.6.3.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
+EBUILD intel-mediasdk-22.6.4.ebuild 1914 BLAKE2B 130c75db7637c111ebc9fa229436a7d6e52ecef7417690fb06fcbfd59b4f86c899ae2410f653ce69054e9190dd550edec9a6eb56cd62bc6b3433fcaf00678e10 SHA512 2413e454af5f17327e857b7af3f77d0fc79a23cec9673c47041d04590b0ff36baab12c5e58bc9bc0402d6350eca9b4c694ac25f95ef37c4596b9cef966eb4777
 EBUILD intel-mediasdk-9999.ebuild 1916 BLAKE2B 0afe7a7034386a2f32dd3a7b074dca39a8771439ff1502cca97baa08959c928aa62614211d500f8d280faca37fa39b68e5bbf95ab77168620432289dcea65e08 SHA512 9c90d66da6c5ff7a93a993d977d48e6a496c1ca872b96465d44c0e954d1678e9a72bbc5f11d54f8578a7bf0811a7a9b2d68d48e42d36cb9a5cb4ec02938b0f4c
 MISC metadata.xml 507 BLAKE2B 1e08efd32142406ac7fc4390a10f51b117bbaf56fc2006ed508bf026d2720447a782f2e86ba323017dc6388ca18e4743688eaf1a8fb7165bc6377194b4139d0b SHA512 ef8d11178dcded14cb74c49e01bedde8986ff8aa02641c275d5a36ca3973782955f90d0c25ef728ca120fc1a46f1f3965f4b5a36376203c6f6cb9b1411af52e1
diff --git a/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild b/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild
new file mode 100644
index 000000000000..27755b2b6e96
--- /dev/null
+++ b/media-libs/intel-mediasdk/intel-mediasdk-22.6.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/Intel-Media-SDK/MediaSDK"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+fi
+
+DESCRIPTION="Intel Media SDK"
+HOMEPAGE="https://github.com/Intel-Media-SDK/MediaSDK"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${PV}.tar.gz"
+	S="${WORKDIR}/MediaSDK-intel-mediasdk-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="dri test +tools wayland X"
+# Test not working at the moment
+#RESTRICT="!test? ( test )"
+RESTRICT="test"
+# Most of these flags only have an effect on the tools
+REQUIRED_USE="
+	dri? ( X )
+	wayland? ( tools )
+	X? ( tools )
+"
+
+# x11-libs/libdrm[video_cards_intel] for intel_bufmgr.h in samples
+# bug #805224
+DEPEND="
+	x11-libs/libpciaccess
+	>=media-libs/libva-intel-media-driver-${PV}
+	media-libs/libva[X?,wayland?]
+	x11-libs/libdrm[video_cards_intel]
+	wayland? (
+		dev-libs/wayland
+		dev-util/wayland-scanner
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+		-DBUILD_TUTORIALS=OFF
+		# Need to package the cm-compiler to build kernels, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_RUNTIME=ON
+		-DBUILD_DISPATCHER=ON
+		-DBUILD_TOOLS="$(usex tools)"
+		# Cannot build tools without samples
+		-DBUILD_SAMPLES="$(usex tools)"
+		-DBUILD_TESTS="$(usex test)"
+		-DENABLE_X11="$(usex X)"
+		-DENABLE_X11_DRI3="$(usex dri)"
+		-DENABLE_WAYLAND="$(usex wayland)"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 12eaffef0d23..fe0eff536fd1 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,6 @@
-DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a07d7157e0d202c4d027d13ad4563c40ea63e1d0a92675af7f23d5245be9ed137955c3a9dd85171a35d497a94b2 SHA512 08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6
 DIST mesa-22.2.5.tar.xz 16524904 BLAKE2B 5891e76e818dcd665ebac6dadbf223f382380206ec0edc85f8d9f6e298ab3126d9992fc7d4e38c12b455f21e6e40f3849b08ffaacc0cb38454b2e23c06277d36 SHA512 9039cf31e719b66a6ecea48e7f871d187333a1accd3fa77ce2cb36ce539682dd50f09bccc11a0c35760051768108699cf90dfb0936809faf1e1294cc5d1ec0af
-DIST mesa-22.3.0.tar.xz 16878600 BLAKE2B 16b11bfad509292338fc46b36e49d747e5cd43a96c753cc2a8c0b915c7b86198a30aa78c8e2bcbaa0daf8cadd79a82046cf32ee6f6e373dcc00e2fdef554bc66 SHA512 bf4d344459f97d266a5943b33aecf062b0825e13c1617afdab71c4ba6a87a201440761c9a32a6e0060910a0917122e3f4d29f666d6b94a38a71c94b9ff3ab9da
-DIST mesa-22.3.1.tar.xz 16972884 BLAKE2B 14c2b265af97cf0436c0f104c748952ae875caac3e48766e2bad70e500c8f87cd8e1483ed88d19efc44625058ee80b242501dad5c24c96450b7068946e352152 SHA512 8a7aee67f6351de293d23425229eb7c42d6918fe9ffb46c6e5df9609f79633c98ab78e892507fe48055c51fa88bf103d7b7baa58e826b1758f66067048baed5b
 DIST mesa-22.3.2.tar.xz 16988720 BLAKE2B 8fdadd77a7bcac1b0ba6955b452a89cf823650ad3296128b82471888da666a33407e6ea2784ccf3f49c04a34fecfcd6a172372828fd2200e74d7dcf97e9c5938 SHA512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f
-EBUILD mesa-22.2.3.ebuild 12662 BLAKE2B 1a59e0550ecb26c798779952f41b3778d8c5291ac82f1735f8ef34a0cf41f9f894623526f8ef6aa2df9b2d1c5caeb23dcdb907ee2292cf831b74a7743a94317d SHA512 2b67830be3e83ab1033d52d57300ab57b5aa85bede7e5f69bd94e9a517324c61abc719347f792596271e602a9057500eaa35ddd4f7d43278fb03bc4de0c4b5d9
-EBUILD mesa-22.2.5.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d
-EBUILD mesa-22.3.0.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
-EBUILD mesa-22.3.1.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
+EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B 1a59e0550ecb26c798779952f41b3778d8c5291ac82f1735f8ef34a0cf41f9f894623526f8ef6aa2df9b2d1c5caeb23dcdb907ee2292cf831b74a7743a94317d SHA512 2b67830be3e83ab1033d52d57300ab57b5aa85bede7e5f69bd94e9a517324c61abc719347f792596271e602a9057500eaa35ddd4f7d43278fb03bc4de0c4b5d9
 EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
 EBUILD mesa-9999.ebuild 12462 BLAKE2B 39bef0e3793be36b2e20f70dfebe4d6693aba98019cb60b3975301bdb31cc6e6b9c903721dc875407c78151b6eec4612f1e759571234cb53e93b2887bcc0bd11 SHA512 b73c8b2a7bbb31b11b09b8477409839cb87ba9a0102dca8116e3ffad8e1672fa2c349a82f1b63433224e4813cd8a7ad0b668444b82ba31b7b61cbc858d386c98
 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0
diff --git a/media-libs/mesa/mesa-22.2.3.ebuild b/media-libs/mesa/mesa-22.2.3.ebuild
deleted file mode 100644
index dbced9dbf5a3..000000000000
--- a/media-libs/mesa/mesa-22.2.3.ebuild
+++ /dev/null
@@ -1,476 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa xvmc zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	xvmc? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
-	)
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="15"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) )
-	vulkan-overlay? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if use xvmc; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=xvmc       since VIDEO_CARDS does not contain r600 or nouveau"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_r600 ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature xvmc gallium-xvmc))
-	else
-		emesonargs+=(-Dgallium-xvmc=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.2.5.ebuild b/media-libs/mesa/mesa-22.2.5.ebuild
index c0bc271552b9..dbced9dbf5a3 100644
--- a/media-libs/mesa/mesa-22.2.5.ebuild
+++ b/media-libs/mesa/mesa-22.2.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.3.0.ebuild b/media-libs/mesa/mesa-22.3.0.ebuild
deleted file mode 100644
index f39169af89a2..000000000000
--- a/media-libs/mesa/mesa-22.3.0.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="16"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:16[${MULTILIB_USEDEP}]
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/mesa/mesa-22.3.1.ebuild b/media-libs/mesa/mesa-22.3.1.ebuild
deleted file mode 100644
index f39169af89a2..000000000000
--- a/media-libs/mesa/mesa-22.3.1.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit llvm meson-multilib python-any-r1 linux-info
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
-	inherit git-r3
-else
-	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!test? ( test )"
-
-RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa +proprietary-codecs selinux
-	test unwind vaapi valgrind vdpau vulkan
-	vulkan-overlay wayland +X xa zink +zstd"
-
-REQUIRED_USE="
-	d3d9?   ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
-	vulkan? ( video_cards_radeonsi? ( llvm ) )
-	vulkan-overlay? ( vulkan )
-	video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
-	video_cards_radeonsi?   ( llvm )
-	xa? ( X )
-	zink? ( vulkan )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110"
-RDEPEND="
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
-	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
-	llvm? (
-		video_cards_radeonsi? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_r600? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-		video_cards_radeon? (
-			virtual/libelf:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
-	opencl? (
-				>=virtual/opencl-3[${MULTILIB_USEDEP}]
-				dev-libs/libclc
-				virtual/libelf:0=[${MULTILIB_USEDEP}]
-			)
-	vaapi? (
-		>=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
-	)
-	vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
-	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	)
-	zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-RDEPEND="${RDEPEND}
-	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="16"
-LLVM_DEPSTR="
-	|| (
-		sys-devel/llvm:16[${MULTILIB_USEDEP}]
-		sys-devel/llvm:15[${MULTILIB_USEDEP}]
-		sys-devel/llvm:14[${MULTILIB_USEDEP}]
-		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-	)
-	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
-	llvm? (
-		opencl? (
-			video_cards_r600? (
-				${CLANG_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${CLANG_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${CLANG_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${CLANG_DEPSTR}
-					)
-				)
-			)
-		)
-		!opencl? (
-			video_cards_r600? (
-				${LLVM_DEPSTR_AMDGPU}
-			)
-			!video_cards_r600? (
-				video_cards_radeonsi? (
-					${LLVM_DEPSTR_AMDGPU}
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeonsi? (
-					video_cards_radeon? (
-						${LLVM_DEPSTR_AMDGPU}
-					)
-				)
-			)
-			!video_cards_r600? (
-				!video_cards_radeon? (
-					!video_cards_radeonsi? (
-						${LLVM_DEPSTR}
-					)
-				)
-			)
-		)
-	)
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
-	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
-	valgrind? ( dev-util/valgrind )
-	wayland? ( >=dev-libs/wayland-protocols-1.24 )
-	X? (
-		x11-libs/libXrandr[${MULTILIB_USEDEP}]
-		x11-base/xorg-proto
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	opencl? (
-		>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	$(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-	vulkan? ( dev-util/glslang )
-	wayland? ( dev-util/wayland-scanner )
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
-	usr/lib*/libglapi.so.0.0.0
-	usr/lib*/libGLESv1_CM.so.1.1.0
-	usr/lib*/libGLESv2.so.2.0.0
-	usr/lib*/libGL.so.1.2.0
-	usr/lib*/libOSMesa.so.8.0.0
-	usr/lib/libGLX_mesa.so.0.0.0
-)"
-
-llvm_check_deps() {
-	local flags=${MULTILIB_USEDEP}
-	if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
-	then
-		flags+=",llvm_targets_AMDGPU(-)"
-	fi
-
-	if use opencl; then
-		has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
-	fi
-	has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
-	if use vulkan; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_freedreno &&
-		   ! use video_cards_intel &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
-		fi
-	fi
-
-	if use opencl; then
-		if ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi; then
-			ewarn "Ignoring USE=opencl     since VIDEO_CARDS does not contain r600 or radeonsi"
-		fi
-	fi
-
-	if use vaapi; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use vdpau; then
-		if ! use video_cards_d3d12 &&
-		   ! use video_cards_r300 &&
-		   ! use video_cards_r600 &&
-		   ! use video_cards_radeonsi &&
-		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
-		fi
-	fi
-
-	if use xa; then
-		if ! use video_cards_freedreno &&
-		   ! use video_cards_nouveau &&
-		   ! use video_cards_vmware; then
-			ewarn "Ignoring USE=xa         since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
-		fi
-	fi
-
-	if ! use llvm; then
-		use opencl     && ewarn "Ignoring USE=opencl     since USE does not contain llvm"
-	fi
-
-	if use osmesa && ! use llvm; then
-		ewarn "OSMesa will be slow without enabling USE=llvm"
-	fi
-}
-
-python_check_deps() {
-	python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# warning message for bug 459306
-	if use llvm && has_version sys-devel/llvm[!debug=]; then
-		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
-		ewarn "detected! This can cause problems. For details, see bug 459306."
-	fi
-
-	if use video_cards_intel ||
-	   use video_cards_radeonsi; then
-		if kernel_is -ge 5 11 3; then
-			CONFIG_CHECK="~KCMP"
-		elif kernel_is -ge 5 11; then
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		elif kernel_is -ge 5 10 20; then
-			CONFIG_CHECK="~KCMP"
-		else
-			CONFIG_CHECK="~CHECKPOINT_RESTORE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use llvm; then
-		llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local emesonargs=()
-
-	local platforms
-	use X && platforms+="x11"
-	use wayland && platforms+=",wayland"
-	emesonargs+=(-Dplatforms=${platforms#,})
-
-	if use video_cards_intel ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_use d3d9 gallium-nine))
-	else
-		emesonargs+=(-Dgallium-nine=false)
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vaapi gallium-va))
-		use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
-	else
-		emesonargs+=(-Dgallium-va=disabled)
-	fi
-
-	if use video_cards_d3d12; then
-		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
-	fi
-
-	if use video_cards_d3d12 ||
-	   use video_cards_r300 ||
-	   use video_cards_r600 ||
-	   use video_cards_radeonsi ||
-	   use video_cards_nouveau; then
-		emesonargs+=($(meson_feature vdpau gallium-vdpau))
-	else
-		emesonargs+=(-Dgallium-vdpau=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_nouveau ||
-	   use video_cards_vmware; then
-		emesonargs+=($(meson_feature xa gallium-xa))
-	else
-		emesonargs+=(-Dgallium-xa=disabled)
-	fi
-
-	if use video_cards_freedreno ||
-	   use video_cards_lima ||
-	   use video_cards_panfrost ||
-	   use video_cards_v3d ||
-	   use video_cards_vc4 ||
-	   use video_cards_vivante; then
-		gallium_enable -- kmsro
-	fi
-
-	gallium_enable -- swrast
-	gallium_enable video_cards_freedreno freedreno
-	gallium_enable video_cards_intel crocus i915 iris
-	gallium_enable video_cards_lima lima
-	gallium_enable video_cards_d3d12 d3d12
-	gallium_enable video_cards_nouveau nouveau
-	gallium_enable video_cards_panfrost panfrost
-	gallium_enable video_cards_v3d v3d
-	gallium_enable video_cards_vc4 vc4
-	gallium_enable video_cards_virgl virgl
-	gallium_enable video_cards_vivante etnaviv
-	gallium_enable video_cards_vmware svga
-	gallium_enable zink zink
-
-	gallium_enable video_cards_r300 r300
-	gallium_enable video_cards_r600 r600
-	gallium_enable video_cards_radeonsi radeonsi
-	if ! use video_cards_r300 && \
-		! use video_cards_r600; then
-		gallium_enable video_cards_radeon r300 r600
-	fi
-
-	# opencl stuff
-	emesonargs+=(
-		-Dgallium-opencl="$(usex opencl icd disabled)"
-	)
-
-	if use vulkan; then
-		vulkan_enable video_cards_freedreno freedreno
-		vulkan_enable video_cards_intel intel
-		vulkan_enable video_cards_d3d12 microsoft-experimental
-		vulkan_enable video_cards_radeonsi amd
-		vulkan_enable video_cards_v3d broadcom
-	fi
-
-	driver_list() {
-		local drivers="$(sort -u <<< "${1// /$'\n'}")"
-		echo "${drivers//$'\n'/,}"
-	}
-
-	local vulkan_layers
-	use vulkan && vulkan_layers+="device-select"
-	use vulkan-overlay && vulkan_layers+=",overlay"
-	emesonargs+=(-Dvulkan-layers=${vulkan_layers#,})
-
-	# In LLVM 16, we've switched to building LLVM with EH/RTTI disabled
-	# to match upstream defaults.  Mesa requires being built the same way.
-	# https://bugs.gentoo.org/883955
-	if [[ ${LLVM_SLOT} -ge 16 ]]; then
-		emesonargs+=(
-			-Dcpp_rtti=false
-		)
-	fi
-
-	emesonargs+=(
-		$(meson_use test build-tests)
-		-Dglx=$(usex X dri disabled)
-		-Dshared-glapi=enabled
-		-Ddri3=enabled
-		-Degl=enabled
-		-Dgbm=enabled
-		-Dglvnd=true
-		$(meson_feature gles1)
-		$(meson_feature gles2)
-		$(meson_feature llvm)
-		$(meson_feature lm-sensors lmsensors)
-		$(meson_use osmesa)
-		$(meson_use selinux)
-		$(meson_feature unwind libunwind)
-		$(meson_feature zstd)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		-Dvalgrind=$(usex valgrind auto disabled)
-		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
-		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
-		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-gallium_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		GALLIUM_DRIVERS+=("$@")
-	fi
-}
-
-vulkan_enable() {
-	if [[ $1 == -- ]] || use $1; then
-		shift
-		VULKAN_DRIVERS+=("$@")
-	fi
-}
diff --git a/media-libs/oneVPL-cpu/Manifest b/media-libs/oneVPL-cpu/Manifest
index 3ab9f22ee9c0..9b0083767acd 100644
--- a/media-libs/oneVPL-cpu/Manifest
+++ b/media-libs/oneVPL-cpu/Manifest
@@ -1,5 +1,7 @@
 AUX oneVPL-cpu-2022.2.5-respect-user-flags.patch 416 BLAKE2B c0ba2a7d75ab2d4ce93a472df09529536a141ff30563f0c6cc618a02d2766a1a88b5c3ab21fc6d02a4da6007e1b0c45df8b3c7bd206d2494200b8a835654315f SHA512 e5e7d762db4b45e84832cbee5f8e3e37e986bb0f73c07e792373c254e172fed0eb320ec58c3873aec071a51617682b0f4e2c299f701112094fec56ee74356986
 AUX oneVPL-cpu-2022.2.5-use-system-libs.patch 1884 BLAKE2B c13fecb58e2692ae53c531fe3ca4199a381f170712777d2df9f5ddd334481238f48666636dced8d39213187d9e162915b62c641d9015afe1a8326fcdcb724c88 SHA512 bffcfcc4b17145d1b1f0b608b1451d8438a77254c389ed4542c0b457b6064ad85b646605ac9cd2c176d9480aa1136412a728b172e8d2c642f8aae77ff9d18703
 DIST oneVPL-cpu-2022.2.5.tar.gz 9917180 BLAKE2B 8e0beebc226a0984474ca6822769736c78e80959bd2df9fd4a34014a31e3439cd42b9a104dfefaa70043df03834246c973e1ba29cea3a9af94a48c2b1d08edcc SHA512 e79b0f396bfcdb7156f8ec5b3008ddd813a0a01ade8e319f78afd3c9d862b111531c42a65ba19ea396b51d3e298608da271894867297dc95f51e4bcc19e9029e
+DIST oneVPL-cpu-2023.1.1.tar.gz 9917709 BLAKE2B 2e30f8e8e493b4027089031ea9434dd04e2ca4dc75d56083259077ef6f2b906c4419451592ce7d272af689c9e46f5dafe2a1552564e77a8012eb4881edc6afc2 SHA512 d294268f45dd59ebae43f3845641c39ecdea39055b9b2fb0fa660e7a3c809ba675f52a23a4cfb67b7c6e6dc0ea200aeb43d3313aeb70efa2b5027eec3d25e5f8
 EBUILD oneVPL-cpu-2022.2.5.ebuild 1350 BLAKE2B 39d7b66b53cd7f0c6a02a7f6626131adf78a176fbb270fdfd45853c99cf42655ac383feb4039d658d6ba8ff7601f0843ccac547d7116fa1e53ba98f9f05153ea SHA512 6d32c0ef1a0e77d75cc65a24c418b963be6daa2009aae32e6de92e579e81e7db302edf1ef811a0d5eea5b5474a78486b1df8d0be0aaddd812b0b36328194d45e
+EBUILD oneVPL-cpu-2023.1.1.ebuild 1355 BLAKE2B 5722d49b8a2cc4a81e9349b072605149efa1cc90cd20d73315094920f8ab504f15cf443835e872015b6e23249b6dd686110d498ca97136b25e1da2190a91d53a SHA512 4969d207a4e58b03e3fcec68b828a5bcbeb1c7618889db3682272eeb3f1e682574257214b016efe1b1e9c314519a1ee41469e26f3dc0340ae373b1d1856104c7
 MISC metadata.xml 606 BLAKE2B 470321a75d274c50d7480359081d67f9a4614549af06d0172f8211815d1d70edf73fd17ab576802294c375b7ddfff1849b63647894c7dca971e3b429236501cb SHA512 3e43d49860ee353cd16b6070ff358d3bef7ab404c55bd57f22e49e6aebf3b245930554884ecc490690512c92914fe04d40b35dbb6b339f46b5314d9e3545a92f
diff --git a/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild b/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild
new file mode 100644
index 000000000000..513675dc8a74
--- /dev/null
+++ b/media-libs/oneVPL-cpu/oneVPL-cpu-2023.1.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library CPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-cpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-cpu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT x264? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="experimental openh264 test +x264"
+REQUIRED_USE="^^ ( openh264 x264 )"
+# RESTRICT="!test? ( test )"
+# Tests fail
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/dav1d
+	media-libs/oneVPL[experimental?]
+	media-libs/svt-av1
+	media-libs/svt-hevc
+	media-video/ffmpeg
+	x264? ( media-libs/x264 )
+	openh264? ( media-libs/openh264 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2022.2.5-use-system-libs.patch"
+	"${FILESDIR}/${PN}-2022.2.5-respect-user-flags.patch"
+)
+
+src_configure() {
+	# Use system libraries
+	export VPL_BUILD_DEPENDENCIES="${ESYSROOT}/usr"
+	local mycmakeargs=(
+		-DUSE_EXPERIMENTAL_API="$(usex experimental)"
+		-DBUILD_OPENH264="$(usex openh264)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_GPL_X264="$(usex x264)"
+		# Use FHS instead
+		-DUSE_ONEAPI_INSTALL_LAYOUT=NO
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove these license files
+	rm -r "${ED}/usr/share/oneVPL-cpu/licensing" || die
+}
diff --git a/media-libs/oneVPL-intel-gpu/Manifest b/media-libs/oneVPL-intel-gpu/Manifest
index 46bc3750ef23..6a5f80144cdb 100644
--- a/media-libs/oneVPL-intel-gpu/Manifest
+++ b/media-libs/oneVPL-intel-gpu/Manifest
@@ -1,3 +1,5 @@
 DIST oneVPL-intel-gpu-22.6.3.tar.gz 6819100 BLAKE2B 9c87c41c072b7e7ef2dd8adcc6843eea564582f4070d452babb6b1eeadc13eb12dbe2e9d6075821954b7f7194f2ed814d3c1f6463c3b078912ee42cd684d1277 SHA512 56b29513142dc434732e646e3ec3e8d60db542f3be315190b06e9b532e4aef98423be9a0b6f35e65489085786446ecbd1c1774d06bea7552aaa7fb71517f4fb9
+DIST oneVPL-intel-gpu-22.6.4.tar.gz 6820037 BLAKE2B 0e91c91e31fbab69468f4ef351e6674551c02a7a42099b17b3e8fee07a2b8a1ea5884b2becee78d406cf881b3199a6b9823b690334dfd087b7e589309b382d17 SHA512 6d8c144e7efa0f900fab282fceb2d9f58e68212ed71c0e70ce3b9098f7dfba9f441d0ac181082387d254fcf171ef35746ac72edd7351a8065d0fd0f98e4b8ed6
 EBUILD oneVPL-intel-gpu-22.6.3.ebuild 1184 BLAKE2B 38714a7bf7d4c044540652f430378aa6930b65e7eab925941be748e1547519f78ee44b54a7c677e7325ccbe107bd04dd5a811d04c1a009cff3e27469ac03187a SHA512 1758be8b6e3ea52d174148df81a5970e4ccc2782ada6b03ea272eb7874c5b9956ef6b85110816378b0c780cc4805b19d0fec7d15c3c08b2ea36f9b7e3ce99d51
+EBUILD oneVPL-intel-gpu-22.6.4.ebuild 1189 BLAKE2B 8a6ed3716eb86c59cafe38febd015d9d66ed96f7db2397f9b3cf97283ed367d8d3ff49a764f97a0f59b831611576792df1398bd29d1cc740be7e0e6ccad8f62a SHA512 92c6095b06adfb4d3e697c8a2958d2afa9b5a50d13c1c16b870540be3356006a81913db012afbc8f5f9e0db96c29b95da6c547e9b9613666bbcdf932b33574db
 MISC metadata.xml 434 BLAKE2B f5f6ea2e0ebac9ba06ebdb2a8469e99171f25ad08d8e992695e7d189f5c3f8fb3e966d710fe02cbd1f590f2137e265d9bf5014f0d9e7a492574b526360d70133 SHA512 713bf6044fd4d5606568af248dc0adf1a93c5917fb7d6d79c7a033a5b52a0164769b02086caa0a4492979c586511b5a4d7b85fe603ffe80d4884786e05dc520e
diff --git a/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild
new file mode 100644
index 000000000000..1f7c7bcb5019
--- /dev/null
+++ b/media-libs/oneVPL-intel-gpu/oneVPL-intel-gpu-22.6.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="oneAPI Video Processing Library Intel GPU implementation"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL-intel-gpu"
+SRC_URI="https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-onevpl-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	media-libs/libva
+	x11-libs/libdrm[video_cards_intel]
+"
+# At runtime we need a dispatcher, oneVPL is preferred but mediasdk also works
+RDEPEND="${DEPEND}
+	>=media-libs/libva-intel-media-driver-${PV}
+	|| (
+		media-libs/oneVPL[drm,vaapi]
+		media-libs/intel-mediasdk
+	)
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_RUNTIME=ON
+		# To build the kernels we need to package the cm-compiler, use pre-built instead
+		-DBUILD_KERNELS=OFF
+		-DBUILD_TESTS="$(usex test)"
+		# This only seems to do something if we BUILD_KERNELS=ON
+		#-DBUILD_TOOLS="$(usex tools)"
+		# OpenCL only has an effect if we build kernels
+		-DENABLE_OPENCL=OFF
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/oneVPL/Manifest b/media-libs/oneVPL/Manifest
index cd01742ca98d..b973cc84a946 100644
--- a/media-libs/oneVPL/Manifest
+++ b/media-libs/oneVPL/Manifest
@@ -1,3 +1,5 @@
 DIST oneVPL-2022.2.5.tar.gz 6517210 BLAKE2B 1da487e9a4fbaa171f14213d0828c7dbed91d1f92d9641f10d9ef8fc895b4d51b33f80485b16e41e2cb15cd8d771f5c5f84370268cb2c347dc8e19d90d91a759 SHA512 7d100a347a109720f37d86c6dd86c216a75e77b9f032f5c066835fb5a3c7c7312bca81ffd3a30836c59d20e10863567788a247b4daa57721b3ba011c4e0cd34d
+DIST oneVPL-2023.1.1.tar.gz 6346209 BLAKE2B 043064fb5781ec0f23cbc2eedb5371bdd1718ae862bd9ae492529ab501b034d2a8d5c4814c5ce219bd15894bc6139dd3b2bef7c7ac4b8a5e9cd37502f022faf8 SHA512 a3df5ebafd748a887cb581525d07af930d3e3b4930d5d2adc5bc2629e385d1802b3315b8f02a3c66956a3dbb46b008e680687ebf125b344a34e86b9cc0910faa
 EBUILD oneVPL-2022.2.5.ebuild 2131 BLAKE2B 99803b725c8b0b69626062f78b1bad90f70264588962931b54fb1285ac4a39b4d14edbc9d3873dc171891cadb9ee3bf39fc3fa8f78d6c38501a68a2998aab280 SHA512 373c1a9b2f0649d0a6db77066ea72126ef7224373558245efdeec70925242d96ed21ad30b29c310459436b3aaed1c7b7ac6d256d549bcefefbcef84026f7f58c
+EBUILD oneVPL-2023.1.1.ebuild 2146 BLAKE2B c6e3e3ecae998581833b70616d81354e54d32869379632293d3c1a29e5e7ff8465ad98b14332ab9d2db6d92693ad4dc322858a71ef487e059f7c36187b9e9447 SHA512 e77ed4ba01e53f7055264f32c88455e6b87e931735dfbb94560e685fedb3ef913fec63fdc29d53346fce044f08247af300d46b58f8002e3603cbaa28e98f0c3c
 MISC metadata.xml 633 BLAKE2B b53305f7c1127190352b5ba25b43411455eba014b85a2305abe07571c2d95c6e1a60b1f1872895b94b7e6292178966c5b3733d7c8b5b9d1c16925f153d60e00d SHA512 a1dcf8c3fe13311bd81d48c3afd76de850b7fc395ae89e2f5973811525e56e69c12de2c83ce8e25971ab4330ed80ba4794051e5826c271f62b86116bc520d81a
diff --git a/media-libs/oneVPL/oneVPL-2023.1.1.ebuild b/media-libs/oneVPL/oneVPL-2023.1.1.ebuild
new file mode 100644
index 000000000000..223184c18698
--- /dev/null
+++ b/media-libs/oneVPL/oneVPL-2023.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake optfeature
+
+DESCRIPTION="oneAPI Video Processing Library, dispatcher, tools, and examples"
+HOMEPAGE="https://github.com/oneapi-src/oneVPL"
+SRC_URI="https://github.com/oneapi-src/oneVPL/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="dri drm examples experimental +tools test vaapi wayland X"
+RESTRICT="!test? ( test )"
+# Most of these flags only have an effect on the tools
+REQUIRED_USE="
+	dri? ( X drm )
+	drm? ( tools )
+	X? ( tools vaapi )
+	wayland? ( tools drm )
+	vaapi? ( tools )
+"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	x11-libs/libpciaccess
+	vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] )
+	drm? ( x11-libs/libdrm )
+	wayland? (
+		dev-libs/wayland
+		dev-libs/wayland-protocols
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_DISPATCHER=ON
+		# Headers, cmake and pkgconfig files
+		-DBUILD_DEV=ON
+		-DBUILD_EXAMPLES="$(usex examples)"
+		-DINSTALL_EXAMPLE_CODE="$(usex examples)"
+		-DBUILD_PREVIEW="$(usex experimental)"
+		-DBUILD_DISPATCHER_ONEVPL_EXPERIMENTAL="$(usex experimental)"
+		# Fails to build with experimental tools off if tools on
+		-DBUILD_TOOLS_ONEVPL_EXPERIMENTAL="$(usex tools)"
+		-DBUILD_TESTS="$(usex test)"
+		-DBUILD_TOOLS="$(usex tools)"
+		-DENABLE_WAYLAND="$(usex wayland)"
+		-DENABLE_X11="$(usex X)"
+		-DENABLE_DRI3="$(usex dri)"
+		-DENABLE_VA="$(usex vaapi)"
+		-DENABLE_DRM="$(usex drm)"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# Remove these license files
+	rm -r "${ED}/usr/share/vpl/licensing" || die
+}
+
+pkg_postinst() {
+	optfeature_header "This package provides only the dispatcher, to use it install one or more implementations"
+	optfeature "CPUs" media-libs/oneVPL-cpu
+	optfeature "Intel GPUs newer then, and including, Intel Xe" media-libs/oneVPL-intel-gpu
+	optfeature "Intel GPUs older then Intel Xe" media-libs/intel-mediasdk
+}
diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index 4da67f46c706..4f723e402dfe 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -11,6 +11,6 @@ AUX raspberrypi-userland-pkgconf-arm64.patch 1453 BLAKE2B 42dae98ead22bf8c37adae
 DIST raspberrypi-userland-0_pre20160424.tar.gz 32933952 BLAKE2B 4a2d40200a6a4d673be277a0958f768342a2777c28b14b4c7fcac1dbc9c59f2ef2485234f11fbd228aea6bbcf4982a3fd1d4825268af60be91665ea6fee6922d SHA512 04a71837b1247ecbbe479b3b09b5705638a9e576dc99a1ab2200727509195a4a2f2a9b184e3c23ce3933a3236b260afc8bd2b75bc218567b386445bdd8208a5b
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32958590 BLAKE2B 01733a24822d80c5bf9aa3e0feefc3e9437390a465d7a4184d0a9c6a68446e91515d3d6d398ff516d9fd1bdcd4a885512d358a4ed1d24d9b94bdc72d81db84d3 SHA512 1813224068b8a8e569c874a8ffb354f1ac86e95b482caaad18b9703a187baaea60f1f87dfbb0c7e4b3cb2eb875abbcc82aedba410646a3c1df0208bd73aaf9f9
 EBUILD raspberrypi-userland-0_pre20160424.ebuild 3301 BLAKE2B e161b79ed582cd8a2e296240ab69a4e93d35db235b4b1bc362a00fdc2bd08a7fe2667297ec088f7769d0e94c66bd4dacc70dede2700f1f4e5d326810e032c828 SHA512 f74586db6a6a0790f29a2007fc2e6abd8892df6024c83ad71d21757e9f3d490b8f6643c255c60a4d617cc53c0d1d2193fd5a78dbbf5ec165b97c87df7ae87574
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 2196 BLAKE2B 642b00c7d84402d89b221b1cb3cbad841967564b65a647ac22335e0ecaabad2855d9360c4a0b03d9aff5a934d33a0b94ae3d2bd7e9507993dfc3ac63aded398a SHA512 5f55c812d3157038c07290bc6fa1ab6e5b599f597035a8d4002773204b9b70337a850cfcc112ac449860074435b4a080bb6086af886fae0c02fa16b0ea476428
-EBUILD raspberrypi-userland-9999.ebuild 2198 BLAKE2B b319169a6cb94cfae89bdbe11814a59e61127bfd3919a3ef55c946fb87bee93b946ce5bc52d717cf63d6785b8487b53ce276643a176f30676ea8cd2fb2008379 SHA512 71e2caf3c5791eeb42b330a3f47050afed43abff461bb295f24a378c41446842431c03305d81f1f0784e631cb8d23949c58233c8c25820fb013ceefe86532dc5
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 2202 BLAKE2B c06468662e378695c8b2440af7445e61c794e9b702f99b5a5c315eea0f8d3a313ccae61abc6c3f7fb129b59dd6a07900702fa2b4d08c2c41127ca00b82358e38 SHA512 104808aed7cd1cc35b7e61e3a304b9ab4e66c759756cf022be80f4dcdc4d8d6cd7dbd7501671161493e25f5bd9483141a19673bf47d9723c6f2e73ca06a1f4f7
+EBUILD raspberrypi-userland-9999.ebuild 2204 BLAKE2B 259252104160364565b2dff655e10670b4ed82282af72b16212ee1eccfb1d5b42431c5533e324e1d71ebf21e109f72dc68aab9f331f7bebb198cd081a2ef1be6 SHA512 bc1dd67bbe72f4da1625640fc657dd6b893a0e464138a65fd07836e02a46f2ef85e7baf0a5657373fb60f1748424309cf48a09674c33396286ef3701f7f6beeb
 MISC metadata.xml 352 BLAKE2B 4824c9e6ed48717baa59e11b0efe49446163a2371964c4062d8797da53f842c9bd8e1f2c2717f6d8a2541ef26bbe9ada9fbe1a1a04bb7bc31cf96153dab63465 SHA512 56890e790e423f487613ec16aa317463f459d6400b81d09d826c2a96524e05cb6a27b16f4f664e4c0880d790cd69fcd12bcb2ff02c5eca5995055e3a295beb0b
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index 112896ef1dde..b4ce5bc37dc1 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ src_prepare() {
 src_configure() {
 	append-ldflags $(no-as-needed)
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DARM64=$(usex arm64)
 	)
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index f05820d71ac0..b7827907a660 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,7 @@ src_prepare() {
 src_configure() {
 	append-ldflags $(no-as-needed)
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVMCS_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DARM64=$(usex arm64)
 	)
diff --git a/media-libs/rtmidi/Manifest b/media-libs/rtmidi/Manifest
index 73601a1cb434..5a58cef82169 100644
--- a/media-libs/rtmidi/Manifest
+++ b/media-libs/rtmidi/Manifest
@@ -1,3 +1,3 @@
 DIST rtmidi-5.0.0.tar.gz 528747 BLAKE2B 7bc8f5d9109cf1fb81ced4ff3afb4a7a42200d7458315c7b33cf966c856ca13959a9ce99012eadf05f65ec1bb93d41b8d2b7c9c66082badb7598c519a7fe2531 SHA512 d2688b6777c09c213e1f6800c67bca6905ac9a0161480e7c167583322a64be086bb47f1452cc45d4a4e2c1d3d3fe626d57b4a187e79c0a20af4f6e23d4a3530a
-EBUILD rtmidi-5.0.0.ebuild 625 BLAKE2B dfa5e7823bd68085a01809b04fa40e07886c88cbd2a1267cb685a3674080bb2a343339cf0e87af95c33d37a678432c293938ddf20a6c37bee569f0301c2f2857 SHA512 2cd0970f68730773ed3dff434ee283a807d210670edda84cbd30811e4a17402c12ccf6abc06c2d851ce27da70befae048b59870ece8576879fee5dcf27a91456
+EBUILD rtmidi-5.0.0.ebuild 631 BLAKE2B 581b139d52e14f2eede673b7bc246628ca830c2a7f200af41030e74da1cf26e2a6bf57614b9b71f26f596a817c90769a0ffeb153a51cf042ed2e4ab423799d0b SHA512 dd1941787f02bfcdabe6a46c77f5d1bba10a21af669c3fd8c737eaf0e9ada88721b6071baf19e00fc98733e1cdd7a73ca181edab012f027ac92520c4544c7b6c
 MISC metadata.xml 685 BLAKE2B 20a22f4c40cd51230f13c0cc46a9237bf49a326d4fada0060d42c8cf6ddc17b58517a3df82a19c491045c4d81705522871dff9af7b1fe9a4ef3e18fd8bde51f8 SHA512 dbba9fe55711732149801c6dd4a15685215507f23a080ce2be060b1dc48c6da18adc23de611dbfade2b64afde25703a6e460ab2c2b403450829d3982374507f2
diff --git a/media-libs/rtmidi/rtmidi-5.0.0.ebuild b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
index 1689276e2d89..b7bef58e8518 100644
--- a/media-libs/rtmidi/rtmidi-5.0.0.ebuild
+++ b/media-libs/rtmidi/rtmidi-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DRTMIDI_API_ALSA=$(usex alsa)
 		-DRTMIDI_API_JACK=$(usex jack)
 	)
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ab4d80f27922..8510c5213bbf 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/obs-v4l2sink/Manifest b/media-video/obs-v4l2sink/Manifest
index a676dac604fa..91db5e4cafb4 100644
--- a/media-video/obs-v4l2sink/Manifest
+++ b/media-video/obs-v4l2sink/Manifest
@@ -1,4 +1,4 @@
 AUX obs-v4l2sink-0.1.0_p20181012-installdirs.patch 676 BLAKE2B acc766c095bc7c3e6b430f4d3da5d5f8ca4fd8317128271ffc63e137dcbca70a466a18ca43c96c6c028b95006e1d861c92056b5e7b05604d48302dc8a4ab5457 SHA512 30c5753eb5335bd13da05f80526b2c634d7f548c126e50efb87c9ac698042f0f00a2b72f3913f4586015f809b0ddf1800cc6334dadb10b1098f148853e00681d
 DIST obs-v4l2sink-0.1.0_p20181012.tar.gz 21392 BLAKE2B 7f024a89c900588a4b3a45d598622e05d25b2eabbd007d5ce701d82ab935fa5a267faaf903925ec19e74071b5f4d32a5f39c810d181c97ea047060bfa69c145c SHA512 c64cff7feff7722e8cfd66f92daa46d8cb189da5adc50dabddd21baaa97e033611b94f1dafb9a9ad9a58504930fb40e05d7e5a4d128ee703b60993be7edc063c
-EBUILD obs-v4l2sink-0.1.0_p20181012-r2.ebuild 950 BLAKE2B f782a31611d44763f20076e8f24da8f76a0f56a4d26d89a273cf71bd2c813abfe9a03bc6db2dbf8147b0c69956df8cd206c25fe1d34b1b0ea853830e5d25dda3 SHA512 ad43125ae2b8633ab7f8f85ee7a599f1f2ee4584abaf5698489a1b6028165f3e2b490d68f9e8778f823e7d005e6890912038bc37c6f0273c144aac6531126d4a
+EBUILD obs-v4l2sink-0.1.0_p20181012-r2.ebuild 961 BLAKE2B 3b98493cfe3f6e40389f9d66b93070d94b1aa40e502346340c94f8c36e7c84f2806324274520529c88d95c8b52a604910f5d08fd5c70dafd914f5fd87eb03d17 SHA512 412cf000f4c942832c14ddc2d924ede3758315994fbcf9bcfc4832c162a9096eb3f5cc8edd04cfe2209a1707e7acbb27e277d0cee3e2a3f13a72b3685a416217
 MISC metadata.xml 344 BLAKE2B 12b51b9e374d2d363b7a8685ad1e609322fc5bf3eaa633625d7cbc0c6ee2782bce43c1a04419b32fb50fec3a4976526806c563bcf2d7e813dee2fbdef8501bd0 SHA512 62033d1d4aa45075c0080ae420d9faabe67d2c3fbe139d69172e84f1416f662af12ab1b6f6a5f33ebe03485fc46f25640df26f1c8c6f3110fc55156c83ff9b43
diff --git a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
index 4b4f0cc3d8fb..41cb4b07deae 100644
--- a/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
+++ b/media-video/obs-v4l2sink/obs-v4l2sink-0.1.0_p20181012-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DLIBOBS_INCLUDE_DIR="/usr/include/obs/"
 	)
 	cmake_src_configure
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 0d56652db75d..db9aa1acf021 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f455de4001ae..3956af1743ad 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jan 2023 13:39:54 +0000
+Tue, 03 Jan 2023 19:39:53 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 134daafc07a7..11a2ba0858ce 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 538785 BLAKE2B a42e589b6c2be5ab4486b79822a326a12b3725dbc28e32cbb116cd453b6899511ab2026524f136171407f678f9acafd852f1a2a245b8caed5bad581d2eb86337 SHA512 8ff81ddfe9cd2569ab4fe6eabe9daf23f1f66918aba5cae55ff8241b2bb330fac90cb5595df81455bfa98b51ed1c6e965c73508fe1b662e752525e3e27b52956
-TIMESTAMP 2023-01-03T13:39:57Z
+TIMESTAMP 2023-01-03T19:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0MC1fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0hIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAhtw/9ED4E7jGTptalX1RByi+in2q+kNNFX7zYuRpjiCahIcYsiCSAKtsT/IMo
-DCyaOPxyg+fPa/P+rBx/1Cmes3RHAgsZX7QqcIo0Zdvj5Sd88r9E4i/PO2cjUKlW
-z9lcyd0e6ahqF2ewBwabVdqcC9VU52e8I6PC/VH4HU00OTa5q6eroTC7edLrATcG
-oaqPlfbDM9PWClysqY8oSD8Be7O86xpZWOqY8O/X8SGWurNbjyoHa4O84QrIGjn8
-Pif4fA8QWd5UrZU+uJ8OEQxfmRZ11mZIoibtmQYOb4/HBACSCfRN/XbrxogSql2B
-uJbgVHeVxirAy+L4jlyf6prj8pTIXeXOYZZwLt7EKvvyAoN5jlZBKSeyLxoVJCQI
-cxHDhrFOHq0CEkL0246Y5Ud0gUhIz9xhSm2tojg+GLqazjDWcR6o8T9aaW8sKqkq
-imwS7udVFlvkbzholCydlz24TUswp/uWZf+F9WaxN3L2og07P7wRxOKd7iCDQ8oN
-hDlQ6aIVg/v/iV8GtmSMWZFNKNpeqDoiG94i1X1WbELRUvf2QOJC7Ws0VTyYkLDv
-VfDgo//7KT6EcDytbOqYMvQ9YEP6MLkoMwrJ4dhOPxeuZ0SOLg2i7Sp3k0aNQeKL
-Mbx5iFSTao6eTdho5/SawamihtwWWJy2tgnLDOX0y40JZoClQFE=
-=FOel
+klBzyRAAlN6jCgo9e14d1TtczS4P3FdGdbF9btsmHgsmxRKIuacDZO5FQTcfxCZO
+oTUZ03UmBPTy7Y2WVYcFmT0jpvo9mHpmkKWvIehFBk34iltR+47xkcBpMQ+5QCQG
+vYG3giWYwzvQaHTFkiTrGVhWJU3v6VUIpguW9Fd+EeeAco05b3dY/PNgjeDpHvgX
+V11rYh5l111bUqoTWCjuzK5VI1DOcdjo0UmRAg9nHCaEMwGWUdqXtp1SVouxt78b
+/Ov7eKPpeQwDOFdP1vtmILnQAv4dOb0UpTEmjLyngdVz5UhjhOCe6qeHhzGun5DS
+b9xxKt742Pe5PfR7T0ddU/KEuevkJVExyH6fYwfu9eAeWa2+qLF+DN8V+nTSI3oX
+rb4mM8t3Ew2a7TZKnOvVHd0nQB0a5/juIH1YKSIAqmmN43OwRCpuJLU7CZMnysym
+ZJLzns9phbiBVoUd1+CWSRfuEN+LQ7yrrvn1X2rxbazP0AoShh38EkRJLRIN/EVB
+E5acYgVODHTdnbGAi+kW9CAh4H3O1btm39EkjIKdmaeIVJDLEdxg5vJtfJYlzMwY
+qqvq4d3Jnq2W2nUmqkS1isnN2LSD0M3vqt4IP/ZPRMOLg/BfH5WkJeE3qolw/Hms
+Uvr3JuZOrZa0xXlWUQ/sFdK8VYijogMCd5gpe8pNQ2yg7Y2pJJ8=
+=I9wy
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f455de4001ae..3956af1743ad 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jan 2023 13:39:54 +0000
+Tue, 03 Jan 2023 19:39:53 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index a77e8a350841..ec0bee7af536 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 02ad6a78b1de..3a8a36974308 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/conky-1.13.1 b/metadata/md5-cache/app-admin/conky-1.13.1
index 949aac584cd2..914476823a4b 100644
--- a/metadata/md5-cache/app-admin/conky-1.13.1
+++ b/metadata/md5-cache/app-admin/conky-1.13.1
@@ -14,4 +14,4 @@ REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundle
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.13.1.tar.gz -> conky-1.13.1.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8d797f65eca97cdcc5fabe29cf81389c
+_md5_=0993e542792ab23e6cef5393918c2f56
diff --git a/metadata/md5-cache/app-admin/conky-1.15.0 b/metadata/md5-cache/app-admin/conky-1.15.0
index 9aa435b9c1b9..f5c27f26ec99 100644
--- a/metadata/md5-cache/app-admin/conky-1.15.0
+++ b/metadata/md5-cache/app-admin/conky-1.15.0
@@ -14,4 +14,4 @@ REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundle
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.15.0.tar.gz -> conky-1.15.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3f098ee79b86c8373865b423b5c8f7bb
+_md5_=709696909cb319baf029f9670a0ad90a
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index e148d11e924e..c7aaaf23178d 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/file-roller-3.42.0 b/metadata/md5-cache/app-arch/file-roller-3.42.0
deleted file mode 100644
index ec352e90af85..000000000000
--- a/metadata/md5-cache/app-arch/file-roller-3.42.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-util/glib-utils dev-util/itstool >=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 prepare setup test
-DEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.0:1 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
-DESCRIPTION=Archive manager for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-IUSE=libnotify nautilus
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.0:1 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/file-roller/3.42/file-roller-3.42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1b336e3b080f55a0e0c331f3398d1d9a
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index e7bef543f5d1..f7a4eda5901b 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/containerd-1.6.14 b/metadata/md5-cache/app-containers/containerd-1.6.14
index 88b99f4bdbbc..24076d148bfe 100644
--- a/metadata/md5-cache/app-containers/containerd-1.6.14
+++ b/metadata/md5-cache/app-containers/containerd-1.6.14
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://containerd.io/
 INHERIT=go-module systemd
 IUSE=apparmor btrfs device-mapper +cri hardened +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp ) ~app-containers/runc-1.1.4
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/v1.6.14.tar.gz -> containerd-1.6.14.tar.gz https://dev.gentoo.org/~williamh/dist/containerd-1.6.14-deps.tar.xz
 _eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5995ce47bb5e1b32bcc31f9a6fb6bded
+_md5_=23ce7b80711f8e16cc14eae0e7c1d785
diff --git a/metadata/md5-cache/app-containers/docker-20.10.22 b/metadata/md5-cache/app-containers/docker-20.10.22
new file mode 100644
index 000000000000..c84d32406f62
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-20.10.22
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16.12 dev-go/go-md2man virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst postrm setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=linux-info systemd udev golang-vcs-snapshot
+IUSE=apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp selinux
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-containers/containerd-1.6.6[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-containers/docker-proxy-0.8.0_p20220601 cli? ( ~app-containers/docker-cli-20.10.22 ) container-init? ( >=sys-process/tini-0.19.0[static] ) selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/moby/moby/archive/v20.10.22.tar.gz -> docker-20.10.22.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=15e45760273dfb5c16061292764f3089
diff --git a/metadata/md5-cache/app-containers/docker-cli-20.10.22 b/metadata/md5-cache/app-containers/docker-cli-20.10.22
new file mode 100644
index 000000000000..36545c807fc0
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-cli-20.10.22
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16.6 dev-go/go-md2man >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=the command line binary for docker
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=bash-completion-r1 golang-vcs-snapshot
+IUSE=hardened selinux
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=!<app-containers/docker-20.10.1 selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/docker/cli/archive/v20.10.22.tar.gz -> docker-cli-20.10.22.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=b494c0e281f8a3ba89f88ea784942707
diff --git a/metadata/md5-cache/app-containers/runc-1.1.4 b/metadata/md5-cache/app-containers/runc-1.1.4
index 67de8822fc6c..1d489e43e6b1 100644
--- a/metadata/md5-cache/app-containers/runc-1.1.4
+++ b/metadata/md5-cache/app-containers/runc-1.1.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://github.com/opencontainers/runc/
 INHERIT=go-module linux-info
 IUSE=apparmor hardened +kmem +seccomp selinux test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 ~riscv ~x86
 LICENSE=Apache-2.0 BSD-2 BSD MIT
 RDEPEND=seccomp? ( sys-libs/libseccomp ) !app-emulation/docker-runc apparmor? ( sys-libs/libapparmor ) selinux? ( sec-policy/selinux-container )
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/v1.1.4.tar.gz -> runc-1.1.4.tar.gz
 _eclasses_=go-module	4c4b34f361efda91762ffeda8f632c02	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c028f5df5496c71064a17ef5dcf3bf6b
+_md5_=27d5889d5338df4542cc93a47787c018
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 0a53b43f57a0..f8cc3923a53f 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gcr-3.41.1 b/metadata/md5-cache/app-crypt/gcr-3.41.1
deleted file mode 100644
index ad059fba1e81..000000000000
--- a/metadata/md5-cache/app-crypt/gcr-3.41.1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) gtk? ( dev-libs/libxml2:2 ) dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gi-docgen ) >=sys-devel/gettext-0.19.8 test? ( app-crypt/gnupg ) 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=>=dev-libs/glib-2.44.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=app-crypt/p11-kit-0.19.0 >=app-crypt/libsecret-0.20 systemd? ( sys-apps/systemd:= ) gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] ) >=sys-apps/dbus-1 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-DESCRIPTION=Libraries for cryptographic UIs and accessing PKCS#11 modules
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gcr
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=gtk gtk-doc +introspection systemd test +vala
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=app-crypt/gnupg
-RDEPEND=>=dev-libs/glib-2.44.0:2 >=dev-libs/libgcrypt-1.2.2:0= >=app-crypt/p11-kit-0.19.0 >=app-crypt/libsecret-0.20 systemd? ( sys-apps/systemd:= ) gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] ) >=sys-apps/dbus-1 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gcr/3.41/gcr-3.41.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=623e826ab89a39bdc9f9281713d4cef3
diff --git a/metadata/md5-cache/app-crypt/seahorse-42.0-r1 b/metadata/md5-cache/app-crypt/seahorse-42.0-r1
deleted file mode 100644
index a1fdaf4accf8..000000000000
--- a/metadata/md5-cache/app-crypt/seahorse-42.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=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 prepare setup test
-DEPEND=>=dev-libs/glib-2.66:2 >=app-crypt/gcr-3.38:0= >=app-crypt/gpgme-1.14.0:= >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.6:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] ) || ( dev-lang/vala:0.56 ) dev-libs/libxml2:2 app-crypt/gcr:0[vala] app-crypt/libsecret[vala] gui-libs/libhandy:1[vala]
-DESCRIPTION=Manage your passwords and encryption keys
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=ldap zeroconf
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.66:2 >=app-crypt/gcr-3.38:0= >=app-crypt/gpgme-1.14.0:= >=x11-libs/gtk+-3.24.0:3 >=app-crypt/gnupg-2.2 >=gui-libs/libhandy-1.6:1= >=app-crypt/libsecret-0.16 dev-libs/libpwquality net-misc/openssh ldap? ( net-nds/openldap:= ) >=net-libs/libsoup-2.33.92:2.4 zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-SLOT=0
-SRC_URI=mirror://gnome/sources/seahorse/42/seahorse-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=da97ef1c83e47f8c9be86c962ead23fa
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 035f20603496..981d69afdd1e 100644
--- a/metadata/md5-cache/app-dicts/Manifest.gz
+++ b/metadata/md5-cache/app-dicts/Manifest.gz
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20230101 b/metadata/md5-cache/app-dicts/myspell-en-20230101
new file mode 100644
index 000000000000..c15d157a9001
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-en-20230101
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=English dictionaries for myspell/hunspell
+EAPI=8
+HOMEPAGE=https://extensions.libreoffice.org/extensions/english-dictionaries https://proofingtoolgui.org https://github.com/marcoagpinto/aoo-mozilla-en-dict
+INHERIT=myspell-r2
+IUSE=+l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD MIT LGPL-3+
+REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA )
+SLOT=0
+SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/1672590731/dict-en-20230101_lo.oxt
+_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
+_md5_=c37d924fede373f671cc8673660efd32
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 900d90205d8d..68de78fe22d9 100644
--- a/metadata/md5-cache/app-doc/Manifest.gz
+++ b/metadata/md5-cache/app-doc/Manifest.gz
diff --git a/metadata/md5-cache/app-doc/jargon-4.4.7-r2 b/metadata/md5-cache/app-doc/jargon-4.4.7-r2
index 96e43653e9a2..98131ef1f171 100644
--- a/metadata/md5-cache/app-doc/jargon-4.4.7-r2
+++ b/metadata/md5-cache/app-doc/jargon-4.4.7-r2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=A compendium of hacker slang illuminating many aspects of hackish tradition
 EAPI=8
 HOMEPAGE=http://www.catb.org/jargon/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.catb.org/jargon/jargon-4.4.7.tar.gz
-_md5_=3de81ad271a4bd26f795b76fa3e0e13c
+_md5_=25b7d82517b8dc8df7507b7ac22b08c4
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 04232ee505a6..9003281dccb8 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gedit-42.2 b/metadata/md5-cache/app-editors/gedit-42.2
deleted file mode 100644
index cdbd53ac6b26..000000000000
--- a/metadata/md5-cache/app-editors/gedit-42.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 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 prepare setup test
-DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) )
-DESCRIPTION=A text editor for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
-IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gedit/42/gedit-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a73914fa94389e706fb7149bdb6ac599
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-42.1 b/metadata/md5-cache/app-editors/gedit-plugins-42.1
deleted file mode 100644
index 0ac2ae00611f..000000000000
--- a/metadata/md5-cache/app-editors/gedit-plugins-42.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2 dev-util/itstool >=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=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[python,python_single_target_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] >=dev-python/dbus-python-0.82[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-DESCRIPTION=Collection of extra plugins for the gedit Text Editor
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
-IUSE=charmap git +python terminal vala python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[python,python_single_target_python3_11(-)] dev-libs/libpeas[python,python_single_target_python3_11(-)] >=dev-python/dbus-python-0.82[python_targets_python3_11(-)] dev-python/pycairo[python_targets_python3_11(-)] dev-python/pygobject:3[cairo,python_targets_python3_11(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
-REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) terminal? ( python )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gedit-plugins/42/gedit-plugins-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6bc81d86fec51dcd519c72da410d6a0d
diff --git a/metadata/md5-cache/app-editors/gnome-latex-3.40.0 b/metadata/md5-cache/app-editors/gnome-latex-3.40.0
deleted file mode 100644
index 75106a0ae498..000000000000
--- a/metadata/md5-cache/app-editors/gnome-latex-3.40.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/gspell-1.8:0= >=dev-libs/glib-2.56:2 >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0:4 >=gui-libs/amtk-5.2:5 >=gui-libs/tepl-6.0.1:6 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnome-base/dconf
-DESCRIPTION=Integrated LaTeX environment for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/GNOME-LaTeX https://gitlab.gnome.org/swilmet/gnome-latex
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=+introspection +latexmk rubber
-KEYWORDS=amd64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=app-text/gspell-1.8:0= >=dev-libs/glib-2.56:2 >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0:4 >=gui-libs/amtk-5.2:5 >=gui-libs/tepl-6.0.1:6 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnome-base/dconf virtual/latex-base x11-themes/hicolor-icon-theme latexmk? ( dev-tex/latexmk ) rubber? ( dev-tex/rubber )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-latex/3.40/gnome-latex-3.40.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=10377ca8b95880bba235f97d1808dd08
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e62ab9ea38c7..ab1edd618118 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/boxquote-2.3 b/metadata/md5-cache/app-emacs/boxquote-2.3
index 183bafd50829..0c9d9244c86a 100644
--- a/metadata/md5-cache/app-emacs/boxquote-2.3
+++ b/metadata/md5-cache/app-emacs/boxquote-2.3
@@ -4,10 +4,10 @@ DESCRIPTION=Quote text with a semi-box
 EAPI=8
 HOMEPAGE=http://www.davep.org/emacs/
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/davep/boxquote.el/archive/v2.3.tar.gz -> boxquote-2.3.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=7f55d769161ab0d61b56819394c3cf1d
+_md5_=8da56de05664c5971a3d0c7975103cea
diff --git a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2 b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
index 9e22b9c56aab..6c7bdbaed2f4 100644
--- a/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
+++ b/metadata/md5-cache/app-emacs/company-ebuild-0.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Company backend for editing Ebuild files
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/company-ebuild.git
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=~amd64 x86 ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=app-emacs/company-mode app-emacs/ebuild-mode >=app-editors/emacs-26.2:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/company-ebuild.git/snapshot/company-ebuild-0.1.2.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=2d12f1b18d7c0b432b8f593d3179cbb3
+_md5_=918eebebdc84943ac5795ee130421d10
diff --git a/metadata/md5-cache/app-emacs/csharp-mode-2.0.0 b/metadata/md5-cache/app-emacs/csharp-mode-2.0.0
index 4da8bdc025b8..65d0f6946237 100644
--- a/metadata/md5-cache/app-emacs/csharp-mode-2.0.0
+++ b/metadata/md5-cache/app-emacs/csharp-mode-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=A derived Emacs mode implementing most of the C# rules
 EAPI=8
 HOMEPAGE=https://github.com/emacs-csharp/csharp-mode
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-csharp/csharp-mode/archive/refs/tags/2.0.0.tar.gz -> csharp-mode-2.0.0.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=9100addb936c254d2c6bfaa6be8ea4fb
+_md5_=dac83ee94e0216ed408cbbe2220d4c28
diff --git a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809 b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
index 97860257783c..d84661c0b16f 100644
--- a/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
+++ b/metadata/md5-cache/app-emacs/dashboard-1.8.0_pre20220809
@@ -4,11 +4,11 @@ DESCRIPTION=Extensible Emacs dashboard, with sections like bookmarks, agenda and
 EAPI=8
 HOMEPAGE=https://github.com/emacs-dashboard/emacs-dashboard/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-editors/emacs-26.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/emacs-dashboard/emacs-dashboard/archive/49e5603cac7d028bfc4c679161a20ca40327956c.tar.gz -> dashboard-1.8.0_pre20220809.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=88805c5dd6b8bdb8e7897061e18fa7da
+_md5_=8c9661960c652a1c26cfdc45b5b155e8
diff --git a/metadata/md5-cache/app-emacs/emacs-eix-0.0.0 b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
index 84fccd99b759..79bfc7bb9fa5 100644
--- a/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
+++ b/metadata/md5-cache/app-emacs/emacs-eix-0.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Eix integration for GNU Emacs
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-eix.git
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/emacs-eix.git/snapshot/emacs-eix-0.0.0.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=0177cf7c7f69f795e16afd0e0c33bf69
+_md5_=f5d5a619cbf581a4eb0a2b656bdadae7
diff --git a/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0 b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
index e6ed5f4b626a..1077e31407b4 100644
--- a/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
+++ b/metadata/md5-cache/app-emacs/emacs-openrc-0.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=OpenRC integration for GNU Emacs
 EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/emacs-openrc.git
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=>=app-editors/emacs-24.3:*
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/emacs-openrc.git/snapshot/emacs-openrc-0.0.0.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=0960f83dc2236ec843ff8c01ba7cad5a
+_md5_=c08ffcb8d8396fd34d9af2612ce46af4
diff --git a/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1 b/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
index 8dab8740b664..9d1e86391c1a 100644
--- a/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
+++ b/metadata/md5-cache/app-emacs/flycheck-32_p20220328-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Modern on-the-fly syntax checking extension for GNU Emacs
 EAPI=8
 HOMEPAGE=https://www.flycheck.org/
 INHERIT=elisp
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~ppc64 ~riscv ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-emacs/dash-2.12.1 >=app-emacs/pkg-info-0.4 >=app-editors/emacs-24.3:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/flycheck/flycheck/archive/3b5b4248074f016922c2674789d4a242528cf4c7.tar.gz -> flycheck-32_p20220328.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=80a6f9e2c02a11f5784f09067a4a63ae
+_md5_=a1a73b91104d6748fb90ec09e9356894
diff --git a/metadata/md5-cache/app-emacs/mmm-mode-0.5.9 b/metadata/md5-cache/app-emacs/mmm-mode-0.5.9
index bd89b8792629..0bf1e6b8513b 100644
--- a/metadata/md5-cache/app-emacs/mmm-mode-0.5.9
+++ b/metadata/md5-cache/app-emacs/mmm-mode-0.5.9
@@ -4,10 +4,10 @@ DESCRIPTION=Enables the user to edit different parts of a file in different majo
 EAPI=8
 HOMEPAGE=http://mmm-mode.sourceforge.net/ https://github.com/dgutov/mmm-mode/
 INHERIT=elisp
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2+ Texinfo-manual
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/dgutov/mmm-mode/archive/0.5.9.tar.gz -> mmm-mode-0.5.9.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=92626561e7600886ac17ddc4e15a4513
+_md5_=ed4ccdfeaea5f3108ec45b9ab5509303
diff --git a/metadata/md5-cache/app-emacs/racket-mode-1_p20221122 b/metadata/md5-cache/app-emacs/racket-mode-1_p20221122
index c7d3611d9e22..ae76a64e92fa 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-1_p20221122
+++ b/metadata/md5-cache/app-emacs/racket-mode-1_p20221122
@@ -4,10 +4,10 @@ DESCRIPTION=Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, an
 EAPI=8
 HOMEPAGE=https://github.com/greghendershott/racket-mode/
 INHERIT=elisp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/b07ffc1541c848a85d8c1afa807ed06cb8e81228.tar.gz -> racket-mode-1_p20221122.tar.gz
 _eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=230699f9b530ea7fd5a2ee6a7476bb4c
+_md5_=bab5e341e8e12a43320bfe6938cb45b5
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 0ab7ed7137e4..6c01dbf340b8 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/nemu-3.1.0 b/metadata/md5-cache/app-emulation/nemu-3.1.0
index 178d2ab61696..0fa1a666b482 100644
--- a/metadata/md5-cache/app-emulation/nemu-3.1.0
+++ b/metadata/md5-cache/app-emulation/nemu-3.1.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/nemuTUI/nemu
 INHERIT=cmake linux-info
 IUSE=dbus network-map +ovf remote-api
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2
 RDEPEND=>=app-emulation/qemu-6.0.0-r3[vnc,virtfs,spice] dev-db/sqlite:3= dev-libs/json-c sys-libs/ncurses:=[unicode(+)] virtual/libusb:1 virtual/libudev:= dbus? ( sys-apps/dbus ) network-map? ( media-gfx/graphviz[svg] ) ovf? ( dev-libs/libxml2:2 app-arch/libarchive:= ) remote-api? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=https://github.com/nemuTUI/nemu/archive/v3.1.0.tar.gz -> nemu-3.1.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a95ea1f9808327ce00f15daac5d889ca
+_md5_=ea19f3b04b763d40214f2347958af90d
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index b573be3fd1d5..c2af9d919da7 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/bijiben-40.1 b/metadata/md5-cache/app-misc/bijiben-40.1
deleted file mode 100644
index b7952c06d5eb..000000000000
--- a/metadata/md5-cache/app-misc/bijiben-40.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=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 prepare setup test
-DEPEND=app-misc/tracker:3= >=dev-libs/glib-2.53.4:2 net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.19.3:3 dev-libs/json-glib >=gnome-extra/evolution-data-server-3.33.2:= >=gui-libs/libhandy-1.0.0:1= dev-libs/libxml2:2 net-misc/curl sys-apps/util-linux >=net-libs/webkit-gtk-2.26:4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Note editor designed to remain simple to use
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Notes
-INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=app-misc/tracker:3= >=dev-libs/glib-2.53.4:2 net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.19.3:3 dev-libs/json-glib >=gnome-extra/evolution-data-server-3.33.2:= >=gui-libs/libhandy-1.0.0:1= dev-libs/libxml2:2 net-misc/curl sys-apps/util-linux >=net-libs/webkit-gtk-2.26:4
-SLOT=0
-SRC_URI=mirror://gnome/sources/bijiben/40/bijiben-40.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7cdac796466e4a4cbcabb1f544aea208
diff --git a/metadata/md5-cache/app-misc/cmatrix-2.0-r4 b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
index 2db7226481cb..bb38e280a77a 100644
--- a/metadata/md5-cache/app-misc/cmatrix-2.0-r4
+++ b/metadata/md5-cache/app-misc/cmatrix-2.0-r4
@@ -12,4 +12,4 @@ RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0
 SRC_URI=https://github.com/abishekvashok/cmatrix/archive/v2.0.tar.gz -> cmatrix-2.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	font	5e03cb70902daa9ff8967c61130f0f60	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e13e6916e5ac17ffa2b2c83b46ea3c12
+_md5_=bb9c2695c53309e9c123b7a27c56d185
diff --git a/metadata/md5-cache/app-misc/task-2.6.2 b/metadata/md5-cache/app-misc/task-2.6.2
index ac9615305b1a..ca6acf9ed80d 100644
--- a/metadata/md5-cache/app-misc/task-2.6.2
+++ b/metadata/md5-cache/app-misc/task-2.6.2
@@ -12,4 +12,4 @@ RDEPEND=sync? ( net-libs/gnutls )
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.6.2/task-2.6.2.tar.gz https://github.com/GothenburgBitFactory/taskwarrior/releases/download/v2.6.2/tests-2.6.2.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e6e3148dbffe9ae73a3d632e0b3aa202
+_md5_=b4b2d22217c6c7b41974c8828cff7ee0
diff --git a/metadata/md5-cache/app-misc/timew-1.4.2 b/metadata/md5-cache/app-misc/timew-1.4.2
index e78e47de3373..42d522ae9f19 100644
--- a/metadata/md5-cache/app-misc/timew-1.4.2
+++ b/metadata/md5-cache/app-misc/timew-1.4.2
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.4.2/timew-1.4.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6cdedeb961c95ead9fbabbd54bd6f6ef
+_md5_=e928b6eced08d23bab4f78ea632520f9
diff --git a/metadata/md5-cache/app-misc/timew-1.4.3-r1 b/metadata/md5-cache/app-misc/timew-1.4.3-r1
index 73c07918e3ed..856c176faca4 100644
--- a/metadata/md5-cache/app-misc/timew-1.4.3-r1
+++ b/metadata/md5-cache/app-misc/timew-1.4.3-r1
@@ -9,4 +9,4 @@ LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.4.3/timew-1.4.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c0168bbedc2eb2368f0ed914c82d552a
+_md5_=6e0b76ba421170b905fd10a61f86f633
diff --git a/metadata/md5-cache/app-misc/tracker-3.4.0 b/metadata/md5-cache/app-misc/tracker-3.4.0
deleted file mode 100644
index 84cd9d16797c..000000000000
--- a/metadata/md5-cache/app-misc/tracker-3.4.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-IUSE=gtk-doc +miners stemmer test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=miners? ( >=app-misc/tracker-miners-3.4 )
-RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-RESTRICT=!test? ( test )
-SLOT=3/0
-SRC_URI=mirror://gnome/sources/tracker/3.4/tracker-3.4.0.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5c129b31334c465599dac9b10a3e0896
diff --git a/metadata/md5-cache/app-misc/tracker-3.4.1 b/metadata/md5-cache/app-misc/tracker-3.4.1
deleted file mode 100644
index 15272ecf6a26..000000000000
--- a/metadata/md5-cache/app-misc/tracker-3.4.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/asciidoc dev-libs/libxslt || ( dev-lang/vala:0.56 ) gtk-doc? ( >=dev-util/gtk-doc-1.8 app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) ) || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-DESCRIPTION=A tagging metadata database, search tool and indexer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker https://gitlab.gnome.org/GNOME/tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
-IUSE=gtk-doc +miners stemmer test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-PDEPEND=miners? ( >=app-misc/tracker-miners-3.4 )
-RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.99.2:3.0 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0:3 stemmer? ( dev-libs/snowball-stemmer:= )
-RESTRICT=!test? ( test )
-SLOT=3/0
-SRC_URI=mirror://gnome/sources/tracker/3.4/tracker-3.4.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1b3eff5ab02ed1e2bd00bf4604bf7beb
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1 b/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1
deleted file mode 100644
index c571763f1809..000000000000
--- a/metadata/md5-cache/app-misc/tracker-miners-3.4.0-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-REQUIRED_USE=cue? ( gstreamer )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/tracker-miners/3.4/tracker-miners-3.4.0.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2f28c7948c09e64f80674a03faad86ac
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.4.1-r1 b/metadata/md5-cache/app-misc/tracker-miners-3.4.1-r1
deleted file mode 100644
index f9e9fe1e443a..000000000000
--- a/metadata/md5-cache/app-misc/tracker-miners-3.4.1-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/asciidoc dev-libs/libxslt dev-util/glib-utils dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/tappy[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/tappy[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/tappy[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/tappy[python_targets_python3_8(-)] ) ) gstreamer? ( media-libs/gstreamer:1.0[introspection] || ( media-plugins/gst-plugins-libav:1.0 media-plugins/gst-plugins-openh264:1.0 ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-DESCRIPTION=Collection of data extractors for Tracker/Nepomuk
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
-IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.4.0:3 gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( media-libs/libjpeg-turbo:0= ) iso? ( >=sys-libs/libosinfo-1.10.0-r1 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:= ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0:=[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
-REQUIRED_USE=cue? ( gstreamer )
-RESTRICT=!test? ( test )
-SLOT=3
-SRC_URI=mirror://gnome/sources/tracker-miners/3.4/tracker-miners-3.4.1.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ae97fa77eb27f85d0153e389019f8a62
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d9fd74d169e0..cc0d39616b9e 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/editorconfig-core-c-0.12.4 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
index 5ef77971e1d0..f783ecb16126 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.4.tar.gz -> editorconfig-core-c-0.12.4.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8905ac10d695e9545c1854edb8970ad1
+_md5_=48cd594f8ba2f8e5a1163d512f5eb815
diff --git a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5 b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
index eb5a8d1c8606..969574ed834a 100644
--- a/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
+++ b/metadata/md5-cache/app-text/editorconfig-core-c-0.12.5
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libpcre2:= cli? ( !dev-python/editorconfig-core-py[cli] )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.5.tar.gz -> editorconfig-core-c-0.12.5.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ec86cea6bd27606e24a2129a68e33312
+_md5_=03fd28e2ae052d1d15313804c93ce5c4
diff --git a/metadata/md5-cache/app-text/evince-43.0-r1 b/metadata/md5-cache/app-text/evince-43.0-r1
deleted file mode 100644
index ac5fab6edfd5..000000000000
--- a/metadata/md5-cache/app-text/evince-43.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=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 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:= ) xps? ( >=app-text/libgxps-0.2.1:= )
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson systemd xdg
-IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/43/evince-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f08bddc778d1c18e606e9c83000e37e4
diff --git a/metadata/md5-cache/app-text/gtranslator-40.0 b/metadata/md5-cache/app-text/gtranslator-40.0
deleted file mode 100644
index 823682e6ade6..000000000000
--- a/metadata/md5-cache/app-text/gtranslator-40.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.28 app-text/docbook-xml-dtd:4.1.2 ) dev-util/itstool >=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 prepare test
-DEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gui-libs/libhandy:1= >=dev-libs/libdazzle-3.33.90 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:2.4 >=dev-libs/json-glib-1.2.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME Translation Editor
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Gtranslator
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=gtk-doc
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.36.0:2 >=x11-libs/gtk+-3.22.20:3 gui-libs/libhandy:1= >=dev-libs/libdazzle-3.33.90 gnome-extra/libgda:5= gnome-base/gsettings-desktop-schemas >=app-text/gspell-1.2.0:= >=x11-libs/gtksourceview-4.0.2:4 >=dev-libs/libxml2-2.4.12:2 net-libs/libsoup:2.4 >=dev-libs/json-glib-1.2.0
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtranslator/40/gtranslator-40.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=90cb094fcc1a81cc90518ea9bb952212
diff --git a/metadata/md5-cache/app-text/iso-codes-4.11.0 b/metadata/md5-cache/app-text/iso-codes-4.11.0
deleted file mode 100644
index 2dba80145fd8..000000000000
--- a/metadata/md5-cache/app-text/iso-codes-4.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) sys-devel/gettext
-DEFINED_PHASES=prepare setup
-DESCRIPTION=ISO language, territory, currency, script codes and their translations
-EAPI=8
-HOMEPAGE=https://salsa.debian.org/iso-codes-team/iso-codes
-INHERIT=python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.11.0/iso-codes-v4.11.0.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=dddea93a8c97ab1476a1f7c3c32ee5fd
diff --git a/metadata/md5-cache/app-text/libgepub-0.6.0 b/metadata/md5-cache/app-text/libgepub-0.6.0
deleted file mode 100644
index 3e492cef8f61..000000000000
--- a/metadata/md5-cache/app-text/libgepub-0.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4[introspection?] x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-DESCRIPTION=GObject based library for handling and rendering epub documents
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libgepub
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-IUSE=+introspection
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+
-RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4[introspection?] x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgepub/0.6/libgepub-0.6.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=71145409840875ae148f0697202e165b
diff --git a/metadata/md5-cache/app-text/yelp-tools-42.0 b/metadata/md5-cache/app-text/yelp-tools-42.0
deleted file mode 100644
index 4f919dddc4ac..000000000000
--- a/metadata/md5-cache/app-text/yelp-tools-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 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=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
-DESCRIPTION=Collection of tools for building and converting documentation
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 meson python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2+ freedist ) GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp-tools/42/yelp-tools-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5045ea02ba7406c1b5589dd5b8c707d8
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index d547dfd57d04..fc18e91c92ea 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/lightline-0_pre20221005 b/metadata/md5-cache/app-vim/lightline-0_pre20221005
new file mode 100644
index 000000000000..046d06968ab2
--- /dev/null
+++ b/metadata/md5-cache/app-vim/lightline-0_pre20221005
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: A light and configurable statusline/tabline
+EAPI=8
+HOMEPAGE=https://github.com/itchyny/lightline.vim/
+INHERIT=vim-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/itchyny/lightline.vim/archive/b1e91b41f5028d65fa3d31a425ff21591d5d957f.tar.gz -> lightline-0_pre20221005.tar.gz
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
+_md5_=2e50a962f61a3ff35003dc58ae9c61b1
diff --git a/metadata/md5-cache/app-vim/lightline-9999 b/metadata/md5-cache/app-vim/lightline-9999
index 443c075a737a..e638eee7c567 100644
--- a/metadata/md5-cache/app-vim/lightline-9999
+++ b/metadata/md5-cache/app-vim/lightline-9999
@@ -1,7 +1,8 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A light and configurable statusline/tabline
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/itchyny/lightline.vim/
 INHERIT=vim-plugin git-r3
 LICENSE=MIT
@@ -9,4 +10,4 @@ PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
-_md5_=48459901ef0cf6d075c1aa31ef2d3a5f
+_md5_=3435c3edd490f8ad47d2891d37e62105
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 88b06d096347..f7e8f32f9a08 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/mm-common-1.0.4 b/metadata/md5-cache/dev-cpp/mm-common-1.0.4
deleted file mode 100644
index 77d38e75de4a..000000000000
--- a/metadata/md5-cache/dev-cpp/mm-common-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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
-DESCRIPTION=Build infrastructure and utilities for GNOME C++ bindings
-EAPI=8
-HOMEPAGE=https://www.gtkmm.org/
-INHERIT=gnome.org python-any-r1 meson
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnome/sources/mm-common/1.0/mm-common-1.0.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7d43ae814a8812d28a4bbfdb087dd7cd
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1 b/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1
index 474610fc6abd..745ee60228e9 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.2-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/v2.3.2.tar.gz -> muParser-2.3.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e520f3d9c23754e0ba773ef59efb085
+_md5_=1dfafd7dd6142f53656e051ca776cc18
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.3 b/metadata/md5-cache/dev-cpp/muParser-2.3.3
index 54252f8b5924..bfa8609637c6 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.3
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.3
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.3-1.tar.gz -> muParser-2.3.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=429b371c7a631f78dfc814de7a4bba9a
+_md5_=c54e0d1ce81bbbde157395e94c3ecc82
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1 b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1
index 749de83b4a29..2d1c18259006 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.3-r1
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.3-1.tar.gz -> muParser-2.3.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=83241f0dd8ded6fc93459aef716c6bed
+_md5_=712a15f5e8d9816b0f7a924eb27a1932
diff --git a/metadata/md5-cache/dev-cpp/muParser-2.3.4 b/metadata/md5-cache/dev-cpp/muParser-2.3.4
index 3002da1474ae..615d2239cfe7 100644
--- a/metadata/md5-cache/dev-cpp/muParser-2.3.4
+++ b/metadata/md5-cache/dev-cpp/muParser-2.3.4
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/beltoforion/muparser/archive/refs/tags/v2.3.4.tar.gz -> muParser-2.3.4.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=61e89bc2e61d85398385620a40da633d
+_md5_=3cea33dff314a202fa377c53cdf7a33d
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2
index 15bde240a5c3..c7ba69ee64e8 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.3.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.3.0.tar.gz -> opentelemetry-cpp-1.3.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dff56849f5bd8da518a79023db389704
+_md5_=d4614d573b00a871520588092511c9ae
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
index bf5359bdda36..1414b4ba9f40 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.4.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.4.0.tar.gz -> opentelemetry-cpp-1.4.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dff56849f5bd8da518a79023db389704
+_md5_=d4614d573b00a871520588092511c9ae
diff --git a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0 b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
index a9bebff3cb4a..e8d7da2853c4 100644
--- a/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
+++ b/metadata/md5-cache/dev-cpp/opentelemetry-cpp-1.6.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.6.0.tar.gz -> opentelemetry-cpp-1.6.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f9d43996600667c9bea3c3402298fcc6
+_md5_=a550e140f2b2a86f10f38333b6fd30dc
diff --git a/metadata/md5-cache/dev-cpp/valijson-0.7 b/metadata/md5-cache/dev-cpp/valijson-0.7
index 5b2346225618..fa30f1161469 100644
--- a/metadata/md5-cache/dev-cpp/valijson-0.7
+++ b/metadata/md5-cache/dev-cpp/valijson-0.7
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/tristanpenman/valijson
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=BSD-2
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tristanpenman/valijson/archive/v0.7.tar.gz -> valijson-0.7.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7bc3d40c378c3b4ecb252e964d13822c
+_md5_=3f2370167bdb5213a3aa49e784895729
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6ac7bdfecd76..8025aaf503ba 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.36 b/metadata/md5-cache/dev-db/mariadb-10.3.36
index 201c1c092339..3305a1c97ae4 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.36
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.36
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=mirror://mariadb/mariadb-10.3.36/source/mariadb-10.3.36.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.3.36-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f2b14a51ee46074d6af5d0a05ba89339
+_md5_=a29742b699f09e2e02ee2a7bd7a8d73a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.3.37 b/metadata/md5-cache/dev-db/mariadb-10.3.37
index fb2afac714e3..5be247b7c732 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.3.37
+++ b/metadata/md5-cache/dev-db/mariadb-10.3.37
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.3/18
 SRC_URI=mirror://mariadb/mariadb-10.3.37/source/mariadb-10.3.37.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.3.36-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8b227f836e9f2c8b0e68745d1df01fb5
+_md5_=a994527551a65a6b79593cff93d1a64b
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.26 b/metadata/md5-cache/dev-db/mariadb-10.4.26
index c28522902efb..8412d68e46fc 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.26
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.26
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=mirror://mariadb/mariadb-10.4.26/source/mariadb-10.4.26.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d8958aef281a6078eb43e1dd46ccae87
+_md5_=f9e52d8e669773bbcea1a87c2f7179cc
diff --git a/metadata/md5-cache/dev-db/mariadb-10.4.27 b/metadata/md5-cache/dev-db/mariadb-10.4.27
index 86e7f919ed72..bb0c59061bed 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.4.27
+++ b/metadata/md5-cache/dev-db/mariadb-10.4.27
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.4/18
 SRC_URI=mirror://mariadb/mariadb-10.4.27/source/mariadb-10.4.27.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.26-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1e0c4d22efd3aa6c067b6b908c6aa4fc
+_md5_=db7e5455f9bc2d674358c675e864affa
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.17 b/metadata/md5-cache/dev-db/mariadb-10.5.17
index 4746b5f9bd0c..09aa39264840 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.17
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.17
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=mirror://mariadb/mariadb-10.5.17/source/mariadb-10.5.17.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.17-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=550611137de94eeb21cb005acdb0f97e
+_md5_=c32895cda213721f1ace3f53d6ff6c43
diff --git a/metadata/md5-cache/dev-db/mariadb-10.5.18 b/metadata/md5-cache/dev-db/mariadb-10.5.18
index 296d34888b00..a121920721c5 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.5.18
+++ b/metadata/md5-cache/dev-db/mariadb-10.5.18
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.5/18
 SRC_URI=mirror://mariadb/mariadb-10.5.18/source/mariadb-10.5.18.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.5.17-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b9f66126d56669371a91fdeaacfb147
+_md5_=097f0a9b749bdcb2ce128dbee3c83918
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.10 b/metadata/md5-cache/dev-db/mariadb-10.6.10
index f905f672753e..8aaeb470ff3a 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.10
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.10
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.10/source/mariadb-10.6.10.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=668920da7757f58b727d518ef188a682
+_md5_=b9a03bbfd2f5c824c8c2c898735c6fe9
diff --git a/metadata/md5-cache/dev-db/mariadb-10.6.11 b/metadata/md5-cache/dev-db/mariadb-10.6.11
index 07545015e9a2..f6e37e355f2e 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.6.11
+++ b/metadata/md5-cache/dev-db/mariadb-10.6.11
@@ -15,4 +15,4 @@ RESTRICT=!bindist? ( bindist ) !test? ( test )
 SLOT=10.6/18
 SRC_URI=mirror://mariadb/mariadb-10.6.11/source/mariadb-10.6.11.tar.gz https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.6.10-patches-01.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=26ce8fec362111e3e20625fee9e766c5
+_md5_=9b839b93b56b7937b06ad5feffbfab50
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.36-r1 b/metadata/md5-cache/dev-db/mysql-5.7.36-r1
index 5a578105ea2a..dd8d0497a15f 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.36-r1
+++ b/metadata/md5-cache/dev-db/mysql-5.7.36-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.36.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.36.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.36.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.36-patches-01.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a01401821eb0af214189d40b2aa8ef2
+_md5_=ca6e52536f4505bb3dbb2868031f8ebe
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.40 b/metadata/md5-cache/dev-db/mysql-5.7.40
index 953023f975d0..02b34bfce56e 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.40
+++ b/metadata/md5-cache/dev-db/mysql-5.7.40
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=5.7/18
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.40.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.40.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.40.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-5.7.36-patches-01.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cbc94048389fa518fe6189d0e47ee59b
+_md5_=7f8622ac912320ae7d3896e363961bc3
diff --git a/metadata/md5-cache/dev-db/mysql-8.0.27 b/metadata/md5-cache/dev-db/mysql-8.0.27
index d53648058307..e927d9b80c34 100644
--- a/metadata/md5-cache/dev-db/mysql-8.0.27
+++ b/metadata/md5-cache/dev-db/mysql-8.0.27
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-8.0.27.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/mysql-boost-8.0.27.tar.gz https://dev.gentoo.org/~whissi/dist/mysql/mysql-8.0.27-patches-03.tar.xz https://dev.gentoo.org/~dlan/dist/mysql/mysql-8.0.27-patches-03.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=be73e40893e6e061107c28aa03eae02b
+_md5_=d5c3c946c71b71ed46281ee8db720ae6
diff --git a/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r1 b/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r1
index 582968e704e9..709ef18d6818 100644
--- a/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r1
+++ b/metadata/md5-cache/dev-db/percona-server-8.0.26.16-r1
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=8.0
 SRC_URI=https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-8.0.26-16/source/tarball/percona-server-8.0.26-16.tar.gz https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2 https://dev.gentoo.org/~whissi/dist/percona-server/percona-server-8.0.26.16-patches-01.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f18aa550525b020de726315f27823f65
+_md5_=c889143e522a9f1dc24b205ff52c667b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4f3918b0af8b..ba7019594ab8 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/appstream-glib-0.8.1 b/metadata/md5-cache/dev-libs/appstream-glib-0.8.1
deleted file mode 100644
index 4a6d1023a29e..000000000000
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/gperf dev-libs/libxml2:2 app-text/docbook-xml-dtd:4.2 dev-libs/libxslt gtk-doc? ( >=dev-util/gtk-doc-1.9 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 >=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.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-misc/curl-7.56.0 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer:= ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=Provides GObjects and helper methods to read and write AppStream metadata
-EAPI=8
-HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/ https://github.com/hughsie/appstream-glib
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=xdg meson
-IUSE=gtk-doc fonts +introspection stemmer
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.58.0:2 sys-apps/util-linux app-arch/libarchive:= >=net-misc/curl-7.56.0 >=dev-libs/json-glib-1.1.2 >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] fonts? ( x11-libs/gtk+:3 >=media-libs/freetype-2.4:2 ) >=media-libs/fontconfig-2.11:1.0 dev-libs/libyaml stemmer? ( dev-libs/snowball-stemmer:= ) x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-SLOT=0/8
-SRC_URI=https://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-0.8.1.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8d67b6320328b542792212612f69f424
diff --git a/metadata/md5-cache/dev-libs/asmjit-2021.11.13 b/metadata/md5-cache/dev-libs/asmjit-2021.11.13
index 87b06e42a958..fa16a441896c 100644
--- a/metadata/md5-cache/dev-libs/asmjit-2021.11.13
+++ b/metadata/md5-cache/dev-libs/asmjit-2021.11.13
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asmjit/asmjit/archive/4ec760a3d1f69e32ba460ecd2513f29b8428700b.tar.gz -> asmjit-2021.11.13.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca81854c24c217aaf1685f88dace8b23
+_md5_=351666e4c24bb14cb0869afe844bfe3e
diff --git a/metadata/md5-cache/dev-libs/asmjit-2022.07.02 b/metadata/md5-cache/dev-libs/asmjit-2022.07.02
index 487ac5482236..9d868d58821e 100644
--- a/metadata/md5-cache/dev-libs/asmjit-2022.07.02
+++ b/metadata/md5-cache/dev-libs/asmjit-2022.07.02
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/asmjit/asmjit/archive/c59847629d3a19da4d10f0be4ac33b43fc4a100f.tar.gz -> asmjit-2022.07.02.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7a31b22b706d4ca7b03ebe3db16487eb
+_md5_=962b9124a3f98aedcbfd22802ed79331
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.2-r1 b/metadata/md5-cache/dev-libs/gjs-1.72.2-r1
deleted file mode 100644
index 76265632b80e..000000000000
--- a/metadata/md5-cache/dev-libs/gjs-1.72.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig 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 test
-DEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-91.3.0:91 cairo? ( x11-libs/cairo[X,glib,svg(+)] ) readline? ( sys-libs/readline:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) test? ( sys-apps/dbus >=x11-libs/gtk+-3.20:3[introspection] )
-DESCRIPTION=Javascript bindings for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs
-INHERIT=flag-o-matic gnome.org meson virtualx
-IUSE=+cairo examples readline sysprof test test
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
-RDEPEND=>=dev-libs/glib-2.66.0:2 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-91.3.0:91 cairo? ( x11-libs/cairo[X,glib,svg(+)] ) readline? ( sys-libs/readline:0= )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.2.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0b43cf268f5b7015db2e0e956fa4397c
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.1-r1 b/metadata/md5-cache/dev-libs/glib-2.74.1-r1
deleted file mode 100644
index 81bef6e4720a..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.74.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.1:3.11[xml(+)] >=dev-lang/python-3.10.9:3.10[xml(+)] >=dev-lang/python-3.9.16:3.9[xml(+)] >=dev-lang/python-3.8.16:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) 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 prepare setup test
-DEPEND=!<dev-util/gdbus-codegen-2.74.1 >=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(-)?] >=dev-libs/libpcre2-10.32:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=The GLib library of C routines
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
-IUSE=dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1+
-PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
-RDEPEND=!<dev-util/gdbus-codegen-2.74.1 >=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(-)?] >=dev-libs/libpcre2-10.32:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-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(-)?] >=sys-libs/zlib-1.2.8-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(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] kernel_linux? ( >=sys-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-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(-)?] ) ) elf? ( virtual/libelf:0= ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=2
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1463024d9be779e030c4111db7517f7f
diff --git a/metadata/md5-cache/dev-libs/libb64-2.0.0.1 b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
index 09970b20f7b9..e85b749d43c9 100644
--- a/metadata/md5-cache/dev-libs/libb64-2.0.0.1
+++ b/metadata/md5-cache/dev-libs/libb64-2.0.0.1
@@ -3,8 +3,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Fast Base64 encoding/decoding routines
 EAPI=7
 HOMEPAGE=https://github.com/libb64/libb64/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=CC-PD
 SLOT=0/2.0.0.1
 SRC_URI=https://github.com/libb64/libb64/archive/v2.0.0.1.tar.gz -> libb64-2.0.0.1.tar.gz
-_md5_=200f04878d679c33d23bf334cb35233b
+_md5_=8b769742a12d08f695f9216213731ae8
diff --git a/metadata/md5-cache/dev-libs/libcbor-0.9.0 b/metadata/md5-cache/dev-libs/libcbor-0.9.0
index c7b185186161..4f8592418d3f 100644
--- a/metadata/md5-cache/dev-libs/libcbor-0.9.0
+++ b/metadata/md5-cache/dev-libs/libcbor-0.9.0
@@ -11,4 +11,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.9
 SRC_URI=https://github.com/PJK/libcbor/archive/v0.9.0.tar.gz -> libcbor-0.9.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=74571565584b588c45c50646d6c40fcb
+_md5_=a9f3b1a4a7dbfac6d3e97091b0298ebc
diff --git a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1 b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
index 5416aacdf9f8..8b7bf62c232e 100644
--- a/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
+++ b/metadata/md5-cache/dev-libs/libgaminggear-0.15.1
@@ -4,7 +4,7 @@ DEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/ca
 DESCRIPTION=Provides functionality for gaming input devices
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/libgaminggear/
-INHERIT=cmake xdg
+INHERIT=xdg cmake
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -12,4 +12,4 @@ RDEPEND=>=dev-db/sqlite-3.17:3 dev-libs/glib:2 media-libs/libcanberra x11-libs/c
 SLOT=0
 SRC_URI=mirror://sourceforge/libgaminggear/libgaminggear-0.15.1.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=964033e2a1813d100a1305d104c5960b
+_md5_=5145b997bd668567b3fa36a06038ba0d
diff --git a/metadata/md5-cache/dev-libs/libgweather-4.0.0-r1 b/metadata/md5-cache/dev-libs/libgweather-4.0.0-r1
deleted file mode 100644
index a24821f683ee..000000000000
--- a/metadata/md5-cache/dev-libs/libgweather-4.0.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gi-docgen-2021.6 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject[python_targets_python3_8(-)] ) ) 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=>=dev-libs/glib-2.68.0:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib:0 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Location and timezone database and weather-lookup library
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=gtk-doc +introspection test +vala
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.68.0:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib:0 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4/4-0
-SRC_URI=mirror://gnome/sources/libgweather/4.0/libgweather-4.0.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e2472c17f006858c36d88c4cc7f55113
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r2 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r2
deleted file mode 100644
index b0c7a08748d6..000000000000
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.18.2 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
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
-DESCRIPTION=Library for password quality checking and generating random passwords
-EAPI=8
-HOMEPAGE=https://github.com/libpwquality/libpwquality
-INHERIT=autotools pam python-r1 usr-ldscript
-IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=|| ( BSD GPL-2 )
-RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	usr-ldscript	80677644cd5fa559d15743fb93dcbf5a
-_md5_=1e699ce6b0981fe681014bd30c5b2908
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1 b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
index c94f39e1b2b5..1657aaf87c6c 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.14.6-r1
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags:= dev-p
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.14.6.tar.gz -> rocksdb-6.14.6.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f291f1bfc7b557bc157462ed200911fb
+_md5_=63338470e1603e880e8b2a02157c888b
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.15.5 b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
index c9bc1e0790e7..e5e3a2da0d7d 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.15.5
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.15.5
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-pyt
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.15.5.tar.gz -> rocksdb-6.15.5.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=634f6a3de1c643a05691754b842f594d
+_md5_=4f9d76a64a14c896c5fd7a250b52483f
diff --git a/metadata/md5-cache/dev-libs/rocksdb-6.17.3 b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
index 90f7cfd87420..8498ee33fea8 100644
--- a/metadata/md5-cache/dev-libs/rocksdb-6.17.3
+++ b/metadata/md5-cache/dev-libs/rocksdb-6.17.3
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:= app-arch/lz4:= app-arch/snappy:= dev-cpp/gflags dev-pyt
 SLOT=0
 SRC_URI=https://github.com/facebook/rocksdb/archive/v6.17.3.tar.gz -> rocksdb-6.17.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=39c6d7e71b39c047a06081e51391a213
+_md5_=b266cfcf995edcc7cd381f6da0492e75
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.0.2 b/metadata/md5-cache/dev-libs/simdjson-1.0.2
index 3e0ca4809187..d9a00b6fb09f 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.0.2
+++ b/metadata/md5-cache/dev-libs/simdjson-1.0.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/simdjson/simdjson/archive/v1.0.2.tar.gz -> simdjson-1.0.2.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7eb714b2a385ab601ea85519fcde911f
+_md5_=9a8cb145240c0151817bc471ff762c80
diff --git a/metadata/md5-cache/dev-libs/simdjson-1.1.0 b/metadata/md5-cache/dev-libs/simdjson-1.1.0
index 2f754c3a8ff0..15e9233b58ad 100644
--- a/metadata/md5-cache/dev-libs/simdjson-1.1.0
+++ b/metadata/md5-cache/dev-libs/simdjson-1.1.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/simdjson/simdjson/archive/v1.1.0.tar.gz -> simdjson-1.1.0.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9854f2a5ece1ccca5efb110415f7511
+_md5_=592579e6bd2ba978daac9a9e1eea93ff
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.0.4 b/metadata/md5-cache/dev-libs/simdjson-2.0.4
index da18be3dc024..8cdff4e8784c 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.0.4
+++ b/metadata/md5-cache/dev-libs/simdjson-2.0.4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/simdjson/simdjson/archive/v2.0.4.tar.gz -> simdjson-2.0.4.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9a9fdba7097c2a13d4e086911810be11
+_md5_=b9a5a2203adab3c6222d85fb6051d935
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1 b/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
index 85976bad446c..a665fb6c04e5 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
+++ b/metadata/md5-cache/dev-libs/simdjson-2.1.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/simdjson/simdjson/archive/v2.1.0.tar.gz -> simdjson-2.1.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=876c439a9c5a2147ac6d1c0970891969
+_md5_=cc8c91e302e502a0e4fab12781d97532
diff --git a/metadata/md5-cache/dev-libs/simdjson-2.2.2 b/metadata/md5-cache/dev-libs/simdjson-2.2.2
index ff257797e7c7..55c03b916ef2 100644
--- a/metadata/md5-cache/dev-libs/simdjson-2.2.2
+++ b/metadata/md5-cache/dev-libs/simdjson-2.2.2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/13
 SRC_URI=https://github.com/simdjson/simdjson/archive/v2.2.2.tar.gz -> simdjson-2.2.2.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6bbc82c7ff520ea77198272926b0bc29
+_md5_=75dfa312c85fae30135a7423f59bd854
diff --git a/metadata/md5-cache/dev-libs/simdjson-3.0.0 b/metadata/md5-cache/dev-libs/simdjson-3.0.0
index 125b265a23a5..edcb8c489b6e 100644
--- a/metadata/md5-cache/dev-libs/simdjson-3.0.0
+++ b/metadata/md5-cache/dev-libs/simdjson-3.0.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/14
 SRC_URI=https://github.com/simdjson/simdjson/archive/v3.0.0.tar.gz -> simdjson-3.0.0.gh.tar.gz test? ( https://github.com/simdjson/simdjson-data/archive/a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz -> simdjson-data-a5b13babe65c1bba7186b41b43d4cbdc20a5c470.tar.gz )
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=df71b3d08b0f3807321c30565a12abcd
+_md5_=75db6fb7d6300e5dc5ba2589061840c2
diff --git a/metadata/md5-cache/dev-libs/thrift-0.16.0-r1 b/metadata/md5-cache/dev-libs/thrift-0.16.0-r1
index 0722e99ab0c5..304a8c5c8fa6 100644
--- a/metadata/md5-cache/dev-libs/thrift-0.16.0-r1
+++ b/metadata/md5-cache/dev-libs/thrift-0.16.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0
 SRC_URI=mirror://apache/thrift/0.16.0/thrift-0.16.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=02b8cfe38e2b28db52b82d1f6803b84f
+_md5_=e38b332573edd1c3651854bb58a6d854
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1ce4fec421bd..091e92f5d3d1 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/json5-0.9.11 b/metadata/md5-cache/dev-python/json5-0.9.11
new file mode 100644
index 000000000000..1beba7fa9637
--- /dev/null
+++ b/metadata/md5-cache/dev-python/json5-0.9.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python implementation of the JSON5 data format
+EAPI=8
+HOMEPAGE=https://github.com/dpranke/pyjson5/ https://pypi.org/project/json5/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dpranke/pyjson5/archive/refs/tags/v0.9.11.tar.gz -> pyjson5-0.9.11.gh.tar.gz
+_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=1558ae31c6b2a63e7a85b9828fe8856c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 3d981530e02f..6b4c261b6d20 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bcc-0.24.0-r1 b/metadata/md5-cache/dev-util/bcc-0.24.0-r1
deleted file mode 100644
index f1e369697d71..000000000000
--- a/metadata/md5-cache/dev-util/bcc-0.24.0-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-15:= <sys-devel/llvm-15:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) ) test? ( || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/netperf net-misc/iperf:* ) !!sys-devel/llvm:0
-DESCRIPTION=Tools for BPF-based Linux IO analysis, networking, monitoring, and more
-EAPI=8
-HOMEPAGE=https://iovisor.github.io/bcc/
-INHERIT=cmake linux-info llvm lua-single python-r1 toolchain-funcs
-IUSE=+lua test +lua_single_target_luajit python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/elfutils-0.166:= >=dev-libs/libbpf-0.7.0:=[static-libs(-)] sys-kernel/linux-headers <sys-devel/clang-15:= <sys-devel/llvm-15:=[llvm_targets_BPF(+)] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) lua? ( ^^ ( lua_single_target_luajit ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/iovisor/bcc/archive/v0.24.0.tar.gz -> bcc-0.24.0.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3fd6686ca0ade27d7637d2fbbf81aa6a
diff --git a/metadata/md5-cache/dev-util/bcc-0.25.0 b/metadata/md5-cache/dev-util/bcc-0.25.0
index 089cf71cbd46..b43dd5392c3f 100644
--- a/metadata/md5-cache/dev-util/bcc-0.25.0
+++ b/metadata/md5-cache/dev-util/bcc-0.25.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bcc/archive/v0.25.0.tar.gz -> bcc-0.25.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=969fbdd14dcaef075773f1282779bbdb
+_md5_=6836720257eb951d97d9d9ec36db46ff
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.15.0-r2 b/metadata/md5-cache/dev-util/bpftrace-0.15.0-r2
index f071c150c285..fc65ccc08482 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.15.0-r2
+++ b/metadata/md5-cache/dev-util/bpftrace-0.15.0-r2
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.15.0.tar.gz -> bpftrace-0.15.0.tar.gz https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ce488ae14a247836690bdba88685db4
+_md5_=d149a0ff2e4cbfd062396ed17ea58b85
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.16.0 b/metadata/md5-cache/dev-util/bpftrace-0.16.0
index 282ca2eba828..f73f3588d7ee 100644
--- a/metadata/md5-cache/dev-util/bpftrace-0.16.0
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c4d99b95db7ae64780164bf1f4c5db74
+_md5_=1d2bd40c1491a6d3c063e18ca80b5a73
diff --git a/metadata/md5-cache/dev-util/devhelp-41.3 b/metadata/md5-cache/dev-util/devhelp-41.3
deleted file mode 100644
index 9fa62a0ea112..000000000000
--- a/metadata/md5-cache/dev-util/devhelp-41.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) dev-libs/libxml2:2 dev-util/glib-utils dev-util/itstool gtk-doc? ( >=dev-util/gi-docgen-2021.6 ) >=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 setup test
-DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=An API documentation browser for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Devhelp
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
-IUSE=+gedit gtk-doc +introspection python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 ~arm ~ppc64 ~sparc x86
-LICENSE=GPL-3+ CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22:3[introspection?] >=net-libs/webkit-gtk-2.26:4[introspection?] gnome-base/gsettings-desktop-schemas introspection? ( >=dev-libs/gobject-introspection-1.54:= ) gedit? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( app-editors/gedit[introspection(+),python,python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[introspection(+),python,python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[introspection(+),python,python_single_target_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( app-editors/gedit[introspection(+),python,python_single_target_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) )
-REQUIRED_USE=gedit? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) gtk-doc? ( introspection )
-SLOT=0/3-6
-SRC_URI=mirror://gnome/sources/devhelp/41/devhelp-41.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2e84daae8289234b738e99df63282cad
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1
deleted file mode 100644
index cbea81af6bab..000000000000
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.74.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-9[python_targets_python3_8(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-9[python_targets_python3_9(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-9[python_targets_python3_10(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] >=dev-python/wheel-0.38.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-9[python_targets_python3_11(-)] >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] >=dev-python/wheel-0.38.4[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
-DESCRIPTION=GDBus code and documentation generator
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org distutils-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[xml(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=66da1095b600c1950017b864a56f54ce
diff --git a/metadata/md5-cache/dev-util/gi-docgen-2022.1 b/metadata/md5-cache/dev-util/gi-docgen-2022.1
deleted file mode 100644
index fd8566fca2ef..000000000000
--- a/metadata/md5-cache/dev-util/gi-docgen-2022.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( >=dev-python/markdown-3[python_targets_python3_8(-)] >=dev-python/markupsafe-1[python_targets_python3_8(-)] >=dev-python/pygments-2[python_targets_python3_8(-)] >=dev-python/jinja-2[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/typogrify-2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/markdown-3[python_targets_python3_9(-)] >=dev-python/markupsafe-1[python_targets_python3_9(-)] >=dev-python/pygments-2[python_targets_python3_9(-)] >=dev-python/jinja-2[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/typogrify-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3[python_targets_python3_10(-)] >=dev-python/markupsafe-1[python_targets_python3_10(-)] >=dev-python/pygments-2[python_targets_python3_10(-)] >=dev-python/jinja-2[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/typogrify-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3[python_targets_python3_11(-)] >=dev-python/markupsafe-1[python_targets_python3_11(-)] >=dev-python/pygments-2[python_targets_python3_11(-)] >=dev-python/jinja-2[python_targets_python3_11(-)] dev-python/toml[python_targets_python3_11(-)] >=dev-python/typogrify-2[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.3[python_targets_python3_11(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] )
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( >=dev-python/markdown-3[python_targets_python3_8(-)] >=dev-python/markupsafe-1[python_targets_python3_8(-)] >=dev-python/pygments-2[python_targets_python3_8(-)] >=dev-python/jinja-2[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/typogrify-2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/markdown-3[python_targets_python3_9(-)] >=dev-python/markupsafe-1[python_targets_python3_9(-)] >=dev-python/pygments-2[python_targets_python3_9(-)] >=dev-python/jinja-2[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/typogrify-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3[python_targets_python3_10(-)] >=dev-python/markupsafe-1[python_targets_python3_10(-)] >=dev-python/pygments-2[python_targets_python3_10(-)] >=dev-python/jinja-2[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/typogrify-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3[python_targets_python3_11(-)] >=dev-python/markupsafe-1[python_targets_python3_11(-)] >=dev-python/pygments-2[python_targets_python3_11(-)] >=dev-python/jinja-2[python_targets_python3_11(-)] dev-python/toml[python_targets_python3_11(-)] >=dev-python/typogrify-2[python_targets_python3_11(-)] )
-DESCRIPTION=A documentation generator for GObject-based libraries
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/
-INHERIT=distutils-r1
-IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86
-LICENSE=|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( >=dev-python/markdown-3[python_targets_python3_8(-)] >=dev-python/markupsafe-1[python_targets_python3_8(-)] >=dev-python/pygments-2[python_targets_python3_8(-)] >=dev-python/jinja-2[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/typogrify-2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/markdown-3[python_targets_python3_9(-)] >=dev-python/markupsafe-1[python_targets_python3_9(-)] >=dev-python/pygments-2[python_targets_python3_9(-)] >=dev-python/jinja-2[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/typogrify-2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/markdown-3[python_targets_python3_10(-)] >=dev-python/markupsafe-1[python_targets_python3_10(-)] >=dev-python/pygments-2[python_targets_python3_10(-)] >=dev-python/jinja-2[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/typogrify-2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/markdown-3[python_targets_python3_11(-)] >=dev-python/markupsafe-1[python_targets_python3_11(-)] >=dev-python/pygments-2[python_targets_python3_11(-)] >=dev-python/jinja-2[python_targets_python3_11(-)] dev-python/toml[python_targets_python3_11(-)] >=dev-python/typogrify-2[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gi-docgen/gi-docgen-2022.1.tar.gz
-_eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ba8ab591a52face5c14577e2341414ca
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.74.1 b/metadata/md5-cache/dev-util/glib-utils-2.74.1
deleted file mode 100644
index 0ed521ce05c4..000000000000
--- a/metadata/md5-cache/dev-util/glib-utils-2.74.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
-DEFINED_PHASES=compile configure install setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-DESCRIPTION=Build utilities for GLib using projects
-EAPI=8
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome.org python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=LGPL-2.1+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=1dee82b35e3b348107381c004eb60801
diff --git a/metadata/md5-cache/dev-util/gnome-builder-42.1 b/metadata/md5-cache/dev-util/gnome-builder-42.1
deleted file mode 100644
index 7c4f5fb74b53..000000000000
--- a/metadata/md5-cache/dev-util/gnome-builder-42.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=doc? ( python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ) gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.3 ) test? ( dev-libs/appstream-glib sys-apps/dbus ) dev-util/desktop-file-utils 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.69.1:2 >=x11-libs/gtk+-3.24:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=gui-libs/libhandy-1.5.0:1[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.41.0 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.65.0:2.91[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.26:4=[introspection] ) sysprof? ( >=dev-util/sysprof-capture-3.37.1:4 >=dev-util/sysprof-3.37.1:0/4[gtk] ) >=app-text/cmark-0.29.0:0= flatpak? ( dev-util/ostree >=net-libs/libsoup-2.52.0:2.4 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 ) !!sys-devel/llvm:0
-DESCRIPTION=An IDE for writing GNOME-based software
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
-IUSE=clang +devhelp doc flatpak +git +glade gtk-doc spell +sysprof test +webkit python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=amd64
-LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
-RDEPEND=>=dev-libs/libdazzle-3.37.0[introspection] >=dev-libs/glib-2.69.1:2 >=x11-libs/gtk+-3.24:3[introspection] >=x11-libs/gtksourceview-4.0.0:4[introspection] >=gui-libs/libhandy-1.5.0:1[introspection] >=dev-libs/json-glib-1.2.0 >=dev-libs/jsonrpc-glib-3.41.0 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.22.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] dev-libs/libportal:=[gtk,introspection] >=dev-libs/template-glib-3.28.0[introspection] >=x11-libs/vte-0.65.0:2.91[introspection] >=dev-libs/libxml2-2.9.0 webkit? ( >=net-libs/webkit-gtk-2.26:4=[introspection] ) sysprof? ( >=dev-util/sysprof-capture-3.37.1:4 >=dev-util/sysprof-3.37.1:0/4[gtk] ) >=app-text/cmark-0.29.0:0= flatpak? ( dev-util/ostree >=net-libs/libsoup-2.52.0:2.4 >=sys-apps/flatpak-1.10.2 ) git? ( dev-libs/libgit2:=[ssh,threads] >=dev-libs/libgit2-glib-0.28.0.1[ssh] ) dev-libs/libpcre:3 dev-libs/libpcre2 >=dev-libs/gobject-introspection-1.54.0:= python_single_target_python3_8? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.22.0:3[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) clang? ( sys-devel/clang:= ) devhelp? ( >=dev-util/devhelp-3.25.1:= ) glade? ( >=dev-util/glade-3.22.0:3.10= ) spell? ( >=app-text/gspell-1.8:0= app-text/enchant:2 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) flatpak? ( git ) devhelp? ( webkit )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-builder/42/gnome-builder-42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eb214f5dbee5b10f67e8fa2db2f655b3
diff --git a/metadata/md5-cache/dev-util/kdevelop-22.12.0 b/metadata/md5-cache/dev-util/kdevelop-22.12.0
index a66566a6797a..0fd16e82fad6 100644
--- a/metadata/md5-cache/dev-util/kdevelop-22.12.0
+++ b/metadata/md5-cache/dev-util/kdevelop-22.12.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://kdevelop.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm gear.kde.org optfeature
 IUSE=+gdbui hex +plasma +qmake reviewboard subversion test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm64 ~ppc64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.15.5:5 >=dev-qt/qtdeclarative-5.15.5:5[widgets] >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qthelp-5.15.5:5 >=dev-qt/qtnetwork-5.15.5:5 >=dev-qt/qttest-5.15.5:5 >=dev-qt/qtwebengine-5.15.5:5[widgets] >=dev-qt/qtwidgets-5.15.5:5 >=dev-qt/qtxml-5.15.5:5 >=dev-util/astyle-3.1:= kde-apps/libkomparediff2:5 >=kde-frameworks/karchive-5.99.0:5 >=kde-frameworks/kbookmarks-5.99.0:5 >=kde-frameworks/kcmutils-5.99.0:5 >=kde-frameworks/kcodecs-5.99.0:5 >=kde-frameworks/kcompletion-5.99.0:5 >=kde-frameworks/kconfig-5.99.0:5 >=kde-frameworks/kconfigwidgets-5.99.0:5 >=kde-frameworks/kcoreaddons-5.99.0:5 >=kde-frameworks/kcrash-5.99.0:5 >=kde-frameworks/kdeclarative-5.99.0:5 >=kde-frameworks/kguiaddons-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kiconthemes-5.99.0:5 >=kde-frameworks/kio-5.99.0:5 >=kde-frameworks/kitemmodels-5.99.0:5 >=kde-frameworks/kitemviews-5.99.0:5 >=kde-frameworks/kjobwidgets-5.99.0:5 >=kde-frameworks/knewstuff-5.99.0:5 >=kde-frameworks/knotifications-5.99.0:5 >=kde-frameworks/knotifyconfig-5.99.0:5 >=kde-frameworks/kparts-5.99.0:5 >=kde-frameworks/kservice-5.99.0:5 >=kde-frameworks/ktexteditor-5.99.0:5 >=kde-frameworks/ktextwidgets-5.99.0:5 >=kde-frameworks/kwidgetsaddons-5.99.0:5 >=kde-frameworks/kwindowsystem-5.99.0:5 >=kde-frameworks/kxmlgui-5.99.0:5 >=kde-frameworks/sonnet-5.99.0:5 >=kde-frameworks/threadweaver-5.99.0:5 >=sys-devel/clang-6.0:= gdbui? ( kde-plasma/libksysguard:5= ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.99.0:5 >=kde-frameworks/plasma-5.99.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.99.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) >=dev-qt/qdbus-5.15.5:* >=dev-qt/qtquickcontrols-5.15.5:5 >=dev-qt/qtquickcontrols2-5.15.5:5 dev-util/ninja kde-apps/kapptemplate:5 kde-apps/kio-extras:5 >=sys-devel/gdb-7.0[python] reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/57
 SRC_URI=mirror://kde/stable/release-service/22.12.0/src/kdevelop-22.12.0.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	ecm	de69a52df44fb7a4ccc49c275f0402c5	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7aff17b510c44eb95c4312f25e4e6f41
+_md5_=a83289ced3e94e270b323fcfec4d9787
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-22.12.0 b/metadata/md5-cache/dev-util/kdevelop-php-22.12.0
index d309172bb9ea..3c3ffe0dfd00 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-22.12.0
+++ b/metadata/md5-cache/dev-util/kdevelop-php-22.12.0
@@ -7,11 +7,11 @@ HOMEPAGE=https://kdevelop.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm gear.kde.org
 IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 arm64 ~x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5= >=kde-frameworks/kcmutils-5.99.0:5 >=kde-frameworks/kconfig-5.99.0:5 >=kde-frameworks/kconfigwidgets-5.99.0:5 >=kde-frameworks/kcoreaddons-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kio-5.99.0:5 >=kde-frameworks/ktexteditor-5.99.0:5 >=kde-frameworks/kwidgetsaddons-5.99.0:5 >=kde-frameworks/kxmlgui-5.99.0:5 >=kde-frameworks/threadweaver-5.99.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.0/src/kdev-php-22.12.0.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	ecm	de69a52df44fb7a4ccc49c275f0402c5	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bced3277ef1a6bf2f2ec6fd706e64f7d
+_md5_=b29e75425c655012057f9ccafc5255a2
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-22.12.0 b/metadata/md5-cache/dev-util/kdevelop-python-22.12.0
index a63030aca92f..2051c3b4d450 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-22.12.0
+++ b/metadata/md5-cache/dev-util/kdevelop-python-22.12.0
@@ -7,7 +7,7 @@ HOMEPAGE=https://kdevelop.org/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=ecm gear.kde.org python-single-r1
 IUSE=debug test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 arm64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-qt/qtgui-5.15.5:5 >=dev-qt/qtwidgets-5.15.5:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.99.0:5 >=kde-frameworks/kconfig-5.99.0:5 >=kde-frameworks/kcoreaddons-5.99.0:5 >=kde-frameworks/ki18n-5.99.0:5 >=kde-frameworks/kio-5.99.0:5 >=kde-frameworks/kitemmodels-5.99.0:5 >=kde-frameworks/knewstuff-5.99.0:5 >=kde-frameworks/kparts-5.99.0:5 >=kde-frameworks/ktexteditor-5.99.0:5 >=kde-frameworks/kwidgetsaddons-5.99.0:5 >=kde-frameworks/kxmlgui-5.99.0:5 >=kde-frameworks/threadweaver-5.99.0:5 python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycodestyle[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycodestyle[python_targets_python3_10(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/release-service/22.12.0/src/kdev-python-22.12.0.tar.xz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	ecm	de69a52df44fb7a4ccc49c275f0402c5	flag-o-matic	69394e25812406faa1f90edaf4969395	gear.kde.org	aebcdbce229877667716707f608f9cc3	kde.org	5dd311d12cdba33b446368fad288784d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d1ec943a6398e1abc7348a7a341694db
+_md5_=b1a725fdaecd257e2790519f79089dcb
diff --git a/metadata/md5-cache/dev-util/scap-driver-0.29.3 b/metadata/md5-cache/dev-util/scap-driver-0.29.3
index 1858f83448df..088816477e8e 100644
--- a/metadata/md5-cache/dev-util/scap-driver-0.29.3
+++ b/metadata/md5-cache/dev-util/scap-driver-0.29.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://sysdig.com/
 INHERIT=cmake linux-mod
 IUSE=dist-kernel
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=!<dev-util/sysdig-0.29.3[modules] kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/falcosecurity/libs/archive/e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz -> falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	linux-mod	6ae66f4d491ffb4390c547e768159fce	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2752aabcc5359fdb83e67ae76d3bbee6
+_md5_=fd6a43fd95a21084a637d6b7b005d550
diff --git a/metadata/md5-cache/dev-util/sysdig-0.29.3 b/metadata/md5-cache/dev-util/sysdig-0.29.3
index 36ee35ab0630..c94add0deb52 100644
--- a/metadata/md5-cache/dev-util/sysdig-0.29.3
+++ b/metadata/md5-cache/dev-util/sysdig-0.29.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sysdig.com/
 INHERIT=bash-completion-r1 cmake lua-single
 IUSE=+modules +lua_single_target_luajit
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=Apache-2.0
 PDEPEND=modules? ( =dev-util/scap-driver-0.29.3* )
 RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) app-misc/jq dev-cpp/tbb:= dev-cpp/yaml-cpp:= dev-libs/libb64:= dev-libs/openssl:= dev-libs/protobuf:= net-dns/c-ares:= net-libs/grpc:= net-misc/curl sys-libs/ncurses:= sys-libs/zlib:=
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( lua_single_target_luajit )
 SLOT=0
 SRC_URI=https://github.com/draios/sysdig/archive/0.29.3.tar.gz -> sysdig-0.29.3.tar.gz https://github.com/falcosecurity/libs/archive/e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz -> falcosecurity-libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=315cea452ca97bff7af40a6be5cd19c5
+_md5_=f843854fedc39858cd3245476e36ad76
diff --git a/metadata/md5-cache/dev-util/umockdev-0.17.13 b/metadata/md5-cache/dev-util/umockdev-0.17.13
deleted file mode 100644
index fcc16dd0a542..000000000000
--- a/metadata/md5-cache/dev-util/umockdev-0.17.13
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) app-arch/xz-utils virtual/pkgconfig >=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=net-libs/libpcap[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/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32: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(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-libs/libgudev:=[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=Mock hardware devices for creating unit tests
-EAPI=8
-HOMEPAGE=https://github.com/martinpitt/umockdev/
-INHERIT=meson-multilib python-any-r1 vala
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=net-libs/libpcap[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/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32: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(-)?] >=dev-libs/gobject-introspection-1.32:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.17.13/umockdev-0.17.13.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8
-_md5_=10273d414de343e15cd73e1133a8b103
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b41caa4f3c2b..b4395c584f01 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/python-gitlab-3.12.0 b/metadata/md5-cache/dev-vcs/python-gitlab-3.12.0
index ebeea6457571..ccda10cdc3b4 100644
--- a/metadata/md5-cache/dev-vcs/python-gitlab-3.12.0
+++ b/metadata/md5-cache/dev-vcs/python-gitlab-3.12.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-console-scripts-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-cov[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/requests-2.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-console-scripts-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-cov[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/requests-2.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python command line interface to gitlab API
 EAPI=8
 HOMEPAGE=https://github.com/python-gitlab/python-gitlab/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=LGPL-3
-RDEPEND=>=dev-python/requests-2.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-toolbelt-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/requests-2.28.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-toolbelt-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-gitlab/python-gitlab-3.12.0.tar.gz
 _eclasses_=distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ac5f3ccca669186505a5a80bfbb2b759
+_md5_=1d2f7786aae606af8f415cbcd0cefc01
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index a0b42452865b..1d460d053db1 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.16.6 b/metadata/md5-cache/games-strategy/wesnoth-1.16.6
index a9d8ad15617c..0ba28df5d914 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.16.6
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.16.6
@@ -13,4 +13,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,
 SLOT=0
 SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.16.6.tar.gz -> wesnoth-1.16.6.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=294f0f67e024c9f1df8fd2921c8c52ff
+_md5_=f9ed45b6f7038d5c2fd7ffdf4d6d5d08
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.17.11 b/metadata/md5-cache/games-strategy/wesnoth-1.17.11
index d4b79e20e818..9790f48eb3b6 100644
--- a/metadata/md5-cache/games-strategy/wesnoth-1.17.11
+++ b/metadata/md5-cache/games-strategy/wesnoth-1.17.11
@@ -12,4 +12,4 @@ RDEPEND=acct-group/wesnoth acct-user/wesnoth dev-libs/boost:=[bzip2,context,icu,
 SLOT=0
 SRC_URI=mirror://sourceforge/wesnoth/wesnoth-1.17.11.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f41da7d6cca55a0c0d86f6d10e8956c9
+_md5_=3391d164e267f931609898d4197c8307
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index e392c408a961..28dc6e07d038 100644
--- a/metadata/md5-cache/gnome-base/Manifest.gz
+++ b/metadata/md5-cache/gnome-base/Manifest.gz
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
deleted file mode 100644
index f9634ea71d70..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r300
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/itstool >=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 prepare test
-DEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) media-libs/fontconfig
-DESCRIPTION=Library with common API for various GNOME modules
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-IUSE=debug +introspection seccomp systemd udev
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
-RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
-SLOT=3/19
-SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9fac462aea8a475b53881ead749dec0c
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r400 b/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r400
deleted file mode 100644
index cc3208a0e5ef..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.4-r400
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/itstool >=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 prepare test
-DEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection] >=gui-libs/gtk-4.4.0:4[introspection] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= >=dev-libs/gobject-introspection-1.54:= media-libs/fontconfig
-DESCRIPTION=Library with common API for various GNOME modules
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-IUSE=debug gtk-doc seccomp systemd udev
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
-RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection] >=gui-libs/gtk-4.4.0:4[introspection] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= >=dev-libs/gobject-introspection-1.54:= seccomp? ( sys-apps/bubblewrap ) !<gnome-base/gnome-desktop-42.4:3
-SLOT=4/1
-SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b923d0e8f00074dd94fb4b64483fbb75
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.2-r4 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.2-r4
deleted file mode 100644
index 97f3ba7afc0f..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.2-r4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-kernel/linux-headers dev-util/glib-utils dev-util/gdbus-codegen x11-base/xorg-proto || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) test? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) gnome-base/gnome-session ) >=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 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=sci-geosciences/geocode-glib-3.10:0 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.0.0:4= <dev-libs/libgweather-4.2.0:4= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7:= >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:0= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 )
-DESCRIPTION=Gnome Settings Daemon
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
-IUSE=+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=sci-geosciences/geocode-glib-3.10:0 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.0.0:4= <dev-libs/libgweather-4.2.0:4= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7:= >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:0= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) gnome-base/dconf elogind? ( sys-auth/elogind )
-REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-settings-daemon/42/gnome-settings-daemon-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=43cd3ce071ec1deced6ddd0269a56daf
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-42.5-r2 b/metadata/md5-cache/gnome-base/gnome-shell-42.5-r2
deleted file mode 100644
index 267a3db742c8..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-42.5-r2
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)]
-DESCRIPTION=Provides core UI functions for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/gnome-browser-connector )
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5:0=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3:2 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] <dev-libs/libgweather-4.2.0:4 x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.5.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a58294472f60db83352f1a7ea82eade1
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-43.1 b/metadata/md5-cache/gnome-base/gnome-shell-43.1
deleted file mode 100644
index 5278419dc7fe..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-43.1
+++ /dev/null
@@ -1,19 +0,0 @@
-BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( x11-wm/mutter[test] ) 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 prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)]
-DESCRIPTION=Provides core UI functions for the GNOME desktop
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
-IUSE=elogind gtk-doc +ibus +networkmanager systemd test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
-RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.90.0:4=[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.73.1[cairo] >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-43.0:0/11[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] networkmanager? ( >=net-misc/networkmanager-1.10.4[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242:= >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-core-2.46:2[introspection] x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-libs/libpulse-2[glib] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] x11-libs/pango[introspection] net-libs/libsoup:3.0[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gnome
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/43/gnome-shell-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=924ae42cbc2a0970824a03133fe5fdde
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.48.1-r2 b/metadata/md5-cache/gnome-base/gvfs-1.48.1-r2
deleted file mode 100644
index 3affd4f4410b..000000000000
--- a/metadata/md5-cache/gnome-base/gvfs-1.48.1-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/gdbus-codegen test? ( dev-libs/libgdata ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:0= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Virtual filesystem implementation for GIO
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
-INHERIT=gnome.org gnome2-utils meson systemd tmpfiles xdg
-IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.65.1:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:0= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-2.58.0:2.4 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8 ) net-misc/openssh
-REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gvfs/1.48/gvfs-1.48.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=139bd61951c58c55bae59f235be8051a
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.40.0-r1 b/metadata/md5-cache/gnome-base/libgtop-2.40.0-r1
deleted file mode 100644
index 0cab6b3b0442..000000000000
--- a/metadata/md5-cache/gnome-base/libgtop-2.40.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/gtk-doc-am-1.4 >=sys-devel/gettext-0.19.6 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=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A library that provides top functionality to applications
-EAPI=7
-HOMEPAGE=https://gitlab.gnome.org/GNOME/libgtop
-INHERIT=flag-o-matic gnome2
-IUSE=+introspection
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=2/11
-SRC_URI=mirror://gnome/sources/libgtop/2.40/libgtop-2.40.0.tar.xz https://dev.gentoo.org/~leio/distfiles/libgtop-2.40.0-patchset.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=30dc7b10a78df9f5dea00697d5862297
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 1a0f8bef5645..5e4f1a60b689 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/evolution-data-server-3.44.4-r2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.4-r2
deleted file mode 100644
index 93ea82789f36..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.4-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.4:0= >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4:0=[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] oauth? ( dev-libs/libgdata[vala] ) gnome-online-accounts? ( dev-libs/libgdata[vala] ) )
-DESCRIPTION=Evolution groupware backend
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
-IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/gcr-3.4:0= >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4:0=[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0/63-26-20
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.44/evolution-data-server-3.44.4.tar.xz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=016bed64141005ef4caf3efbd35f8e6e
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1-r1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1-r1
deleted file mode 100644
index 5b40cf06aba5..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.46.1-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= ) vala? ( || ( dev-lang/vala:0.56 ) >=net-libs/libsoup-3.1.1:3.0[vala] dev-libs/libical[vala] )
-DESCRIPTION=Evolution groupware backend
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-data-server
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
-IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=net-libs/libsoup-3.1.1:3.0 >=dev-libs/json-glib-1.0.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=x11-libs/gtk+-3.20:3 >=gui-libs/gtk-4.4:4 >=media-libs/libcanberra-0.25[gtk3] oauth? ( >=net-libs/webkit-gtk-2.34.0:4.1 >=net-libs/webkit-gtk-2.36.0:5 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-4.2.0:4= )
-REQUIRED_USE=oauth? ( gtk ) vala? ( introspection )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=0/64-11-21-4-2-27-2-27-4-0
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.46/evolution-data-server-3.46.1.tar.xz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	db-use	3807d3e43e20aaa6e4decedd2bb2db4c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5957dde0e26af955e773c0d76239141c
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.4-r1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.4-r1
deleted file mode 100644
index 4c09e55204c2..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.4:0= >=mail-client/evolution-3.44.4:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock:0 )
-DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution-ews
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 optfeature
-IUSE=test
-KEYWORDS=amd64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.4:0= >=mail-client/evolution-3.44.4:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/evolution-ews/3.44/evolution-ews-3.44.4.tar.xz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ad686ac8bf6876e2e6565127844214c7
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-42.3 b/metadata/md5-cache/gnome-extra/gnome-boxes-42.3
deleted file mode 100644
index d9b2cfc1113c..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-42.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib rdp? ( x11-libs/gtk+:3[introspection] ) dev-util/itstool >=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 prepare pretend setup test
-DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= )
-DESCRIPTION=Simple GNOME application to access remote or virtual systems
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-IUSE=rdp
-KEYWORDS=amd64
-LICENSE=LGPL-2+ CC-BY-2.0
-RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-boxes/42/gnome-boxes-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=faf9c2f157088286c9074bf3a5d969e2
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-42.2 b/metadata/md5-cache/gnome-extra/gnome-calculator-42.2
deleted file mode 100644
index b60923e4e46f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-42.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 ) net-libs/libsoup:2.4[vala] gui-libs/gtksourceview:5[vala] gui-libs/libhandy:1[vala] 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 prepare test
-DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-DESCRIPTION=A calculator application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson vala virtualx xdg
-IUSE=+introspection test test
-KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calculator/42/gnome-calculator-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=eb0f48a3547b67b2ebfd3b2ca21da44e
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-42.2-r2 b/metadata/md5-cache/gnome-extra/gnome-calendar-42.2-r2
deleted file mode 100644
index a7ef1efb579f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-42.2-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/gdbus-codegen 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= <dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23:0
-DESCRIPTION=Manage your online calendars with simple and modern interface
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson virtualx xdg
-IUSE=test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= <dev-libs/libgweather-4.2.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23:0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calendar/42/gnome-calendar-42.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=326a3eda5e638e92e5e1f0e27986f70b
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-43.0 b/metadata/md5-cache/gnome-extra/gnome-characters-43.0
deleted file mode 100644
index 5cd256e634d5..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-characters-43.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 postinst postrm preinst test
-DEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.2:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
-DESCRIPTION=Unicode character map viewer and library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+ BSD
-RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.2:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-characters/43/gnome-characters-43.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=346f458e24590866289178feb2f96e98
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0-r2 b/metadata/md5-cache/gnome-extra/gnome-clocks-42.0-r2
deleted file mode 100644
index 40d4ea9b0fe6..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 ) <dev-libs/libgweather-4.2.0:4[vala] media-libs/gsound[vala] gui-libs/libadwaita:1[vala] app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.68:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.0.0:4= gnome-base/gnome-desktop:4 >=sci-geosciences/geocode-glib-1:0 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.0:1
-DESCRIPTION=Clocks application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.68:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.0.0:4= gnome-base/gnome-desktop:4 >=sci-geosciences/geocode-glib-1:0 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.0:1
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-clocks/42/gnome-clocks-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cb9cbfb19508bad532aa354db09a3d7e
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-41.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
deleted file mode 100644
index f024b5f67227..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-41.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( dev-lang/vala:0.56 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.1.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=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 prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GNOME contact management application
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=telepathy v4l
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 >=gnome-base/gnome-desktop-3.0:3= net-libs/gnome-online-accounts:= >=x11-libs/gtk+-3.23.1:3 v4l? ( >=media-video/cheese-3.5.91:= ) telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-contacts/41/gnome-contacts-41.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fc1ced6a3e749e15c951918a0029db88
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0-r1 b/metadata/md5-cache/gnome-extra/gnome-contacts-42.0-r1
deleted file mode 100644
index b670f5855c65..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( dev-lang/vala:0.56 ) >=dev-libs/gobject-introspection-1.54 dev-libs/folks[vala(+)] net-libs/gnome-online-accounts[vala] gnome-extra/evolution-data-server[gtk,vala] >=dev-libs/libportal-0.6:=[vala] telepathy? ( net-libs/telepathy-glib[vala] ) >=gui-libs/libhandy-1.1.0:1[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/appstream-glib dev-libs/libxml2:2 dev-libs/libxslt >=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 prepare setup test
-DEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.14.0:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 net-libs/gnome-online-accounts:= >=gui-libs/gtk-4.6:4 gui-libs/libadwaita:1 telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1 >=dev-libs/libportal-0.6:=
-DESCRIPTION=GNOME contact management application
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-IUSE=telepathy
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.14.0:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 net-libs/gnome-online-accounts:= >=gui-libs/gtk-4.6:4 gui-libs/libadwaita:1 telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1 >=dev-libs/libportal-0.6:=
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-contacts/42/gnome-contacts-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8a75c2d8864c6dbd6fe0e816ded89f44
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
deleted file mode 100644
index a41a5e5dce54..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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 postrm preinst test
-DEPEND=dev-libs/glib:2
-DESCRIPTION=KDE Connect implementation for Gnome Shell
-EAPI=8
-HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2-utils meson readme.gentoo-r1 xdg
-IUSE=nautilus
-KEYWORDS=amd64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-42* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
-SLOT=0
-SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v50.tar.gz -> gnome-shell-extension-gsconnect-50.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3c453c66a577937f733005b8dde1ca19
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.3 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.3
deleted file mode 100644
index 77db31e842b6..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211
-DESCRIPTION=JavaScript extensions for GNOME Shell
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org readme.gentoo-r1 meson xdg
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell-extensions/42/gnome-shell-extensions-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5c51656c3897b3322a7d0eb280226ae6
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.1 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.1
deleted file mode 100644
index 23d7faf1c51f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Unofficial extension pack providing GNOME 2-like features
-EAPI=8
-HOMEPAGE=http://frippery.org/extensions/index.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gui-libs/gtk:4[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-42.1.tgz
-_md5_=a2540e7540d356d3dc6daf51f173803e
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-15.0.1 b/metadata/md5-cache/gnome-extra/gucharmap-15.0.1
deleted file mode 100644
index 830ec0d3e068..000000000000
--- a/metadata/md5-cache/gnome-extra/gucharmap-15.0.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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 https://gitlab.gnome.org/GNOME/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.1/gucharmap-15.0.1.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e17742a1df622558d771b5cfa6f7e550
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.28.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.28.0
deleted file mode 100644
index 34ac187a0a51..000000000000
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.28.0
+++ /dev/null
@@ -1,16 +0,0 @@
-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.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=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 meson xdg
-IUSE=appindicator modemmanager selinux teamd
-KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=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.28/network-manager-applet-1.28.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a556e1c4ff11415df82b1c8185c94801
diff --git a/metadata/md5-cache/gnome-extra/sushi-42.0 b/metadata/md5-cache/gnome-extra/sushi-42.0
deleted file mode 100644
index 397363e6f923..000000000000
--- a/metadata/md5-cache/gnome-extra/sushi-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=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 postinst postrm preinst test
-DEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= >=net-libs/webkit-gtk-2.34:4[introspection] >=dev-libs/gjs-1.40
-DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-IUSE=office wayland +X
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= >=net-libs/webkit-gtk-2.34:4[introspection] >=dev-libs/gjs-1.40 >=gnome-base/nautilus-3.1.90 media-plugins/gst-plugins-gtk:1.0[wayland?,X?] office? ( app-office/libreoffice )
-REQUIRED_USE=|| ( wayland X )
-SLOT=0
-SRC_URI=mirror://gnome/sources/sushi/42/sushi-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7965e0c65554e4ae7e18476b6df7926a
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.42.1 b/metadata/md5-cache/gnome-extra/zenity-3.42.1
deleted file mode 100644
index bceade1dfe36..000000000000
--- a/metadata/md5-cache/gnome-extra/zenity-3.42.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/itstool >=sys-devel/gettext-0.19.4 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=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
-DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=libnotify webkit
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-RDEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
-SLOT=0
-SRC_URI=mirror://gnome/sources/zenity/3.42/zenity-3.42.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=695fc32a334f220438d77e6e9c40a580
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 617e4b10f807..152a9e88db09 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/amtk-5.4.1 b/metadata/md5-cache/gui-libs/amtk-5.4.1
deleted file mode 100644
index 475c43cda360..000000000000
--- a/metadata/md5-cache/gui-libs/amtk-5.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-DESCRIPTION=Actions, Menus and Toolbars Kit for GTK+ applications
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/Amtk https://gitlab.gnome.org/swilmet/amtk
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 meson
-IUSE=+introspection gtk-doc
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-SLOT=5
-SRC_URI=mirror://gnome/sources/amtk/5.4/amtk-5.4.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a3b79ed2e8b91051cf5f425aca208faa
diff --git a/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.6 b/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.6
deleted file mode 100644
index 9ce1071e4e25..000000000000
--- a/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=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 postrm preinst prepare test
-DEPEND=>x11-libs/gdk-pixbuf-2.22.0: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(-)?] >media-libs/libwebp-0.4.3:=[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=WebP GDK Pixbuf Loader library
-EAPI=8
-HOMEPAGE=https://github.com/aruiz/webp-pixbuf-loader
-INHERIT=gnome2-utils meson-multilib
-IUSE=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 arm arm64 ppc ppc64 x86
-LICENSE=LGPL-2+
-RDEPEND=>x11-libs/gdk-pixbuf-2.22.0: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(-)?] >media-libs/libwebp-0.4.3:=[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
-SRC_URI=https://github.com/aruiz/webp-pixbuf-loader/archive/0.0.6.tar.gz -> gdk-pixbuf-loader-webp-0.0.6.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d6d5d9749b3524cded80909e029636d4
diff --git a/metadata/md5-cache/gui-libs/tepl-6.0.2 b/metadata/md5-cache/gui-libs/tepl-6.0.2
deleted file mode 100644
index a71e0c458c02..000000000000
--- a/metadata/md5-cache/gui-libs/tepl-6.0.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig 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 test
-DEPEND=>=dev-libs/glib-2.62:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-4.0:4[introspection?] >=gui-libs/amtk-5.0:5[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-DESCRIPTION=GtkSourceView-based text editors and IDE helper library
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/swilmet/tepl
-INHERIT=gnome.org meson virtualx
-IUSE=+introspection gtk-doc test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/glib-2.62:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-4.0:4[introspection?] >=gui-libs/amtk-5.0:5[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=mirror://gnome/sources/tepl/6.0/tepl-6.0.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=0b8c421fc0b31d8da5036dc64ee8b817
diff --git a/metadata/md5-cache/gui-libs/vte-0.70.1 b/metadata/md5-cache/gui-libs/vte-0.70.1
deleted file mode 100644
index 003ecd40fe75..000000000000
--- a/metadata/md5-cache/gui-libs/vte-0.70.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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.52: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 https://gitlab.gnome.org/GNOME/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.52: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.70.1[systemd?]
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-SLOT=2.91-gtk4
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a6c75ceaa90c03cca2548b1cf4c73eb1
diff --git a/metadata/md5-cache/gui-libs/vte-common-0.70.1 b/metadata/md5-cache/gui-libs/vte-common-0.70.1
deleted file mode 100644
index d832188bbd2c..000000000000
--- a/metadata/md5-cache/gui-libs/vte-common-0.70.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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.52: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 https://gitlab.gnome.org/GNOME/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
-SLOT=2.91
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=76eb6578175915090dfc0a712a5ee03e
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 0c3c837d0ce7..4da5377a8a4a 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/evolution-3.44.4-r4 b/metadata/md5-cache/mail-client/evolution-3.44.4-r4
deleted file mode 100644
index 4c58370e0174..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.44.4-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.4:0=[gtk] >=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.44.4:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0:0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= ) ytnef? ( net-mail/ytnef )
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution https://gitlab.gnome.org/GNOME/evolution
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake gnome2 readme.gentoo-r1
-IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4:0=[gtk] >=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.44.4:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4=[spell?] >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7 >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0:0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) weather? ( >=dev-libs/libgweather-3.91.0:4= <dev-libs/libgweather-4.2.0:4= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.44/evolution-3.44.4.tar.xz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a3f0448111e7280f1c3816771ab18519
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 6213173eb8e8..ad61ec2ca2fb 100644
--- a/metadata/md5-cache/mail-filter/Manifest.gz
+++ b/metadata/md5-cache/mail-filter/Manifest.gz
diff --git a/metadata/md5-cache/mail-filter/imapfilter-2.7.6 b/metadata/md5-cache/mail-filter/imapfilter-2.7.6
index 31508f133140..f53f32e8a902 100644
--- a/metadata/md5-cache/mail-filter/imapfilter-2.7.6
+++ b/metadata/md5-cache/mail-filter/imapfilter-2.7.6
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/lefcha/imapfilter
 INHERIT=lua-single toolchain-funcs
 IUSE=lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
 LICENSE=MIT
 RDEPEND=dev-libs/openssl:= dev-libs/libpcre2 lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 )
 REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=https://github.com/lefcha/imapfilter/archive/v2.7.6.tar.gz -> imapfilter-2.7.6.tar.gz
 _eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=11a555111180f9ea5a72dc49d6148141
+_md5_=44cfd83f8953d0633e4090492a891fb2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index c248f615fe8c..bcab7e1c95fd 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/eog-42.3-r1 b/metadata/md5-cache/media-gfx/eog-42.3-r1
deleted file mode 100644
index 7c9556553cb6..000000000000
--- a/metadata/md5-cache/media-gfx/eog-42.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=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.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
-DESCRIPTION=The Eye of GNOME image viewer
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2= ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
-REQUIRED_USE=exif? ( jpeg )
-SLOT=1
-SRC_URI=mirror://gnome/sources/eog/42/eog-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0c3bcbda167c5244b3f42a5985946a40
diff --git a/metadata/md5-cache/media-gfx/gmic-3.0.1-r3 b/metadata/md5-cache/media-gfx/gmic-3.0.1-r3
index 20a6bede7d38..246a0a846a49 100644
--- a/metadata/md5-cache/media-gfx/gmic-3.0.1-r3
+++ b/metadata/md5-cache/media-gfx/gmic-3.0.1-r3
@@ -13,4 +13,4 @@ REQUIRED_USE=gimp? ( png zlib fftw X ) qt5? ( png zlib fftw X )
 SLOT=0
 SRC_URI=https://gmic.eu/files/source/gmic_3.0.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ce589a7e6bb558fa0bd29c4400082d10
+_md5_=98a4ac68ca31284926cc3b1b972b8970
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index b282bb5f5904..cddc9f426500 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/ctl-1.5.2-r4 b/metadata/md5-cache/media-libs/ctl-1.5.2-r4
index 0023423675db..6d683f50e102 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2-r4
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=51e3d22cf636f36cf91e281b88c155aa
+_md5_=7b69deb67e9a14376920a2380057d9e5
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5 b/metadata/md5-cache/media-libs/hamlib-4.5
deleted file mode 100644
index d668b85877a0..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=8
-HOMEPAGE=http://www.hamlib.org
-INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f3b57b7b8776c199eb012f2312fa81e9
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5.1 b/metadata/md5-cache/media-libs/hamlib-4.5.1
deleted file mode 100644
index 271edffe0846..000000000000
--- a/metadata/md5-cache/media-libs/hamlib-4.5.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
-DESCRIPTION=Ham radio backend rig control libraries
-EAPI=8
-HOMEPAGE=http://www.hamlib.org
-INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0/4.2
-SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=a76e62ea7f3ef785add74692ac3c5d07
diff --git a/metadata/md5-cache/media-libs/hamlib-4.5.3 b/metadata/md5-cache/media-libs/hamlib-4.5.3
index 5f63752db1c2..22e83e1a1e2d 100644
--- a/metadata/md5-cache/media-libs/hamlib-4.5.3
+++ b/metadata/md5-cache/media-libs/hamlib-4.5.3
@@ -1,17 +1,17 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
+DEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig dev-lang/swig >=sys-devel/libtool-2.2 doc? ( app-doc/doxygen dev-util/source-highlight )
 DESCRIPTION=Ham radio backend rig control libraries
 EAPI=8
 HOMEPAGE=http://www.hamlib.org
 INHERIT=autotools python-single-r1
-IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=doc perl python tcl python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=LGPL-2 GPL-2
-RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RDEPEND==virtual/libusb-0* dev-libs/libxml2 sys-libs/readline:0= perl? ( dev-lang/perl ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0/4.2
 SRC_URI=mirror://sourceforge/hamlib/hamlib-4.5.3.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6980d690a17f63b7ea8be21d65c32e0d
+_md5_=d400f6f515ba983f7e55543ac3380473
diff --git a/metadata/md5-cache/media-libs/intel-mediasdk-22.6.4 b/metadata/md5-cache/media-libs/intel-mediasdk-22.6.4
new file mode 100644
index 000000000000..6a21201f6a32
--- /dev/null
+++ b/metadata/md5-cache/media-libs/intel-mediasdk-22.6.4
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=x11-libs/libpciaccess >=media-libs/libva-intel-media-driver-22.6.4 media-libs/libva[X?,wayland?] x11-libs/libdrm[video_cards_intel] wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb )
+DESCRIPTION=Intel Media SDK
+EAPI=8
+HOMEPAGE=https://github.com/Intel-Media-SDK/MediaSDK
+INHERIT=cmake optfeature
+IUSE=dri test +tools wayland X
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libpciaccess >=media-libs/libva-intel-media-driver-22.6.4 media-libs/libva[X?,wayland?] x11-libs/libdrm[video_cards_intel] wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb )
+REQUIRED_USE=dri? ( X ) wayland? ( tools ) X? ( tools )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-22.6.4.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=dac40ecec49e576b285ee80212078722
diff --git a/metadata/md5-cache/media-libs/mesa-22.2.3 b/metadata/md5-cache/media-libs/mesa-22.2.3
deleted file mode 100644
index ae241251f804..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) ) vulkan-overlay? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3:=[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-1.13:=[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3:=[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-1.13:=[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.2.3.tar.xz
-_eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=3a3830ea804137d11a90c2eabed7f24d
diff --git a/metadata/md5-cache/media-libs/mesa-22.2.5 b/metadata/md5-cache/media-libs/mesa-22.2.5
index a3d8dde3aa6e..4bd6e4a752d2 100644
--- a/metadata/md5-cache/media-libs/mesa-22.2.5
+++ b/metadata/md5-cache/media-libs/mesa-22.2.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3:=[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-1.13:=[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-16:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-16:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.2.5.tar.xz
 _eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ee2a700942e96d1229aeeba68426e551
+_md5_=3a3830ea804137d11a90c2eabed7f24d
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.0 b/metadata/md5-cache/media-libs/mesa-22.3.0
deleted file mode 100644
index 0794b6105c96..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3[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-1.13:=[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3[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-1.13:=[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.3.0.tar.xz
-_eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6b0ed74fb00f4ee85391a76d18c2441a
diff --git a/metadata/md5-cache/media-libs/mesa-22.3.1 b/metadata/md5-cache/media-libs/mesa-22.3.1
deleted file mode 100644
index a52d81d24cc3..000000000000
--- a/metadata/md5-cache/media-libs/mesa-22.3.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) vulkan? ( dev-util/glslang ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3[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-1.13:=[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[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-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=8
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=media-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,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/libxshmfence-1.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/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/libXxf86vm-1.1.3[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-1.13:=[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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-17:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:15[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-17:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) zink? ( vulkan )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.3.1.tar.xz
-_eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	llvm	2573b2f563461fd232f4587523e5144b	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6b0ed74fb00f4ee85391a76d18c2441a
diff --git a/metadata/md5-cache/media-libs/oneVPL-2023.1.1 b/metadata/md5-cache/media-libs/oneVPL-2023.1.1
new file mode 100644
index 000000000000..eee944834bec
--- /dev/null
+++ b/metadata/md5-cache/media-libs/oneVPL-2023.1.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=x11-libs/libpciaccess vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] ) drm? ( x11-libs/libdrm ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb )
+DESCRIPTION=oneAPI Video Processing Library, dispatcher, tools, and examples
+EAPI=8
+HOMEPAGE=https://github.com/oneapi-src/oneVPL
+INHERIT=cmake optfeature
+IUSE=dri drm examples experimental +tools test vaapi wayland X
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=x11-libs/libpciaccess vaapi? ( media-libs/libva[X?,wayland?,drm(+)?] ) drm? ( x11-libs/libdrm ) wayland? ( dev-libs/wayland dev-libs/wayland-protocols ) X? ( x11-libs/libX11 x11-libs/libxcb )
+REQUIRED_USE=dri? ( X drm ) drm? ( tools ) X? ( tools vaapi ) wayland? ( tools drm ) vaapi? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/oneapi-src/oneVPL/archive/refs/tags/v2023.1.1.tar.gz -> oneVPL-2023.1.1.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7bbaec4a0789508f93a35da9d95dd949
diff --git a/metadata/md5-cache/media-libs/oneVPL-cpu-2023.1.1 b/metadata/md5-cache/media-libs/oneVPL-cpu-2023.1.1
new file mode 100644
index 000000000000..4ec3cbcea94d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/oneVPL-cpu-2023.1.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/dav1d media-libs/oneVPL[experimental?] media-libs/svt-av1 media-libs/svt-hevc media-video/ffmpeg x264? ( media-libs/x264 ) openh264? ( media-libs/openh264 )
+DESCRIPTION=oneAPI Video Processing Library CPU implementation
+EAPI=8
+HOMEPAGE=https://github.com/oneapi-src/oneVPL-cpu
+INHERIT=cmake
+IUSE=experimental openh264 test +x264
+KEYWORDS=~amd64
+LICENSE=MIT x264? ( GPL-2 )
+RDEPEND=media-libs/dav1d media-libs/oneVPL[experimental?] media-libs/svt-av1 media-libs/svt-hevc media-video/ffmpeg x264? ( media-libs/x264 ) openh264? ( media-libs/openh264 )
+REQUIRED_USE=^^ ( openh264 x264 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/oneapi-src/oneVPL-cpu/archive/refs/tags/v2023.1.1.tar.gz -> oneVPL-cpu-2023.1.1.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=daa1f298cd5245896d5905c0de8f0253
diff --git a/metadata/md5-cache/media-libs/oneVPL-intel-gpu-22.6.4 b/metadata/md5-cache/media-libs/oneVPL-intel-gpu-22.6.4
new file mode 100644
index 000000000000..64e8fba4ec1c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/oneVPL-intel-gpu-22.6.4
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libva x11-libs/libdrm[video_cards_intel]
+DESCRIPTION=oneAPI Video Processing Library Intel GPU implementation
+EAPI=8
+HOMEPAGE=https://github.com/oneapi-src/oneVPL-intel-gpu
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=media-libs/libva x11-libs/libdrm[video_cards_intel] >=media-libs/libva-intel-media-driver-22.6.4 || ( media-libs/oneVPL[drm,vaapi] media-libs/intel-mediasdk )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/oneapi-src/oneVPL-intel-gpu/archive/refs/tags/intel-onevpl-22.6.4.tar.gz -> oneVPL-intel-gpu-22.6.4.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=cbcce4a03c5fabd6d9198d82da8ace2d
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022 b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
index cb5a23d41377..5a5e7609baa3 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-0_pre20201022
@@ -10,4 +10,4 @@ RDEPEND=acct-group/video !media-libs/raspberrypi-userland-bin
 SLOT=0
 SRC_URI=https://github.com/raspberrypi/userland/archive/e432bc3400401064e2d8affa5d1454aac2cf4a00.tar.gz -> raspberrypi-userland-0_pre20201022.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c826703fd27ca229255e2b87ccb07387
+_md5_=749f0540f8bfda5a583b3a30f325c158
diff --git a/metadata/md5-cache/media-libs/raspberrypi-userland-9999 b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
index 53fa5dd81d60..090de7c9c9f9 100644
--- a/metadata/md5-cache/media-libs/raspberrypi-userland-9999
+++ b/metadata/md5-cache/media-libs/raspberrypi-userland-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=acct-group/video !media-libs/raspberrypi-userland-bin
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5b70ab9a6df33ffc034461c3b46a7025
+_md5_=0e038f9f8263dd9b851e6c15df525a08
diff --git a/metadata/md5-cache/media-libs/rtmidi-5.0.0 b/metadata/md5-cache/media-libs/rtmidi-5.0.0
index c86e02f99063..0a57a14d5601 100644
--- a/metadata/md5-cache/media-libs/rtmidi-5.0.0
+++ b/metadata/md5-cache/media-libs/rtmidi-5.0.0
@@ -12,4 +12,4 @@ RDEPEND=alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack )
 SLOT=0
 SRC_URI=https://www.music.mcgill.ca/~gary/rtmidi/release/rtmidi-5.0.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f3b996a1d4c598f485355300dc7605e2
+_md5_=70ce7a6e23efc817cd4ccf28cddf7fcd
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 97dfeab8aede..263c16eb5e61 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2 b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
index 5bcbebb91b40..5cffc5998859 100644
--- a/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
+++ b/metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
@@ -12,4 +12,4 @@ RDEPEND=>=media-video/obs-studio-25.0.8-r1 dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev
 SLOT=0
 SRC_URI=https://github.com/CatxFish/obs-v4l2sink/archive/1ec3c8ada0e1040d867ce567f177be55cd278378.tar.gz -> obs-v4l2sink-0.1.0_p20181012.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c34048fbf3607481c43562e6dc7670e3
+_md5_=7e0d4c7f6014ba6de39158cc0b472a7a
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 07d433ac0edc..31d9c8e4ff97 100644
--- a/metadata/md5-cache/net-fs/Manifest.gz
+++ b/metadata/md5-cache/net-fs/Manifest.gz
diff --git a/metadata/md5-cache/net-fs/cvmfs-2.9.4 b/metadata/md5-cache/net-fs/cvmfs-2.9.4
index 9a31bca375c8..bc99f8c48646 100644
--- a/metadata/md5-cache/net-fs/cvmfs-2.9.4
+++ b/metadata/md5-cache/net-fs/cvmfs-2.9.4
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://cernvm.cern.ch/fs/
 INHERIT=cmake linux-info bash-completion-r1
 IUSE=server
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=acct-group/cvmfs acct-user/cvmfs app-arch/libarchive dev-cpp/gtest dev-cpp/sparsehash dev-db/sqlite:3= <dev-libs/leveldb-1.23:0= dev-libs/openssl:0= dev-libs/protobuf:0= net-dns/c-ares:0= net-libs/pacparser:0= net-misc/curl:0[adns] sys-apps/attr sys-fs/fuse:0= sys-fs/fuse:3= sys-libs/libcap:0= sys-libs/zlib:0= app-admin/sudo net-fs/autofs
 SLOT=0
 SRC_URI=https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.9.4/source.tar.gz -> cvmfs-2.9.4.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6fea0637a6a93103a4896481c0b5cae0
+_md5_=1932246c4c1337437fac9a9ce5407037
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 0c513fd9c63c..91847b023be0 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/polari-42.0 b/metadata/md5-cache/net-irc/polari-42.0
deleted file mode 100644
index 163fcb246660..000000000000
--- a/metadata/md5-cache/net-irc/polari-42.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( dev-libs/json-glib ) 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.43.4:2 net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.69.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection]
-DESCRIPTION=An IRC client for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg
-IUSE=test
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.43.4:2 net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.69.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/polari/42/polari-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=faa7e9cc5403a886dfce8d361d8a62a3
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index fe0b667e1972..10ca50dac777 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/aqbanking-6.5.3 b/metadata/md5-cache/net-libs/aqbanking-6.5.3
index 3afd8c914e13..8b1f62bb323e 100644
--- a/metadata/md5-cache/net-libs/aqbanking-6.5.3
+++ b/metadata/md5-cache/net-libs/aqbanking-6.5.3
@@ -5,9 +5,9 @@ DESCRIPTION=Generic Online Banking Interface
 EAPI=8
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 IUSE=debug doc ebics examples ofx
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= >=sys-libs/gwenhywfar-5.10.1:= virtual/libintl ebics? ( dev-libs/xmlsec[gcrypt] ) ofx? ( >=dev-libs/libofx-0.9.5:= )
 SLOT=0
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/467/aqbanking-6.5.3.tar.gz
-_md5_=253de68eb50297d17606c5aa0b693a96
+_md5_=3356b567d43213be685a52bd274adcfb
diff --git a/metadata/md5-cache/net-libs/dleyna-0.8.1 b/metadata/md5-cache/net-libs/dleyna-0.8.1
deleted file mode 100644
index 269473cd2de5..000000000000
--- a/metadata/md5-cache/net-libs/dleyna-0.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/docutils virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
-DESCRIPTION=A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/World/dLeyna
-INHERIT=meson
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.28:2 >=net-libs/gssdp-1.6.0:1.6= >=net-libs/gupnp-1.6.0:1.6= >=net-libs/gupnp-av-0.12.9:0= >=media-libs/gupnp-dlna-0.9.4:2.0= >=net-libs/libsoup-3.0:3.0 dev-libs/libxml2 !net-libs/dleyna-connector-dbus !net-libs/dleyna-core !net-libs/dleyna-renderer !net-misc/dleyna-server
-SLOT=1.0/6
-SRC_URI=https://gitlab.gnome.org/World/dLeyna/-/archive/v0.8.1/dLeyna-v0.8.1.tar.bz2
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=514d6775d35f7459571f2b6396f425a1
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
deleted file mode 100644
index c714c8f4b939..000000000000
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.52:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 >=net-libs/webkit-gtk-2.26.0:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 ) vala? ( || ( dev-lang/vala:0.56 ) ) dev-libs/libxslt >=dev-util/gdbus-codegen-2.30.0 >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-libs/gobject-introspection-common gnome-base/gnome-common
-DESCRIPTION=GNOME framework for accessing online accounts
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2 vala
-IUSE=debug gnome +introspection kerberos +vala
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+
-PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
-RDEPEND=>=dev-libs/glib-2.52:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 >=net-libs/webkit-gtk-2.26.0:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.44/gnome-online-accounts-3.44.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1b67457c7da41276f21372b6fb31c938
diff --git a/metadata/md5-cache/net-libs/libnma-1.10.2 b/metadata/md5-cache/net-libs/libnma-1.10.2
deleted file mode 100644
index 6ad819c21c91..000000000000
--- a/metadata/md5-cache/net-libs/libnma-1.10.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) net-misc/networkmanager[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] ) introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-DESCRIPTION=NetworkManager GUI library
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/libnma
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg vala
-IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libnma/1.10/libnma-1.10.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=534ae6826355e5908ab6fdf321e61da5
diff --git a/metadata/md5-cache/net-libs/libnma-1.10.4 b/metadata/md5-cache/net-libs/libnma-1.10.4
deleted file mode 100644
index 840305da8cc8..000000000000
--- a/metadata/md5-cache/net-libs/libnma-1.10.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/libxml2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) vala? ( || ( dev-lang/vala:0.56 ) net-misc/networkmanager[vala] ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-4.0.0:4 ) introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-DESCRIPTION=NetworkManager GUI library
-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 vala
-IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-4.0.0:4 ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libnma/1.10/libnma-1.10.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=181f87952528ddfb76c18a73628dd552
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 0b7bd6fd4592..3860f162a2a3 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/gupnp-tools-0.10.3-r1 b/metadata/md5-cache/net-misc/gupnp-tools-0.10.3-r1
deleted file mode 100644
index 830f4da324ce..000000000000
--- a/metadata/md5-cache/net-misc/gupnp-tools-0.10.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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=>=net-libs/gssdp-1.2.0:0= >=net-libs/gupnp-1.4.0:0= >=net-libs/libsoup-2.42:2.4 >=net-libs/gupnp-av-0.5.5:0= >=x11-libs/gtk+-3.10:3 >=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 x11-libs/gtksourceview:4
-DESCRIPTION=Collection of developer-oriented UPnP tools
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/GUPnP
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=net-libs/gssdp-1.2.0:0= >=net-libs/gupnp-1.4.0:0= >=net-libs/libsoup-2.42:2.4 >=net-libs/gupnp-av-0.5.5:0= >=x11-libs/gtk+-3.10:3 >=dev-libs/glib-2.24:2 >=dev-libs/libxml2-2.4:2 x11-libs/gtksourceview:4
-SLOT=0
-SRC_URI=mirror://gnome/sources/gupnp-tools/0.10/gupnp-tools-0.10.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9fbb7e36c019a3fa3ba28e7fe2d1e00
diff --git a/metadata/md5-cache/net-misc/kafkacat-1.7.1 b/metadata/md5-cache/net-misc/kafkacat-1.7.1
index 92d7ba148482..6554617e662f 100644
--- a/metadata/md5-cache/net-misc/kafkacat-1.7.1
+++ b/metadata/md5-cache/net-misc/kafkacat-1.7.1
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/edenhill/kcat
 INHERIT=toolchain-funcs
 IUSE=+avro +json
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/librdkafka-0.9.4 avro? ( dev-libs/avro-c dev-libs/libserdes ) json? ( dev-libs/yajl )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/edenhill/kcat/archive/1.7.1.tar.gz -> kcat-1.7.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e6c7fc95d535d98e2a95cb92c821ddf7
+_md5_=a3236e9945d4e7c8ca0e7d2031705e41
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220725 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220725
deleted file mode 100644
index 5a133cff2905..000000000000
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220725
+++ /dev/null
@@ -1,14 +0,0 @@
-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 ) test
-SLOT=0
-SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20220725/mobile-broadband-provider-info-20220725.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=e091890733baf9ce6b6cf55c7e7930d5
diff --git a/metadata/md5-cache/net-misc/mosh-1.4.0 b/metadata/md5-cache/net-misc/mosh-1.4.0
index 0f03df283b7f..30645ba3cff0 100644
--- a/metadata/md5-cache/net-misc/mosh-1.4.0
+++ b/metadata/md5-cache/net-misc/mosh-1.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mosh.org
 INHERIT=autotools bash-completion-r1
 IUSE=+client examples +hardened nettle +server syslog ufw +utempter
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/protobuf:= sys-libs/ncurses:= sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) !nettle? ( dev-libs/openssl:= ) nettle? ( dev-libs/nettle:= ) utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://github.com/mobile-shell/mosh/releases/download/mosh-1.4.0/mosh-1.4.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=06e47a481d88b2783270f26e1f56fdee
+_md5_=393ee0a5778396e7182ee76c7cc6dea6
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.40.2 b/metadata/md5-cache/net-misc/networkmanager-1.40.2
deleted file mode 100644
index aa437a51f9ca..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-1.40.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.56 ) ) test? ( >=dev-libs/jansson-2.7 || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) >=sys-kernel/linux-headers-3.18 net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
-INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sec-policy/selinux-networkmanager sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
-REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager/1.40/NetworkManager-1.40.2.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=359e62bc9a81b97f2ee34f47641c7a8b
diff --git a/metadata/md5-cache/net-misc/rygel-0.40.4 b/metadata/md5-cache/net-misc/rygel-0.40.4
deleted file mode 100644
index 0eb5531bdfe5..000000000000
--- a/metadata/md5-cache/net-misc/rygel-0.40.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 ) >=sys-devel/gettext-0.19.7 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Rygel is an open source UPnP/DLNA MediaServer
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/Rygel
-INHERIT=gnome.org meson systemd vala xdg
-IUSE=gtk gtk-doc +introspection +sqlite tracker test transcode
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.56.0:2 >=dev-libs/libgee-0.8:0.8 >=dev-libs/libxml2-2.7:2 >=media-libs/gstreamer-1.12:1.0 >=media-libs/gst-plugins-base-1.12:1.0 media-libs/gstreamer-editing-services:1.0 >=media-libs/gupnp-dlna-0.9.4:2.0= >=media-libs/libmediaart-0.7:2.0[vala] media-plugins/gst-plugins-soup:1.0 >=net-libs/gssdp-1.1.0:0=[vala] >=net-libs/gupnp-1.1.0:0=[vala] >=net-libs/gupnp-av-0.12.8:= >=net-libs/libsoup-2.44:2.4 >=sys-apps/util-linux-2.20 x11-misc/shared-mime-info introspection? ( >=dev-libs/gobject-introspection-1.33.4:= ) sqlite? ( >=dev-db/sqlite-3.5:3 dev-libs/libunistring:= x11-libs/gdk-pixbuf:2 ) tracker? ( app-misc/tracker:3= ) transcode? ( media-libs/gst-plugins-bad:1.0 media-plugins/gst-plugins-twolame:1.0 media-plugins/gst-plugins-libav:1.0 ) gtk? ( >=x11-libs/gtk+-3.22:3 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/rygel/0.40/rygel-0.40.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=027792319a2dbb5d6ee0fe6ab26a33b3
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index a9f790a21fe1..c9b270e39c8b 100644
--- a/metadata/md5-cache/net-vpn/Manifest.gz
+++ b/metadata/md5-cache/net-vpn/Manifest.gz
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.10.0 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.10.0
deleted file mode 100644
index 786554b3a979..000000000000
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.10.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=sys-devel/gettext-0.19 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.0 >=x11-libs/gtk+-3.4:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 )
-DESCRIPTION=NetworkManager OpenVPN plugin
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.gnome.org/GNOME/NetworkManager-openvpn
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=gtk test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.0 >=x11-libs/gtk+-3.4:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 ) acct-group/nm-openvpn acct-user/nm-openvpn
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.10/NetworkManager-openvpn-1.10.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4ab6b4cd8bd7d5e95c76add42e1872a5
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 5a14150c7d4e..f86445047587 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/bladerf-2021.03 b/metadata/md5-cache/net-wireless/bladerf-2021.03
index 1f20b4d940ba..c9d590fb6f22 100644
--- a/metadata/md5-cache/net-wireless/bladerf-2021.03
+++ b/metadata/md5-cache/net-wireless/bladerf-2021.03
@@ -13,4 +13,4 @@ RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/2021.03
 SRC_URI=https://github.com/Nuand/bladeRF/archive/2021.03.tar.gz -> bladerf-2021.03.tar.gz https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=058bb5a14e33daf0397be6b47f2ab694
+_md5_=753ca877e05089267dc0f4687ad2b214
diff --git a/metadata/md5-cache/net-wireless/bladerf-9999 b/metadata/md5-cache/net-wireless/bladerf-9999
index 83ec1b59e069..c38c5f2d771c 100644
--- a/metadata/md5-cache/net-wireless/bladerf-9999
+++ b/metadata/md5-cache/net-wireless/bladerf-9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=>=dev-libs/libusb-1.0.16 tecla? ( dev-libs/libtecla )
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8aaa07eb158cd7c42795aaf39477c4aa
+_md5_=48d79f4adc0fc7dd897a6236c3f66613
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.4.0-r1 b/metadata/md5-cache/net-wireless/gnuradio-3.10.4.0-r1
index cc748b90749d..7defa06af9e1 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.4.0-r1
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.4.0-r1
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/3.10.4.0
 SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.4.0.tar.gz -> gnuradio-3.10.4.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f7db1177e1428b49a307b50c76bc8431
+_md5_=533c47bb581f451ac5c8c152e58da84b
diff --git a/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r2 b/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r2
index c3d94bc91d9d..0be0db93c535 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r2
+++ b/metadata/md5-cache/net-wireless/gnuradio-3.10.5.0-r2
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/3.10.5.0
 SRC_URI=https://github.com/gnuradio/gnuradio/archive/refs/tags/v3.10.5.0.tar.gz -> gnuradio-3.10.5.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=15666e6fef3fb97efb17e8b12f65f8b3
+_md5_=29a8e167f37e956cd78c6287518a4203
diff --git a/metadata/md5-cache/net-wireless/gnuradio-9999 b/metadata/md5-cache/net-wireless/gnuradio-9999
index 42f462761a16..e8d3bbaffa76 100644
--- a/metadata/md5-cache/net-wireless/gnuradio-9999
+++ b/metadata/md5-cache/net-wireless/gnuradio-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test !test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ad1798a575907e29508c45dd4b62623c
+_md5_=5ce9bf9b90c0e2b34af24e272a3c38c4
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20210719-r3 b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20210719-r3
index 04f2afb6afe7..073522356847 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20210719-r3
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-0.0_p20210719-r3
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 SLOT=0/0.0_p20210719
 SRC_URI=https://github.com/bastibl/gr-ieee802-15-4/archive/1a2999ce2778df279870f028a4ce15d94e60fbd9.tar.gz -> gr-ieee802154-0.0_p20210719.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=96a329692949ca6ea8e0b3c94f81eb1f
+_md5_=a1dd631fc3b05145d54a50860fba7dfc
diff --git a/metadata/md5-cache/net-wireless/gr-ieee802154-9999 b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
index bce5ae8b67c0..e8a64fe2dc1d 100644
--- a/metadata/md5-cache/net-wireless/gr-ieee802154-9999
+++ b/metadata/md5-cache/net-wireless/gr-ieee802154-9999
@@ -12,4 +12,4 @@ RDEPEND=net-wireless/gnuradio:0=[python_single_target_python3_8(-)?,python_singl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=31765dbe6872c00a4e33448155d730a6
+_md5_=efe190ad52800dd6ed9ac8bb1db89d0e
diff --git a/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518-r1 b/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518-r1
index e4cf19e7df18..566b7c5a0bde 100644
--- a/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518-r1
+++ b/metadata/md5-cache/net-wireless/liblms7002m-0.0_p20200518-r1
@@ -9,4 +9,4 @@ LICENSE=LGPL-2.1
 SLOT=0/0.0_p20200518
 SRC_URI=https://github.com/xtrx-sdr/liblms7002m/archive/b07761b7386181f0e6a35158456b75bce14f2aca.tar.gz -> liblms7002m-0.0_p20200518.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a02c8f1db2fbabc32c003a385e55092d
+_md5_=be6061e6ff232825e5cf9a1a2af5efdb
diff --git a/metadata/md5-cache/net-wireless/liblms7002m-9999 b/metadata/md5-cache/net-wireless/liblms7002m-9999
index 3141178aa35b..48d55a0225f5 100644
--- a/metadata/md5-cache/net-wireless/liblms7002m-9999
+++ b/metadata/md5-cache/net-wireless/liblms7002m-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 PROPERTIES=live
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a02c8f1db2fbabc32c003a385e55092d
+_md5_=be6061e6ff232825e5cf9a1a2af5efdb
diff --git a/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202 b/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
index 3ad6713885d9..e872b75bdd61 100644
--- a/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
+++ b/metadata/md5-cache/net-wireless/libxtrx-0.0_p20201202
@@ -11,4 +11,4 @@ RDEPEND=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms70
 SLOT=0/0.0_p20201202
 SRC_URI=https://github.com/xtrx-sdr/libxtrx/archive/acb0b1cf7ab92744034767a04c1d4b4c281b840f.tar.gz -> libxtrx-0.0_p20201202.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=39b641a34502b01fda1824ba663288d0
+_md5_=b2a9d84cfac866f18533028012a0d88d
diff --git a/metadata/md5-cache/net-wireless/libxtrx-9999 b/metadata/md5-cache/net-wireless/libxtrx-9999
index 6804f88e58cf..a35153383e76 100644
--- a/metadata/md5-cache/net-wireless/libxtrx-9999
+++ b/metadata/md5-cache/net-wireless/libxtrx-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=net-wireless/libxtrxll:= net-wireless/libxtrxdsp:= net-wireless/liblms7002m:=
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=39b641a34502b01fda1824ba663288d0
+_md5_=b2a9d84cfac866f18533028012a0d88d
diff --git a/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202 b/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
index e694275940c3..b29bbf013607 100644
--- a/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
+++ b/metadata/md5-cache/net-wireless/libxtrxll-0.0_p20201202
@@ -12,4 +12,4 @@ RDEPEND=usb3380? ( net-wireless/libusb3380 )
 SLOT=0/0.0_p20201202
 SRC_URI=https://github.com/xtrx-sdr/libxtrxll/archive/1b6eddfbedc700efb6f7e3c3594e43ac6ff29ea4.tar.gz -> libxtrxll-0.0_p20201202.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c3143534ad2c2f5297d255101951383c
+_md5_=f4a02404c0e3a104aa31bcc138c9041a
diff --git a/metadata/md5-cache/net-wireless/libxtrxll-9999 b/metadata/md5-cache/net-wireless/libxtrxll-9999
index f84703719f7f..d55b2946645c 100644
--- a/metadata/md5-cache/net-wireless/libxtrxll-9999
+++ b/metadata/md5-cache/net-wireless/libxtrxll-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=usb3380? ( net-wireless/libusb3380 )
 SLOT=0/9999
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c3143534ad2c2f5297d255101951383c
+_md5_=f4a02404c0e3a104aa31bcc138c9041a
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
index 89aa4f0eda8c..7bbf5ac1937b 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802
@@ -12,4 +12,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=779d6127a019112a2a5c952f4d9c3dbd
+_md5_=93970a7a1049575ec7c60ee6338db135
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
index edcf0ff704e6..a2b47c8ef2d5 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p2020802-r1
@@ -12,4 +12,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/ed0317e6a58c098874ac58b769cf2e609c18d9a5.tar.gz -> rtl-sdr-0.6.0_p2020802.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7f43e4c8d35612b6543ee919434ef235
+_md5_=7e04648e526a3f005d7812ff20c951e6
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p20221217 b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p20221217
index e4a9186c85cc..2659e3b5d5f0 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p20221217
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-0.6.0_p20221217
@@ -12,4 +12,4 @@ RDEPEND=virtual/libusb:1
 SLOT=0
 SRC_URI=https://github.com/osmocom/rtl-sdr/archive/142325a93c6ad70f851f43434acfdf75e12dfe03.tar.gz -> rtl-sdr-0.6.0_p20221217.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=240e7809cdda2af910742327f1f3f1cb
+_md5_=6ab2c3257dfb71fc99b16c1809913b17
diff --git a/metadata/md5-cache/net-wireless/rtl-sdr-9999 b/metadata/md5-cache/net-wireless/rtl-sdr-9999
index b5e219ad6f36..abb4e06247ef 100644
--- a/metadata/md5-cache/net-wireless/rtl-sdr-9999
+++ b/metadata/md5-cache/net-wireless/rtl-sdr-9999
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=virtual/libusb:1
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=240e7809cdda2af910742327f1f3f1cb
+_md5_=6ab2c3257dfb71fc99b16c1809913b17
diff --git a/metadata/md5-cache/net-wireless/rtl_433-21.12 b/metadata/md5-cache/net-wireless/rtl_433-21.12
index 766f95279489..91865fd707fe 100644
--- a/metadata/md5-cache/net-wireless/rtl_433-21.12
+++ b/metadata/md5-cache/net-wireless/rtl_433-21.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/merbanan/rtl_433/archive/21.12.tar.gz -> rtl_433-21.12.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5043e6a2a9afe98164bb4e5104b824c4
+_md5_=1987327f1e50e5e69ac3322f795afd13
diff --git a/metadata/md5-cache/net-wireless/rtl_433-9999 b/metadata/md5-cache/net-wireless/rtl_433-9999
index 36f6a64f1193..20c0c5376d6a 100644
--- a/metadata/md5-cache/net-wireless/rtl_433-9999
+++ b/metadata/md5-cache/net-wireless/rtl_433-9999
@@ -12,4 +12,4 @@ RDEPEND=rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 ) soapysdr? ( net-wire
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b12ac73f50603b98d2590d78c7ea1ad7
+_md5_=be3dd97e3603c9cc69682b88d00177e9
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index e525fc6d6811..4acf7f59a3d3 100644
--- a/metadata/md5-cache/sci-chemistry/Manifest.gz
+++ b/metadata/md5-cache/sci-chemistry/Manifest.gz
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
index f657c4d0d8df..56ff5fe8b7e9 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2018.8-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2018.8
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2018.8.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2018.8.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2018.8.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=62504256bd3370da24a4b0685dfb98fd
+_md5_=2e1dcb3cefdfced18f4cc52d5413ed57
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r1
index c99fb5fba26f..213b3632a284 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ee1488ef8b6424de834125b6c8cc01c7
+_md5_=561a12adbd967e7d3abfd9b2a9a2f0ed
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2 b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
index 0dcd593fe4fd..da8b5ed9161e 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2019.6-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2019.6
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2019.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2019.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2019.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=35568f4309fe40b474fd85b4a17f9044
+_md5_=c3201fc04df8f1811c9289524a29427d
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
index 5e9771fb7ea2..251b4cc58b32 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.4-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.4
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2020.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.4.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2020.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fe851b6cbbacb8d13ffdb5cb877562bd
+_md5_=2fbe267df30656fcf13fed0727c6333d
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2020.7 b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
index c10ab9078eb6..0a4eac2a0460 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2020.7
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2020.7
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2020.7
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2020.7.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2020.7.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2020.7.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5e3015bf0ce953ed38a87ac43320ec5a
+_md5_=600b385d35f0a84b8c2e106863124bb3
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1 b/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
index 3aa5942d6cbe..c22e24f7097d 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.3
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.3.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=50dd8c0c3f8100a3f3daf36d799b443a
+_md5_=73234aef2329fd9ab69dc5ccd543724a
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.5 b/metadata/md5-cache/sci-chemistry/gromacs-2021.5
index 1d6f8ec15b5c..4bbd84f2338c 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.5
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.5
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.5
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.5.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.5.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.5.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d2d4e035f513df405350ead97653ec87
+_md5_=df343432a635670716d490c16cbf9cd5
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.6 b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
index 62037981f6ac..5470c1d6dacf 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.6
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.6
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2021.6
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2021.6.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2021.6.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2021.6.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f6d2ca52add1d138555cd698492205a8
+_md5_=9cebf459f094a22a4bbb9003e799b501
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
index ebadce7dde55..6da7c0c4f4ba 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2021.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2021.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a9613ba1801e2769fd52f6e6f5905f25
+_md5_=55eca44a86575afdb7a9d6105282fc49
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.3 b/metadata/md5-cache/sci-chemistry/gromacs-2022.3
index 70f045f15daf..f9cbf75a82b7 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.3
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.3
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2022.3
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2022.3.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.3.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2022.3.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b7c7d4818087217d2438f01a2b707c84
+_md5_=eeddfcfb3f1fc07a46ab6b6a551b4f8b
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.4 b/metadata/md5-cache/sci-chemistry/gromacs-2022.4
index 9e83531996c0..d96c7ad87f53 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.4
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.4
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2022.4
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2022.4.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2022.4.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2022.4.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=606151c6f371cbb69eb0118928818df0
+_md5_=57ca0a1822cd2216bcc41833b0e592d7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
index 695ff65cf181..bddd3d3d296f 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2022.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2022.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=606151c6f371cbb69eb0118928818df0
+_md5_=57ca0a1822cd2216bcc41833b0e592d7
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023.9999 b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
index 86cb2f0a2647..48645d5ab493 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023.9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/2023.9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=864dec28dd4a22a4a2bbb3d31836b5bf
+_md5_=3da352075eddebffafb20412ed422062
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1 b/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1
index 4b9a873cfe25..9e06b658a978 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1
+++ b/metadata/md5-cache/sci-chemistry/gromacs-2023_rc1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2023_rc1
 SRC_URI=https://ftp.gromacs.org/gromacs/gromacs-2023-rc1.tar.gz doc? ( https://ftp.gromacs.org/manual/manual-2023-rc1.pdf ) test? ( https://ftp.gromacs.org/regressiontests/regressiontests-2023-rc1.tar.gz )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=864dec28dd4a22a4a2bbb3d31836b5bf
+_md5_=3da352075eddebffafb20412ed422062
diff --git a/metadata/md5-cache/sci-chemistry/gromacs-9999 b/metadata/md5-cache/sci-chemistry/gromacs-9999
index aa0483f35e13..16e3bbb0dcf1 100644
--- a/metadata/md5-cache/sci-chemistry/gromacs-9999
+++ b/metadata/md5-cache/sci-chemistry/gromacs-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( single-precision double-precision ) doc? ( !build-manual ) cud
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=864dec28dd4a22a4a2bbb3d31836b5bf
+_md5_=3da352075eddebffafb20412ed422062
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 5e4e6ab6386b..fc9d70604cb9 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.4 b/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.4
deleted file mode 100644
index c2ea23f436a7..000000000000
--- a/metadata/md5-cache/sci-geosciences/geocode-glib-3.26.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.13 app-text/docbook-xml-dtd:4.3 ) >=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.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-DESCRIPTION=GLib helper library for geocoding services
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/geocode-glib
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org meson xdg
-IUSE=gtk-doc +introspection test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.99.2[introspection?] >=net-libs/libsoup-2.42:2.4[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/geocode-glib/3.26/geocode-glib-3.26.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7ce54685de394da6c537b2c60e348804
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-42.3-r3 b/metadata/md5-cache/sci-geosciences/gnome-maps-42.3-r3
deleted file mode 100644
index 4fa82d16a83d..000000000000
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-42.3-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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 postinst postrm preinst setup test
-DEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2:0[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] <dev-libs/libgweather-4.2.0:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
-DESCRIPTION=A map application for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Maps
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2:0[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] <dev-libs/libgweather-4.2.0:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-maps/42/gnome-maps-42.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e7918c838c3d24ccaa93aaf7bb6b3b3c
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 58d61019ec97..fde2db160752 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/libaec-1.0.6 b/metadata/md5-cache/sci-libs/libaec-1.0.6
index fe82040282cd..6b0bed50b8bd 100644
--- a/metadata/md5-cache/sci-libs/libaec-1.0.6
+++ b/metadata/md5-cache/sci-libs/libaec-1.0.6
@@ -11,4 +11,4 @@ RDEPEND=szip? ( !sci-libs/szip )
 SLOT=0/2
 SRC_URI=https://gitlab.dkrz.de/k202009/libaec/-/archive/v1.0.6/libaec-v1.0.6.tar.gz -> libaec-1.0.6.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d1a234b25750dec6be8e9d6b8a70fe98
+_md5_=1e1f01d7e7324f0951e3513a79bf2375
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index e1b7b8173719..b0709bc11584 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/espresso-4.1.3 b/metadata/md5-cache/sci-physics/espresso-4.1.3
index 77b03e6babde..84401a39ad30 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.1.3
+++ b/metadata/md5-cache/sci-physics/espresso-4.1.3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.1.3/espresso-4.1.3.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	portability	58227860123d3e8da23290064ce3373e	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=3c5984cc24b57a11a42ec7d191979b7a
+_md5_=e39b7fff00f3155bdbeef94efbee113a
diff --git a/metadata/md5-cache/sci-physics/espresso-4.2.0 b/metadata/md5-cache/sci-physics/espresso-4.2.0
index 519902e60b54..e6b05d67d448 100644
--- a/metadata/md5-cache/sci-physics/espresso-4.2.0
+++ b/metadata/md5-cache/sci-physics/espresso-4.2.0
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/espressomd/espresso/releases/download/4.2.0/espresso-4.2.0.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	portability	58227860123d3e8da23290064ce3373e	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=dad790abc4f93042a7c16c052a920838
+_md5_=77ef312116e6c822798aa3e1861c0a7a
diff --git a/metadata/md5-cache/sci-physics/espresso-9999 b/metadata/md5-cache/sci-physics/espresso-9999
index 53c3d9f1b039..69b9ffc54fae 100644
--- a/metadata/md5-cache/sci-physics/espresso-9999
+++ b/metadata/md5-cache/sci-physics/espresso-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	cuda	bbef1902e3953ff9f3a9947ebf4e56f9	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	portability	58227860123d3e8da23290064ce3373e	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=712ee87392891c350f0b7e3e6fab58c6
+_md5_=f27b01935b62dab456b9e224b9e906d4
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 071ee23432c1..f89be85880cd 100644
--- a/metadata/md5-cache/sci-visualization/Manifest.gz
+++ b/metadata/md5-cache/sci-visualization/Manifest.gz
diff --git a/metadata/md5-cache/sci-visualization/pythonprop-0.30.1 b/metadata/md5-cache/sci-visualization/pythonprop-0.30.1
new file mode 100644
index 000000000000..d816a954cba6
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/pythonprop-0.30.1
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl app-text/yelp-tools app-text/rarian
+DESCRIPTION=Scripts to prepare and plot VOACAP propagation predictions
+EAPI=7
+HOMEPAGE=https://www.qsl.net/h/hz1jw/pythonprop
+INHERIT=autotools python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.16:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) dev-python/cairocffi sci-libs/cartopy[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] sci-electronics/voacapl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/jawatson/pythonprop/archive/v0.30.1.tar.gz -> pythonprop-0.30.1.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=820e35a9c28ef7ab3ef6390cad1cf5ab
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 2cdb3f45f662..c5c88ad7ee09 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.6.2-r1 b/metadata/md5-cache/sys-apps/bubblewrap-0.6.2-r1
deleted file mode 100644
index 81d42213f506..000000000000
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.6.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
-DESCRIPTION=Unprivileged sandboxing tool, namespaces-powered chroot-like solution
-EAPI=8
-HOMEPAGE=https://github.com/containers/bubblewrap/
-INHERIT=linux-info meson
-IUSE=selinux suid
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.6.2/bubblewrap-0.6.2.tar.xz
-_eclasses_=linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=ef546c26163739cca55770f399a17045
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-20221018 b/metadata/md5-cache/sys-apps/osinfo-db-20221018
deleted file mode 100644
index f4553c5ed0ef..000000000000
--- a/metadata/md5-cache/sys-apps/osinfo-db-20221018
+++ /dev/null
@@ -1,10 +0,0 @@
-BDEPEND=sys-apps/osinfo-db-tools
-DEFINED_PHASES=install unpack
-DESCRIPTION=osinfo database files
-EAPI=8
-HOMEPAGE=https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-20221018.tar.xz
-_md5_=2f18bc44c02e792114262fd49d4a41df
diff --git a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.10.0 b/metadata/md5-cache/sys-apps/osinfo-db-tools-1.10.0
deleted file mode 100644
index 62092fbfb890..000000000000
--- a/metadata/md5-cache/sys-apps/osinfo-db-tools-1.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig >=sys-devel/gettext-0.19.8 dev-lang/perl test? ( || ( ( >=dev-lang/python-3.10.9:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=app-arch/libarchive-3.0.0:= net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0
-DESCRIPTION=Tools for managing the osinfo database
-EAPI=7
-HOMEPAGE=https://libosinfo.org/
-INHERIT=meson python-any-r1
-IUSE=test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=app-arch/libarchive-3.0.0:= net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://releases.pagure.org/libosinfo/osinfo-db-tools-1.10.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=554fbdb98cc4e07a11ecc91fd2f427b2
diff --git a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101 b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101
index 6dd7d83c5f13..0ecf35f471d2 100644
--- a/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101
+++ b/metadata/md5-cache/sys-apps/roccat-tools-5.9.0-r101
@@ -13,4 +13,4 @@ REQUIRED_USE=input_devices_roccat_ryosmk? ( ^^ ( lua_single_target_luajit lua_si
 SLOT=0
 SRC_URI=mirror://sourceforge/roccat/roccat-tools-5.9.0.tar.bz2
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=263a0e0487211a671530b68b7e72a219
+_md5_=34c2dabd810c4c63b5bf1e4715141140
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0
deleted file mode 100644
index 66f2ddc78e2d..000000000000
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/gdbus-codegen sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.14.0 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
-DESCRIPTION=Backend implementation for xdg-desktop-portal using GTK+
-EAPI=8
-HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk
-INHERIT=systemd
-IUSE=wayland X
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 media-libs/fontconfig sys-apps/dbus >=sys-apps/xdg-desktop-portal-1.14.0 x11-libs/cairo[X?] x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?,X?]
-SLOT=0
-SRC_URI=https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.14.0/xdg-desktop-portal-gtk-1.14.0.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=609acb42f6dea41ee01e91068e85bacd
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index ee012202614b..eb23d3bb57ab 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/dfc-3.1.1 b/metadata/md5-cache/sys-fs/dfc-3.1.1
index 25358aa808da..0289f76a6a71 100644
--- a/metadata/md5-cache/sys-fs/dfc-3.1.1
+++ b/metadata/md5-cache/sys-fs/dfc-3.1.1
@@ -12,4 +12,4 @@ RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=https://projects.gw-computing.net/attachments/download/615/dfc-3.1.1.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=205e531b6df9ec76492b587144f31801
+_md5_=7fe7e4925812ad5fe21e1a673d795169
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 96bbda99230e..8df1fab9b90f 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1 b/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1
index c456a0b0a813..f7c4273f4b59 100644
--- a/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1
+++ b/metadata/md5-cache/sys-libs/gwenhywfar-5.10.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.aquamaniac.de/sites/aqbanking/index.php
 INHERIT=qmake-utils
 IUSE=debug doc gtk qt5 test
-KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= dev-libs/libgpg-error dev-libs/libxml2:2 dev-libs/openssl:0= net-libs/gnutls:= virtual/libiconv virtual/libintl virtual/opengl gtk? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) gtk? ( !<app-office/gnucash-3.7[aqbanking] )
 RESTRICT=test
 SLOT=0/79
 SRC_URI=https://www.aquamaniac.de/rdm/attachments/download/465/gwenhywfar-5.10.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d97b1a9595dbd59d0f67e5c9fbca23a2
+_md5_=356560c8e0a167b8b34deaec066bd815
diff --git a/metadata/md5-cache/sys-libs/libosinfo-1.10.0 b/metadata/md5-cache/sys-libs/libosinfo-1.10.0
deleted file mode 100644
index 5fc71bf114b0..000000000000
--- a/metadata/md5-cache/sys-libs/libosinfo-1.10.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56[vapigen(+)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.44:2 net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwdata sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-1.56:= ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject library for managing information about real and virtual OSes
-EAPI=7
-HOMEPAGE=https://libosinfo.org/
-INHERIT=meson udev vala xdg
-IUSE=gtk-doc +introspection +vala test
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.44:2 net-libs/libsoup:2.4 >=dev-libs/libxml2-2.6.0 >=dev-libs/libxslt-1.0.0 sys-apps/hwdata sys-apps/osinfo-db-tools sys-apps/osinfo-db introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://releases.pagure.org/libosinfo/libosinfo-1.10.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=59776d6b7abf60e38383cc2a63fb7965
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index da11ea0ba8a9..a06c68258d91 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/prowlarr-1.0.0.2171 b/metadata/md5-cache/www-apps/prowlarr-1.0.1.2220
index b0c6521bfdb6..892c139fcbfd 100644
--- a/metadata/md5-cache/www-apps/prowlarr-1.0.0.2171
+++ b/metadata/md5-cache/www-apps/prowlarr-1.0.1.2220
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.0.2171/Prowlarr.develop.1.0.0.2171.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.0.2171/Prowlarr.develop.1.0.0.2171.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.0.2171/Prowlarr.develop.1.0.0.2171.linux-core-arm64.tar.gz )
+SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.1.2220/Prowlarr.master.1.0.1.2220.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.1.2220/Prowlarr.master.1.0.1.2220.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v1.0.1.2220/Prowlarr.master.1.0.1.2220.linux-core-arm64.tar.gz )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b397a1336ac6b1be246176b8ed1d24f7
+_md5_=bd1b8345656fd5bd570b74fc3fdb460f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 0194522c15e3..0d8ab89bdb6f 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/epiphany-42.4-r1 b/metadata/md5-cache/www-client/epiphany-42.4-r1
deleted file mode 100644
index 36de0523c59d..000000000000
--- a/metadata/md5-cache/www-client/epiphany-42.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst test
-DEPEND=>=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.33.2:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:0=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.5.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0=
-DESCRIPTION=GNOME webbrowser based on Webkit
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson xdg virtualx
-IUSE=test test
-KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.33.2:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:0=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.5.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://gnome/sources/epiphany/42/epiphany-42.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7c1ea776a7708003a2d26fdf74946419
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index d3b8b85e1b06..709045a138f6 100644
--- a/metadata/md5-cache/x11-base/Manifest.gz
+++ b/metadata/md5-cache/x11-base/Manifest.gz
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.4 b/metadata/md5-cache/x11-base/xorg-server-21.1.4
deleted file mode 100644
index 6a8ba0896603..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex 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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
-DESCRIPTION=X.Org X servers
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=flag-o-matic xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.4
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.4.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=2b1dfa7b021dda0cb9c86c286eeb2e42
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.4-r1 b/metadata/md5-cache/x11-base/xorg-server-21.1.4-r1
deleted file mode 100644
index 53e87b7e1499..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.4-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex 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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
-DESCRIPTION=X.Org X servers
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=flag-o-matic xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.4
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.4.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=f79e6390285a037e50abe783fa78c46a
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.5 b/metadata/md5-cache/x11-base/xorg-server-21.1.5
deleted file mode 100644
index 2f749c3d4d2b..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex 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 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) 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 postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util test? ( >=x11-libs/libxcvt-0.1.0 )
-DESCRIPTION=X.Org X servers
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=flag-o-matic xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 xorg? ( >=x11-libs/libxcvt-0.1.0 ) xnest? ( >=x11-libs/libXext-1.0.99.4 >=x11-libs/libX11-1.1.5 ) xephyr? ( x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.5
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.5.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xorg-3	d594392da077c1ccd08dc6e48e18c78a
-_md5_=f79e6390285a037e50abe783fa78c46a
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.5 b/metadata/md5-cache/x11-base/xwayland-22.1.5
deleted file mode 100644
index 71dcad491b24..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.5.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fc7ea351ee8bdebc781d540e919f18da
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.6 b/metadata/md5-cache/x11-base/xwayland-22.1.6
deleted file mode 100644
index 7ed8b3a40f79..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=8
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.6.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=eef35da6e842e56a006c53a8511bc9ff
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 741d384e37e3..1e37bc973bbd 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/gtk+-3.24.34-r1 b/metadata/md5-cache/x11-libs/gtk+-3.24.34-r1
deleted file mode 100644
index 0582094bdc44..000000000000
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.34-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xsl-stylesheets dev-libs/gobject-introspection-common dev-libs/libxslt >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 wayland? ( dev-util/wayland-scanner ) >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-libs/gdk-pixbuf:2 gtk-doc? ( app-text/docbook-xml-dtd:4.3 >=dev-util/gtk-doc-1.20 ) 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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/atk-2.32.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2: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(-)?] media-libs/fontconfig[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-2.2.0:= >=media-libs/libepoxy-1.4[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(-)?] virtual/libintl[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/cairo-1.14[aqua?,glib,svg(+),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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,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/pango-1.44.0[introspection?,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-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[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.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.17 media-libs/mesa[wayland,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/libxkbcommon-0.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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.15.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(-)?] media-libs/mesa[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(-)?] x11-libs/libX11[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/libXcomposite[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/libXcursor[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/libXdamage[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[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[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/libXi-1.8[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/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gimp ToolKit +
-EAPI=7
-HOMEPAGE=https://www.gtk.org/
-INHERIT=gnome2 multilib multilib-minimal virtualx
-IUSE=aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg[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-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
-RDEPEND=>=dev-libs/atk-2.32.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2: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(-)?] media-libs/fontconfig[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-2.2.0:= >=media-libs/libepoxy-1.4[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(-)?] virtual/libintl[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/cairo-1.14[aqua?,glib,svg(+),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(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,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/pango-1.44.0[introspection?,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-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( >=net-print/cups-2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[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.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.17 media-libs/mesa[wayland,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/libxkbcommon-0.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(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.15.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(-)?] media-libs/mesa[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(-)?] x11-libs/libX11[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/libXcomposite[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/libXcursor[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/libXdamage[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[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[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/libXi-1.8[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/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<x11-libs/vte-0.31.0:2.90
-REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
-RESTRICT=test
-SLOT=3
-SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.34.tar.xz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=549762efe3291052613cc2e86d56485e
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-4.8.2 b/metadata/md5-cache/x11-libs/gtksourceview-4.8.2
deleted file mode 100644
index a49f3fd8e8fe..000000000000
--- a/metadata/md5-cache/x11-libs/gtksourceview-4.8.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=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 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.24:3[introspection?] >=dev-libs/libxml2-2.6:2 glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) >=dev-libs/fribidi-0.19.7 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A text widget implementing syntax highlighting and other features
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
-INHERIT=gnome.org meson vala virtualx xdg
-IUSE=glade gtk-doc +introspection +vala test
-KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.48:2 >=x11-libs/gtk+-3.24:3[introspection?] >=dev-libs/libxml2-2.6:2 glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) >=dev-libs/fribidi-0.19.7
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtksourceview/4.8/gtksourceview-4.8.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=649b71d88a809dfdd114c2affa607bab
diff --git a/metadata/md5-cache/x11-libs/pango-1.50.11 b/metadata/md5-cache/x11-libs/pango-1.50.11
deleted file mode 100644
index d44ebfcca66c..000000000000
--- a/metadata/md5-cache/x11-libs/pango-1.50.11
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-apps/help2man virtual/pkgconfig test? ( media-fonts/cantarell ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.62.2: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(-)?] >=dev-libs/fribidi-1.0.6[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-2.6.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-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/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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-base/xorg-proto )
-DESCRIPTION=Internationalized text layout and rendering library
-EAPI=8
-HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=flag-o-matic gnome2-utils meson-multilib xdg
-IUSE=debug +introspection sysprof test 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=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.62.2: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(-)?] >=dev-libs/fribidi-1.0.6[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-2.6.0:=[glib(+),introspection?,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(-)?] >=media-libs/fontconfig-2.13.0:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.10:=[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(-)?] >=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) 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/libXft-2.3.1-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/libXrender-0.9.8[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
-SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.50/pango-1.50.11.tar.xz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=fb50e8d684c108cc05967c0f4b2ba96d
diff --git a/metadata/md5-cache/x11-libs/vte-0.70.1 b/metadata/md5-cache/x11-libs/vte-0.70.1
deleted file mode 100644
index 953c4f57dddc..000000000000
--- a/metadata/md5-cache/x11-libs/vte-0.70.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) 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.52: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 https://gitlab.gnome.org/GNOME/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.52: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.70.1[systemd?]
-REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
-SLOT=2.91
-SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.70.1/vte-0.70.1.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.70.0-command-notify.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	vala	2633382950a3a9ce912c9258150d5db8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c586d2fbbb604682015d3430d13963ac
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index a8c0b247daa1..8790c56e6b85 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/gnome-terminal-3.46.3 b/metadata/md5-cache/x11-terms/gnome-terminal-3.46.3
deleted file mode 100644
index 79b7aa7bbafd..000000000000
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.46.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=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 prepare setup test
-DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-DESCRIPTION=A terminal emulator for GNOME
-EAPI=8
-HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.70.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-43.0 )
-SLOT=0
-SRC_URI=https://gitlab.gnome.org/GNOME/gnome-terminal/-/archive/3.46.3/gnome-terminal-3.46.3.tar.gz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz )
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5e398d403fbc3156f01a6478d0991d39
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 934dc8805249..dff32ce96fe0 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
index b1bb1225e055..119559a3afe8 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.5.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=422e3210edfc1d58c56e14ddafcd9b19
+_md5_=aad06b0a95f1408298b34bf12b3cacfa
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index eb3bf4ef7c60..0e506ef47c6a 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 p
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	distutils-r1	9c5f8e35fdc556c29573796aca3e87ea	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-r1	ca02b49ab4dd44b606c151aa296ef399	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=5dcd90446ef8888e017f5c3d171d6c29
+_md5_=94f451f4fed93802d142ac2302d48776
diff --git a/metadata/md5-cache/x11-wm/metacity-3.46.0 b/metadata/md5-cache/x11-wm/metacity-3.46.0
deleted file mode 100644
index 16579a8fcc48..000000000000
--- a/metadata/md5-cache/x11-wm/metacity-3.46.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vulkan? ( dev-util/vulkan-headers ) dev-util/glib-utils >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=x11-libs/libXres-1.2 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader ) x11-base/xorg-proto
-DESCRIPTION=GNOME Flashback window manager
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/metacity/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome2
-IUSE=+libcanberra vulkan xinerama
-KEYWORDS=~amd64 ~riscv
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.67.3:2 >=x11-libs/gtk+-3.24.6:3[X] >=x11-libs/pango-1.2.0 >=x11-libs/libXcomposite-0.3 >=x11-libs/libXres-1.2 >=gnome-base/gsettings-desktop-schemas-3.3.0 x11-libs/libXfixes x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent libcanberra? ( media-libs/libcanberra[gtk3] ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) x11-libs/libXrandr x11-libs/libXext x11-libs/libICE x11-libs/libSM gnome-extra/zenity vulkan? ( media-libs/vulkan-loader )
-SLOT=0
-SRC_URI=mirror://gnome/sources/metacity/3.46/metacity-3.46.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	8dcac7a0c320f92299160b297d4fec6f	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0d7a6460500942b39951f788155bff2a
diff --git a/metadata/md5-cache/x11-wm/mutter-42.5 b/metadata/md5-cache/x11-wm/mutter-42.5
deleted file mode 100644
index ac57a64b3324..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-42.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst setup test
-DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
-IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.5.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6977350e786bd9a2ddd005d6f59e8035
diff --git a/metadata/md5-cache/x11-wm/mutter-43.1 b/metadata/md5-cache/x11-wm/mutter-43.1
deleted file mode 100644
index 869c810e1772..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-43.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 >=dev-lang/python-3.8.16:3.8 ) || ( ( >=dev-lang/python-3.11.1:3.11 >=dev-python/python-dbusmock-0.28[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 >=dev-python/python-dbusmock-0.28[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 >=dev-python/python-dbusmock-0.28[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.16:3.8 >=dev-python/python-dbusmock-0.28[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=media-libs/lcms-2.6:2 >=x11-misc/colord-1.4.5:= >=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=app-accessibility/at-spi2-core-2.46:2[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/libglvnd[X] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.26 >=dev-libs/wayland-1.21.0 x11-libs/libdrm >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-DESCRIPTION=GNOME compositing window manager based on Clutter
-EAPI=8
-HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
-IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/lcms-2.6:2 >=x11-misc/colord-1.4.5:= >=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=app-accessibility/at-spi2-core-2.46:2[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/libglvnd[X] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.26 >=dev-libs/wayland-1.21.0 x11-libs/libdrm >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0:= elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232 >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb:= x11-libs/libXinerama x11-libs/libXau gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
-REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=mirror://gnome/sources/mutter/43/mutter-43.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	1d1b325c00c1d24c564a1b49327ec3c5	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	udev	eec0bbab06977f1cfc5597269c1fa152	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7c9fce3100f7da85affd3cf7fb9f1947
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index e647b3c37824..eaa2d2415491 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14965 BLAKE2B 0511d9d714cebde2326e23abfa24bba7318694b5216c96f343d6d94416db2ba397ccc9f0f63ea9c7707aa0414d66e329fb1669bedb5e961cf73b188b04dac363 SHA512 bc41483b3882eeb50bbf35dc4b007fdb5080fc09c4d64d83706e8c2e509eccc05aa28c839c8c30c89e9b3fbc6832e099264b3f3b6e0b76887f0b37a1f8a14e1d
-TIMESTAMP 2023-01-03T13:39:57Z
+TIMESTAMP 2023-01-03T19:39:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0MC5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmO0hIxfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB5ow/+KUpU3FKcZnYBpj9ZO3nUDry7g5PYVj2f2xzm/FAx11iJHmiH1GAhVa0h
-WwhvB1l/NCQW2bjAdWNLqYGI6U16hBID4XCfhlfCH/g+B7hM7h0u/f1lH8fOirTC
-R7Iv0yFJzaoH36d4lHdnzzNJ+nkFmeJmrQ09YNIvIU51UKNH7uMmOlczdFRziJ7O
-PXcfyoAt70FBrW56/PlECU71aJaUFxzo3LZGs5kUgvAC6HAslnT9GLuz81VmhSJF
-UeNicfaXDL6nxmqXgR0Nu3b/m0PdTj1spXMoXiLhDltMx90lLTt+8+wJ0kHSdLL6
-zfHx9RSgAI4InlyGc83MysO05KpfWW6QOFV21up0vHp4oXMsRdOSJ3xuCFkwbktM
-UHbs43Q/rAKZa70MSkLxBcmWAlKPmv5mjr0iyXfPFdMgtV8DX07mm2sYP63nxBqK
-3f1c43STsFM0ESOfcGRaCLB/0sYDFzwj8cl1REs+lYWdRhv9wdOlXDxK5zvr+T80
-U9TSlY+zKffVlKsgGJhv8nvOcYXUUlvM/MCjWA5TV+D+TCMVENJe4D9s+YugRY9v
-JM6slH3nRHsmNTrVTC9CK19lCZMF9gbxsiQb9Y/xdEYxFV7VG4S05E4Rj6pUIwsW
-wzhoOqZegvr70X3GopB1QCjEe5WRL0KqFPsB4dtmyFXz8NnmFpo=
-=1SfU
+klBDBxAAkDE0FVwHU6MYNpd8AdJ0yJA9di4y8Z7GCwyMuoId3eXILlh2abvgRTTf
+Qae5vMdrUwbozg+Q13OFBJbklOZaFVkdc1XCJXgTreHmf7uqm/M9CcsoCMFaFIvV
+7pZ1cpEhkhXZkHh9OysASIgmgT1UUDqw1suTX2jl4HJQE/KB3q4ItQPWEFedeiwu
+3kw/EQ+ubphh/1q8ECSJ4OMlDWTFWL0vdC8gdGpN7HJNkQ4YootdocQ7UbWUDBX0
+illtaV8ah4NrhWU/fiWnLFlqwpPBnFxir4euCFkzM6bjjF1N649nX7767zT6yOEm
+j03kkodw2OrjWEIUhLDZdPO1/TB0WYrReOfa4/P+9ynbIWYo8al4HTUALuf34gAN
+ppp8S+j5FmisoNv8QRDRkVtrT+AeQhGtOs4Z30FYZh5ziVzrQ0jBWN5gaiiamfbK
+fmP77yRMbBg4+txzPPKvrP4HD/EEX1d00uW9IFGt1pf7MqgZjMPNZiZdbcjh5vLR
+y2QLlhXP/1g2wM2wvwoUCWA7BRvzCdjszOEuEV5BiQr10AnW+VtLazwUbgTDD3xU
+5p3W9iy3KPAu9I10uf4+KOhUmswse6VE3QPH+bCz9rO+AYEBu+GR0tU0LRNHjJ7/
+YfrwSMAhuXU08AyipyRLU1plceJ0Uk2P3q2IATTfjkjQmjYMpgA=
+=ARyu
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f455de4001ae..3956af1743ad 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jan 2023 13:39:54 +0000
+Tue, 03 Jan 2023 19:39:53 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a42882f810e4..7ba563701729 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Jan  3 01:39:54 PM UTC 2023
+Tue Jan  3 07:39:53 PM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2a557d5b04a2..bb872ae929ba 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jan 2023 13:45:01 +0000
+Tue, 03 Jan 2023 19:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 34d5bcf636e8..951ece03212d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ede3c9e3284bfcc0f5f7e4769f91acf3198f76ef 1672750863 2023-01-03T13:01:03+00:00
+bcf3f59981ae8bf2af0341089c181a25b987aa0e 1672774462 2023-01-03T19:34:22+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4730b2db6bad..4e36490e00e0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1672753201 Tue 03 Jan 2023 01:40:01 PM UTC
+1672774801 Tue 03 Jan 2023 07:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f455de4001ae..3956af1743ad 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 03 Jan 2023 13:39:54 +0000
+Tue, 03 Jan 2023 19:39:53 +0000
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 7b74d3d62125..6a1ba23c20f9 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index efa33d6423b6..a306da4f0c1f 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -4,5 +4,5 @@ AUX cvmfs-2.9.2-include-ctime.patch 274 BLAKE2B c0c0aebb4e9b8bef114c06a3fbd2a6aa
 DIST cvmfs-2.9.2.tar.gz 70806074 BLAKE2B aeb7a246331e2e8453285582934e4da337ff6730f5b826db907b76773968b89138e9e7cc43d7422b5e7588e81b97e7dc0c0f5ea03e6bde89d55297cbab75f70c SHA512 7742678a227a22a8e17bbdba21e68b0e188ccae8e483906cae005d15ff465f60b407f5fc29183b0272ca9572c3512ffc9596b4c9dda764e6adf5edcec97d4547
 DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
 EBUILD cvmfs-2.9.2.ebuild 2363 BLAKE2B 8bb21a5aebe78cdc4235d846750247c09a7b15561bf952e10e03d9ba5c6d06c3b1732f73256cbe1ca56b3473a70267352752d7de2704f9ec0c65b2c06c9c44c0 SHA512 3c7da2d9dee7910795db22ea0ceb3d593bae9284e584020d2ef05923b524dbe16ef718ba1edddab2cbb4cf5951d48cdb8485f22748b5c58890376bfe42bf4465
-EBUILD cvmfs-2.9.4.ebuild 2365 BLAKE2B f6cfca7805904244b48c873062b2358656e8ca75aeaf14b588d5f18941c8cd9d8538264e94cd152db8fea38d1b3bbd816d1970c2447d555abb0c0148baaf894c SHA512 fd61d4a3d84834b3e42c1ae99c33f5f1300dbd050dfc644468a6744170f15b1536573ce211725d1a5d4e75142c21c99a06ed285d426d3f5f97025627d924a4dc
+EBUILD cvmfs-2.9.4.ebuild 2363 BLAKE2B a34659b2ab8baab45598cf15f3b527f21c7175c6de9a17c617b138a53b98f1a001d13338cb7edd169980e131085cc01c577a77bf2f48ae20a3df015279dd1ca7 SHA512 2b48e0420b28f4368158366fac7debbc1f9c83df2eb6e12fea11febb38ed8f44f9e843a44fb33ba91fb3b09533c7d41cce6d44adf1a27f8d3af7e8cbe11b7c84
 MISC metadata.xml 1446 BLAKE2B 17b4b0170f3aa7e4ebbdc7d2bbd1b851a6e11b08338ecd9e441dc98a37b9dc5b9b952ef57b367b7e5991a7008f893fda2289c2e391fe8b3ceca112203b02ad00 SHA512 3e759f757e392a13efec745e56a1edabe32ca1c64372ba41b3919f312a81f2e1cb486009baec38704325d466731782d44edd447dfee28607eee9ac75924ac97e
diff --git a/net-fs/cvmfs/cvmfs-2.9.4.ebuild b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
index ed1428a69031..6f06d176f81d 100644
--- a/net-fs/cvmfs/cvmfs-2.9.4.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="server"
 
 CDEPEND="
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b5dc6be2b2b1..2d1377b9866d 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index d84d325cfc72..686afec8906d 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,3 @@
-DIST polari-42.0.tar.xz 1125160 BLAKE2B e4edeb2023c2df2e1ad855ceea4dc9e646eca18da61643698410724d1fbe031ee609a30e139b2ab2ad6ddf22d1a4ea0b408b4b93d7ac8874c35c9d49f96f16bd SHA512 a64e1841d91809389af4b1f7eebd1b1e187f9e5f7058a84ab3b50bbbdc3786a7ec89bd4ccc4935473d1de1c40f6dbd6daf30b6bff48dd132e28a4be3e8bfb114
 DIST polari-43.0.tar.xz 1128316 BLAKE2B 224c70d77ad772aacc5264b2ff15b9371cbfb47bcdaef3b3fd6b55b86e48947b960773e9568f3a6830b1958b2d901ec9d3e3da3cd3fb1c6341a5fa7d34ab5014 SHA512 ff1d96f7e464043616760f378136c3dfb1b5fc3fce3d24fe067540ce0a306d76027681f085ad0030959a6b1653d9f0291e108457305c16849936ab25861fe285
-EBUILD polari-42.0.ebuild 1058 BLAKE2B a8b84f2ef48fe1e0a42c41fb5fa25fe48558c0edc2ec0ed74aef06fbec2b0cb69f8de3db5e3b37b58884b61ca55327480f7b30017714af664533af60b3f8be98 SHA512 22cfe5afe01e7ec962e0341d5e782c30c8f98c709ba885c703c8d1ce76f24a2c84df217e909e019968c1fd1cb777cfed2498beb4c34184c56b20a20efdece9d5
 EBUILD polari-43.0.ebuild 1058 BLAKE2B 407113d29bdc9a4267c71c0b35ea4c88506a4e228f7716fea889d6b0e6963d4f308460805409f02160843bb3dcdd561007def463b05abb69f710ce78379fd44d SHA512 5f0f3a40bbb078f7632fbd246e95cd055b0083eaecf672ae51e24d17a7488c2e5317627bf0ed3bafb247932bfdcb0ca5c68458ba56fe79dbc7bc29ac7cc36eba
 MISC metadata.xml 347 BLAKE2B b85c094ef47060737f8f7b57071e7b78374ab17226ef793da84e4b6a13792cd8076d6ac060a9c4cda5893a2559cd0bf3e958397fb35908aaf73a462fd496fe97 SHA512 e63acb67ec5073a50302f175f361842ca5b633aba721975f685c9f0d4bcdeb3801e2ad83cae600975f994946682d5ad1ab7da3d682bf4d4bb712a2f64eab82c5
diff --git a/net-irc/polari/polari-42.0.ebuild b/net-irc/polari/polari-42.0.ebuild
deleted file mode 100644
index c423aa098f2c..000000000000
--- a/net-irc/polari/polari-42.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.69.2
-
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=app-text/gspell-1.4.0[introspection]
-	x11-libs/pango[introspection]
-	app-crypt/libsecret[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-im/telepathy-logger[introspection]
-"
-RDEPEND="${DEPEND}
-	>=net-irc/telepathy-idle-0.2
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		dev-libs/json-glib
-	)
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index b9a297126149..106c3b523d61 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/aqbanking/Manifest b/net-libs/aqbanking/Manifest
index 2e1fc7097ea1..dcd3b3e40f77 100644
--- a/net-libs/aqbanking/Manifest
+++ b/net-libs/aqbanking/Manifest
@@ -1,5 +1,5 @@
 DIST aqbanking-6.2.5.tar.gz 2611057 BLAKE2B 05ba9b652f60ae79bc8446f65714ec72396669886d34e57ad09a21b4e5a563bc3f9fbb14431be076b9c05171fe6eac17b128d4bcd7af5250fd5c63d8d93e3e65 SHA512 aec71c16d8f0b3bdac1bba32f83fb22d5b4d2272b41845e7f63e770323a622fcabe1d2e1a9fc98977a38c467ab7cc0f934746216c2107363b81f51b90e65c88c
 DIST aqbanking-6.5.3.tar.gz 2690700 BLAKE2B 2a6407a9d6bfe6a7cfa3b3f4b6d3183b801bda8914770a11d48491fa7bc48e9b034b7eb5d220c6181725240e4475460a11c64df2d73dac98ccb30a61d5de5bca SHA512 bca4449981f9660dc7de8506a2088981b52dcf4ded765fd337263962b464b7903319878e8efbce6cbef043b65be8edb828fee873f19e8c6b2fed0cf7906d58b2
 EBUILD aqbanking-6.2.5.ebuild 1410 BLAKE2B 5ae237ac47d649bb68b8a2b6d5d8dc69babb322b9fdca904d70ff0df5d1905f59906234e18245a42dcde7de80561f7e5e8f6094fe4bf6428a255ba2d13acd9d4 SHA512 3c6adf5c66be001f511d27584a14661eb4606d7a0c4dc2075a6a194eac61ce763e8bf2440646de02fa9b9346e277e9865cd3d2eeb8983effb4b6df0bb5d7cf78
-EBUILD aqbanking-6.5.3.ebuild 1328 BLAKE2B 349645437375ff7ed1ca84fd304ecc92f5e29df31d61232af97f5994f9b59fa80280330154822f2e85d40413a486a9f4f1eae086505a68c43c3170cd94b417ca SHA512 9572fdf1ec46afd6db248a1a35d00d4653b934289f6c8de51542f5246b0a936e5fbff1d3d0925fc9180ffad8ebcb081a1803a86d8099d625bbd9ae278ec8c9d9
+EBUILD aqbanking-6.5.3.ebuild 1326 BLAKE2B 123ef25929ea4375b3ac247062559794bc55e312b9d574eeaa48e8ef518292d3bb343ae92710ac10a377da15b6a1781187d1b76561797c36848e0ee3efac7d58 SHA512 51c334936bee9aff77258391d120d40787c51a39622167d76278592498f6a4e739aa959c7c16b1461eb89dec99073254496f30206dfce2a2535cec151c97ad6d
 MISC metadata.xml 294 BLAKE2B 3e8d1f1507f7ddb3187be8ca27bb737073510725cb99e38816a95ae321f3c06428131cd55ba2d825749d4788e7551c4c6492804b4f2b60039370209af1b2115e SHA512 f0d83a3d07d5fce12d53c0557f32648a8b3df0b2a85d927a53531910bfd24762f32284dbc2f2c8d5dbb2aecaf96060c0f5f3fee5adfb2b12fb2cc60194a5907a
diff --git a/net-libs/aqbanking/aqbanking-6.5.3.ebuild b/net-libs/aqbanking/aqbanking-6.5.3.ebuild
index 9d0bc815c50b..c8e1bc474d99 100644
--- a/net-libs/aqbanking/aqbanking-6.5.3.ebuild
+++ b/net-libs/aqbanking/aqbanking-6.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/467/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="debug doc ebics examples ofx"
 
 BDEPEND="
diff --git a/net-libs/dleyna/Manifest b/net-libs/dleyna/Manifest
index c5fddf6c3d74..e2e328cf07a3 100644
--- a/net-libs/dleyna/Manifest
+++ b/net-libs/dleyna/Manifest
@@ -1,5 +1,3 @@
-DIST dLeyna-v0.8.1.tar.bz2 146410 BLAKE2B a26ebc01df4a8d5cefeb900001e06605d4dffe6beebd6df650e9425048b787edb7dd144399fd66916dee360bc6bb3cf1071e24464ec52d0cdce36e5440272e41 SHA512 9b93ddb0b1a7a29d99da875aba1ae0e3e9c61d003353e4705cbf4274449af6c4ca454e68fe4d618749b7ff7cd215ad3361b07575494dadd8be34c589b8e48641
 DIST dLeyna-v0.8.2.tar.bz2 149691 BLAKE2B c9837da15c18b25c0e9021776cabdcffe52acfaac0f2858ab004b554d9a212ca45cc08f2893383248c5bb5ce57df854d79c329f80511b9f098663326f1badecc SHA512 25a62ad6b623a8d67d90af608d0fa68e4dcef916c5b44f51eb927f6e276555b978414c95f59a680c5938c7b67abe0cc09afa4e58d068f115d73ce6cb40959144
-EBUILD dleyna-0.8.1.ebuild 1015 BLAKE2B 8d826080b76aa14b065258fc6ac9af7a6c06059f9ea0c695daf23780eb4b165f45eb515e6b1ae81587baae3efabff9fc64353f8f5a563cc217d3b6475dc56e08 SHA512 211bd09a4229011661249ee6921739c5686ff0ba4bc3821c4a0cc5a72590f28752f38c931205ba9754fbe588b736c7edc922405512249c5f56f25c14f7292727
 EBUILD dleyna-0.8.2.ebuild 1176 BLAKE2B 9df1ebfb7a9320e6ec025bcda8c12581356093c0f533a919fd755b52da076a2d82692b369e6256d7fa4f9e4964401363281740c602069c52b5f63aa84218a62d SHA512 18ea1dde032bdb6d38e28b432350bce50a5ed944cbd579ec53e88281cef91aa3df6148532b89e9b533badd081bd99f428b178402f2c1fa7389ec09d4ffa531bc
 MISC metadata.xml 347 BLAKE2B f530e4051daea6e7c842e14aab33cd08680f7414dd5bb06fb0c4e7aafc9c851daff77752e77e1f12b333e992854ae97217f78d30a2be2b601ea3465b4e0ff31e SHA512 e5d55300134824082f76ed5fd0a9e5753ef74e98796b17da4c47e7b5e0e5480e82b3e6db6d4880e2ca00b12e01c1514736a41ae0967226283d329f576ab497a3
diff --git a/net-libs/dleyna/dleyna-0.8.1.ebuild b/net-libs/dleyna/dleyna-0.8.1.ebuild
deleted file mode 100644
index a9da0994691e..000000000000
--- a/net-libs/dleyna/dleyna-0.8.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="A set of services and D-Bus APIs to simplify access to UPnP/DLNA media devices"
-HOMEPAGE="https://gitlab.gnome.org/World/dLeyna"
-SRC_URI="https://gitlab.gnome.org/World/dLeyna/-/archive/v${PV}/dLeyna-v${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0/6" # soname of libdleyna-core-1.0.so
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=net-libs/gssdp-1.6.0:1.6=
-	>=net-libs/gupnp-1.6.0:1.6=
-	>=net-libs/gupnp-av-0.12.9:0=
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=net-libs/libsoup-3.0:3.0
-	dev-libs/libxml2
-
-	!net-libs/dleyna-connector-dbus
-	!net-libs/dleyna-core
-	!net-libs/dleyna-renderer
-	!net-misc/dleyna-server
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"/dLeyna-v${PV}
-
-src_configure() {
-	local emesonargs=(
-		-Ddbus_service_dir="${EPREFIX}/usr/share/dbus-1/services"
-		-Dman_pages=true
-		-Ddocs=false
-	)
-	meson_src_configure
-}
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 9775db11ed44..580f65afda0e 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-online-accounts-3.46.0-fix-meson-dependencies.patch 946 BLAKE2B 18bb415247b1fa6e5d24cae781f57812eba367a6317e6c8b426a72435731c0ede8b5b2f85e48991c74470f01af862e7910f74515528f736831cf75644e44a47a SHA512 d2d4e5ec7a074849fad3b76dd366c52d75d2ef39ea8e4573bccfed323a727d9ec99848895f576d72b548db2091af15964697949b0a97ac21996868463da7f354
-DIST gnome-online-accounts-3.44.0.tar.xz 859564 BLAKE2B 6131094df19d5f282491bd19a97f6e0248b10a5c4db19962a6804523101fb86d6bed7523b46cef91328e0f3c7b6496068594de0689ab1fcb63fd8fb80eece49c SHA512 e70a83b557b816dc7eb22bcd1e4a263044a16c981dfa945a529250ea76e743c9cc73f2ecd4f3006d28a4f3161c7a15dba8bd1416b413c28f4d86d0192755e809
 DIST gnome-online-accounts-3.46.0.tar.xz 379464 BLAKE2B 20825f2836e334d3f26222ae0583a7dd27d00528fa0e0a1b67f940ada633e3bd3ec93b251f40c88a850ade7dbe503b9610cd4f982eece368a61c04d0d54181f7 SHA512 727eaf248d70ba8b3874ca500d40e6fead3f76f72aee1b1f383aac57ee71bdb77dab7da3487b3f0fee665130cc61ac8b53f3a1bf1754e5df919fc5c48486c201
-EBUILD gnome-online-accounts-3.44.0.ebuild 2089 BLAKE2B 38bb7a0c89c92f4c0ef00b0cb4d935219c59c7b8ccd1681d5140f685a5cb93c1ece18ce0f1a2dec39220797b348ac255a0d70aaf7aa20aeac3096e949e622aa4 SHA512 68e5a9f935256c35dc3bf6c8cc66e0866e850a9125653faa78c1ced29f616096b0809118f7d0b0e72958c8f25a61a84ba32c430c93c9e38fa85317c8f5dfe833
 EBUILD gnome-online-accounts-3.46.0.ebuild 1948 BLAKE2B e400df4ac17d6e4416142b7d97586bf62427cc6040298a9cf5ac482f3b606de35789979ef5c2dc330c8f036c0fd29433acb5cf00ced033a19cd6cb2b2f159213 SHA512 1d0301356a0dc12ce75355ab4b20093bb7865c2aa52cad7f5f10980afd6fea58bdd61821bd77c1a6216b66cea82f9e9e788af98011a853ef85c5d9ac6616d435
 MISC metadata.xml 497 BLAKE2B c9f25a548f7d6c51efc6dcd12d2c23ce4121621bccd62b0dd29ea9c83170eb5d91ccdb208362c7d4a246207162bc34f5c9f447baaa079b46a848c64ba26ee9a7 SHA512 9950752a3f1465eca98bc46d691ec3105f9d6806449923189884028e4d591977b2840f515348b948985cc75ec9e389155d4a54c2a460e4fc6c757ca30ad466bc
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
deleted file mode 100644
index dbe8f1387ab6..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME framework for accessing online accounts"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-
-LICENSE="LGPL-2+"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
-
-IUSE="debug gnome +introspection kerberos +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# pango used in goaeditablelabel
-# libsoup used in goaoauthprovider
-# goa kerberos provider is incompatible with app-crypt/heimdal, see
-# https://bugzilla.gnome.org/show_bug.cgi?id=692250
-# json-glib-0.16 needed for bug #485092
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=app-crypt/libsecret-0.5
-	>=dev-libs/json-glib-0.16
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.42:2.4
-	net-libs/rest:0.7
-	>=net-libs/webkit-gtk-2.26.0:4
-	>=x11-libs/gtk+-3.19.12:3
-	x11-libs/pango
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
-	kerberos? (
-		app-crypt/gcr:0=[gtk]
-		app-crypt/mit-krb5
-	)
-"
-# goa-daemon can launch gnome-control-center
-PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
-
-DEPEND="${RDEPEND}
-	vala? ( $(vala_depend) )
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.30.0
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	use vala && vala_setup
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: Give users a way to set the G/FB/Windows Live secrets
-
-	# CONFIG_SHELL for bashisms in bug #829494, patch submitted upstream.
-	# Can be removed in future.
-	CONFIG_SHELL="${BROOT}/bin/bash" gnome2_src_configure \
-		--disable-static \
-		--enable-backend \
-		--enable-documentation \
-		--enable-exchange \
-		--enable-facebook \
-		--enable-flickr \
-		--enable-foursquare \
-		--enable-imap-smtp \
-		--enable-lastfm \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable kerberos) \
-		$(use_enable kerberos fedora) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index c6a5b1ceb7cb..ac13df17e98c 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,7 +1,4 @@
 AUX libnma-1.10.4-path-eap-schema.patch 1229 BLAKE2B 50c80e5f5e5bdfbe14e176daa5082162902af4184fd94093353aba3e4b68c181ba3fa0a10e756a81de1b43efa2142c2843fd08d317df806578bf78329ff4a804 SHA512 6d5dc9f13de966471cac8391d2422279abca235daf7e839b0b92fa00abc98f4949935822997920b2d0b597892c0402ef42b09a3af922f06abb1b1772cb70c015
-DIST libnma-1.10.2.tar.xz 1360128 BLAKE2B 8caff2baaf1d7e0cb7a6cefee4917b5f294517cc3ee22446f0bbea0301664969bdf43d10fcdf15e938bdae07467ad0a048687e61c3c494c4f042a1f6800d5745 SHA512 f8ac5f73ee8bc918325d2beec3e1eea61fed18110103ba9c3eb21da02fbd054895aa5ce332942a9113bb4860d59958dbf9c3b91885663b6225daec25cadf7458
 DIST libnma-1.10.4.tar.xz 1351932 BLAKE2B 0178407d04fed680b260ea7e4615f0d939483504209b4bc721e2a4fe49ecbf49d9ffde0476b4352973cda9de4f088ac50d557c12f67d970f21031c1741f692e3 SHA512 4fe0d6b0e5b3c1bd7654e03dce747ee390de76d6641eb317fecb901ed6768bf48785e4a99e6fc8f12864066d06a64e308a8dbb2081a2d57e3f1509ca712deccc
-EBUILD libnma-1.10.2.ebuild 1720 BLAKE2B b8097044c991d5ad1de2501c578ed57566c07843ca27c21c746e30df2298c83fc3e8a8ead3e38fc05ba9030ee3a82e02cde9cf963b18ba57808920811ae6968c SHA512 6c824e780fb011d73cda9eccafcd3e13c3dab86f1d59ef7c889199fdb24490e028e48f417996da4f525fd0d106169d57b6aeb7e0acc3903b5a2eebe30d8b2c3f
 EBUILD libnma-1.10.4-r2.ebuild 1889 BLAKE2B 7ebfb7b19c81909881ba542948da4d92217e9f7f215c5009886dd691f7acb512e8a5c6ea2081f943cd2d03a11c1c5e2397a41e112f70e22f217a157f6b63675e SHA512 98e5eab9a2859038fb07e1d9a26726e7a57b331983943c63f340fc923320f4880c3f87769156f13eabf69475e48bcb9ddd885c86f30d3fa31c2ea51491bb4483
-EBUILD libnma-1.10.4.ebuild 1779 BLAKE2B 562d5c55285df7911789d00604001b1411a57d7e98b42a54f9fd499c4d1df0a24ccb6200c6ed8aa9b1a6a23e639d45a9f16621b15136246443c21e097ec9403c SHA512 ff1d4013c5464bd1569df5c649e70d1960eb1f8cd6581e9c24c13e2a4ea2094460c844c060889338370be7ab7d94f10fe1c7fa9246494a85d2a6f790927a1c89
 MISC metadata.xml 470 BLAKE2B 634b69ece62b9f3f8aa9e82b1df56009823dffd8dd45a46b6ac58c3580179c7c6c87965c8da5d653188e81bfbe5c26c956d15181d23f23ec17b468ba3b585cbd SHA512 a15b193fd01eda0a1408af3ad93660ed7cf859e3837e8e83c5c76031cf50aa3634e8a4d2a47f8db8c311cb36b1eb2fb8a89f8c7adfb9fd6d596eb6e9e5e8bea6
diff --git a/net-libs/libnma/libnma-1.10.2.ebuild b/net-libs/libnma/libnma-1.10.2.ebuild
deleted file mode 100644
index 421090613fa2..000000000000
--- a/net-libs/libnma/libnma-1.10.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/libnma"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-	>=gui-libs/gtk-4.0:4
-	app-text/iso-codes
-	net-misc/mobile-broadband-provider-info
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	>=net-misc/networkmanager-1.7[introspection?]
-	pkcs11? ( >=app-crypt/gcr-3.14:0=[gtk] )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend)
-		net-misc/networkmanager[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibnma_gtk4=true
-		$(meson_use pkcs11 gcr)
-		-Dmore_asserts=0
-		-Dgcr_gtk4=false
-		-Diso_codes=true
-		-Dmobile_broadband_provider_info=true
-		-Dld_gc=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(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/net-libs/libnma/libnma-1.10.4.ebuild b/net-libs/libnma/libnma-1.10.4.ebuild
deleted file mode 100644
index 965eae62dbe5..000000000000
--- a/net-libs/libnma/libnma-1.10.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
-	>=gui-libs/gtk-4.0:4
-	app-text/iso-codes
-	net-misc/mobile-broadband-provider-info
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	>=net-misc/networkmanager-1.7[introspection?]
-	pkcs11? ( >=app-crypt/gcr-4.0.0:4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-	!<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0
-BDEPEND="
-	dev-libs/libxml2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	vala? ( $(vala_depend)
-		net-misc/networkmanager[vala]
-	)
-"
-
-src_prepare() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlibnma_gtk4=true
-		$(meson_use pkcs11 gcr)
-		-Dmore_asserts=0
-		-Diso_codes=true
-		-Dmobile_broadband_provider_info=true
-		-Dld_gc=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	rm "${D}/usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1f35c999a814..3791493fbe50 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gupnp-tools/Manifest b/net-misc/gupnp-tools/Manifest
index f61fde1403d6..863592931d50 100644
--- a/net-misc/gupnp-tools/Manifest
+++ b/net-misc/gupnp-tools/Manifest
@@ -1,5 +1,3 @@
-DIST gupnp-tools-0.10.3.tar.xz 180596 BLAKE2B 26140962cc24cda867465a4f94d251a26849db544fe1cb017ca86e6208f037b09e772109bfac150a9f6db845d1212af5a5c624d81958816349b3c60e45b80933 SHA512 a95a169c65e50d9953b79b96b92abbad709adc0bf74db47abaa529bd7989ebe2d41ae30ab340d09e5a727b61200d55a6d34b04d6981327b920d23a7c916babbe
 DIST gupnp-tools-0.12.0.tar.xz 181736 BLAKE2B aa33ab97ece72f9baebda4db20a0f72d995017ff45abf0e2da0ae4644d6ede6309b7aa2172c75607a4caf4fbcc65b5e88d1766a8819af96ffe054c83ef87ec77 SHA512 e9c4882f910adee6021433904b78bad89abf4a0d978e24b61cc1c07736e27f0d7e79592e18bbbae8fa13a65f86e72cb8bd7783d74140c6f5d3c65fea4f57da30
-EBUILD gupnp-tools-0.10.3-r1.ebuild 697 BLAKE2B 7eb16387dec65f3f118a110b44d825ac75d192c1276be340e931f1a607c9493407710f65063952236653148ff54490ec7b3ff2373a61cbabf6e7bbc7e71f0fe8 SHA512 de47cf559adf46a4c6277a8e7895b8096a90312083dd93069a2523b95789a0f35075672899e58f02a81711c3e7c797e2406d915697aba839bf6f0eb1854f2f2f
 EBUILD gupnp-tools-0.12.0-r1.ebuild 700 BLAKE2B 5d6b24d53d7e6c280823384511c3277b251bcf23033a6764efea2f30eb3dfccbcb696a5023546e367393afca4e7989208fbfa3b72cd75789fbfcac3f666b32a6 SHA512 e4fb14973414bfc7a22aa7a21f7f247a4f898d433c15255fb47a8fce28505648a26f822b355c74760541c1a0fee3a520cc1896f502e688e5853d929eef40fb42
 MISC metadata.xml 352 BLAKE2B 0847258ecdc48f7f07000a47067e9437fbd7082a8ffff8d8cd3bc7a3ade5a52d9f082dec3cf04ece3835be9904c294b9d523e595e6d7fa9477796dbf1230f234 SHA512 65fda0d85f721fbfcb890f15b8f12ccdc7931017585675716bc0020f81ab37249b5f890b334318c9dc1c5fc0f9a4ba69171312899e3f4714ecce0602cc7f095a
diff --git a/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild b/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild
deleted file mode 100644
index 8061aeac2537..000000000000
--- a/net-misc/gupnp-tools/gupnp-tools-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="Collection of developer-oriented UPnP tools"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=net-libs/gssdp-1.2.0:0=
-	>=net-libs/gupnp-1.4.0:0=
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/gupnp-av-0.5.5:0=
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/glib-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	x11-libs/gtksourceview:4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dav-tools=true
-	)
-	meson_src_configure
-}
diff --git a/net-misc/kafkacat/Manifest b/net-misc/kafkacat/Manifest
index a454a023648c..4ddba67ac485 100644
--- a/net-misc/kafkacat/Manifest
+++ b/net-misc/kafkacat/Manifest
@@ -1,5 +1,5 @@
 DIST kafkacat-1.5.0.tar.gz 124682 BLAKE2B 392689ded1cd07268bba572273b2b18dbac0d0f4c2daf87c0a4c5fbbff2568df7ec5ca7b64aed34caa851b5e9b8629e246f9d19087496a882b8b55b2e2138f78 SHA512 57f75b26ef32df244043fa9fc17dc2d6fd93daeea4bc389aa78356ea6e45dea780ff9c3462ed27d2a7798560a21eef04f098bf7766c7305bcee4573f557651ad
 DIST kcat-1.7.1.tar.gz 142699 BLAKE2B 2736d284d9f1f940688a3605db3a966ddee0cb26cc271d0d288f5910a86b8d494e207757d5d35e445ea99bb4a0a218715401815167734eee3942d7de6573baaf SHA512 07aa442a840819ca8d1ab20d86fe9d07afee0e4fa546b033ceb0c1c526f3fb5d9fbd2c34c29460d3439c5046b836605150dc76e85072d9516d82b9a193a0a3cd
 EBUILD kafkacat-1.5.0.ebuild 667 BLAKE2B 912e8c4ee0f788eed5024f008031db1bdf47fa46909f9b5a7b8e1c84ede1cf2724796fda1e2ddcf3ecee3fcceddf00cd872795fceab8b7a4d84da9ea07a58efb SHA512 a69fd7fe4268b5e42c2da2e058f10fa53975b45fa56675e2be9756a84bc0dcf8137f0f020dd11d4ec282198c9ab24e18fe21cd692ba10452736b86c0aa390187
-EBUILD kafkacat-1.7.1.ebuild 926 BLAKE2B 2c94586bcc367ec1dad014dd558e5e4aa3c91179aed1b788013bfe2876e5f26e878b1ea89fdff5fae8a84b106b15dafeea2c7242cc46e6f0b0c991181fcc15f4 SHA512 b9e5f72baeec5d3bfadef7dfd462bfda2b9daece230fb26e521057506677a8104c6c0f5d6e2496315d1d6675107a6fca1297db0bc2b625ab84fa89e6aae1ff0c
+EBUILD kafkacat-1.7.1.ebuild 925 BLAKE2B 091029254c4bc44042b466118e59d82e83b6ca1b7adb81870dc34ab9feaf54c87c2891b77b33bc77d243456e1a041d0bdd946d7c40de76931766a5b930faf0f7 SHA512 8c0dc83980eab43c6a34df23047a7a50098ada50c2cf23cb0eda9be69823b996e4e2fc1a91c18920aef4da06c6297ac1cb372bb408c39db8d94335ddea89448d
 MISC metadata.xml 468 BLAKE2B a9a00808af0af8c2a3183f35ccef3edd15c2772d99c3c01e2a0da115dafe46c89449d1dbe7119e08c294c7d53372ac4a6dc31d5cc956c66b73350143472af09b SHA512 d1cdf304cc2cca1744e2092b50db577b981d8684ebfa4a4d099bd84bada67e00558c439d9a735bc43247db598fa34e0419dd3fcaae94ae68246baf003bbffca8
diff --git a/net-misc/kafkacat/kafkacat-1.7.1.ebuild b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
index ec9435f80a3b..b0c95f3ca2f5 100644
--- a/net-misc/kafkacat/kafkacat-1.7.1.ebuild
+++ b/net-misc/kafkacat/kafkacat-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/edenhill/kcat/archive/${PV}.tar.gz -> ${MY_PN}-${PV}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+avro +json"
 
 DEPEND=">=dev-libs/librdkafka-0.9.4
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index ed7f6e02aee5..5ebfd4184aeb 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,3 @@
-DIST mobile-broadband-provider-info-20220725.tar.xz 85184 BLAKE2B 1b36b2cf8f0a66755a7cd10090531efd2c5094e5d611247af748f0923fd76b5e1ce20c31ce16be2b0bad5bd64e44e72eeeec7123435366186e31c7da9e66343a SHA512 335b3a5598144f4b11eab2d924b4671055c414664c783507fb8aa0ee20769dca640d03e559e7f55741b38652590812e777b663264d6dcafd24407cfaeb5bc24d
 DIST mobile-broadband-provider-info-20221107.tar.xz 85416 BLAKE2B 91772a7f16fbba8d477abd623e4902e1aa2317ba0e226ab493ca8cc94bd6dc4c68ea61fc2f3d8f1f4c6bbfce2d7b27dc9dcfa3d35df6a9c9370b9c4ff277318f SHA512 e72fc1c78dd1bf991fc29ba952757af9c38d11e3e918662ce6380337c75eaa56fe33705f6d1eb78627378e1575b4102dceaa68e5e035c62c02e60570752f3e86
-EBUILD mobile-broadband-provider-info-20220725.ebuild 507 BLAKE2B 8db65fc32a0ac10bf81b6b56c2af9363af57ddefc158c90a54c35be6b410d2851a39231c5f2e0f0382338905b2e54983005d67a6bd565dc6a53ffaed9201cb7c SHA512 f0af591423af0a89248c6aa972e2043067abb407710180f3f7b89cdd242d0a06b21b2042d0d17770b633d062acb8aab494ce15f1ef7b36999500836fef45ac49
 EBUILD mobile-broadband-provider-info-20221107.ebuild 488 BLAKE2B 412a87ce704d84c711295ef2eb551d61d7a5228535ccf0127edb5734c234084391fd06cf56d4f74b6e97c6aba73ba285101f50288b57054a05a140bc5f5258a3 SHA512 a12cab7fe9065286e27398e090f48a7cc674cd9f3bab7ae34330ba7b57e036548e8db146701c4a1e513c96f7ec180e7a0157aaf5c6697156a4a535e95682e5bc
 MISC metadata.xml 371 BLAKE2B 0bebc02fecc2a73323bb775ef52ccad19b856e70beb7202a588d128d3abc8fd77fa0937cc3ae897596c29dca0d3ce0e0d2ef88b3528ac90a07db4de1e0b97a46 SHA512 3b3eb4caef7124cb52d7a42d4abffcafc7b0f480546a57fd568b7ac98e22b217105f0699c4ab0c9ee3d004e6e392ad1da4213bfb61f0d04440058c717b75917f
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
deleted file mode 100644
index d2bb879094ad..000000000000
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220725.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 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 ) test" # bug #856436
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( dev-libs/libxml2 )
-"
-
-DOCS=( README )
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 1a27e636a18f..c7baec8045a0 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -3,5 +3,5 @@ AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 DIST mosh-1.4.0.tar.gz 399624 BLAKE2B a122b859f1c626ed231b6b1bb484eacfa7c76da0f764394e9c42596c5d89cc3a40beae3076f95b07e73aa590422b1397f17ce1583f68436dff6b74233d609839 SHA512 7ea895a3fb86e0e94ddf2d86660ca42e9a8954cebee2b2b86952e4db4475a450fdadbfe415872908494c8900f4f42a4fb861c49308d08185037d21b9359df758
 EBUILD mosh-1.3.2-r3.ebuild 1507 BLAKE2B 10115565942c1b4bb81a7a87416e0219ccc0e9ed35c448c55c78a658da28946057f68075482c156b24c468450ed20523db5b53e66559a11d9d384ba3aa6adcd0 SHA512 af52e3002f15884a7c11d045c1d9e2a068ebdac8b3a4623d11242881a6502998032d9e6bff2699e5e2fa5d3ea7d4bfdfe1eeb6284757592bfa3b7c6eca638f8d
-EBUILD mosh-1.4.0.ebuild 1951 BLAKE2B d01b4b9b6f0c0935962341f215c66c4282fa437ab82a800c6a66aafd0ea352a3eb29a82568ed2873d33ad2a8c735087cdc7c53591aa97ca372e665820d85fc23 SHA512 2733e9c2d3c9686762e13afdfa9d8b00f09eed8735a9528bd9ad963c8c9d1730fb68a4b0de2919c847be7e63588e70830a17011788d2161d207440d9b84a8b86
+EBUILD mosh-1.4.0.ebuild 1944 BLAKE2B d665e2e71fb5414d802d7dd8c6523caa210c973c741e3ade9cd3f7c9170b7fe489a73e35d07e1d45726dedf4b1e86d4a2bf8f12743af536497639dd7dd42bcad SHA512 8a3aac4184ed5d9871e471a875d9f2bc81c3a4204489dedaf6528b75eb820502588ac88a413e9b7ab85b28ec6f86022158444a77fcfb941bd8943500208a03e3
 MISC metadata.xml 1308 BLAKE2B dd0adee201ba12f75e60f781f6642921c2bb64c19b8defb6cd175d48090c7ee083ae6dbcb73c87c080fdd47b28569adbfb3fe64dd2b6ed7d11b3d66be40e2205 SHA512 ef68cfe26d69a3ffa088d6b1efc142861f90d224d41f6b5e2c2536932ddeff6d1d036de0778d164d35a38c9d470d28ee761be08528c7f23a48072cf5d77a5f09
diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild
index 289455b3b6e6..e15c2b02f5b0 100644
--- a/net-misc/mosh/mosh-1.4.0.ebuild
+++ b/net-misc/mosh/mosh-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 22dfccb8a86c..13642fdb5d50 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,10 +2,8 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r2 1880 BLAKE2B d765a298955cdcf0c62518488fc9f02f97c31ee645c7b15ed73914397e02266e1b72a32af1d9f8007ae81119e9223b3e41184aa58b9fa328ed72e0ebec91acd8 SHA512 f06e7e6b6ebeb991471cf6e71c44687210a115fd008505ebe01de1b52a059952c2b191789d217412ae30daaaecf8bc028c89daf536af793eac23cfcd62ba9ad4
-DIST NetworkManager-1.40.2.tar.xz 6585760 BLAKE2B 12bd809e0d5140ecb1f52f61680fbd21044350d0c265bfff2ac812f977a7db5c5342a0302b6f02b057ce675ab917f449106e4bb1bb9b1d187066e076785ed951 SHA512 b79119d11ad98262a22a3f78a7dfa979a7890682f97ed8154552f7ceb964402fc9c2dcda082bf80ba45d7f717f541d3145e40f7f6c4fbb8f2858272cc9505761
 DIST NetworkManager-1.40.6.tar.xz 6596776 BLAKE2B 32e2a496d68d183a44a15f9ecfef18f5c7fcbc7ba5e27e0eb62825edb0ebbcf8ec34dcdd6d4da953aa46029d7063197f549cae13eb3622dd1f52c92aa5961941 SHA512 cd8ced0598ea4224cfde23a157108c872bb3935e539029571110b6a0bb4bf3637ad8e3afe8e5f162890ed557e8b42a803bc4e18db00e1de840dd0fa20643e036
 DIST NetworkManager-1.40.8.tar.xz 6518080 BLAKE2B 90a65dde96b3127a5438aa4add47e66887c940a86598109bde74f9bc56d317c41f835858a0b2ea89dca228f7fcc43e811b20e0d4528018ebe95947114f405cb4 SHA512 1c3f986c0f37160fced3cc790f6e569ae2185aec2bb2b5ef9635848ba493d4e920cc7ea83cd34a8df7bc12902d071238f9ae6aeb7721658ac54ba862f7c822ef
-EBUILD networkmanager-1.40.2.ebuild 12490 BLAKE2B b3d81d5bb1a99c214195939d024014027deac7d14672f47aff691fdd51ff0cf30109660f4d32fe459e33afa3453b20cd9ce74bcc5918ffb28a826ae8065b044b SHA512 a2c9aed9f711bb1e3345115e72a3d297e1e7cc2c79635f718c3cb45ace4587bdcc64fdfb11398eab32adccba1e487af17081e9e96b62e00ce1ce43466c249abe
 EBUILD networkmanager-1.40.6.ebuild 12529 BLAKE2B 6e84177d759c8f40fa273b5a5d45a6b17efa345d7cb081492064b60dd98ef7b03a33c6b92064c95644afd4e44ff81f7179f00957821eca39c5d57f54ddb3cd16 SHA512 03237e960c02a3edd9b1798863f780acd96822ecb79c0d74081d6e411d6abf2bdc7d0e6cb08beba46fb20db4584783261da1720f7e1124290ad47e8702165faa
 EBUILD networkmanager-1.40.8.ebuild 12535 BLAKE2B 121488dea0a92b9e720e556fa51188b5005f2a20426c75615ca70cf78ea61e5fb5c7db244a6602dc62fd212c266a3401419422e407f81ef2f4bf72593e25f568 SHA512 419e4932a983ba0e4473af16b790d4d815d7697d29be5aea26d2a9f32f23d65df15060d77b56cb64934ad2a35d901e75b1f77d1c1b70710d16f20932a5208d3b
 MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2
diff --git a/net-misc/networkmanager/networkmanager-1.40.2.ebuild b/net-misc/networkmanager/networkmanager-1.40.2.ebuild
deleted file mode 100644
index e7f593a72f24..000000000000
--- a/net-misc/networkmanager/networkmanager-1.40.2.ebuild
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-GNOME_ORG_MODULE="NetworkManager"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	bluetooth? ( modemmanager )
-	connection-sharing? ( || ( iptables nftables ) )
-	gtk-doc? ( introspection )
-	iwd? ( wifi )
-	vala? ( introspection )
-	wext? ( wifi )
-	^^ ( gnutls nss )
-	?? ( elogind systemd )
-	?? ( dhclient dhcpcd )
-	?? ( syslog systemd )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-
-COMMON_DEPEND="
-	sys-apps/util-linux[${MULTILIB_USEDEP}]
-	elogind? ( >=sys-auth/elogind-219 )
-	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
-	sys-apps/dbus
-	net-libs/libndp
-	systemd? ( >=sys-apps/systemd-209:0= )
-	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
-	selinux? (
-		sec-policy/selinux-networkmanager
-		sys-libs/libselinux
-	)
-	audit? ( sys-process/audit )
-	teamd? (
-		>=dev-libs/jansson-2.7:=
-		>=net-misc/libteam-1.9
-	)
-	policykit? ( >=sys-auth/polkit-0.106 )
-	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
-	gnutls? (
-		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}]
-	)
-	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
-	modemmanager? (
-		net-misc/mobile-broadband-provider-info
-		>=net-misc/modemmanager-0.7.991:0=
-	)
-	bluetooth? ( >=net-wireless/bluez-5 )
-	ofono? ( net-misc/ofono )
-	dhclient? ( >=net-misc/dhcp-4[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-9.3.3 )
-	ovs? ( >=dev-libs/jansson-2.7:= )
-	resolvconf? ( virtual/resolvconf )
-	connection-sharing? (
-		net-dns/dnsmasq[dbus,dhcp]
-		iptables? ( net-firewall/iptables )
-		nftables? ( net-firewall/nftables )
-	)
-	psl? ( net-libs/libpsl )
-	concheck? ( net-misc/curl )
-	tools? (
-		>=dev-libs/newt-0.52.15
-		libedit? ( dev-libs/libedit )
-		!libedit? ( sys-libs/readline:= )
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/plugdev
-	|| (
-		net-misc/iputils[arping(+)]
-		net-analyzer/arping
-	)
-	wifi? (
-		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-		iwd? ( net-wireless/iwd )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.18
-	net-libs/libndp[${MULTILIB_USEDEP}]
-	ppp? ( elibc_musl? ( net-libs/ppp-defs ) )
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	introspection? (
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	vala? ( $(vala_depend) )
-	test? (
-		>=dev-libs/jansson-2.7
-		$(python_gen_any_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	if use introspection; then
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	if use test; then
-		python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
-		python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
-	fi
-}
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See https://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See https://bugs.gentoo.org/333639 for more info."
-		fi
-	fi
-}
-
-pkg_setup() {
-	if use connection-sharing; then
-		if kernel_is lt 5 1; then
-			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
-		else
-			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
-		fi
-		linux-info_pkg_setup
-	fi
-
-	if use introspection || use test; then
-		python-any-r1_pkg_setup
-	fi
-
-	# bug 809695
-	if tc-is-clang && use lto; then
-		eerror "Clang does not support -flto-partition"
-		die "Please use gcc or turn off USE=lto flag when building with clang"
-	fi
-}
-
-src_prepare() {
-	DOC_CONTENTS="To modify system network connections without needing to enter the
-		root password, add your user account to the 'plugdev' group."
-
-	default
-	use vala && vala_setup
-
-	sed -i \
-		-e 's#/usr/bin/sed#/bin/sed#' \
-		data/84-nm-drivers.rules \
-		|| die
-}
-
-meson_nm_program() {
-	usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-meson_nm_native_program() {
-	multilib_native_usex "$1" "-D${2:-$1}=$3" "-D${2:-$1}=no"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		--localstatedir="${EPREFIX}/var"
-
-		-Dsystemdsystemunitdir=$(systemd_get_systemunitdir)
-		-Dsystem_ca_path=/etc/ssl/certs
-		-Dudev_dir=$(get_udevdir)
-		-Ddbus_conf_dir=/usr/share/dbus-1/system.d
-		-Dkernel_firmware_dir=/lib/firmware
-		-Diptables=/sbin/iptables
-		-Dnft=/sbin/nft
-		-Ddnsmasq=/usr/sbin/dnsmasq
-
-		-Ddist_version=${PVR}
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool policykit config_auth_polkit_default)
-		-Dmodify_system=true
-		-Dpolkit_agent_helper_1=/usr/lib/polkit-1/polkit-agent-helper-1
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool systemd systemd_journal)
-		-Dhostname_persist=gentoo
-		-Dlibaudit=$(multilib_native_usex audit)
-
-		$(meson_native_use_bool wext)
-		$(meson_native_use_bool wifi)
-		$(meson_native_use_bool iwd)
-		$(meson_native_use_bool ppp)
-		-Dpppd=/usr/sbin/pppd
-		$(meson_native_use_bool modemmanager modem_manager)
-		$(meson_native_use_bool ofono)
-		$(meson_native_use_bool concheck)
-		$(meson_native_use_bool teamd teamdctl)
-		$(meson_native_use_bool ovs)
-		$(meson_native_use_bool tools nmcli)
-		$(meson_native_use_bool tools nmtui)
-		$(meson_native_use_bool tools nm_cloud_setup)
-		$(meson_native_use_bool bluetooth bluez5_dun)
-		-Debpf=true
-
-		-Dconfig_wifi_backend_default=$(multilib_native_usex iwd iwd default)
-		-Dconfig_plugins_default=keyfile
-		-Difcfg_rh=false
-		-Difupdown=false
-
-		$(meson_nm_native_program resolvconf "" /sbin/resolvconf)
-		-Dnetconfig=no
-		-Dconfig_dns_rc_manager_default=auto
-
-		$(meson_nm_program dhclient "" /sbin/dhclient)
-		-Ddhcpcanon=no
-		$(meson_nm_program dhcpcd "" /sbin/dhcpcd)
-
-		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
-		$(meson_native_use_bool gtk-doc docs)
-		-Dtests=$(multilib_native_usex test)
-		$(meson_native_true firewalld_zone)
-		-Dmore_asserts=0
-		$(meson_use debug more_logging)
-		-Dvalgrind=no
-		-Dvalgrind_suppressions=
-		-Dld_gc=false
-		$(meson_native_use_bool psl libpsl)
-		-Dqt=false
-
-		$(meson_use lto b_lto)
-	)
-
-	if multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=systemd )
-		emesonargs+=( -Dsuspend_resume=systemd )
-	elif multilib_is_native_abi && use elogind; then
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=elogind )
-		emesonargs+=( -Dsuspend_resume=elogind )
-	else
-		emesonargs+=( -Dsession_tracking_consolekit=false )
-		emesonargs+=( -Dsession_tracking=no )
-		emesonargs+=( -Dsuspend_resume=auto )
-	fi
-
-	if multilib_is_native_abi && use syslog; then
-		emesonargs+=( -Dconfig_logging_backend_default=syslog )
-	elif multilib_is_native_abi && use systemd; then
-		emesonargs+=( -Dconfig_logging_backend_default=journal )
-	else
-		emesonargs+=( -Dconfig_logging_backend_default=default )
-	fi
-
-	if multilib_is_native_abi && use dhclient; then
-		emesonargs+=( -Dconfig_dhcp_default=dhclient )
-	elif multilib_is_native_abi && use dhcpcd; then
-		emesonargs+=( -Dconfig_dhcp_default=dhcpcd )
-	else
-		emesonargs+=( -Dconfig_dhcp_default=internal )
-	fi
-
-	if use nss; then
-		emesonargs+=( -Dcrypto=nss )
-	else
-		emesonargs+=( -Dcrypto=gnutls )
-	fi
-
-	if use tools ; then
-		emesonargs+=( -Dreadline=$(usex libedit libedit libreadline) )
-	else
-		emesonargs+=( -Dreadline=none )
-	fi
-
-	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
-	if use ppp; then
-		local PPPD_VER=`best_version net-dialup/ppp`
-		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
-		emesonargs+=( -Dpppd_plugin_dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
-	fi
-
-	meson_src_configure
-}
-
-multilib_src_test() {
-	if use test && multilib_is_native_abi; then
-		python_setup
-		virtx meson_src_test
-	fi
-}
-
-multilib_src_install() {
-	meson_src_install
-	if ! multilib_is_native_abi; then
-		rm -r "${ED}"/{etc,usr/{bin,lib/NetworkManager,share},var} || die
-	fi
-}
-
-multilib_src_install_all() {
-	! use systemd && readme.gentoo_create_doc
-
-	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Provide openrc net dependency only when nm is connected
-	exeinto /etc/NetworkManager/dispatcher.d
-	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
-	# Allow users in plugdev group to modify system connections
-	insinto /usr/share/polkit-1/rules.d/
-	doins "${FILESDIR}"/01-org.freedesktop.NetworkManager.settings.modify.system.rules
-
-	insinto /usr/lib/NetworkManager/conf.d #702476
-	doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
-
-	if use iwd; then
-		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
-		cat <<-EOF > "${ED}"/usr/lib/NetworkManager/conf.d/iwd.conf || die
-		[device]
-		wifi.backend=iwd
-		EOF
-	fi
-
-	mv "${ED}"/usr/share/doc/{NetworkManager/examples/,${PF}} || die
-	rmdir "${ED}"/usr/share/doc/NetworkManager || die
-
-	# Empty
-	rmdir "${ED}"/var{/lib{/NetworkManager,},} || die
-}
-
-pkg_postinst() {
-	udev_reload
-
-	systemd_reenable NetworkManager.service
-	! use systemd && readme.gentoo_print_elog
-
-	if [[ -e "${EROOT}/etc/NetworkManager/nm-system-settings.conf" ]]; then
-		ewarn "The ${PN} system configuration file has moved to a new location."
-		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-		ewarn "to ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-		ewarn
-		ewarn "After doing so, you can remove ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
-	fi
-
-	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
-	# but still show a warning to remember people to have cleaner config file
-	if [[ -e "${EROOT}/etc/NetworkManager/NetworkManager.conf" ]]; then
-		if grep plugins "${EROOT}/etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
-			ewarn
-			ewarn "You seem to use 'ifnet' plugin in ${EROOT}/etc/NetworkManager/NetworkManager.conf"
-			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
-			ewarn
-		fi
-	fi
-
-	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
-	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
-		ewarn "You have psk-flags=1 setting in above files, you will need to"
-		ewarn "either reconfigure affected networks or, at least, set the flag"
-		ewarn "value to '0'."
-	fi
-
-	if use dhclient || use dhcpcd; then
-		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
-		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
-		ewarn "works for you, and you're happy with, the alternative USE flags can be"
-		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
-		ewarn "the main.dhcp configuration option to use one of them instead of internal."
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 5ad7047aa656..b45f59061221 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.40.4.tar.xz 1696492 BLAKE2B 9e22390b379b2e09abb2685b0c2a00bc03ae3668d4c6d5ed432dd9c5cefdf07a00370bc5a9a96bc542d14f48dfdcdf4db3647365833942d1d81dc377d0440705 SHA512 5e4003af9c0dc8a4b948cc63a12ec3f61c9e9f4f8007b196f9ce988c85e2fea7ec0a6c1e4217c59a770ca179b4ad8bba2e01aa99459a4e1179b9bc5db22ea0f8
 DIST rygel-0.42.0.tar.xz 1699676 BLAKE2B d3a324baba0b649c0b215e897a23cc963575c2c8b71f7f993fa4a544435a38c921115a5cc3c5ad1db45769d27db6d901a196210cbff540684b55b19aeb53aab1 SHA512 78dd253ad5f4e3dd5ac8db38f5f160a84878c868c445795e676b20e1cba2dd08e6b757f6473d6db5175dca4e9de4d7bb5143acc467cda2a5691e18c654c17dfa
-EBUILD rygel-0.40.4.ebuild 2167 BLAKE2B e0ae1ea263fcfb805566cec724a01124b8faf707b899f1121ed9271fa2f9a03c7a8eec2f0c69204f9cf291c552fde118e182e33764242b4431bf6cbca6c7e0be SHA512 2be12c543ced037e3a224f1b945b9d48eac1a70c566888e09844500fb3496813593da85dc9f1140f9e77e1e3325ab5ede391772e8dac0a9cc8fef6f3841dc1ae
 EBUILD rygel-0.42.0.ebuild 2265 BLAKE2B 99eaa06d99447fa5561eeaf88c145e2d7a56169a9a4d78fd535741e8113d144c4f3acc691861d78ca3511ee8e196cc6affaad4131e01349acd48211c90252d50 SHA512 1e7e52e786bb9307f1a1eb8efafa828fd25b78f396da6abbc0494bfe7b9ff4b73d5aa0e2306a37447aebbf63036c71925c16f2168027a2155088aa0502dc35e9
 MISC metadata.xml 518 BLAKE2B 789b1e692571138dfd93f177e22ae1f86ed20a96652c31d5012b4e691b101408eb6162e401be9661f23b8239a304e854044485a8de6f2e1db7b8ecd1e801dabc SHA512 7f956f2a41c6de314dbfc2f3b17de68857474fcbfb4fc43f3019cc713d899ebbb17fcddc613bae43e441242f6e730ddb188cf09a40bd22080e665e6f32212a63
diff --git a/net-misc/rygel/rygel-0.40.4.ebuild b/net-misc/rygel/rygel-0.40.4.ebuild
deleted file mode 100644
index c3f72b1a5e97..000000000000
--- a/net-misc/rygel/rygel-0.40.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson systemd vala xdg
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk gtk-doc +introspection +sqlite tracker test transcode"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gstreamer-1.12:1.0
-	>=media-libs/gst-plugins-base-1.12:1.0
-	media-libs/gstreamer-editing-services:1.0
-	>=media-libs/gupnp-dlna-0.9.4:2.0=
-	>=media-libs/libmediaart-0.7:2.0[vala]
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-1.1.0:0=[vala]
-	>=net-libs/gupnp-1.1.0:0=[vala]
-	>=net-libs/gupnp-av-0.12.8:=
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:3= )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	gtk? ( >=x11-libs/gtk+-3.22:3 )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	$(vala_depend)
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.36
-#   dev-libs/libxslt
-
-src_prepare() {
-	vala_src_prepare
-	default
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	#sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-	#	-i tests/rygel-playbin-renderer-test.c || die
-
-	#default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc api-docs)
-		-Dsystemd-user-units-dir=$(systemd_get_userunitdir)
-		-Dplugins=gst-launch$(use sqlite && echo ",lms,media-export")$(use tracker && echo ",tracker3")
-		-Dengines=gstreamer
-		-Dexamples=false
-		$(meson_use test tests)
-		-Dgstreamer=enabled
-		$(meson_feature gtk)
-		$(meson_feature introspection)
-	)
-	meson_src_configure
-}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 4ba97f8d4ba3..b817ed7be6e0 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index 5ce557c7f35d..e9ac685b0297 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,3 @@
-DIST NetworkManager-openvpn-1.10.0.tar.xz 698340 BLAKE2B 3061aa0525897fe1321ac2843f1dd07b34d6f322b32db9811cb66afd7784d5a50c877ce91d5620d80fa33a74832486426c742f186fb86626bda862c4513d830d SHA512 f7c3b44cf2b7651ac940d3d0547ca3a38d0af415cf580d9fde3780b2320ba022710c2cc1efeddcbc983a7d3e02ab869b36d44ca2ae05df3443f06471d405c679
 DIST NetworkManager-openvpn-1.10.2.tar.xz 701652 BLAKE2B c6cef27e57320dc68c168248981f54d2a8eb0a2b19524e11b2c25da04dc98f2a4e00e07b9b83d92d1654c26685d46d8f152c95462e4d73f853872fa3553735bb SHA512 469aa4eeab169ccabd04b18b425ab2f8ad095e19c80dfca528855e1c66314e3ac129145ce5e62f5ccbb7a01cd7ba7f657571c3f4ec57b15ecb95aeaa765f5c4a
-EBUILD networkmanager-openvpn-1.10.0.ebuild 1069 BLAKE2B 8258ba34da5c3f06db1a5eed64fa0812c7e4d502e6ef4096404e31ae35a43989a81139ad383ee4dfe142235f274d0f22269e7947cc94f744ab6de242016a46db SHA512 f612333eb01d0c8f320cd36928c106518b3fbf59efc5df9d7ce571ee7058c78a5aeda82fce738768cfc77cddf51696c361733fe4cb7db3e4207a82fd132e95f7
 EBUILD networkmanager-openvpn-1.10.2.ebuild 993 BLAKE2B 12d6e1c4a985bb5890c50e9e3c958a2e313b12a55ac074484157bc3b6d21029efd1e46b96bfe92ba42e3663c57ffe0adef243de0eadfd1b12f39fc2eebbc9cd0 SHA512 32a2d972794d5f70984d6d279ce3aa4bbca0e6a9797b22dac35e4fa29b41681151cd820423b762fae0af6302ddab4ca9e2d22dd1dd5437b0bf31074790f45358
 MISC metadata.xml 363 BLAKE2B 2ff0b1a3948001faad595b1e106a906aee729c0f576a6f7b66f766bcb309f4ef1f12ba3d24af1cf130db8e734d913402f74e9a12adef51bfcd77cdb532ab81ae SHA512 6b05e736c4c25efc495d219779f29c570a1e45ab6f259751c44e28a6c7fc94dae1b8d7ebd21d4297e11f64a591f8e72576e20711f52f3364e9fdbc727cf133e9
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.0.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.0.ebuild
deleted file mode 100644
index f017262cfa07..000000000000
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager OpenVPN plugin"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.gnome.org/GNOME/NetworkManager-openvpn"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="gtk test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.34:2
-	dev-libs/libxml2:2
-	>=net-misc/networkmanager-1.7.0:=
-	>=net-vpn/openvpn-2.1
-	gtk? (
-		>=app-crypt/libsecret-0.18
-
-		>=net-libs/libnma-1.8.0
-		>=x11-libs/gtk+-3.4:3
-
-		>=gui-libs/gtk-4.0:4
-		>=net-libs/libnma-1.8.36
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/nm-openvpn
-	acct-user/nm-openvpn
-"
-
-BDEPEND="
-	>=sys-devel/gettext-0.19
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# --localstatedir=/var needed per bug #536248
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-more-warnings \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		$(use_with gtk gnome) \
-		$(use_with gtk gtk4)
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 6ae721e6a788..c57a77d391b3 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 85ea59d060be..03c66cf41802 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,5 +1,5 @@
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
-EBUILD bladerf-2021.03.ebuild 1640 BLAKE2B 78c010e6446a831ca7c1f881d9811e22fe562ab16c6b1d6fd4446f80a3b3f5aed89718d60d21855ab21d0e376bc64191481c073418d861c917f9217275dafe97 SHA512 a4c6a4165534a9194659d094a07222537ada1882a47b7f697d6d3a37a90d8a2cb73a6b36c976fb2aff6a0c879dac37c5be8a45380af373b9ce33b78f4322d0a0
-EBUILD bladerf-9999.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
+EBUILD bladerf-2021.03.ebuild 1646 BLAKE2B d0c571be1a7686d98aa52046b68f626ad66da816f79562a4612b41504cffa4f5a63516b0a5dc94f30b2743d7320350742070995f818c6a47f7d6630473f91fc3 SHA512 0f18f2ba3fdebdbe979a8046ffb22d3d815baaff2aa419054f4c54ad599a79579d828017ea97d16eb224ab991afee56685acd9c175f14a7720da40bef30d0f51
+EBUILD bladerf-9999.ebuild 1641 BLAKE2B f7933c6953dba593cb9f0bf7fb6dffd882fa064a870248b3a6c2b8262634fdd18c9d04aa92f9ce9838cb7cc8d8c4ed274bd04ca18509f3da60975554b55e4eff SHA512 1a92f43e762a01565e9317a8fdb99c13c4a163c41fce95c8deb40cf02cdffdac5740eefc4039f13e5da218bdd7657ab535f359dcf4af5260bb68374773a8bdd7
 MISC metadata.xml 535 BLAKE2B 7fc9a46afda3efa2b20a94b888d5c808066ea749b3fb81fd5e6351f1749b0beb02e0c9c8986a4704ecc42f6406c22b1da3742536c62b269e472b721ab7172486 SHA512 8070f05c8a481f0e921f63b0722e8991c7be6103aea4753536dd36af4d10bbb67e72a55a465d49e4ff7f5972e1f535b1cd8ff2d33b569a9fb7b71b3cd81765f2
diff --git a/net-wireless/bladerf/bladerf-2021.03.ebuild b/net-wireless/bladerf/bladerf-2021.03.ebuild
index ca6c57bdf3d4..d2060e9155f5 100644
--- a/net-wireless/bladerf/bladerf-2021.03.ebuild
+++ b/net-wireless/bladerf/bladerf-2021.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ src_unpack() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
 		-DBUILD_DOCUMENTATION="$(usex doc)"
 		-DENABLE_LIBTECLA="$(usex tecla)"
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index 09bf7b568186..e491fa669c2f 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.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
@@ -50,7 +50,7 @@ src_unpack() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
 		-DBUILD_DOCUMENTATION="$(usex doc)"
 		-DENABLE_LIBTECLA="$(usex tecla)"
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 6c0fcd8ac3d3..4685a3f557ca 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,7 +2,7 @@ AUX gnuradio-3.10.3.0-fix-fmt-v9.patch 4393 BLAKE2B eb915d3e63a96e0527b8525da35f
 AUX gnuradio-3.10.4.0-fix-blockinterleaving.patch 797 BLAKE2B 9a32f372f6a2600dda0f341404f922f51f349c88f285257f125b7c1c87db15a074471c44139fd27bb699e2ead3c81a527d24754e82b5910e57e132edb9b4cbad SHA512 343615c80b17fab076b9509d39c4fa0ac86c84d82093805b1bd488a7c8c95a935550c1acba30fc227f374b8842fec3b9d6cbf559eb67c2dd1abc82223708cc9d
 DIST gnuradio-3.10.4.0.tar.gz 4392284 BLAKE2B 2a5766708534966bcea1e1ab57ae703b0b453278da5042c65ddcf5bda39dee084ee8f77d414e2c8ab3eae2397680f7591c456404a6cefc08b28a7d1f5d25534d SHA512 a8690016513df3928cb2f63eef190c7306bc3cc452dfeafab2e47b43aa1dd3f61515df49832e99530535f94deabfb614388a27212b09e1c816782f3fdd4915eb
 DIST gnuradio-3.10.5.0.tar.gz 4368231 BLAKE2B c21e310d4cc50112e7d2085be5a82f4eb633305936004cc60cabbac340a0cbd0016bb5f24229380c36281c4e52e6763c5152ceb6ad0f2efc43bd28b2b55c4df8 SHA512 82f3028cbcb0175f9f354b19613ee59b052881b894c6d668d04235acda2e3be0ca2713642141a917264e70039f23795c647c47364af9ffad63f108da517d77c5
-EBUILD gnuradio-3.10.4.0-r1.ebuild 6721 BLAKE2B d558562b42609e67987e85621432c6cd7220411d6607f632dd3effb48d3cd5b9099685f859c87722d3b99a5c69e49114dd5c3bb320c7b29b95e0e90da594b149 SHA512 5c418fb1dfdea9cc2e99e31941a2d91720d3d44843d829d7954dd487ea0dddba35caba80b6e1093bbaa840d27c8a34361a9a323de598193a65373226220e26bc
-EBUILD gnuradio-3.10.5.0-r2.ebuild 6676 BLAKE2B 748d9c9156f3a2bf6e9df6d4beeede829a602c74e55ae1f12611493d773476151264d963a363a86a62406f86a8c12fc7dd069eca88187a8d86b18bc80a898803 SHA512 7266d472890f304e06b9a73d0259b8ee2d07987b72df8ce97edd77f9085754ae46953b6b24a0c9c218731f72c2b31e27d6adeca162c7fc6155e6e320bee69685
-EBUILD gnuradio-9999.ebuild 6608 BLAKE2B 46da92e06dd30c4abcca6f3d0a624c013058a0bb7a03365b4f62927d9a4a24758223edb3710de0ef77ed04b252c47946c5c06d964a9cdf03b6cbdf4ca10acdad SHA512 21e2bfdea64ec572a6410bddfe87aa2a422309cbc82cd41a9c07244dd773123da111543af7edfc5f39b0ff61da0f8cdcf63656fe77f211214ffd0499b2659da7
+EBUILD gnuradio-3.10.4.0-r1.ebuild 6727 BLAKE2B f69bc6e7d81bc719313898e844e672bf1c06d30a6b2a3474a8c078b4ac51651d0889805183e962e725bb80b420d72f4a3beab126475d2c451043be3110dfbf47 SHA512 93971b7cdbf177580fb3751b88a934c0de06e943af03dec62a682c9389d40a4b09e4a27d92126b81fe8476458303fcce226262833c26fddab997c788b450e8db
+EBUILD gnuradio-3.10.5.0-r2.ebuild 6682 BLAKE2B c6a1cc9195b3924f6a840d6327f193be18b823221ae55be51a9e52ec7210d6964ddd86ad7ce2a074c64fc35049ac098b146d166b24e4edfb2ee8f096a3f8ad6f SHA512 cd139da2e453eab318fff5cc5ef7287a4934ed25edc56ba03441a32371ffc64ed9d0352df55557dbc05ec988c64bc08e1cc836e770e9975722dfcdf9125db4cf
+EBUILD gnuradio-9999.ebuild 6614 BLAKE2B 5d5acb4d991480b731c2f0c9f48a84366896df2d67d77fa4610fe4fb27883d6ddf8cc93d6388d35843516d05907e7a03f8bffae551711b293ecabbd66ce9405f SHA512 80918da7eb67d1a5881ce137eb32665ef925ef2fea75b959fc4662290940139d79dc53f4cfb20212d40d1df4099393c453e3be2d6cc2c6860149fde93cadb2c8
 MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
index b0c65e418699..ad94f3bac3cd 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -148,7 +148,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
diff --git a/net-wireless/gnuradio/gnuradio-3.10.5.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.10.5.0-r2.ebuild
index e0ee70323331..7ab262e863ee 100644
--- a/net-wireless/gnuradio/gnuradio-3.10.5.0-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.10.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -147,7 +147,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 807c1bcd6083..579dc7351b6c 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -143,7 +143,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index e583a9652cae..52de14bf22a7 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,4 +1,4 @@
 DIST gr-ieee802154-0.0_p20210719.tar.gz 155040 BLAKE2B c198de71391ddc2ad32255476b8b9ba0e13bd3eb3c674b21846174cd3d8804c68e407f4e019cc164b1d10eae5ee672ae31a5f23a450d08abd477aa244ef479fb SHA512 77f746832bfaec53ad6439b69de8712fb444d7b45fdc9937445c6df5d6a5a9a19363ab180c063b6c0647dff8c0404797d190730124a2248418e0fee5daff26f7
-EBUILD gr-ieee802154-0.0_p20210719-r3.ebuild 1663 BLAKE2B efc48357dbf5f783dab9f3614ccd942230454985a7114a2f33ca1d5612af5fc3fccbaee9cb78d368d296abcf0603df7b1d1f3162c64a5494dbd66391106b9048 SHA512 55f274ebefd64f064e27322a32d0634b266357966e465a5cb1b8ff77655d93ff5877cc352dcd5117257232da5f38768bba40295c2328aeaa61b838e86292af93
-EBUILD gr-ieee802154-9999.ebuild 1665 BLAKE2B 736697e7d50113fca844aca636fdbf964945efcb9ee5f83aea2c8a19f1dccd8d59b55676065d0e76b096633f1736f347b91b8bb09374aac7f59a3e3a200a2a18 SHA512 bc2ca1566994223f83bea5f6131fbd4ed402d9a1721e08b3afb90e7f6197ca36eb2f7ee6414a2bc005994dacea0da0252c286a2e0e29b00dbdb3f6dcbcc0fa09
+EBUILD gr-ieee802154-0.0_p20210719-r3.ebuild 1669 BLAKE2B f18762ec9b60efed7487c3b92150d4ccab3a983f8f2f2e60f8b16161ec770205e54c1221822c45403109374c2f84ec3d98141ae8456613e86acee21b9761ceaa SHA512 e47441c8c6ee82aa24b0f53bc6f82f9c12a8e8dcaa3bb398d598d25257288e3f41c4460e4eeb3d7f5088efef7ff4a2a6c0626c46e1574539d12f4bd043e834fb
+EBUILD gr-ieee802154-9999.ebuild 1671 BLAKE2B c74f7ab122c2f0c6ab623b864d128a28f82e9997cd284eaabac513147ccf58bb49dae1e1ba302a385b2a81fb62f3dd2227dc7e2f3c03163802f60a1e52446bd7 SHA512 e7e8887e7031c15c77d6a65c73b91bb9a71f40153ca35f8d5301e963de1bfa4ca866c6ad4b5043ca9d9a071b2045ba986bab95c45d20dff19c8db5e8ef65b089
 MISC metadata.xml 327 BLAKE2B 2c9e8d4809ade74a47f5ec1e0f208345c49edc0a994226a8a29739643b1558fa3fe426ce64636742708b32a5a2ac0e9472fbd91545d30d18d0e8755d2743c483 SHA512 dd940d9241b852de89bfcb8f921663ec946f2833c2741ddf39ab6cffcbb275c63e7407a97f8c650135d79351f26622c2a23b05251ca2d9b61eb5a64108ad0200
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild
index f01fbb7f7914..9c5a936cbc26 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
 	)
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index b0c7d2227f94..fbc335000938 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
 	)
diff --git a/net-wireless/liblms7002m/Manifest b/net-wireless/liblms7002m/Manifest
index bf865a3eeeba..c39d1009868e 100644
--- a/net-wireless/liblms7002m/Manifest
+++ b/net-wireless/liblms7002m/Manifest
@@ -1,4 +1,4 @@
 DIST liblms7002m-0.0_p20200518.tar.gz 31413 BLAKE2B 8365734a60bba43597a8337d186021d92685dce068049817800176801aacf50f2eea0bc2cec62d406eb33393fd2252b22789a6b5b38b88748a5ae94d28c9243a SHA512 c684dca2652680f25c6ac089f0283899976b7f1075cfa11ff230ac4b2307357c3ef66e601eb8c97de5315738e08ff14a6dbd345d8c50df91e91ded2bb41f8988
-EBUILD liblms7002m-0.0_p20200518-r1.ebuild 909 BLAKE2B 707a49e6e329ae17c71742e3b0a5a01e39d427fc552251cc50c9808108eaac8fa2aa06e08db19e988fa1232730064d70a7bbf8b7658a8a932dfcb6aae74e42ad SHA512 190c57fe105044d924e3c97a0dfea97cdcdda3aa7d24ab854d422609ed21d2ea005f47ead7ef62ca557ca09b9726cc76757d0e03c974a55d1ab3a25793a681a0
-EBUILD liblms7002m-9999.ebuild 909 BLAKE2B 707a49e6e329ae17c71742e3b0a5a01e39d427fc552251cc50c9808108eaac8fa2aa06e08db19e988fa1232730064d70a7bbf8b7658a8a932dfcb6aae74e42ad SHA512 190c57fe105044d924e3c97a0dfea97cdcdda3aa7d24ab854d422609ed21d2ea005f47ead7ef62ca557ca09b9726cc76757d0e03c974a55d1ab3a25793a681a0
+EBUILD liblms7002m-0.0_p20200518-r1.ebuild 915 BLAKE2B dbc8f85b219b38dd074dcdbb5190ab80fbfcf83615f0b3c1d0bd617cd80471fceb60f89666e618b6c79e24068c9a84d8d265cfe0e6ffef1caa3ab98e67b0be79 SHA512 4747ed50369433ace2a7f631c8acf16f28a3203ff16057a78cea88330ac102f88117449976f1ed00e995e773dcd2e1b98bf0deb71071a48f7e5d98fafc298065
+EBUILD liblms7002m-9999.ebuild 915 BLAKE2B dbc8f85b219b38dd074dcdbb5190ab80fbfcf83615f0b3c1d0bd617cd80471fceb60f89666e618b6c79e24068c9a84d8d265cfe0e6ffef1caa3ab98e67b0be79 SHA512 4747ed50369433ace2a7f631c8acf16f28a3203ff16057a78cea88330ac102f88117449976f1ed00e995e773dcd2e1b98bf0deb71071a48f7e5d98fafc298065
 MISC metadata.xml 324 BLAKE2B 191ca475f6aac35d191da09c50b786f619a26b20c098518f119471864382d42f1c05cae96a223f616e7a78508cfecc8c7a30ce434c15e9d6bac5076767847b2f SHA512 ed71758fbe63319830424ce9c91d9bb5d87b8ac2ac078eabfe2504a78b315ec762d014f40729069933a27ef9de9b6dc43cd5ec2df423280a77ffa18a5a312f80
diff --git a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
index e02edefc4b60..d17dae1a2401 100644
--- a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
+++ b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ python_check_deps() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	cmake_src_configure
diff --git a/net-wireless/liblms7002m/liblms7002m-9999.ebuild b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
index e02edefc4b60..d17dae1a2401 100644
--- a/net-wireless/liblms7002m/liblms7002m-9999.ebuild
+++ b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ python_check_deps() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
 	cmake_src_configure
diff --git a/net-wireless/libxtrx/Manifest b/net-wireless/libxtrx/Manifest
index 7fee89dd4db1..8a0974813091 100644
--- a/net-wireless/libxtrx/Manifest
+++ b/net-wireless/libxtrx/Manifest
@@ -1,4 +1,4 @@
 DIST libxtrx-0.0_p20201202.tar.gz 78058 BLAKE2B 5d2bcd3857226208158abfd8a6790ecc1204e59336f81cac90368da2f7628c9fe2ec3b8b794afe66720aa53455f1b7ead9b2f6fc36edd36718452c294b6e7aa5 SHA512 bc32c0cdc9d19bda62582081b950b50698e000c42cbfd46904287bb12d216d875d636579cfbd68d94d83e67df655825c0f88697854cc134d2cef5a20d614f73f
-EBUILD libxtrx-0.0_p20201202.ebuild 872 BLAKE2B 9727a4d020f4a51b204ced2230739b4e93eb8034f52597eb203389241bbf0291bf36998e1897c8735d209b8ad49294df7c67159af7ea9a5395aa01682585e2ce SHA512 46d4a1575d738729079b1cdff0d1d021127723140994e5551bfc5508c1b80b5108ba512bc63798de303ad36ed121efc6ffb635fa6ae32c4ecc001f5e416191bf
-EBUILD libxtrx-9999.ebuild 872 BLAKE2B 9727a4d020f4a51b204ced2230739b4e93eb8034f52597eb203389241bbf0291bf36998e1897c8735d209b8ad49294df7c67159af7ea9a5395aa01682585e2ce SHA512 46d4a1575d738729079b1cdff0d1d021127723140994e5551bfc5508c1b80b5108ba512bc63798de303ad36ed121efc6ffb635fa6ae32c4ecc001f5e416191bf
+EBUILD libxtrx-0.0_p20201202.ebuild 878 BLAKE2B 494db2ef6f482d358ef796e05dfb12e1dec1fdbe36b652db24e740bd5679f613622c53286b710a185e775c11c6d1f0d5e7461e699a585fc8146b0913d2b30177 SHA512 a093d9e41f0c20ae39443c6089b88061580a4bbd46502f0c54b9c427a9ea9fcf756e81afa48caf28383a90cb427290b99227ac3e348201533ec93105c4ea1e27
+EBUILD libxtrx-9999.ebuild 878 BLAKE2B 494db2ef6f482d358ef796e05dfb12e1dec1fdbe36b652db24e740bd5679f613622c53286b710a185e775c11c6d1f0d5e7461e699a585fc8146b0913d2b30177 SHA512 a093d9e41f0c20ae39443c6089b88061580a4bbd46502f0c54b9c427a9ea9fcf756e81afa48caf28383a90cb427290b99227ac3e348201533ec93105c4ea1e27
 MISC metadata.xml 239 BLAKE2B 8a5d257499b7178bea8d035ab855e235ebbc400424ef2b15910592d72c39ccbd31f0aa62d966799ef867c5478da8a172d4f02ebdeb483333de2561af62a11705 SHA512 1b66fb2d49901d2a3c6a23d60e9f6f4d861870d49441ac076f0f150b8f918da2bf6c4bb2fa1d57a56e4067c65718ce2688496d8b4e06edbd2f65bd267495697a
diff --git a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
index 5277ce0e5d1f..e1962c0b6c2e 100644
--- a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
+++ b/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	#fails to build, not sure why
 	#-DENABLE_SOAPY="$(usex soapy ON OFF)"
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_SOAPY=OFF
 	)
 	cmake_src_configure
diff --git a/net-wireless/libxtrx/libxtrx-9999.ebuild b/net-wireless/libxtrx/libxtrx-9999.ebuild
index 5277ce0e5d1f..e1962c0b6c2e 100644
--- a/net-wireless/libxtrx/libxtrx-9999.ebuild
+++ b/net-wireless/libxtrx/libxtrx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	#fails to build, not sure why
 	#-DENABLE_SOAPY="$(usex soapy ON OFF)"
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_SOAPY=OFF
 	)
 	cmake_src_configure
diff --git a/net-wireless/libxtrxll/Manifest b/net-wireless/libxtrxll/Manifest
index 57cb724acd63..19ffa0f56e26 100644
--- a/net-wireless/libxtrxll/Manifest
+++ b/net-wireless/libxtrxll/Manifest
@@ -1,4 +1,4 @@
 DIST libxtrxll-0.0_p20201202.tar.gz 68732 BLAKE2B f1eeeb3cd9368224a512ade5389cd5f289613e47736f2577cf9a3a7266ee6a8159e60b1523414277fb8dbdcc206d2a8b53b6a72a591af54d40f3175f2192c139 SHA512 b9c32db32e7782db5831b73ea34d801f2b09cc42773db0ea3504f500717c11303083e1b9808ef9d0c6efd19ce0dab2f97f79ef20e9b892fa15a42c52cdeb4db1
-EBUILD libxtrxll-0.0_p20201202.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
-EBUILD libxtrxll-9999.ebuild 787 BLAKE2B 35408dba13b2a025e1c4aa0b12fd503ab872fe632b3ddcb410be7ae4b6a39fb7323416e99de34b0f325053f27df120f67593218bcba00132550fd175642a2c10 SHA512 7953c02abedba0618a29076c9dedd54860f71ed6b145a6c6d61d0d894a815bfd91fffdea5063b186a420b0a0769c43a4ff3d5cf06ca6eca5369766b8888474dc
+EBUILD libxtrxll-0.0_p20201202.ebuild 793 BLAKE2B 0e6ee3df14a084ff5d34fea9b0e5e5e5b959c342cc2728d5ef49062e358022ab13233c98c6f16a3c0cb80499c219eab66d2c4768498ee70930a359a388cce73c SHA512 84b71d41320ed69a733d7eff2379e443fda0e8b1a4b7f46150c213197b8d4665525570cc9f149bfdf83b3630e3c54adbef733e8bce72c152cf930659e020b965
+EBUILD libxtrxll-9999.ebuild 793 BLAKE2B 0e6ee3df14a084ff5d34fea9b0e5e5e5b959c342cc2728d5ef49062e358022ab13233c98c6f16a3c0cb80499c219eab66d2c4768498ee70930a359a388cce73c SHA512 84b71d41320ed69a733d7eff2379e443fda0e8b1a4b7f46150c213197b8d4665525570cc9f149bfdf83b3630e3c54adbef733e8bce72c152cf930659e020b965
 MISC metadata.xml 390 BLAKE2B b90bd1a5456a6ecb90f90268fd92be2df3b776baaa9928261933b1d8786eda57276a154c9455d4776c2621b57a020e4aaa3196755e958fb9ebaa4c8c7515cbcc SHA512 18e4abe0a55739b3a98b55b02686c7141787836b156021926341ca1c0f6d5cc97f842897b4989eb0b00db1980db378bf43df44580998d524c334bbfb47e16eb8
diff --git a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
index 6e0b7183d221..0bf53e74f27d 100644
--- a/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
+++ b/net-wireless/libxtrxll/libxtrxll-0.0_p20201202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_PCIE=ON
 		-DENABLE_USB3380="$(usex usb3380 ON OFF)"
 	)
diff --git a/net-wireless/libxtrxll/libxtrxll-9999.ebuild b/net-wireless/libxtrxll/libxtrxll-9999.ebuild
index 6e0b7183d221..0bf53e74f27d 100644
--- a/net-wireless/libxtrxll/libxtrxll-9999.ebuild
+++ b/net-wireless/libxtrxll/libxtrxll-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ RDEPEND="usb3380? ( net-wireless/libusb3380 )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_PCIE=ON
 		-DENABLE_USB3380="$(usex usb3380 ON OFF)"
 	)
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 5ba90bca2ea0..2ac4f0768ced 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -3,8 +3,8 @@ AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f
 AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
 DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
 DIST rtl-sdr-0.6.0_p20221217.tar.gz 134261 BLAKE2B 1148e0aeaba67dda5545b2bcd18a806047eeea9573578e1a3111b08abea481e2649ef68ab6ccd9e69603798b0003cc63efb3c5f6184acfd021dd223688402d56 SHA512 e80bae2405aaa4c6c943f5df7afc96ea02cd5861b0348d33e567000bde0a3aa79ab2204311bde6094a4b8037d11eb14ca0f91f8dbd339c339aae2581c0a78652
-EBUILD rtl-sdr-0.6.0_p2020802-r1.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
-EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1597 BLAKE2B bacdcdada679b958ec906cce9e50d79007a247bbec5a4222aa51d57b453de3c6516e95b07b9996057371522ac9ef04c51a021ce4cedb5dfd54a987f108c34ff8 SHA512 66509ad51b2ac62490257901eb919a50617204f158bb21fe5b0370e194232e9b2ed2c11f8af3b96d5b23111f6e516c46dfcbcc135bb5f6d740c42485100935a7
-EBUILD rtl-sdr-0.6.0_p20221217.ebuild 1583 BLAKE2B e77846c34db9b7aad2a382bdea82c0be158e1b2d730b67940958eb0065736eb56a6b4bfd79615b9638ee9bc2d77633336bafbd7e5a98914c0526baa89103cc37 SHA512 d32dde18b83c7d71ddcb27b73db3646b0a241e4ba45a634a7fe62f2bd6d36ad9be4090c0a159a84ca1167bca9a0ea2b80ce2600c1424efe26c0188851162846f
-EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B e77846c34db9b7aad2a382bdea82c0be158e1b2d730b67940958eb0065736eb56a6b4bfd79615b9638ee9bc2d77633336bafbd7e5a98914c0526baa89103cc37 SHA512 d32dde18b83c7d71ddcb27b73db3646b0a241e4ba45a634a7fe62f2bd6d36ad9be4090c0a159a84ca1167bca9a0ea2b80ce2600c1424efe26c0188851162846f
+EBUILD rtl-sdr-0.6.0_p2020802-r1.ebuild 1589 BLAKE2B c6c359da54cb08b67fb9d79d222085fe41919a7a1a6c39cf4e9e1d487a844d91baa7ceb06bffbe3120b959c3901173bee5277bb90908ec073a40b9dedbe39089 SHA512 94227754b900fb132d0c18741dcb24450d23aaa148324d74e8857c2b35d51ee70e2de07221417b1f5b20aac5ad20c1d59bd099b8ffa12adef49ab995cf6fda0d
+EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1603 BLAKE2B 734d36c94af61f9c5eaad4697f760ca7f4b86f227c19419ac74b3819be563833310ba8e8d1b95c24e183ec8e0beab591d055b63a40b7115b8777606e16fda879 SHA512 e2837cdb99721a94b49a700b91bb7784b92425c0ae3848c97aca5d0d7504ccdb6aa7edf73b1a3a03a854df99f2953d6b75b646d0d42e729be2e1899d6015685c
+EBUILD rtl-sdr-0.6.0_p20221217.ebuild 1589 BLAKE2B a68199656441027ac1eca70d1e98793800c0d8beec326291a7935e1b4fa4d3ddfff7e6fdee309028ff72515eb340e0226b19f0d0b3872cf735123416ca630048 SHA512 a453c1a2b5954574794fc10275bdf5b0c0ab994c44b540787938de831ae382ce82e40e56a6c0bed7d41d8d8053f126340296624153595f7cdda2bd27a70a9024
+EBUILD rtl-sdr-9999.ebuild 1589 BLAKE2B a68199656441027ac1eca70d1e98793800c0d8beec326291a7935e1b4fa4d3ddfff7e6fdee309028ff72515eb340e0226b19f0d0b3872cf735123416ca630048 SHA512 a453c1a2b5954574794fc10275bdf5b0c0ab994c44b540787938de831ae382ce82e40e56a6c0bed7d41d8d8053f126340296624153595f7cdda2bd27a70a9024
 MISC metadata.xml 327 BLAKE2B c850854368e94999292623351c2b09508b49ff74cf8a3cde1872340347a07766ead3427ab6445fde90788e1a0b264a53829114633c515d4b0b30713a65a3739e SHA512 7770f1736d4207f81194646409e8a971c4ee97a9b2285eb67aef37bc7ec1002191e775ee7b489726580f86b5be8d8d8d8f82e84b37fb480c364c29e5e77f683c
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
index b00901863baa..bbdfee3faae7 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ src_prepare() {
 
 src_configure() {
 	#the udev rules are 666, we don't want that
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
 		-DENABLE_ZEROCOPY="$(usex zerocopy)"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
index 959351d23e5c..f7b88d47150c 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.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
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
 	#the udev rules are 666, we don't want that
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
 		-DENABLE_ZEROCOPY="$(usex zerocopy)"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
index 9077e7f0dbe7..1da1818e4d31 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ src_prepare() {
 
 src_configure() {
 	#the udev rules are 666, we don't want that
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
 		-DENABLE_ZEROCOPY="$(usex zerocopy)"
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 9077e7f0dbe7..1da1818e4d31 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ src_prepare() {
 
 src_configure() {
 	#the udev rules are 666, we don't want that
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
 		-DENABLE_ZEROCOPY="$(usex zerocopy)"
diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index 08add9e0f5e6..d39d4b2c68f2 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,6 +1,6 @@
 AUX rtl_433-21.12-CVE.patch 2373 BLAKE2B 3856b4ca58eadf32cfc023e7544ad98133a49f358474a60d5e44d9551d0ae3ddc8d5acbba53a350d4bd06719f495fcd3e2e8e35223330ad60f4a4bbc6c6126fd SHA512 26e1fff504c3fa52dc13ccaeb9d5865829fb462363b4a042f6245fdce843aa0f8517463fd05b305a550e298859d56e3a8045937b5de3719d543260f2ea0a8c48
 AUX rtl_433-21.12-test-visibility.patch 6747 BLAKE2B 4f03eb9df44e6a789437190c8c09d63c0f51a5345efea14765314af68c704908d30764d26c0f43b1bfc4145b1f224b6ac5b1476d04c85b217c502e0714b7f0bb SHA512 ba7a3f2d8b4fd057c595ca62c01be53bed37f6c408314f06e02d634ef1e6f465920127622f8ae3c94cbefbc677c25ba69873b0f12229ae48ec7caf37933b166a
 DIST rtl_433-21.12.tar.gz 954628 BLAKE2B 7622cba1ff8d9ed46bcd9d7298b2278437aba3dca65985f27d44d20d3b79082cff04172d4593af07379928d42d5e422ff2857ada427156b16f1ba24a7bca57ed SHA512 8183887c1e09e94bee10b70190555d7fa0fa6675bba6130f78ab111b77428fef90696bc15a8e5abb07ae5ae3e492641a40acd6087d5bc413db5f2944878f03a3
-EBUILD rtl_433-21.12.ebuild 985 BLAKE2B c3d05b45d22794d166f12dd1c08d3cd0a0658aa5875513177dd29932d76968b3482ca033a485dc6616981e94a2135fe5aadf704cedcce33c1ef9313f3ed15446 SHA512 0cb2e08414889dbef5e0b93c52ac3030158f8f489393f0c611e0e74f82a5d3d2ad6d9208a699c6b00bc772e8a690ae28ff2bd5cb704515c22531b6ab9b97306a
-EBUILD rtl_433-9999.ebuild 1071 BLAKE2B 89f4eb8d9b04fb618c0d9ce54c5358b9752b7606f06181a29a2616bc03ca9b987bdaa97614927e759f22a6f44de087bcc8af634f86d543310b4dd8741b2cbd3e SHA512 322465165d02b311d3a97f80459fdf00722c6fa9844a11d0a81a21b77e08a1ec337cb1cc55ec1446107ce7117fbf48f7a9dbc4a9978fff86d2276be7bbb5ce0c
+EBUILD rtl_433-21.12.ebuild 991 BLAKE2B 4cf297606caeab8087d247bca4788737992a3e5b60630b98c2341cc1c2bbcbdfa62cbf0c948a860f0a9ae7eec35c7927bf08643e85769fe14662efa0c8777155 SHA512 caf50368acfbc92c1fb13c1711ae2bcc18b937f4d3d51e0f420b2920694f06344654947bdfef9834ed2f12227b313e4be51d184d509daaad7cb7cfb6b3680879
+EBUILD rtl_433-9999.ebuild 1077 BLAKE2B 7afda00ba6855eac323bb9166e601ed07777a6d681eda0bdf8dc96b6198984c723af4728be67a85dc7caee39c33640eeb4708e763e09afbb7698e8ac0b141d72 SHA512 900591a669ca2a892a2981a0f2857cd2fd267805058a651d533589f1b294e19ffb302405cc0d9603ccc4090f3273278ebf0ec6a3e28a980fba8187574efe15af
 MISC metadata.xml 484 BLAKE2B 2cdc645038b7fbc5b1af469b4c2d36e9e36b4cb463f17cdb7d6df6cba5ae4f6672396c6fce29e4ba71529a5ffc72c781f1873a7898e81eae466c075010545c8a SHA512 2258949f4ace0afb3a3b4e44222e02919d7bcb5dc376bc4052b834fbe09dc9f6319479e61c80db66c7465de9c32a635de3d68edb19b9f7cedababf00950be76b
diff --git a/net-wireless/rtl_433/rtl_433-21.12.ebuild b/net-wireless/rtl_433/rtl_433-21.12.ebuild
index 7e127adedfde..8e0908f317bb 100644
--- a/net-wireless/rtl_433/rtl_433-21.12.ebuild
+++ b/net-wireless/rtl_433/rtl_433-21.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -32,7 +32,7 @@ PATCHES=(
 )
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
 		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 		-DBUILD_TESTING="$(usex test)"
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 74f846b96d6d..6ccdde0e72e7 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 RESTRICT="!test? ( test )"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
 		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 		-DBUILD_TESTING="$(usex test)"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 093bee918561..5d739aec37d5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 08dcecc30c73..0f9af71b40d5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ####################################################################
@@ -49,11 +49,6 @@ net-analyzer/chaosreader
 app-containers/docker-gc
 
 # Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
-# EAPI=6 ebuild, live only packages for 6 years!
-# Removal: 2023-01-30.  Bug #889198.
-app-vim/lightline
-
-# Arthur Zamarin <arthurzam@gentoo.org> (2022-12-31)
 # Live only packages for 4 years!
 # Removal: 2023-01-30.  Bug #889196.
 sys-auth/google-authenticator-libpam-hardened
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index e17d8c179748..63a1e815d4a9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2757,10 +2757,8 @@ dev-util/glade:webkit - Build catalog support for net-libs/webkit-gtk:4 widgets.
 dev-util/global:vim - Integrate the GNU GLOBAL source code tag system with Vim
 dev-util/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
 dev-util/gnome-builder:d-spy - Provide D-Bus debugging functionality via dev-util/d-spy
-dev-util/gnome-builder:devhelp - Provide API docs browsing and integration via dev-util/devhelp
 dev-util/gnome-builder:flatpak - Enable support for flatpak applications using sys-apps/flatpak
 dev-util/gnome-builder:git - Provide support for the Git version control system via dev-libs/libgit2-glib (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)
-dev-util/gnome-builder:glade - Provide integration with dev-util/glade UI designer for Gtk
 dev-util/gnome-builder:sysprof - Provide an integrated profiler via dev-util/sysprof
 dev-util/google-perftools:debug - Build a set of libraries with debug support (so-called debugalloc). These are available by default but are not needed unless you're actually developing using tcmalloc.
 dev-util/google-perftools:largepages - Use (experimental) larger pages for tcmalloc, this increases memory usage, but should speed up the allocation/free operations.
@@ -3230,10 +3228,8 @@ gnome-base/gnome-session:elogind - Support sys-auth/elogind for session tracking
 gnome-base/gnome-settings-daemon:elogind - Rely on sys-auth/elogind as runtime logind provider
 gnome-base/gnome-settings-daemon:modemmanager - Enable WWAN support via net-misc/modemmanager
 gnome-base/gnome-settings-daemon:systemd - Rely on sys-apps/systemd as runtime logind provider
-gnome-base/gnome-shell:browser-extension - Ensure the presence of extensions.gnome.org native connector gnome-extra/gnome-browser-connector
 gnome-base/gnome-shell:elogind - Use sys-auth/elogind for session tracking and suspend support.
 gnome-base/gnome-shell:ibus - Enable support for enhanced input methods through app-i18n/ibus
-gnome-base/gnome-shell:telepathy - Ensure presence of telepathy chat integration
 gnome-base/gvfs:afp - Enables support for accessing AFP (Apple Filing Protocol) network shares
 gnome-base/gvfs:archive - Enables support for accessing files in archives transparently via app-arch/libarchive
 gnome-base/gvfs:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray
@@ -3261,7 +3257,6 @@ gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
 gnome-extra/gnome-commander:pdf - Add metadata support for PDF
 gnome-extra/gnome-commander:taglib - Add metadata support for ID3, Vorbis, FLAC and APE
 gnome-extra/gnome-commander:unique - Enable single instance support using dev-libs/libunique
-gnome-extra/gnome-contacts:telepathy - Start chat from contact details
 gnome-extra/gnome-network-displays:firewalld - Install firewalld zones
 gnome-extra/gnome-shell-extension-gsconnect:nautilus - Install Nautilus extension for sending files via GSConnect
 gnome-extra/gnome-software:firmware - Enable firmware update support through sys-apps/fwupd
@@ -3276,7 +3271,6 @@ gnome-extra/libgda:sourceview - Enable support for x11-libs/gtksourceview
 gnome-extra/libgsf:gtk - Enable use of gdk in thumbnailer
 gnome-extra/nm-applet:modemmanager - Enable support for mobile broadband devices using net-misc/modemmanager
 gnome-extra/nm-applet:teamd - Enable teamd configuration editor
-gnome-extra/sushi:office - Support viewing file formats such as generated by app-office/libreoffice
 gnome-extra/synapse:plugins - Build support for plugins using net-libs/rest
 gnustep-apps/gemas:projectcenter - Build and install plugin for gnustep-apps/projectcenter
 gnustep-apps/gworkspace:gwmetadata - Enable the metadata indexing and searching system
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index c6c42ba64f4a..e35423f8a8b2 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 1632c9ad9e57..7118162cbf4a 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -31,19 +31,19 @@ DIST regressiontests-2021.6.tar.gz 48537070 BLAKE2B 982fad6b23da5c1e6d32009f9f08
 DIST regressiontests-2022.3.tar.gz 48615675 BLAKE2B 731d9a210dcd481df937182a9a8239087549abd118d1386175ef68979e139ae33089cfc304e0389670ad15a196008c282ddf62968a7e8bfccac22c0a96add276 SHA512 98888ad908705ac29ae958591368e994b091a1619782b49601e41f576c821eb3c96a713449151b8db59d46bc6dd3bcb363f5d0cda354ce6b39a9bb93ba31f913
 DIST regressiontests-2022.4.tar.gz 48614599 BLAKE2B d41d59d4336455c87f3877be48ec49b2cdc989548c51ef9c8277b05bb6cf3dc05ebfa91a0248cc113c130a0ed19aae2c8316184caf37b72aa612b211fe41b144 SHA512 6495a286b201774ea2a922376ff5c0abaae7aaef1dfd28a1a61c817b5c6ac83db99300d43cc019745ca32a025e1f8a7f538342af539d9d753e494c550b429706
 DIST regressiontests-2023-rc1.tar.gz 48611523 BLAKE2B 4ef09171007c45f38239c8e966d0c9a611ee9b133c91fb51fc5d25a7f67eab01e32b1ef89c12b42eb140b5e189834697e4116ad6c9c302ab33d15cf871ac61d6 SHA512 f5c2a486f8b416140b69841c42df8bb1e38fc0d7b58badc4370a59ca543c48c7875a877eab828ee03f87e55501f4e8fcdd18103939825f8b57f681f99b108f42
-EBUILD gromacs-2018.8-r1.ebuild 6663 BLAKE2B e8ad49c7711cc66b23982f3878469f05570430dfd523f0b6d382d3cb268dc83c8e7c58fc65e14341776b1b53667e67ecac3fefb4ac4f2c3a9ebec8ae69a4c8e9 SHA512 1d643cbec284478077ab580f093f1213493833a31ec6c92247dd2be3116580a5725ba0bb13b6543ce6ccc8e30903b61d4e7cbf6735fe5685ac372f4ce45a91fc
-EBUILD gromacs-2019.6-r1.ebuild 6987 BLAKE2B a1b1ab4a44cdc8dccc0e1b59968d0eb1980f29d6832a8866c45eb975398acc4a763d04246b656b9835430d2f65f85516182694db75c63c3727b37a542daf4a18 SHA512 315b24af88d73f39f71657632444d90c75568ab0f8cab26db6efd2bf7a48a5da6883c7bba152ea6f6ef3e407ae0828997d8ec1ff2bc4df350d07bd9f4b0af0cf
-EBUILD gromacs-2019.6-r2.ebuild 7044 BLAKE2B 4e3efee40fcf70267e3dfc91ee3a1d648892a66d713b36945d49fcaddd8aeec93a06a7e541187bed8334ddf1445e46822425c7126e0f966690a9501804c0a7d4 SHA512 6ba9c1e0293cd202ffe4689c97e39ebca7a4680bbb1c0acec21622fc5486bec8fdf091b6b49120961306c48b000f5d1804429bf7642043801a2593c83701915f
-EBUILD gromacs-2020.4-r1.ebuild 9835 BLAKE2B e43cf4ccef489ef190513f3b7c58ee2102bceb577a89cc4a2ba7636832e254f73d38b8ea39bc3a6c5a787a7c03166feeb63b3c537ca2b8cbbbec67f15676041b SHA512 837f23ca7174dc7a0e210e5cd5bad3fc5702e971f2f25b350b5953e879b89a466549f7a40c8fd7b79850f9b15bc9de4a8af3465eb2586b7416ac5f9ae80f43f3
-EBUILD gromacs-2020.7.ebuild 9838 BLAKE2B 4ee7852fa5b5ff4ce277edcac0908ea4689387e073e7db922f4296fd00dd0240bf9e3b639c5fe8684aa92292a992ad0c608680ed2910084d940fa0c1f2aa61fb SHA512 68bf8266f72b7195d8efbe4e4dbd104544f8cda63aa94d79f95e0f4c734c71ef2af3a2ecc52c19a2bb570d89ef064fdd34b4b333e70a5539ecdb34eeee0942cf
-EBUILD gromacs-2021.3-r1.ebuild 10042 BLAKE2B 623d9ec88841c1ca7c80f86e8fc017821c79a6d35bf1d5e31ceddebedd775cd14779608e54ff15e1f061c71eb7029dafcba5b09172eb262350e4a24984bb424c SHA512 c2112b107f082b51decca1c0cf07b7c09d0bdfac4228ad73728ad1db4b214253a51e0435cc5650f136dc50433fbc33892407b2a206cc89aaf5585d5ac1320ffc
-EBUILD gromacs-2021.5.ebuild 10045 BLAKE2B c6dcb4373636b85999d5977dd77ef1af00dbf6c0180f909fb5b2b50f853bedcfd40562434eb1cdb661cdfc4db9067dadff56a58092b8012da6eb177b156cee2b SHA512 319dedef4da4bf679ff298e5450f883062344cdf767d257c08d1ed61bd8feb4be9c994685b6ffe78c48cab473b74009f235134045a63cd9c3c3b48ea7f306c0e
-EBUILD gromacs-2021.6.ebuild 10044 BLAKE2B afcf683643b5808abe13ec94473871434bb660d376d3696d0dca95dee0cfe109bceb026644cc880fe659136b05cc567da565d34ee0409711ffc5083d7b730768 SHA512 29faf6227d2f5e01c205de486d6e2790da61497cb55a5f7855d8688168d7b1edb279676db5f276d7ef54742ec7ccdfb85e603f0fb5eff50e3289a6aba5c789ef
-EBUILD gromacs-2021.9999.ebuild 9989 BLAKE2B 3aa0458322c25710920abdd4609245dd3c7b679229458543ffd4830893d832fb2585bed41afd299a23c787ba9d8a17a32ea9e44bc4f84047870037d06a1f5a4c SHA512 f0e5b1c1980d2f27196d348d6b362f1fd976af6579549eea8a1bf723073ed83a9ee7031b3e2de50abe9c23fabb6c736232b5ef0b20d4776608153f617b3001af
-EBUILD gromacs-2022.3.ebuild 9590 BLAKE2B 8158822224006946b320786b17f607d4f561a0427a5f44dcfd69cba2feb5aee7d3e1b86a4ebd9f712ea8a475cd166d29e1e1441e2160a703662fa324b2f7db53 SHA512 22561e31e3abbbc834a0478e43fcc533d7a3d51352e46cf202adb0714953d257f8f8b75034289c8ba6755de7e29f3c0dbfbbb275cd4997d631b280045881d9ca
-EBUILD gromacs-2022.4.ebuild 9600 BLAKE2B 6a08feafed6df5444a0845366fa50905fc4ce54dcbf6249bf72a644f1c8fdb026ed565fa2be60853e43b298fc9667dde2d841a765349d8bac316e36d7d3e085d SHA512 0fcf5415eb27407d22f8e568a6610346dec3df2d758ddf56d7dcedf6e07f3116ed94376f42657a68a604d4c852557531518829af5648ad6fd76daf25a24a2a4a
-EBUILD gromacs-2022.9999.ebuild 9600 BLAKE2B 6a08feafed6df5444a0845366fa50905fc4ce54dcbf6249bf72a644f1c8fdb026ed565fa2be60853e43b298fc9667dde2d841a765349d8bac316e36d7d3e085d SHA512 0fcf5415eb27407d22f8e568a6610346dec3df2d758ddf56d7dcedf6e07f3116ed94376f42657a68a604d4c852557531518829af5648ad6fd76daf25a24a2a4a
-EBUILD gromacs-2023.9999.ebuild 9548 BLAKE2B bc1b8b16d6796bd4ec1f17207de355e935b2bddb81d07646a11a7779692e375d6f4deba51575fc5d1e733d0e96d6aec7805cf0b7ab12fc8b5799331b12a6b3b1 SHA512 9f656c7be027b76c4906013478ff359e55b4bc61cad65a7298ea89a04278c0ca72a4761026aeb7c99d710078d4265a6107e7141f4b6014ec462de75377056032
-EBUILD gromacs-2023_rc1.ebuild 9548 BLAKE2B bc1b8b16d6796bd4ec1f17207de355e935b2bddb81d07646a11a7779692e375d6f4deba51575fc5d1e733d0e96d6aec7805cf0b7ab12fc8b5799331b12a6b3b1 SHA512 9f656c7be027b76c4906013478ff359e55b4bc61cad65a7298ea89a04278c0ca72a4761026aeb7c99d710078d4265a6107e7141f4b6014ec462de75377056032
-EBUILD gromacs-9999.ebuild 9548 BLAKE2B bc1b8b16d6796bd4ec1f17207de355e935b2bddb81d07646a11a7779692e375d6f4deba51575fc5d1e733d0e96d6aec7805cf0b7ab12fc8b5799331b12a6b3b1 SHA512 9f656c7be027b76c4906013478ff359e55b4bc61cad65a7298ea89a04278c0ca72a4761026aeb7c99d710078d4265a6107e7141f4b6014ec462de75377056032
+EBUILD gromacs-2018.8-r1.ebuild 6675 BLAKE2B 46cd37f680b71e001586e88974f7a69bd8e41d07de2464ab0d8d80f7755a68da45b77ad28e01444cb48b0156e6f4332dc8fc67d21944c76768b9cbd18804cc46 SHA512 ece906b1c1d3b401ea85121b280f99fafe92f791918c47aab57f1094b53e95a5786812e414928ec765ef44fbecf6219e094dfb74d5a52f0b5fccbdf736a37968
+EBUILD gromacs-2019.6-r1.ebuild 6999 BLAKE2B 3f7480ed9d2a1a83f25e3adf83c40ce435bace719c1eca939821986847190fb9f0767082f53868093627f4bf0bf7d2efc8d381c739ba39ab19ee3aea98bdbaa8 SHA512 1cc8d84a5ec60e21c0b15044ff83a64f4b0c484773e709f0f5351659597c848dde40a8c9d0824d83f94f4e31b3473b8a80bc34536fc6b64b6d8c38fc582a945b
+EBUILD gromacs-2019.6-r2.ebuild 7056 BLAKE2B 7d9265c4e0a1f5783b3c670eacc6da185e08713a4940fe24696d2070e1ea1c75307e3674c2922a3692acbf4857bbeeacc7c323bee27063e4224cafd067d105e3 SHA512 73097f03bc1778bf43de2af76388ecc35f12077dbab94b13486f2528b26ab1e1d4983d293c4eea8e4451202a0356286b86e80b1a473835f5422a7fa1dc5a2d07
+EBUILD gromacs-2020.4-r1.ebuild 9847 BLAKE2B 2eeb844a20226cb44e0f9e9e49067c7997f209006c408cdfc52a382b423f020e9864332f816b5545d540f6e091a86c2ae5adc6c2c82e395d2273d90cd025799d SHA512 22bcb966aa4826d2dbbe6abc3cf74c4b8ec4d726af8cba0e246436b5dbed258fcdd02d9f802a54dfd165325fb03c68c3e51bdbd710ec7872bd14d264005547b9
+EBUILD gromacs-2020.7.ebuild 9850 BLAKE2B 240a35a9bfcd3c58a9e2553a5c8a5983d03df4f088071dcc24fa17775d418c9ed7e0d7a8b2f18718d4f1bd72b65cc5a37f7ff342d68b9dfab32c1896a92ef270 SHA512 3ace7423efd1c017cb14357cc2e560db4d2f59c835440c562dca34dc2f970b8a27d4028aebf7e0e21d4106af082fc21bcff4778f50b9b41686ea3459d17a30a5
+EBUILD gromacs-2021.3-r1.ebuild 10054 BLAKE2B 4b5f95e902459d5e045813b400940042d9add095a9fbb9b6b2f4270ff7abf1663ad10e8d627088006d0a453841d3822a36ad9379bdc860e44d28bb00cdd0eb1b SHA512 834b9cd9b3e2780ec85c4299ef237807a4e5d263b5085a5a54044b8d79ddbd5062c843ce08d876737e27880d5898dea54e1db962cd97da09c83d71c058b00cf8
+EBUILD gromacs-2021.5.ebuild 10057 BLAKE2B 55acef36ea9bce27545d9cf1aa1c1bb700eb7bdf87bd1847663af94a37c9fadcc2bf7af48a555e4ac143d5b8e43b0371afd13db9dcc61c5b995c09cfac07b26d SHA512 f2e34e1541861d0a191f0359b3903657d0ae3caed2630ea4560d350c8ba549c413ccede63e7af23e4e724e111a311c4ce05ed0a3874825581b755b11b0fe67c9
+EBUILD gromacs-2021.6.ebuild 10056 BLAKE2B f92928d42527c4f124e36daf9f4e0058b1e6612b903bfc56e6bdfb9d51e2d81da97f50f4f88f25499fd60e54fa99008798c6cdeb8cee7bcb3e813b59d2fbfef9 SHA512 77332ede9b299408870bd70f52a1e8b5ab7234d5953fb2d6f59d46e42f9a23bc21599096635de483e12a1acde3df0f2cf966ee5922489959394fbd980e495b27
+EBUILD gromacs-2021.9999.ebuild 10001 BLAKE2B 3551270914fae1d69b6d8ddfb859ae38685031b0abf187a4a1e329f9f0fa28f86a11e2c6cf5cc100f4af40305146d4c9a2d021a027228cf424f2a82e310a8cef SHA512 f5e2bd5a3dc38ebc0782922678250be1e7736c26a33d629efd2ac6be7578c7d021e376f9ce1b1e5a201e560a9bd7accc5cb9c4dad3dd11a57e9eedcf7b2014ae
+EBUILD gromacs-2022.3.ebuild 9596 BLAKE2B f6e667ad0c6bb098999d6aa27ce0c731fc88e08007affee7c43ff7ead7e1ddda3d66ef6c151e771825ed0e029b323a5ee864f6ba2829213eac795c890cbf055e SHA512 769587f790e6d57c4c88d64ebbba41f1ba9770cea5ef42603426e819163a666de09a85d6e1deff87e4f2ab8e4785b384023b9f0f08c329428eef00df979f090e
+EBUILD gromacs-2022.4.ebuild 9606 BLAKE2B 1f189a61a229a2c104d762cb7ae5295bcb8e5f7448a8285a591b2f429f0695f04cb392997d062c7602cc5c85674ef18237b02bdf21cd67518baf074774823669 SHA512 e385a5049d4914cb0dc29242c7f7d44268774734991da2f480ade2fe0775893527df6c82164404c4b6b8dd97aaa6978a8a5e0ef5d3a888feb821bb889b519498
+EBUILD gromacs-2022.9999.ebuild 9606 BLAKE2B 1f189a61a229a2c104d762cb7ae5295bcb8e5f7448a8285a591b2f429f0695f04cb392997d062c7602cc5c85674ef18237b02bdf21cd67518baf074774823669 SHA512 e385a5049d4914cb0dc29242c7f7d44268774734991da2f480ade2fe0775893527df6c82164404c4b6b8dd97aaa6978a8a5e0ef5d3a888feb821bb889b519498
+EBUILD gromacs-2023.9999.ebuild 9554 BLAKE2B 852b1e49834ed1fab5e24e50dffe2a30dfd6462a0cb5cea6375251d3919635c60747d9bc2887c3eef1220f346753882c4a939eea38912e052fbf31cf6a67c459 SHA512 ebf7ed758cbb3a677d57b443952ebbe74fa836fdfce6de99e3a069a77e90c7644f20f89f48be2f4d6c24fe8b1992cfa3a1ecee478dd87be50e4cfb66835b10b0
+EBUILD gromacs-2023_rc1.ebuild 9554 BLAKE2B 852b1e49834ed1fab5e24e50dffe2a30dfd6462a0cb5cea6375251d3919635c60747d9bc2887c3eef1220f346753882c4a939eea38912e052fbf31cf6a67c459 SHA512 ebf7ed758cbb3a677d57b443952ebbe74fa836fdfce6de99e3a069a77e90c7644f20f89f48be2f4d6c24fe8b1992cfa3a1ecee478dd87be50e4cfb66835b10b0
+EBUILD gromacs-9999.ebuild 9554 BLAKE2B 852b1e49834ed1fab5e24e50dffe2a30dfd6462a0cb5cea6375251d3919635c60747d9bc2887c3eef1220f346753882c4a939eea38912e052fbf31cf6a67c459 SHA512 ebf7ed758cbb3a677d57b443952ebbe74fa836fdfce6de99e3a069a77e90c7644f20f89f48be2f4d6c24fe8b1992cfa3a1ecee478dd87be50e4cfb66835b10b0
 MISC metadata.xml 1375 BLAKE2B 321b7db8536061655a6efaa40110f4858633921292eba465b85fe0cb50280842e511f2f11385fe5d62bbdfb40e9c0c76e8e986a1efce8eac25d52c438d7ed5f4 SHA512 cc61e0b477f6576079a0f7910475b9091c1c521fbb48efab365d355e3c0a80cd19e1ea9028cb269d37c2572546b1be66a210512e40ff0f2d6314d1b0138cdba6
diff --git a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
index 255810902b42..29c88f0d70a6 100644
--- a/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2018.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -147,7 +147,7 @@ src_configure() {
 			cuda=( "-DGMX_GPU=ON" )
 		local opencl=( "-DGMX_USE_OPENCL=OFF" )
 		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -162,7 +162,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild
index bf9f493d1163..7f9f30390239 100644
--- a/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -158,7 +158,7 @@ src_configure() {
 			cuda=( "-DGMX_GPU=ON" )
 		local opencl=( "-DGMX_USE_OPENCL=OFF" )
 		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -174,7 +174,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
index ea9f998593a4..ceafc20dcc7c 100644
--- a/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2019.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -160,7 +160,7 @@ src_configure() {
 			cuda=( "-DGMX_GPU=ON" )
 		local opencl=( "-DGMX_USE_OPENCL=OFF" )
 		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -176,7 +176,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
index a1a975ee8107..4dba54bef4ab 100644
--- a/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -231,7 +231,7 @@ src_configure() {
 			cuda=( "-DGMX_GPU=ON" )
 		local opencl=( "-DGMX_USE_OPENCL=OFF" )
 		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -249,7 +249,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2020.7.ebuild b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
index afbf991e279f..7e8fc98af66e 100644
--- a/sci-chemistry/gromacs/gromacs-2020.7.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2020.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -231,7 +231,7 @@ src_configure() {
 			cuda=( "-DGMX_GPU=ON" )
 		local opencl=( "-DGMX_USE_OPENCL=OFF" )
 		use opencl && opencl=( "-DGMX_USE_OPENCL=ON" ) cuda=( "-DGMX_GPU=ON" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -249,7 +249,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
index f55212f3bdc7..fb8e9270106c 100644
--- a/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -237,7 +237,7 @@ src_configure() {
 		local gpu=( "-DGMX_GPU=OFF" )
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -254,7 +254,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2021.5.ebuild b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
index 0a8e8fdc1642..61808242def9 100644
--- a/sci-chemistry/gromacs/gromacs-2021.5.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -237,7 +237,7 @@ src_configure() {
 		local gpu=( "-DGMX_GPU=OFF" )
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -254,7 +254,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2021.6.ebuild b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
index 0614696b9b09..4c4b095e5f91 100644
--- a/sci-chemistry/gromacs/gromacs-2021.6.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -237,7 +237,7 @@ src_configure() {
 		local gpu=( "-DGMX_GPU=OFF" )
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -254,7 +254,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
index 31f880174588..ece941e30ed3 100644
--- a/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2021.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -235,7 +235,7 @@ src_configure() {
 		local gpu=( "-DGMX_GPU=OFF" )
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=OFF
 			-DGMX_THREAD_MPI=$(usex threads)
@@ -252,7 +252,7 @@ src_configure() {
 		  sed -i '/SET(CMAKE_INSTALL_NAME_DIR/s/^/#/' "${WORKDIR}/${P}_${x}/gentoo_rules.cmake" || die
 		use mpi || continue
 		einfo "Configuring for ${x} precision with mpi"
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_THREAD_MPI=OFF
 			-DGMX_MPI=ON
diff --git a/sci-chemistry/gromacs/gromacs-2022.3.ebuild b/sci-chemistry/gromacs/gromacs-2022.3.ebuild
index d0f55aca4bc1..306bd72ec9bb 100644
--- a/sci-chemistry/gromacs/gromacs-2022.3.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -245,7 +245,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-chemistry/gromacs/gromacs-2022.4.ebuild b/sci-chemistry/gromacs/gromacs-2022.4.ebuild
index 72ac3b19bbcd..15a7139387d8 100644
--- a/sci-chemistry/gromacs/gromacs-2022.4.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -245,7 +245,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
index 72ac3b19bbcd..15a7139387d8 100644
--- a/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2022.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -245,7 +245,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-chemistry/gromacs/gromacs-2023.9999.ebuild b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
index f2f127f13d21..df489bdf84db 100644
--- a/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2023.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -243,7 +243,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild
index f2f127f13d21..df489bdf84db 100644
--- a/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-2023_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -243,7 +243,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index f2f127f13d21..df489bdf84db 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -243,7 +243,7 @@ src_configure() {
 		[[ ${x} = "float" ]] && use cuda && gpu=( "-DGMX_GPU=CUDA" )
 		[[ ${x} = "float" ]] && use clang-cuda && gpu=( "-DGMX_GPU=CUDA" "-DGMX_CLANG_CUDA=ON" )
 		use opencl && gpu=( "-DGMX_GPU=OPENCL" )
-		mycmakeargs=(
+		local mycmakeargs=(
 			${mycmakeargs_pre[@]} ${p}
 			-DGMX_MPI=$(usex mpi)
 			-DGMX_THREAD_MPI=$(usex threads)
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 04f8d8e789d3..e8b5a88276d2 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
index 2b97c5fece69..c27932c375bc 100644
--- a/sci-geosciences/geocode-glib/Manifest
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -2,5 +2,4 @@ AUX 3.26.4-r200-do-not-install-icons.patch 1060 BLAKE2B 358511d8f441562f81540545
 DIST geocode-glib-3.26.4.tar.xz 75352 BLAKE2B be783328b2372e1647c3fd6debadaf8313688fe1c993cbc1e084cd9ad8ba8fec0b142a0f579f63085684ef8fafc6e7ec6f54441a085d25d9d5f2eed31a893d1b SHA512 998c2f02a8d3d34a8b6a4b031da2e7c28df27014bcf58f3374fbc0c829fff6257c2622fd9bf331e05b85fbc761c64554fb77ce2d986e0f8b59b17aa486f9f609
 EBUILD geocode-glib-3.26.4-r1.ebuild 1220 BLAKE2B 54266027784672a3e9df0f4465958b513b17d18a649c29fbb68f541b87e7d1e3aa2488a9cdf9318a9445533c7a072fdf04c6c7699e165316323f77c84e7c9421 SHA512 5b02203e6e7657e0ef52c98fea38cb08fd3ce6abfef203837cedaeb941c63b6e5f85821b989258a7f7cc2072e545a29474b6cda0d0b6519a562486d31ef3ba0b
 EBUILD geocode-glib-3.26.4-r201.ebuild 1026 BLAKE2B ee339b86ede12198ac4f3dda08f4d825058751a3df60a65e4ca36d1b0561fc3d9caa3cc5df9605fc5e83f6395f20cd4753c7a8fced199c0570b8697dc894f1a4 SHA512 b11da6218fb54f1d99c2bcd5b30c59e70c264906457207c9b3ffeeb41c7d34bbece894764da05bce51b4ceef9a16a14a6fbc03c0dae381cbf75777805604c2bb
-EBUILD geocode-glib-3.26.4.ebuild 974 BLAKE2B aa9554ca93f0607df9b2c3d3d5fe80f3c87751fbe73594403393343662deb01dce700565e8796006aa3a607e727f9fd77845ea46dd77a690a9c27f5f2c16a637 SHA512 71e5bc980648f16c27f5cfc9a9963e404421d13b7e3a8c0d40da5414e23306c7c06956a41031223ceabaf2b7ba8a5582b1ae081d4361924b75a958e988a299ce
 MISC metadata.xml 530 BLAKE2B b1ec0087512fd3f1f73946579481a6734bc6555c1118209a7883bc0ce0e13d9f028c4a7271ec458fc3a1147a2fdaf9692e16d805e09144d2cb729ee77edc1932 SHA512 ecfd5406ec2f8bae406225cf2ae2acfb07cf70ac8b121b2da3c5f814281c9f6a6eda9f06029cc9756e354502d3dc15a7aaf57919d144276ad27d79325bd697a3
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.4.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.4.ebuild
deleted file mode 100644
index 2b45bb7095d2..000000000000
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome.org meson xdg
-
-DESCRIPTION="GLib helper library for geocoding services"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="gtk-doc +introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.99.2[introspection?]
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.13
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Denable-installed-tests=false
-		$(meson_use introspection enable-introspection)
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Dsoup2=true
-	)
-	meson_src_configure
-}
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index c63128e97484..c5db7b02298e 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,6 +1,4 @@
 AUX 43.0-tests-timeTest-Fix-tests-for-time-formats-with-diffe.patch 2232 BLAKE2B 3bc646e4e8403dc38d942c0f589ff9db44240216e420a2d0b184311e10d7286d1c4ccb042d8ab0482a6d59b75bd1e9dc5c66a92ee42250d699f01f6880a8087f SHA512 0f6d921f6fbd82e4a2a8f8072180cf6136d64530f66af7d85b9b5d7a8033469bb608d7982849d27e5574b41234ac9c815577a735e40a05e8e64fc9a797a4890d
-DIST gnome-maps-42.3.tar.xz 2317328 BLAKE2B 365eb5cb8f7b20e2069338249418f5fad1abd47a1ab7ecda2d671dc97dfa45fb9f5687ae01fd605613c7ecf6eb9048aef6ab121cac0f455a42df9156581c87e2 SHA512 e52509603914de8f345a874f931beb68d11f718827b956a48464fe804c42559d977eacb0bbd5d4346b6329ab3f9169ac9afa8ef681f040c5b6a82b440b9786cb
 DIST gnome-maps-43.2.tar.xz 2334324 BLAKE2B a8daacd9874e9b8d44ae6107b7cc1a0a4a168d579b4101e4da408c08e2509f7da782605b27d089331d3628584783f3fd1d43c26d3bc7b09325810dec7b9b1648 SHA512 dfd7eba5fc0cc38152753d2d3b5ba13cdc614b96fe3f8e6629dc6c56515108fc6f2469f32629ffaba97667b15da294d874653d9133dd13592738379d5fb91c78
-EBUILD gnome-maps-42.3-r3.ebuild 1571 BLAKE2B d89dd8060f01ab68fc9c33d84d1a4c320389f8a06621379bbc41dfcfbdfaedd018fbcd18c8de9204e08a8a732e5913f236ecce1050923fffca5bc69b1364983e SHA512 f2d232245df8b3cd350c448a2312e17eda7a509652124cf6b6aed4ebf9b4834a2478bfdcfc200060e5b0370e89b0ac7fb9c8cbf42b9688007937c65d56f59e5f
 EBUILD gnome-maps-43.2.ebuild 1304 BLAKE2B fad8b48609c06ed915878e394e888b86e85aa963d313032cbdfe833c1c1b8779558270125897c0a237ee894d66035bd915c0c3d31e1e6519feddfc7e34c3780b SHA512 f2bc8b9625b00b27c80b86986875a30bf1576e15d43eae949c97c416fd1c6761fa14873a586affd9636270934ddbca086341ba2cd0b3dc24ceecf2b67f10a2e0
 MISC metadata.xml 351 BLAKE2B 720552be0df0a6687b1c65211e4532bcdf2f76a1dbc2cfedf801876006bdef781b6e7a3caab9f61a6d5a17fcb73caaa194bb54d356fd903c6ba3d8849c1e8ae5 SHA512 cb4a26c3d4dbcdc7e6ba7cd7136cddf8633002eab39741c4fe5d033bd3154d17d002d475c8f5370aae652ba1b34f952ce1401ea8d71d22ad4ea4aae364fe9645
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.3-r3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.3-r3.ebuild
deleted file mode 100644
index e593685d11c4..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-42.3-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="A map application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-# Pure introspection dependencies found by grepping imports.gi in ${S}
-# <libgweather-4.2.0 because of libsoup:3 transition
-RDEPEND="
-	>=dev-libs/glib-2.66.0:2
-	x11-libs/pango[introspection]
-	>=dev-libs/gjs-1.66.0
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=app-misc/geoclue-0.12.99:2.0[introspection]
-	>=gui-libs/libhandy-1.5.0:1=
-	>=dev-libs/libgee-0.16:0.8[introspection]
-	>=dev-libs/folks-0.10:=
-	>=sci-geosciences/geocode-glib-3.15.2:0[introspection]
-	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
-	dev-libs/libxml2:2
-	>=net-libs/rest-0.7.90:0.7[introspection]
-
-	app-crypt/libsecret[introspection]
-	<dev-libs/libgweather-4.2.0:4=[introspection]
-	media-libs/clutter-gtk:1.0[introspection]
-	media-libs/clutter:1.0[introspection]
-	net-libs/gnome-online-accounts[introspection]
-	net-libs/libgfbgraph[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-libs/webkit-gtk:4[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index e2b0b5741109..e80cab618108 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/libaec/Manifest b/sci-libs/libaec/Manifest
index ff4e031063bb..431e2a04cfb8 100644
--- a/sci-libs/libaec/Manifest
+++ b/sci-libs/libaec/Manifest
@@ -1,3 +1,3 @@
 DIST libaec-1.0.6.tar.gz 2777547 BLAKE2B 20da3fdf659c9d47ffde442ceaa9f9a831aab70330e27683ed4b62a28fdad02ec9c100413580f04d5a2bbbe86f3fe54b065230393bfb5e7746c522cce71513bc SHA512 f5d118c48225f97b229ac11425b94adff4d3698733bf18767b427e49047f8e08768464bc9cd9f5e6a66ceb44c8ebd9904c4f6f46566e2e66fcaa1049b2ebfcc1
-EBUILD libaec-1.0.6.ebuild 1080 BLAKE2B bbd78e6d834a3c518d76b05a8808c607b53e43ed3d524c95ec59cf06178f7ec5dba0582f5bfe097f9a8c9cccf7a6e7d8f73235aeac9c70df4104da64d89190f1 SHA512 d7d3ccfb4e76e1ece243fef304280af11e386e0c9ecfe28830c1aaa383229e281a84285d60b0f1f0c3d86a6e53e5b2b0cc1e2f88e14e1206fbd2b69b1d24bf68
+EBUILD libaec-1.0.6.ebuild 1086 BLAKE2B 31e5921cea388b4c3392be61b8a75e34404f8adbdf05c0fcbbb1865c1310dda3da866da03e5e3dbb722736234df574990ac32827a3259341efd24f45e313dac5 SHA512 b5eb08b826a0c7203ae312300fc648aae74412f79efecd35946788d674c072b1ffb19f940312d59f06fdd510c6515dcbb301fec759ffc7087d7de804afd16296
 MISC metadata.xml 720 BLAKE2B 08fdb1266842d4855449e2b444beea95e1bddac8b4501a85ec79b1aa40d4838d3d0140b48a0fd366ce588a55873a986483c0ba3216eb5609fb4c4c13da205eb3 SHA512 ffae51194154bcd13ef917b2e16fd9a49725ed163f742d67715a2b1c350bcc3a2bbb9e9ef788fa9e776ae4361911a8954fd56e03adcd59c54e83a64d5b41a0fe
diff --git a/sci-libs/libaec/libaec-1.0.6.ebuild b/sci-libs/libaec/libaec-1.0.6.ebuild
index a285731d1520..d413db1b4c29 100644
--- a/sci-libs/libaec/libaec-1.0.6.ebuild
+++ b/sci-libs/libaec/libaec-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ IUSE="+szip"
 RDEPEND="szip? ( !sci-libs/szip )"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 	)
 
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 662b995f2b7e..ccd164a668ae 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index e7fa5a5ddd03..4f8ec9f474cf 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -2,7 +2,7 @@ AUX espresso-4.1.3-gcc-11.patch 1134 BLAKE2B 40072bba384002ab091427d3c358248fba4
 AUX espresso-4.2.0-fix-disable-test.patch 445 BLAKE2B b1eb0c5004c26fcd17700c098108ec32cd3bfde60f732095a4555294ba0b81e47467311a1dbe379d2144f031f3515f658897003dfd1c7e718b711a2fc5f2ed6a SHA512 f7509a2c5cc73642e487130bf4b6b9f9a1360855908dfcd507490065f32e091c67a329af7eed9146ad0734e778365198c44c32b444c055d4829048e8c71bcf50
 DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
 DIST espresso-4.2.0.tar.gz 14000445 BLAKE2B 79de0e364cd932e534b0e1ee9433ae90e4deeb1ade262aa6877a30c8656f03155ca77b8feafdd5607f83e36ee4f47ad7ec28be353bc3358216a9c9f8c0902323 SHA512 b80afb1bef57911fd79b88378a5b2e31b07a18d415fe17fcd5ed28fb448eeca5922f98af8df42117e9e869645765d55ecfb3aae615fa6a53c915f7d8a63081c5
-EBUILD espresso-4.1.3.ebuild 2767 BLAKE2B 0ccf402e5234a75cf7c0b38eeb4d5e705a573e7ac08c734ca4cbc0230734646bb2ea17b0ad096fefe309a6387b5edf99e4168f586b2a675a0287f065821c7fe9 SHA512 576bb3bd73ba9b274b23c5df9bc6e20cdfaafbe3c6d1895dacb111f3bf29fa32eda3fe8ee1d85b7d120c49e9112ed0b6584628d4a164ca11ece980d8dea09c7a
-EBUILD espresso-4.2.0.ebuild 2637 BLAKE2B 309d6ac36559ac5ac7d1854ee49a47915d483cad59cdff9ec67cefb824964489a3a963e5a189558aae3c8dd6d665d40932f003d6bb3c58ca94a788f934f89cc1 SHA512 cef75c097ef3bd43b39e5d3ece3897c66ef2919ba2231660b709bfe28f7c603980050f6e72f126589e8e1c7652cd5ad970dabafad9f18997213ff5f2b032c0a7
-EBUILD espresso-9999.ebuild 2563 BLAKE2B 45364c1756d63dc08b0d1c47da5375f57a71bd2773cb9e940a21d7e72badec3ffe38cd57f2faefe8229687fee266a3117b500f4158882349a47fa7465971fdad SHA512 3b4d732b67149a0e55fa914bf3d8e1f9da8f5bfcd0dc522af47d2f227626c037732fb78fa58909db90c5ede3ca45cc7ae019c7981c64aac8e702abe48df78c7d
+EBUILD espresso-4.1.3.ebuild 2773 BLAKE2B f77e7f82f4454827d0beb7cf7ee7b8c0a3b3d39cbcb082534c71bc802b60d327c462bc96500f7080381c8b6168125354a2509526be3207bd4a95332c14f662e7 SHA512 37e27138961f4106f8530969382e4c3df60e3aa85fb30effd62784bca75ebfd36983cc1e518d5eb5891ca88d9ca21ba830c941062fd2d0d077c00366d8a469e7
+EBUILD espresso-4.2.0.ebuild 2643 BLAKE2B 0cba55f79e65ba2f3fcc00f46d2e6d4ca82f943405c92ad4684068175411336f8de75cc584bf91a6bfa6e31a7ec2e13debc435b7818413505a8799fa603de4b8 SHA512 a64533f4788116bf6d2615d40e19b96abbe233cd25bbfac5cdc7e4e63f72eebd29f42c09fd18b204368a66c08b1312d5e0f5334563af9fcabcf8cf9cf38ff6e8
+EBUILD espresso-9999.ebuild 2569 BLAKE2B 626abe846038dadc79dab1acc34f5f01c5cbee9970abe6dfb8339f9393bf310e236bf6cdd5e1fc122f75bb3be60b1ebc09075fd7511d6b07d46be2c012fc9e2e SHA512 418f008cd9554d1cad5975313e21c581f92b88df7c5401325ea43413c199b569a8a0ea9ffb13310fb3606691eaa662a873c9e7520c82120d680f78758c34817c
 MISC metadata.xml 477 BLAKE2B a7d573451bf567418f804666abb37160416952f8662c79a5b36172c1358d25b985f62e20bdd11f7163a002e05c061d81331f52607c50315d477919f0c94f344b SHA512 d2fb246a3f9b2f786f7eb02b65cbcd5604daca6f4fd8ca160828e2784dc2eb9c4340bc3a8747808f2e2d193e6b27c4b9a1acfd82c3b6e0eae7788fd73f25cde2
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 4c60379b475a..50078106b0ba 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.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
@@ -59,7 +59,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_CUDA=$(usex cuda)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DWITH_TESTS=$(usex test)
diff --git a/sci-physics/espresso/espresso-4.2.0.ebuild b/sci-physics/espresso/espresso-4.2.0.ebuild
index fb6b55b2bc12..443b1bb4a118 100644
--- a/sci-physics/espresso/espresso-4.2.0.ebuild
+++ b/sci-physics/espresso/espresso-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_CUDA=$(usex cuda)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DWITH_TESTS=$(usex test)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 0373c76056bf..1c8149b261a4 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -59,7 +59,7 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_CUDA=$(usex cuda)
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DWITH_TESTS=$(usex test)
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index a690b6670aaa..1f60cf2d9ca7 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/pythonprop/Manifest b/sci-visualization/pythonprop/Manifest
index 6c31393529b0..4ecaf0255111 100644
--- a/sci-visualization/pythonprop/Manifest
+++ b/sci-visualization/pythonprop/Manifest
@@ -1,3 +1,6 @@
+AUX pythonprop-drop-portland.patch 4249 BLAKE2B 6b7d2ce79db62d6343f68685383e8e60b8a97ef7dc932719218c8078dac4a058b3fc36b21c0a0db0855a766fbe23d575cd6785511fce15d497cbb5a4964508ff SHA512 b03ac440ae831ca8525f39915c2dbca91858d3a284c9ae4f36b1ac27594e00aab02aa2d090c08d0aeee7e273548e769138fc3a965801d462c181a00cb87aa959
+DIST pythonprop-0.30.1.tar.gz 1141620 BLAKE2B 54554d1a50976aa0516e70ef6cabf8c8c8fe41dc15980d0d06defca2dbf722baa4e98dddb974ea0d6da18e3d634661c980685b89411e8de4cf1cded452bb60a1 SHA512 582442e95732c78b580eceaf8b9d4922a23e5b3c5652738b110a40e1b94f91196755fad6e00370328130acc608121961d4e449199610137a757b086b53184b43
 DIST pythonprop-0.30.tar.gz 1141872 BLAKE2B 0703358221825bbeffb47cd5ff97a8de4c22ed9922347b96e359c7fbeffd6bae681a81d4938c03f4199ce583821d6e1006ce2e12aa718f50b5de69f2c0476a38 SHA512 421cade49a241d0dd38afa92e2c1874e2e6a0837ac7aeb9f4a294a2cec23e80e446e88a4de202de445cde73b9d816f4d6e487536be8c02017f1754c116fba310
 EBUILD pythonprop-0.30-r1.ebuild 1192 BLAKE2B f70323a02dc0788af3450e74bae0ca963335d30b7d0811cbdaf0379d85679cb6b07bda3518a1e2a337d40bcd00ec0a3d57de88da6fe1338c4afcdfc92d3df26f SHA512 61d79c6c7bc14d10b0fd3591396bf5fb7bf32ad7b4afa2a2d2cf54a7fd75f2dbc4662f2df1ea8a9cb81c24ba307063e6bdcb92beeb2e6ecbc824bad5fd388209
-MISC metadata.xml 460 BLAKE2B 2fc78265ea1592a637191c799bd9547edf6fa2a4d4bafa2193d290c5992941251c1538e0b41929df07394644ef575aca50968a3517fc7f2ec2466dae30c4394e SHA512 71795b8277bfc20c6043cc30f20bd7f9a8f613752ea74c0f27e142c8b4746079b8df6bfe8587868f9581329a954e3a7bdb5dd5094ff5efef319ab4010a27eadc
+EBUILD pythonprop-0.30.1.ebuild 1268 BLAKE2B 63617bf46253385849d599ec0f53dfed42102a0c1150f021c797792b71cfd2fc9e40ff3b865fb8fce24e6eca2b66e5f12752a0db9f4fe50172e3d7adbb97546b SHA512 083d878df63e5da1fbad18ce184c0b4465eb4646b59425cb1cbc438d185938bdf52f86d37c3c7e190cc79aa925dba0563063340671bd1d4cb2f6d28804afd2b8
+MISC metadata.xml 464 BLAKE2B 51b9b066a69b6dbfb7eac1b069e1481106970d675c0ddafc8131551d4fe676cdda7828c36d50d30b82ea5a97d2f43385c0c420e1a843355dac09aa5b3eadbf93 SHA512 f10cc21761693cf0bd78c19283a8618c0fa7473bded1b87b5fa517ebd860d8d76977d78131af576b2d36cee6ef51d0788b151dbe89418efcd4bb64fc7acfdb92
diff --git a/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch
new file mode 100644
index 000000000000..5a6736b4624b
--- /dev/null
+++ b/sci-visualization/pythonprop/files/pythonprop-drop-portland.patch
@@ -0,0 +1,87 @@
+# Drop 'portland' colormap creation. It is done more than once and actual
+# matplotlib do not like redefinitions.
+diff --git a/src/pythonprop/voaAreaPlot.py b/src/pythonprop/voaAreaPlot.py
+index a0bd789..a3bdd48 100644
+--- a/src/pythonprop/voaAreaPlot.py
++++ b/src/pythonprop/voaAreaPlot.py
+@@ -94,7 +94,7 @@ class VOAAreaPlot:
+                     vg_files = [1],
+                     data_type = 1,
+                     time_zone = 0,
+-                    color_map = 'portland',
++                    color_map = 'jet',
+                     face_colour = "white",
+                     filled_contours = False,
+                     plot_contours = False,
+@@ -145,8 +145,6 @@ class VOAAreaPlot:
+         #    print "-180 < Latitude < 180.0, -90 < Longitude < 90"
+         #    sys.exit(1)
+ 
+-        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
+-        plt.register_cmap(name='portland', cmap=portland)
+         colMap = color_map
+ 
+         projection = ccrs.PlateCarree()
+@@ -498,8 +496,8 @@ def main(in_file, datadir=None):
+         dest = "color_map",
+         default = 'jet',
+         choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \
+-                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ],
+-        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'.  Default = 'jet'"))
++                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ],
++        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'.  Default = 'jet'"))
+     """
+     parser.add_argument("-n", "--interest",
+         dest = "poi_file",
+diff --git a/src/pythonprop/voaAreaPlotgui.py b/src/pythonprop/voaAreaPlotgui.py
+index c001397..9f75acc 100644
+--- a/src/pythonprop/voaAreaPlotgui.py
++++ b/src/pythonprop/voaAreaPlotgui.py
+@@ -84,8 +84,7 @@ class VOAAreaPlotGUI:
+               'pink': _('pink'),
+               'spring': _('spring'),
+               'summer': _('summer'),
+-              'winter': _('winter'),
+-              'portland': _('portland')}
++              'winter': _('winter')}
+ 
+     def __init__(self,
+             data_source_filename,
+diff --git a/src/pythonprop/voaP2PPlot.py b/src/pythonprop/voaP2PPlot.py
+index faf87e6..61fe9b9 100644
+--- a/src/pythonprop/voaP2PPlot.py
++++ b/src/pythonprop/voaP2PPlot.py
+@@ -136,8 +136,6 @@ class VOAP2PPlot:
+ 
+         self.image_defs = self.IMG_TYPE_DICT[self.data_type]
+         self.user_bands = user_bands
+-        portland = ListedColormap(["#0C3383", "#0b599b","#0a7fb4","#57a18f","#bec255","#f2c438","#f2a638","#ef8235","#e4502a","#d91e1e"])
+-        matplotlib.cm.register_cmap(name='portland', cmap=portland)
+ 
+         if plot_groups[0]=='a':
+             num_grp = self.df.get_number_of_groups()
+@@ -375,8 +373,8 @@ def main(data_file, datadir=None):
+         dest="color_map",
+         default='jet',
+         choices = [ 'autumn', 'bone', 'cool', 'copper', 'gray', \
+-                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter', 'portland' ],
+-        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer', 'winter' or 'portland'.  Default = 'jet'"))
++                'hot', 'hsv', 'jet', 'pink', 'spring','summer', 'winter' ],
++        help=_("COLOURMAP - may be one of 'autumn', 'bone', 'cool', 'copper', 'gray', 'hot', 'hsv', 'jet', 'pink', 'spring', 'summer' or 'winter'.  Default = 'jet'"))
+ 
+     parser.add_argument("-o", "--outfile",
+         dest="save_file",
+diff --git a/src/pythonprop/voaP2PPlotgui.py b/src/pythonprop/voaP2PPlotgui.py
+index e1c120b..0aca557 100644
+--- a/src/pythonprop/voaP2PPlotgui.py
++++ b/src/pythonprop/voaP2PPlotgui.py
+@@ -83,8 +83,7 @@ class VOAP2PPlotGUI:
+               'pink': _('pink'),
+               'spring': _('spring'),
+               'summer': _('summer'),
+-              'winter': _('winter'),
+-              'portland': _('portland')}
++              'winter': _('winter')}
+ 
+ 
+     def __init__(self, data_source_filename, parent = None, datadir=""):
diff --git a/sci-visualization/pythonprop/metadata.xml b/sci-visualization/pythonprop/metadata.xml
index 27c9a899306a..fbf434b3fa36 100644
--- a/sci-visualization/pythonprop/metadata.xml
+++ b/sci-visualization/pythonprop/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Electronics Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">pythonprop</remote-id>
+		<remote-id type="github">jawatson/pythonprop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
new file mode 100644
index 000000000000..55899af5d1bf
--- /dev/null
+++ b/sci-visualization/pythonprop/pythonprop-0.30.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Scripts to prepare and plot VOACAP propagation predictions"
+HOMEPAGE="https://www.qsl.net/h/hz1jw/pythonprop"
+SRC_URI="https://github.com/jawatson/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	')
+	dev-python/cairocffi
+	sci-libs/cartopy[${PYTHON_SINGLE_USEDEP}]
+	sci-electronics/voacapl
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	app-text/rarian
+"
+
+PATCHES=( "${FILESDIR}/${PN}-drop-portland.patch" )
+
+src_prepare() {
+	eapply_user
+
+	eapply ${PATCHES[@]}
+
+	# drop building *.pdf files
+	sed -i -e "s#docs/user/help##g" Makefile.am || die
+	# do not call update_destop_database here
+	sed -ie "s/UPDATE_DESKTOP = /UPDATE_DESKTOP = # /g" data/Makefile.am || die
+	# fix Desktop Entry
+	sed -ie "s/HamRadio/HamRadio;/g" data/voacapgui.desktop.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 052f095b5f89..ce67426c90df 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index fa4857311c63..7a0404f97dac 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,5 +1,3 @@
-DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 DIST bubblewrap-0.7.0.tar.xz 147700 BLAKE2B 379feff513a509e6e00c933ca6bafdeef43827e406fbf31e56c1d16feb099a887f88125fb52d038e78b1604c504bdba771aeaeb3274e8d11163492f00fe9633c SHA512 3d163eecd79774e02d082141d027b7ac13f7d3a29c22f6513203e1088f53d53d8dde50e36fc4c8a34e8cde2f3e2a692e00b741f4bee2cc2bb21b9deb600271b5
-EBUILD bubblewrap-0.6.2-r1.ebuild 1158 BLAKE2B ba210fc5efe3f6a0cbdad8cf7202d76df25577c6af271393bad36ca1b681d4666855ffca984b43e9c054f08f90ba27bd3af338df2a73c43d92542449d39b4b45 SHA512 3f794436afcc7627d218a0543b8444b9b0df3d9dcea880e3efd35c73b4e108e1f847f56b5480e39335fb78c935d1f121b905f4f51b943948f12e7cf740e14cb6
 EBUILD bubblewrap-0.7.0.ebuild 1158 BLAKE2B ba210fc5efe3f6a0cbdad8cf7202d76df25577c6af271393bad36ca1b681d4666855ffca984b43e9c054f08f90ba27bd3af338df2a73c43d92542449d39b4b45 SHA512 3f794436afcc7627d218a0543b8444b9b0df3d9dcea880e3efd35c73b4e108e1f847f56b5480e39335fb78c935d1f121b905f4f51b943948f12e7cf740e14cb6
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild
deleted file mode 100644
index f17bb0c7718b..000000000000
--- a/sys-apps/bubblewrap/bubblewrap-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson
-
-DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
-HOMEPAGE="https://github.com/containers/bubblewrap/"
-SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="selinux suid"
-
-RDEPEND="
-	sys-libs/libseccomp
-	sys-libs/libcap
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# tests require root privileges
-RESTRICT="test"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbash_completion=enabled
-		-Dman=enabled
-		-Dtests=false
-		-Dzsh_completion=enabled
-		$(meson_feature selinux)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use suid; then
-		chmod u+s "${ED}"/usr/bin/bwrap
-	fi
-}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index df99fd660331..c0a91b2d03bd 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,3 @@
-AUX 1.10.0-use-libsoup-2.4.patch 570 BLAKE2B a43ae98006dc2791c4594dfba5cd5a7400f44e2313b39fbc3cfd835ac476af53ec5fe682867c275e5a99ec72e3f0765c3eaf5b9a5272bbacb3f769832ab3a2aa SHA512 61f847cf7a57dfa083fac7a4595a9b7c96226d3a23ddd4400143f859ab93f81e2be020cb27b6daf70d121e9c0fa787813524bba255e006a35a57144c3efe9ad6
 DIST osinfo-db-tools-1.10.0.tar.xz 60508 BLAKE2B 2b9abbdba25add96440e2a937ae994c0305f995b924ffc7c88c2c31c122d3e5cf0c710fbf55724bea56f63be7250321ee27d2179e3f247461d6843f7e03dfc58 SHA512 27271b15404a6cb0065854ba8556c272cf3427ff4fd18fc9a22dbca2b01686c32661b24e18f5eff9a1b240a3a459d8fe66cbde530873d60b8c850bdd0b42c475
 EBUILD osinfo-db-tools-1.10.0-r1.ebuild 1060 BLAKE2B 59fbe9419890d392ae1706210a76e759bfd21e435a79bb6a31e34fbc8521d5764aceab1783aab4b8a8d44578f438d2f7e9f5eed9c6e2275d197c63b63a56fb7f SHA512 09d799f79624dd72460013a2047af0a281882ac8fc176613d3ca63c3207c523965ba22339617952d3abfc11d2f2187aebbdfa522421954ca6dc071f14dbfe43b
-EBUILD osinfo-db-tools-1.10.0.ebuild 1126 BLAKE2B d6a124d684cd7f447995b3a7bb51f5a1d04d362c2556b8681d9c0ebb1cfe7c760a5373037a7a88811b841d87985131422e53dadd3b325f0c50236eb1258867e4 SHA512 84ae52f3ef95c853104ca23f1068327437141b8bbfda1a41582172d0e739d1e454f5fa658fb9dd708ac1b9747e0f51eb2649e7b6e6b78b4f866af36b00dc17a9
 MISC metadata.xml 354 BLAKE2B d60564aa9028df9e48d1213b20c33f1057fd21becf7ecf5f3004138fd5eac922b36d5c609d2bbdb03a8208d9a6f5a2969982c68b9ea9bee5c4e212e0caabd4fa SHA512 e6377db8098215eafb31f39fcbbf7982702419d3be0a7ad4a8299e0073d59e79f44d45e2c232fda0276e1f1ebf476ad19028bde0d780b662b1ffe3fa1817ba39
diff --git a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch b/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
deleted file mode 100644
index a59e451baed9..000000000000
--- a/sys-apps/osinfo-db-tools/files/1.10.0-use-libsoup-2.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 1cc5ff5..72b18a8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -58,11 +58,7 @@ gobject_dep = dependency('gobject-2.0', version: glib_version_info)
- #  everything else
- json_glib_dep = dependency('json-glib-1.0')
- libarchive_dep = dependency('libarchive', version: '>= 3.0.0')
--libsoup_dep = dependency('libsoup-3.0', required: false)
--#    fallback to libsoup2
--if not libsoup_dep.found()
-   libsoup_dep = dependency('libsoup-2.4')
--endif
- libxml_dep = dependency('libxml-2.0', version: '>= 2.6.0')
- 
- #  common dependencies
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
deleted file mode 100644
index a551d9abca7c..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	dev-libs/json-glib
-	>=app-arch/libarchive-3.0.0:=
-	net-libs/libsoup:2.4
-	>=dev-libs/libxml2-2.6.0
-"
-# perl dep is for pod2man (manpages)
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-use-libsoup-2.4.patch
-)
-
-python_check_deps() {
-	use test && \
-		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/requests[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 1ccff5b36140..0f20054bfc31 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,3 @@
-DIST osinfo-db-20221018.tar.xz 136440 BLAKE2B 819e3debffb2381242047d8e93cb8eff04b3b7b77b2490e9a94a1326586114ac8113410795663179a9922d78123c59f93d492e678111388d97b72a8d5863a248 SHA512 5a74d05ff1b2c7ac3693c8b4678a2464268f53efa41fce9920d3d030cf3c8b719d696353144f867fcf00d7462b4c37768d569277b73865df258532b51c971ee1
 DIST osinfo-db-20221130.tar.xz 135936 BLAKE2B 34fbbf6eded6d6e53c361ed8e5fc2a45eba546ae6aff3e02f31d321150ff1d7e05be9430d2a8c3a482139e21c73f310ec583d74827c38d206c219ee25f889cf4 SHA512 c0e7cf305d113c61e40f315521e606e73373ffa819ba059cb5ef245784fbf23e247180e8da1da366c96f1595470a870f193ed93a643675dda356b2c79f798015
-EBUILD osinfo-db-20221018.ebuild 692 BLAKE2B 6a023a7d52c7ac117481e628e0a0d8aabf43e2a18ef0daeca80503b3e3256ddb13ff063d45c4f11d4e58e3d871d47871559b68ce4e9be6fcdbe7920289cbb575 SHA512 f98f2d6cbd7c52c5c149030f4983d2a27ce24639b2886062f1205ca4636823df0bb1de63de08fec2bfa0eb9a95a4530b30d3aae540abe05d930ae549dccfe049
 EBUILD osinfo-db-20221130.ebuild 699 BLAKE2B 05680aa249bc2451e7a2b4434dc78df95184fe48fbb1f474745ab930b4ebc7cfabad8b339b6bb17eef714f869faf31995047d682d7e63bfc3077ded47fa49d2f SHA512 21288a1902eba72efb5c89ec6b600a197dd016accaef5b6da17d6b6e23cd595ce50d1c449af3aa61ebc50b541d9420f3419d3a9c0395ab9e413d6a57c4b3f9c4
 MISC metadata.xml 348 BLAKE2B fcfdacef0e6fc650338b935811d7b2ff4460497bb332b87312bd4c69c7ac260d9dc5288b383be27b1522a9ff9717a51fd4b2bd8d97f67e359ca8e5ff6c2c5c64 SHA512 4519bf98303033ae9fa40088f38eb6d703053eb6896d939756669dcf50404c5dac577fd3870afa4be5e40da4d4901b65f452b6779dac886d1673866b3e0f6f2c
diff --git a/sys-apps/osinfo-db/osinfo-db-20221018.ebuild b/sys-apps/osinfo-db/osinfo-db-20221018.ebuild
deleted file mode 100644
index b121959cf21f..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20221018.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/ https://gitlab.com/libosinfo/osinfo-db"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-BDEPEND="sys-apps/osinfo-db-tools"
-
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/roccat-tools/Manifest b/sys-apps/roccat-tools/Manifest
index acce8983f6a4..200a920b8cae 100644
--- a/sys-apps/roccat-tools/Manifest
+++ b/sys-apps/roccat-tools/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 858 BLAKE2B d3cdc925b286481491fdad08de6c2a61c811fecb1eb36fa1e0
 AUX roccat-tools-5.9.0-cmake_lua_impl.patch 236 BLAKE2B 833cb7662bdd1fc5942cfd3fd75fe3a7ce56616c8fb616403a056bbea6d0e5ecb8bd91b7ef39ecd12c30235172631eff839bc803910d1a8808c1d152db080bda SHA512 5bb4d236a053cbfed99f046d8cac4dcc1fb94535497e49f4be5338fc8c287623f4afeffa5164597d84aa16bca98b135d275f75e85df3e03bed95099caeb00d6c
 AUX roccat-tools-5.9.0-fno-common.patch 216 BLAKE2B da4c297a8efbe66afd6796a00e32424b46e84a76d9ee746d599d71ada7a64fff1a2365dc25183b4013c001b63f259516c2501db9bbff6e1bb185a95274a164e3 SHA512 51df4761508094536a5c6c18a7400797ded66ed0bd39acf35ac9aafbaf063d887892a2de738e355b365967e0e4ffe63688da098d04b8b2097a5d51e8660e99e9
 DIST roccat-tools-5.9.0.tar.bz2 3736671 BLAKE2B 4cdd0c6b50021cfae127a692d5a2a7fff5e7e1281da7add0cf9cd8f5fbfd8882186142d56982bf929867bde2950440f26ced167b52707c9d810ab53a62a4bded SHA512 d825fc372654257f330abbc7e611e87c4888924288ad56c8e57c9db5c8c25426d454ae1ab4dd591ef3b930bed410497c0aa88095d5319e2708f4b263d16eca00
-EBUILD roccat-tools-5.9.0-r101.ebuild 3404 BLAKE2B 0a72381c759ebd820179a19e3d22bc71e8e4456f04da910e70e16c4f1f2dd9953be384b0b9d91b31a6fe64dbb9551309a679278963339e6452912fc08ef77d6f SHA512 24d9d57147649199d55db11cea310b04d78072ce185d8a61b6d94d78544ebfd0d9db3a0667384ace97a8a6ac423b2f6adf21d2e739aa6ee47329109bfb4da356
+EBUILD roccat-tools-5.9.0-r101.ebuild 3410 BLAKE2B 04bb220775b31871d2c000ec50fc2fd76abf0c722f7bdd2db08c62a145813f4be94c5994d2d26e1ebd986c27490d27242b151cb3f3e39e4a1bbedb3d57995cee SHA512 3a4bbe5bc673a945fbb620aecd9709466a9f59f8cfaa6ea782d8ee339474aaa20b3727c0415f622e333d101befaf8c00e241dbf43599d1c326a3e28e525777b8
 MISC metadata.xml 244 BLAKE2B 2da05d61cfb52e48c43821bfe91e08721665fe50d0be62cf0505413d84f73e315848605f63b2d49d233511cfe5aea144ceb99f30a4d9c4c34ec3a521ce431dc4 SHA512 422eefaf18c498187b39f07a01a2e19b485a319177740e809e55bb6f2bfb4b0b50130ba3fa36b24d60161b8126e534228eda1fefb9064d7d3cb8c029234f1d93
diff --git a/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
index 84bfb0cbab3f..9c5eab819e44 100644
--- a/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.ebuild
+++ b/sys-apps/roccat-tools/roccat-tools-5.9.0-r101.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
@@ -104,7 +104,7 @@ src_configure() {
 		append-cflags "$(${PKGCONF} --cflags harfbuzz)"
 	fi
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DDEVICES="${USED_MODELS/;/}"
 		-DUDEVDIR="${EPREFIX}$(get_udevdir)/rules.d"
 	)
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index 2fd64afe657f..9695646ad6c0 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-gtk-1.14.0.tar.xz 381316 BLAKE2B 73a1e1d9944c4776ef2ebff33b26559767aad10784e9518690d31575a6216014bd0c518bde9a3b4e92d6a7edbf1aaa3510d669a025b7574c4df978f7c24b83ac SHA512 b0ba54e1ddbdfbd22b8b31bf4ece261dc0beba303e642f10afc72659dd5477438a30688c9d018e3d1ed2adbc053ddf4e3a2d70de8cac03d9519355772862fafc
 DIST xdg-desktop-portal-gtk-1.14.1.tar.xz 393964 BLAKE2B fd7fb960a19a13ad722b3db6e00a81e737c25434a6c4f70b97ad6cb2f9e01a06e9dc563f0e61f496260275854404b006cf4b36df56cc967202def6ca4bf0c8a0 SHA512 d8b487e8fc7d8c1f0f41eb3ee28377b2f77af9c65569b5dbaee785ae40c163929da8b13b39b032e25631515cb8e7218129c8bbffe25692e85c7b8e9269024325
-EBUILD xdg-desktop-portal-gtk-1.14.0.ebuild 1342 BLAKE2B 9833cd4a94dd6cb397393097c8c3c33f1f0dd7c436399d240081b4df51108302a8110950e01f1f7457a254f77870e87fbeecfe2d18194e7f8fb128ea713c07dc SHA512 401ee11a715c9e7c1eca3fcef31dbc0bdae1ab53d75f07675179ba1ad70271be5bef1a6356f81322f0667b511750c989a5720c6efecce7dda0b2380ed9c0e118
 EBUILD xdg-desktop-portal-gtk-1.14.1.ebuild 1380 BLAKE2B e28d0e76b00a73b6601c4128e7a4524438b34a2e7ee3377740e66c1a94accfe09c7411b3a5a5c75b60eea659de32f9fa205f05fb7705dde7377d93261d3ce436 SHA512 bee57573cd863039cd3aeb0b7149cc3675d0a04b793a472d07ec18366951f562de553727a7c45fbed5968db29eca2cfa3039279f7958be60d133f8a15c0fc3e8
 MISC metadata.xml 359 BLAKE2B b88d2d0b01e730aecbf4ce4f75f3aeb70177190ee0ffbdb4afbc55cf49c9e2fa29b10a67086488a22c77999204ed0a863332595257cb64e85c4fe29b2664a040 SHA512 75b9ab2cbe62b8556c6deff6c52b993fc099a3dbb8242929693f16ab907a2cd70d1b06de702d15150d2b0b47532168c72fa7fcbeb29467d49624b2d8c18172c6
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
deleted file mode 100644
index 376bb0ee5de0..000000000000
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-MY_PV="${PV//_pre*}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal using GTK+"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-IUSE="wayland X"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DEPEND="
-	dev-libs/glib:2
-	media-libs/fontconfig
-	sys-apps/dbus
-	>=sys-apps/xdg-desktop-portal-1.14.0
-	x11-libs/cairo[X?]
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[wayland?,X?]
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# As done in Fedora:
-	# All backends that are disabled are instead provided by
-	# xdg-desktop-portal-gnome to keep this package free of GNOME dependencies.
-	# The appchooser and settings backends are enabled for non-GNOME GTK
-	# applications.
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--enable-appchooser
-		--enable-settings
-		--disable-background
-		--disable-lockdown
-		--disable-screencast
-		--disable-screenshot
-		--disable-wallpaper
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b1da31a6f595..dbeafebdc795 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest
index a07d6152e2e5..24ef8641f45d 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,3 +1,3 @@
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
-EBUILD dfc-3.1.1.ebuild 817 BLAKE2B d48a930ba8ecb873811390bbec0f17d121849c6f72b6476cfb21302a14417e04be2f4367408fb91a4d82f9f9550bd411a9617f0a2a36a7838fc7cc6d7bf2c547 SHA512 e7cc4c2e19e41ed9893c983194f9ab30675a6c860e4f95f45585d26c8cd8c7c6247d451946385f07e668ef76c5dc1f3f0af859e412293b0fd52cbfb3558eeb8f
+EBUILD dfc-3.1.1.ebuild 823 BLAKE2B 16d9c750f8e38876f2aeb4b313617393f1879e511e69ee96633d31dcbfe0542690243646c8d73c88f022538de9cd39a4e8387c572ac14fb7823063b5e13b4c4c SHA512 5b1715112071ece7e92859719c004bb5c2a2a18899ec038081e3e5753c67f7c356fbb61656d9fff44c29c1e327ce934fe0693a0960dcc914c034046bc21ed4ee
 MISC metadata.xml 241 BLAKE2B ac22a6a72982cebf268e9d367947dc556420370c70b1f6e26531950f7f2c89734cd293fad93dfea0345fd020a97b8f9304c1362a2ccd6225b22aac1f7b674b17 SHA512 b59cc421f52bc545bc8667dcbf6b4891e29180ef1984596ccc20886071e5f080bed259026c2831c6418131802b93ad945137fe4406d042feb02d9bfdc14c431c
diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild
index 6efb0e5b80cd..4e0dba7f60f0 100644
--- a/sys-fs/dfc/dfc-3.1.1.ebuild
+++ b/sys-fs/dfc/dfc-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ DEPEND="nls? (
 RDEPEND="nls? ( virtual/libintl )"
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		# avoid installing xdg config in /usr
 		-DXDG_CONFIG_DIR="${EPREFIX}"/etc/xdg
 		# use the standard Gentoo doc path
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9df6b3c35521..4d6621b65b54 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 01c14851796e..90b793289576 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,5 +1,5 @@
 DIST gwenhywfar-5.10.1.tar.gz 2687042 BLAKE2B 78fb776a605761f309060affef4e84e526ba789039f48f1e68e107d5002c508e19c9c2c2c0b3a8aba39c6c32543816914b504a6212219cfeeb4f0f04b0354f45 SHA512 11781bec2dd1c4156b609574283179278b8070d604a792aeddf92c8f9b873b3ac09273a8558b9adba567af8d016ea10914d2a149f4b6813798b5800e34e29aa5
 DIST gwenhywfar-5.4.1.tar.gz 2373780 BLAKE2B bc2666145d958c5ab9c5600be65bcdd4a2ea6e35f3bd83a5ba9a2380dcc8788e91038733c49c1c16ff00d27eea999a0c0f4a02a70f30180d54a1541dbb951131 SHA512 78ec815374410bb3ebbbcc5c18120b47bbc2460aa8a620fae068f3c6aaeb16351139fe0e28e8dc7037ffb9eaa449011d2483dde3c99ecd0fed7bb2c9f97f89a0
-EBUILD gwenhywfar-5.10.1.ebuild 1711 BLAKE2B 95c9b61508582488afe127ffdcb35e3405a6b3e935ad5b7f4f183ac067ad9b9b72358806a35b99ea144b20cf0bdcead72b68bc7dea5a7b1f48d6cee90fb69cc2 SHA512 48de2dd76f79ffaf22f471dfa9ba496b55f123bac8873d868f478e8abb3699b2bbb084aa6beaf9cdaa6003177cffbca3b620bad8011c5e2e13c5c949f3e19bc5
+EBUILD gwenhywfar-5.10.1.ebuild 1709 BLAKE2B b34d5c6eb15bb3d7482c1d1336662522b752edf20757651d0616711417e4542171a22df0110d93d1d19c8bdb0488b803804a0edd8a9b115a94ebc64d9a388a09 SHA512 73d2855dfa2fa2b3a3cce248dbe2b1a90355330668e7196b21f1acc6550d9145792ab7180c2e2b894bac03ff2b99bf6bf1885e4daafa1f42405b6ed3c8067f46
 EBUILD gwenhywfar-5.4.1-r1.ebuild 1753 BLAKE2B 45cf247e76ee9ff50191ed1b4974a7b65a3f2b38940e899a21bb6be40cd5621f2b7e4deef336b45681efa3121262c33ea99e40b5b55762a54de7a57e5fbb7f3e SHA512 2460644583e71ef16e104681a149d446966d7c86201778d4830374db9f7bf84de75edf0db3a68e4439915e88f67c4c9821f0044e22e4f5d079bd8b7c650fa5f6
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
index ab910b95aef6..a2b5fef35202 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/465/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="debug doc gtk qt5 test"
 
 BDEPEND="
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 0bd81c484265..a369089d358f 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,5 +1,4 @@
 AUX 1.10.0-build-Add-option-to-disable-libsoup3.patch 1484 BLAKE2B a67153267432e60910e9f013dcc1aee243da3488386fac2b3a79e1d08df47aa5612289bcf7c62866ed919da0f67bb8d6e542bba309f632cfbe5d4ff9e7843d5c SHA512 34a819fd67ef78b55064d663652ff78bf2110521c4fd333e650975728bbec32c0680bf522b5c2e21c62061194acdd497ff0ac0bad652a30ca2eaeb9b6712b792
 DIST libosinfo-1.10.0.tar.xz 293804 BLAKE2B 5c676a466459c4e4150294fd263cd32ed95f181a3dea913977165f61dd81d75fb545dd96d0f87661ea13db9f10706c064421a5ecf0ec1b220054149c66c957d1 SHA512 58a30d62d5a4862150826fd9fda3d5189df3693efca3a8732efaa470fa65dbb64181987534ccc13c0bf2fd4efda229217a169590405f0601927472f6ca08e4e7
 EBUILD libosinfo-1.10.0-r1.ebuild 1635 BLAKE2B 1d5d568b1fbb51562f35048f277258c2a3d08b52830f217b08f9aed7aafac0c0a912d5cf3a41a952c92bf8a9ec7d63223caed700f37366ab08b7229cd3c7789e SHA512 3bc21d3b2e3e770fcbd300b43d17b91ddc2220bc5072fb7e3339727142350e98fce7eb58ab7b4682045c2b1f6176a025891a97b12d4575b0447ef6d7733048e2
-EBUILD libosinfo-1.10.0.ebuild 1643 BLAKE2B 60596f6bc7fb1781085a16ff78c6fa5798808b57d4718864c253bacf695de4f851a9415a5a3e20bc359babf3f4bac1fa68da7f6f7376f33f772dd40f2c79e7ff SHA512 3d728843b4e4eb258d0b545c42fe9f13d9e200affd7624d35c1fa19281456ee828eea8f62114d7a9d7bf2cf7d71840b173d030193f7bd053a6f64a69c195d19d
 MISC metadata.xml 348 BLAKE2B 3bf0a4c2898ac80214a7d8856d743829706c8289dcf752874c44ff0cc7e07af29a50b2dbf271983a87db47774334ad4613516d7d3340fca7824f2fa6c1b12be8 SHA512 1cd02c1f8716f281eb4f9aafb3d02edd09ef2a2fe95f5035fae5759dcc371841225d41cf908acd43d8973bc4da31c15983ae27c24650f7c244decd37d66b4074
diff --git a/sys-libs/libosinfo/libosinfo-1.10.0.ebuild b/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
deleted file mode 100644
index 8e38dda5a5dc..000000000000
--- a/sys-libs/libosinfo/libosinfo-1.10.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit meson udev vala xdg
-
-DESCRIPTION="GObject library for managing information about real and virtual OSes"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-
-IUSE="gtk-doc +introspection +vala test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-# Unsure about osinfo-db-tools rdep, but at least fedora does it too
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	net-libs/libsoup:2.4
-	>=dev-libs/libxml2-2.6.0
-	>=dev-libs/libxslt-1.0.0
-	sys-apps/hwdata
-	sys-apps/osinfo-db-tools
-	sys-apps/osinfo-db
-	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${RDEPEND}"
-# perl dep is for pod2man for automagic manpage building
-BDEPEND="
-	dev-lang/perl
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-build-Add-option-to-disable-libsoup3.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc enable-gtk-doc)
-		$(meson_feature introspection enable-introspection)
-		$(meson_use test enable-tests)
-		$(meson_feature vala enable-vala)
-		-Dlibsoup3=disabled
-		-Dwith-pci-ids-path="${EPREFIX}"/usr/share/hwdata/pci.ids
-		-Dwith-usb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
-	)
-	meson_src_configure
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 9a6fb50a058e..1fd2e3c6581f 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index 19a53cd204d0..4428da03a325 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -1,8 +1,8 @@
 AUX prowlarr.init 139 BLAKE2B 5d2e870b142fd95c42459d5fbce0370a222c64385eb30d7642a1b9b42e76ba8ee3b6d4577e4fad1d6c27ac0018e966f8846fe3dd5451e67c2d42ed65e6ba551f SHA512 b32cadf3ee9ce142cb48c01cbc576dc8a56a03b55fe9e371cd4205a9c927001a988621827dad02618b1bd95cb44ace3fb90974340e8ce5d9f553c4be1ac8ba5e
 AUX prowlarr.logrotate 88 BLAKE2B c5480a0b3f2f21aeb7632c6f7bd6fd95aab8c4fde55447281939f1e1fc67bc4786b64db74f56682af5705b1654eb4a1bdb3f62300001b46eb92536f62502c15e SHA512 fbf91e62a30a929bf6b8b24a2708ef7eaaee7e42e83247f2f2af88a6d6f83571aabf7e9e8fc14253cf5b0efd4271f34ce143e24bd92c67674eba279e332e3ba1
 AUX prowlarr.service 558 BLAKE2B 8bb379f30a93ce537016133627e54cf5d71b666f31db50c29659d0e44fc0df54374fce23cf1e2d20f59e19b9cfaab66253c79df718e86b402c0572ac781e1f58 SHA512 0cb3461a5160da1a617691040c7d6378e5d89f5809a12faa8cb182c8180bceb7a459d3d881cd3a96eee4928eac410533876b90c90d3d62dcde12ba2f0b9f328b
-DIST Prowlarr.develop.1.0.0.2171.linux-core-arm.tar.gz 86162564 BLAKE2B 00a2ea99cb7736ff8361c5b6978e399bc15749b331e6fe79b35d6ab7efa3d655ef38b14df8c6c3f20fff0b26d4caaaf89b2ccbc905bbe4d8857f380509d75ebd SHA512 afd9d6e7072145e4d4dbd8daa9d1efe9c8d681d243e99727fe2d50122a43049d992717506c97d38ccba6a4ee0a2ffc8397e2df592f641f3f90aa381e9a827243
-DIST Prowlarr.develop.1.0.0.2171.linux-core-arm64.tar.gz 85390442 BLAKE2B 2bebb17c98068b9149010921dd61ffb05d937c4abc5347667513e96d0392bbd600984c2c13f1e490e5e09a5d2004460bedb7e4dc9c4e77dddec294f37384f0aa SHA512 b2522f09b78b3f4a7721f8c8f8905451864ff4b4baf2b80ad8b439784bea6c1867a87e3352642d195c7c52be5c69b9107a6e52aab09caaafa24d9e9ea857bb07
-DIST Prowlarr.develop.1.0.0.2171.linux-core-x64.tar.gz 90404642 BLAKE2B ccb650666bf1bb7bc8374ebb2aa3f5a42d01711531cb99e01f0f4ae179e47e8bc98616c17357040027bef3dc6f00005e24351de36825ce228d8a7c4288522ce1 SHA512 9b268f9ad3f7493fb1ea2a51bbab83ee897eca80a90498b59a5342a7a0a48f0f5b3f58d91d4ad7c89cbca77c9d6a8aa5dffbc9d355633d3fc9ddafd7211a3d52
-EBUILD prowlarr-1.0.0.2171.ebuild 1463 BLAKE2B 2c888f1c7d073dfcf039a4097f74b046e6458ba626c8ddeecb867f26714f6000aea338a1c65f94f9012b303b55e55258df8352798bb2b18edfe10236b5449311 SHA512 f2f668f0ae3c3f8a30b0a6647ae065dbfae4d96cf7d6c1a266fb1e30e0f9af51ff0616144bd0cd27993d29da23e3a6a28c336aa0b0067b91fc2a6519d942ea66
+DIST Prowlarr.master.1.0.1.2220.linux-core-arm.tar.gz 86176610 BLAKE2B 9fa5377ac68f75600970c5cd44ac29173019a82feb7fb14fa66dfaf7c1f11f4e74357927f493d07d35573f07596e08c5d916bed728875f14a1509d9b341396de SHA512 695dd17595d679c5d372e7b031635431f3f0f455c86667c4c2b773ffdc55db7450e96cdecceaaeda53c181e1e21bc7fa8617885177afdcb93211b6ed0c8eb44e
+DIST Prowlarr.master.1.0.1.2220.linux-core-arm64.tar.gz 85425008 BLAKE2B 59c0b78791ab6b0477af801cfafa6929c01b8082928480bb6b9f821251714ed9e8526842d0fbb1f7ce7b6cd06815781a019842ce9c77d775bd0cc795b378e613 SHA512 a349fa9479c8fef0dc9097144dd5b3c626dbabd06f9b6ef46da708e1275328f2d83fb0e7711187dfab74f0215c72e5c0eb27fd473ee666fb3573a27ff6abb70f
+DIST Prowlarr.master.1.0.1.2220.linux-core-x64.tar.gz 90436721 BLAKE2B 08af514e2ff75e647f0902d30ac1baf5449e3b67996eafde49a31422cd1d0b03216f11d8fd5214ee4beab632534a80f20fe9dd51e129c4ddd375cd9f377c2683 SHA512 9fdf49633687b309c8d9ccc64700e5a0e32c5f46174136f5f451d43054683250003800c1a6289e93066d1e2e84deb3bd78c13b93349c4bccc5fe6c9baa4b8c01
+EBUILD prowlarr-1.0.1.2220.ebuild 1460 BLAKE2B fcda3e7a6983680af5fe1bab7a6e413b047b50f7700e79c33e186b87c9b59bec6dc7d5bf8460ceb4515b5c12da13ba1f7693472c5a3be03e56eb6dfdac92b5a5 SHA512 963d9653f08a02633f6bf9f313468bb4c007ec09fa8e68fa70b84d4b3090af5ffe9ecae5b779fb7eb67299302b0de01a79e6848e8418ef43610fdb6e3eef8d97
 MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/www-apps/prowlarr/prowlarr-1.0.0.2171.ebuild b/www-apps/prowlarr/prowlarr-1.0.1.2220.ebuild
index b19e1af8dd7d..57ef13400018 100644
--- a/www-apps/prowlarr/prowlarr-1.0.0.2171.ebuild
+++ b/www-apps/prowlarr/prowlarr-1.0.1.2220.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,9 +6,9 @@ EAPI=8
 inherit systemd
 
 SRC_URI="
-	amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-x64.tar.gz )
-	arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm.tar.gz )
-	arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.develop.${PV}.linux-core-arm64.tar.gz )
+	amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-core-x64.tar.gz )
+	arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-core-arm.tar.gz )
+	arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v${PV}/Prowlarr.master.${PV}.linux-core-arm64.tar.gz )
 "
 
 DESCRIPTION="An indexer manager/proxy to integrate with your various PVR apps"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 62d6c19c8f2e..aee99f10018f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 400ec86c9ca0..d9c25cbb553e 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,7 +1,4 @@
 AUX 43.0-Revert-tests-Set-locale-for-the-encodings-test.patch 1935 BLAKE2B 4b05f97f0e05b434f0684f18ccc07ac78b746e7eadc6a3e01a54de0c13a18771eb4976a00c9639027056988d8d17e27e6e8d5753a80dece391a8476c380c2c5d SHA512 b6ff49c29af43f84dcf5661df6218d2a7e078289c2c354cc9dd247f6e48aac1a932908f4d35beb6cc02eb0791ceafd7996cc6440b020b9c5d8d43051fdd31bd9
-AUX var-tmp-tests.patch 659 BLAKE2B 2869f1c28c3a59974758986bd464aeb5c1d86d1b4e23f33d809529a1f1b800ffdb3daf24780774766a16c1f45fff145dd5524c682293dd117b29582adeade7ae SHA512 79480bed41ff59f423087dfd6d0f5eaee665fcba6602c7876ed63397edeb6cf5fcb2ce9f2f91b375117e389ec2fcf6cba1cf1e8919efef2ccad3c84547b7824a
-DIST epiphany-42.4.tar.xz 6107820 BLAKE2B 7ab18ac6d8eceb3577ef53c761e26a64291219311f2d6d82ed13ce6746767b83124faf28c9627056938351a05e5d6aff50eb95eb4dec10ce8847123fb5775b36 SHA512 55153078bc460cc5a0bc17bb8d12fd5ed6495cd2415e128ec0b4917b07a4d2fe1fb74e871c033aaef43c89c125d79ad37e99ea2fa2ada07fbcdf09603129ae47
 DIST epiphany-43.0.tar.xz 3890284 BLAKE2B 74a463030bea6489dc05c975fa885ba3e06a3c552f18d29b0579121cf3b04f73fe3c76a6057d9d941f4361732ea1029cd7abb235969ca4f649964e5f909ea2d1 SHA512 56e65c2b3868447b88b89dc97c9d63c4ef1b174334eda15c6ad6b11a38963457df01a6024109ddfaf67730c691e5d68d37abb779604d4719dbc19950d18fe426
-EBUILD epiphany-42.4-r1.ebuild 1982 BLAKE2B 5a6ffb9f5ca95ad91091c99683313ce4f8145037d008efb06282987a0c55fd9d1948ab72fd06d4bec774f932ff7cca5ea772a0732a67f18af40a4ee4e04d8c08 SHA512 8f0350fb915168f45fcc80846cc7e621cb827a8d86bde482831b8a5a97267cbf5e1991c5cf1a2feb37ad5ba7edb53c40ed7a93f583f4c84c9a64cf280167b15b
 EBUILD epiphany-43.0.ebuild 1939 BLAKE2B fbe161c7046bb720aa8eb911e9a00918e7f2e2b89d40eaeb6c56ae741b1fda15f65c38856924783de6992774048700d4355abdefde04f92e76dee2861f044a17 SHA512 ee9783f6e42ede10a3a6e39be11be902ff9f00d837d4386d74ff3639c4573785521a65f4cbd71bc75aa4805acfbeb3a54e53ceba939218e1ce4947abe17ad72d
 MISC metadata.xml 349 BLAKE2B 3d863d6eb39cc99c7587d53af80d4df96f5c1bb534e406ee904d3b39f947c24e1153707581473e1477d984cd7be541925b4ff002d546f5d50f1115d1ad639362 SHA512 10d54acb787b2d9dab84b43fcc0e578d7afcae36142bef5028ac3838bfce6ae63348a4e05ee97eaa2f7d90204457990c9cf604c8df0dd714d62b907bf4da3019
diff --git a/www-client/epiphany/epiphany-42.4-r1.ebuild b/www-client/epiphany/epiphany-42.4-r1.ebuild
deleted file mode 100644
index 311a5be8c69d..000000000000
--- a/www-client/epiphany/epiphany-42.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web https://gitlab.gnome.org/GNOME/epiphany"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-libs/glib-2.67.4:2
-	>=x11-libs/gtk+-3.24.0:3
-	>=dev-libs/nettle-3.4:=
-	>=net-libs/webkit-gtk-2.33.2:4=
-	>=x11-libs/cairo-1.2
-	>=app-crypt/gcr-3.5.5:0=[gtk]
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.35
-	>=dev-libs/json-glib-1.6
-	app-arch/libarchive:=
-	>=dev-libs/libdazzle-3.37.1
-	>=gui-libs/libhandy-1.5.0:1=
-	>=app-crypt/libsecret-0.19
-	>=net-libs/libsoup-2.48.0:2.4
-	>=dev-libs/libxml2-2.6.12:2
-	>=dev-db/sqlite-3.22:3
-	dev-libs/gmp:0=
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-# appstream-glib needed for appdata.xml gettext translation
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
-	"${FILESDIR}"/var-tmp-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddeveloper_mode=false
-		-Dlibportal=disabled
-		# maybe enable later if network-sandbox is off, but in 3.32.4 the network test
-		# is commented out upstream anyway
-		-Dnetwork_tests=disabled
-		-Dtech_preview=false
-		$(meson_feature test unit_tests)
-		-Dsoup2=enabled
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version net-libs/webkit-gtk:4[jpeg2k]; then
-		ewarn "Your net-libs/webkit-gtk is built without USE=jpeg2k."
-		ewarn "Various image galleries/managers may be broken."
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/www-client/epiphany/files/var-tmp-tests.patch b/www-client/epiphany/files/var-tmp-tests.patch
deleted file mode 100644
index f2a0d97aaf96..000000000000
--- a/www-client/epiphany/files/var-tmp-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/ephy-file-helpers-test.c b/tests/ephy-file-helpers-test.c
-index b3139b67e..10c884ea5 100644
---- a/tests/ephy-file-helpers-test.c
-+++ b/tests/ephy-file-helpers-test.c
-@@ -87,7 +87,7 @@ test_ephy_file_helpers_init (void)
-     if (keep_dir) {
-       /* As a safety measure, only try recursive delete on paths
-        * prefixed with /tmp. */
--      if (g_str_has_prefix (tmp_dir, "/tmp"))
-+      if (g_str_has_prefix (tmp_dir, "/tmp") || g_str_has_prefix (tmp_dir, "/var/tmp"))
-         g_assert_true (ephy_file_delete_dir_recursively (tmp_dir, NULL));
-       else
-         g_warning ("INIT: dangerous path returned as tmp_dir: %s", tmp_dir);
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index 64fee076a1a2..cfe222ac2a74 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index cb46826e5750..60a47d7f6061 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -2,12 +2,7 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b
 AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5
 AUX xorg-server-21.1.4-BadIDChoice.patch 1950 BLAKE2B eb3ef49d68c526b1484b580ac08b45c4e31b7f263354a8fffc763577c618a1edbf55c8bec5ddb916eefd2c0b4e9429d2a445f221ea0a447d6e26ec1b6f88fa0e SHA512 bbd49c133f33bfad4eb4225d3246ca9814c6bc876a5a606f89ce018de7bd26c1bd84462f4f250c2dbdac82d2fdb366ab722ecf5bbb183f9958ba7f856efc1472
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
-DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f
-DIST xorg-server-21.1.5.tar.xz 4929120 BLAKE2B 40f31250101293fa048c3c32278caaf0350fcf0b153a295d7574a6698893fa3c2d14078714a3c6ee7755b66c1f0ccf80b8faacb27aa5d7c279bc09fa6285ffd5 SHA512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953
 DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a SHA512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239
-EBUILD xorg-server-21.1.4-r1.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
-EBUILD xorg-server-21.1.4.ebuild 4513 BLAKE2B 7a36143b235eeaec435bb21b989d464723ba062fa1d7b223b8f944cd60661662d38cac82973c7f2b1911cb4ba3294357a74677561fe599b636bb6a9896687409 SHA512 7fb72a177b8ef0f61ccb0ca677f118c065846577b9da21317b5343e19ec797b5e7cddf60f47eff50b4b03ee4507bc51c9f92545bd1e52357fe862e9265ced7f0
-EBUILD xorg-server-21.1.5.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba
 EBUILD xorg-server-21.1.6.ebuild 4646 BLAKE2B cf73bcd0c069b6fb5c9999907e8e9fcf63a0115608f61009e856b2e73839fd8db4eb491506ad7d9a82656dcf7b8ab5348547eca397c96342aa1a1c4b0f4c4fc5 SHA512 d7e55274629256573017d5421339911f4aff1e56b4dde3f5e670bf404ae6e99c6ac6aff612f97488f88149e6b9fd40e0eb0e9e7dce7c25017a0cd9f0e68d4213
 EBUILD xorg-server-9999.ebuild 4516 BLAKE2B 232c7211a805dfca04da95c0c17e71847a57bbb22351e8eecd5d5be51b88653ab7ab67874e66022cf70bfdf382e7e3284de54a2d843763468540453fc46e1592 SHA512 ffa779b6a8fc0127422542863eb4ca25876c352662215bd4ec1a29dccb354514bdf7e043a66b5c5d1aa634f386b75d3528b0c39ace7d4bc745a1593477d205ce
 MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90
diff --git a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
deleted file mode 100644
index 85f83743b7ff..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-	# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
-	"${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild
deleted file mode 100644
index c43a56374d07..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.4.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-21.1.5.ebuild b/x11-base/xorg-server/xorg-server-21.1.5.ebuild
deleted file mode 100644
index 85f83743b7ff..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.5.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit flag-o-matic xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	xorg? (
-		>=x11-libs/libxcvt-0.1.0
-	)
-	xnest? (
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libX11-1.1.5
-	)
-	xephyr? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-	test? ( >=x11-libs/libxcvt-0.1.0 )
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-	# https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953
-	"${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# bug #835653
-	use x86 && replace-flags -Os -O2
-
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 4f7d5c4752b4..079310c7c92c 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,10 +1,6 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06
-DIST xwayland-22.1.6.tar.xz 1273532 BLAKE2B aa0604e425c8e5648966f58d8baa56163f7f39b439618e4fe556cdbfd7d417e4d8b1d34a7d850d31ed51b782e268c05f8d8ef4c8c48b3f8c702aabe8e579fb0f SHA512 a78f44f14a6c1e25afbf245c5c757a253f0607afdc80c8b852cf6f810247566d1cc17b63d4442a21d8e69bdb696faf1014438ad98a977fbed9a11b9c5b85e0a4
 DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649
-EBUILD xwayland-22.1.5.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
-EBUILD xwayland-22.1.6.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924
 EBUILD xwayland-22.1.7.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a
 MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6
diff --git a/x11-base/xwayland/xwayland-22.1.5.ebuild b/x11-base/xwayland/xwayland-22.1.5.ebuild
deleted file mode 100644
index afcd2774aad0..000000000000
--- a/x11-base/xwayland/xwayland-22.1.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.6.ebuild b/x11-base/xwayland/xwayland-22.1.6.ebuild
deleted file mode 100644
index 384312c2aa5c..000000000000
--- a/x11-base/xwayland/xwayland-22.1.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-	inherit git-r3
-else
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index f3306e3553f9..79c12f4d19f2 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0c8648b92d65..fe441b0767c6 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -6,9 +6,7 @@ AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-DIST gtk+-3.24.34.tar.xz 21587592 BLAKE2B 708e03ee9e62f1a1742faffb63a352ec2d90a1dc46a4e0162e343bf68355ab80fbd30c1f2261b5e5339cbb66a02cfb48addbc5ecbc2b8a37f97aae86c5af1405 SHA512 95af4441b53be175acf16121a90b1db7a152cbfb3e5ed2dffc59f622b2eb5a4d74720ae8e05dc1421b6b23588f28e09e0f153f0b92777c836f522881720fb0a2
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
 EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
-EBUILD gtk+-3.24.34-r1.ebuild 7213 BLAKE2B de7bf8b74b60cb663bc93c8af0ce70f5aa84fdbb09262d9305797a57e85e5f33e2802b85545d9af9a81a4231c28ee59c265371d3e65472c9b924d5a6860add9b SHA512 c92a024e99eda30848aabe805af9fdd0652cde94848edbd604210d9f38a6bf860432788a7fe1ba49317e5969bf49afd1e37b82ffc7561e4393ddecbb2c289873
 EBUILD gtk+-3.24.35.ebuild 7018 BLAKE2B ca017af92b058f58b51f6bf49f751188cf97702b0b7eba11626a024a5aeace8c4ac6b9bd16cdd3ca200a0bdc84ffd7f06caf7971ac9b194efba6fc1ef3f78e3c SHA512 084deed3cd289cb2b35163bb7aec97b7ee98ced90c136581e3fed6d04c2674059bb4ef7e6adc2632b133e73a5c860764c877de2d5036a96b2c304a3a1645d2c9
 MISC metadata.xml 953 BLAKE2B 29defa50a776f75e114697ad02f4ff22ecd813dd6f67ed6674f6edad57cb1db8e3bc548a98497d4c1f6133c98318e95901c9b602026e225d8dd1350e2dd5858f SHA512 00669a6a0befecca4766adf61de1e0986754ecef00af45d6d3a33724e06ffb86476e4523cf06a214d2add354ee08065dea55f31b6173e27ec3f58fc39b53570a
diff --git a/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild
deleted file mode 100644
index df783ef9e075..000000000000
--- a/x11-libs/gtk+/gtk+-3.24.34-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Upstream wants us to do their job:
-# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
-RESTRICT="test"
-
-# FIXME: introspection data is built against system installation of gtk+:3,
-# bug #????
-COMMON_DEPEND="
-	>=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.2.0:=
-	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
-	wayland? (
-		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.17
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
-		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	test? (
-		media-fonts/font-cursor-misc
-		media-fonts/font-misc-misc
-	)
-	X? ( x11-base/xorg-proto )
-"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-	!<x11-libs/vte-0.31.0:2.90
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	>=x11-themes/adwaita-icon-theme-3.14
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	wayland? ( dev-util/wayland-scanner )
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	gtk-doc? (
-		app-text/docbook-xml-dtd:4.3
-		>=dev-util/gtk-doc-1.20
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-PATCHES=(
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
-
-	# Fix broken autotools logic
-	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
-)
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	if ! use test ; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
-
-		# the tests dir needs to be build now because since commit
-		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
-		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
-		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(use_enable aqua quartz-backend)
-		$(use_enable broadway broadway-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(use_enable sysprof profiler)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		# cloudprovider is not packaged in Gentoo yet
-		--disable-cloudproviders
-		--disable-papi
-		--enable-man
-		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
-		# need libdir here to avoid a double slash in a path that libtool doesn't
-		# grok so well during install (// between $EPREFIX and usr ...)
-		# TODO: Is this still the case?
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
-	)
-
-	if use wayland; then
-		myconf+=(
-			# Include wayland immodule into gtk itself, to avoid problems like
-			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
-			# user overridden GTK_IM_MODULE envvar
-			--with-included-immodules=wayland
-		)
-	fi;
-
-	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		local d
-		for d in gdk gtk libgail-util; do
-			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
-		done
-	fi
-}
-
-multilib_src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-	# Skip README.{in,commits,win32} that would get installed by default
-	DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	multilib_pkg_preinst() {
-		# Make immodules.cache belongs to gtk+ alone
-		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}${cache}" "${ED}${cache}" || die
-		else
-			touch "${ED}${cache}" || die
-		fi
-	}
-	multilib_parallel_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_query_immodules_gtk3 \
-			|| die "Update immodules cache failed (for ${ABI})"
-	}
-	multilib_parallel_foreach_abi multilib_pkg_postinst
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		multilib_pkg_postrm() {
-			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
-		}
-		multilib_foreach_abi multilib_pkg_postrm
-	fi
-}
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index ce660dc10a0d..59e6e257c947 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,10 +3,8 @@ AUX 4.6-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d0944
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
-DIST gtksourceview-4.8.2.tar.xz 1164876 BLAKE2B 3e6269b4e6a7147d5f4e0ed2096514a0e0bc29a928b73c0cd12eb207f2627c9eadde55ee81183b2a67fe5380fcd96c2335283a1f3da3f06303b7d2b65b49a09a SHA512 6951b9477b1e47b1b25756aef246630c948e8dd212b1b0e13f87ef4f56f39b59b02db3fd18315869e98acfc6454de13cfffa6eeb8fe1cd030dfd537b5f710a04
 DIST gtksourceview-4.8.4.tar.xz 1159636 BLAKE2B 0fb649522ff904993b7673c380b8ffb6458c0727b6af906e5328d972fb5385a2a668c2ca45b7dd3533f9f00b2ed9eaade55ee7b20a0b75fb1c031b917c27af2d SHA512 9e4262e52a92b3a052f33b799622d4fd4dcc7cc5355df12f160d0e60a6d6c135bc52f07eb40c06b357d5d74bec7228d4ec545a69ee5af69429d4170cc1e2243d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1317 BLAKE2B 80f626e2a5ded1e372760139354bc61a36c64620a2476c385f24e44d8711536ab162ed299b016fa1e4734afea2a48aa1346507b0c265440857bba8b0740bf406 SHA512 796445765875a51c6467d3a80a20007d892f40c0d71a5c8b768dcc2738f091b46f24e37d9fb45715152a72bfb709b6fa272c9f973ce22eafecbf5fa01a20e15e
 EBUILD gtksourceview-3.24.11-r1.ebuild 1221 BLAKE2B 8f07e18a7443d3e7802d4da2f7c3faa7791eb55d2440a9be3a7d60edf7de3edf03274ce01e2391d812cf773fd9469a31e2588ecd069696076da35307fe2ad3d0 SHA512 f764ec43144157e7354f996a78d09c22c3de1933b3ecc1b529123d0369a8948d8a9e798b048588351ddcbe3bf9a315ef72a41a1ba809698861aafca8dbc723a1
-EBUILD gtksourceview-4.8.2.ebuild 1751 BLAKE2B d20f94cd5f313cf4fed081b8ac6a39894ef809e14e9f3eeeb7822a27ac42833aa1af048ce57e1fc5d5ef93103d93a363ae7349bd380222303295945ac94e09b1 SHA512 738aec48327b3c17fafdf334b5b031fed2e962b518864dfd354074fbf29efad73a8438c51475f102661ac4a1ade9b872fb33ffb73e124613234968da8b4d9cba
 EBUILD gtksourceview-4.8.4.ebuild 1758 BLAKE2B 37ffc9bba7db4f65ed3883e4039965c53bbaa563868fe92054c576dbfa4a91df6e2643172d1735b02f5a55a64e4205ce3ebd68922e99bf7b5fc7d337f9e68ef8 SHA512 d2ae4df7cabfe191efced1d5e72fa7e8469c11cdb762520053ecfe2999462ae3c7788f8b744783b4b74ecba02813b00bfb17d9a661770aedd05f2b1ac55324d6
 MISC metadata.xml 430 BLAKE2B 97632c64552f8f8414314de16a73981465cdce4c553d550618ebaf6fdfd1ef100e32c008b6442cbbea68ad1f97ca0631f332ed9bc4fc1884fbf4ecc608b70ec0 SHA512 3c8df69407d401080882427ca5d135a462d246fc29878dbef7b0614e1ab150cb0c9349f5398397cb7c94adc854271066000a0d4ac118f8be342e2a02464e8ff9
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
deleted file mode 100644
index 303e382be390..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson vala virtualx xdg
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-
-LICENSE="LGPL-2.1+"
-SLOT="4"
-
-IUSE="glade gtk-doc +introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.48:2
-	>=x11-libs/gtk+-3.24:3[introspection?]
-	>=dev-libs/libxml2-2.6:2
-	glade? ( >=dev-util/glade-3.9:3.10 )
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	>=dev-libs/fribidi-0.19.7
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		-Dinstall_tests=false
-		$(meson_use introspection gir)
-		$(meson_use vala vapi)
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/${PN}-4/language-specs
-	newins "${FILESDIR}"/4.6-gentoo.lang gentoo.lang
-
-	# Avoid conflict with gtksourceview:3.0 glade-catalog
-	# TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
-	if use glade; then
-		mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
-	fi
-}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index b7118fddf9a5..19c5443db284 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -3,9 +3,7 @@ AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbe
 AUX 1.50.8-harfbuzz-4.patch 1364 BLAKE2B 8f6d83da81854922ab04673e1590fc7a4e04628f325579ffdeff151a3e3b604bbe0d6e4ad4d59c7aa05fda71c0669653bc76fed12d324c0329c43431188ca514 SHA512 9eae987a563d590afd3e9d6aba02ac09e89d6cbfa9e9d797a58da6868f3b80c64e475b9ed1a24d56b839c0ffb34b2cde3d20e793d084ec7202fd1ee51e030845
 DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1
 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
-DIST pango-1.50.11.tar.xz 4263184 BLAKE2B f496f66ed996dd4125f2de7b0ea9635e7199e54de3038e6475c4677f04183442a27acc9c8b353f9207145b8c86e0f725f1b888fbe5e8df40929a70d9290bc376 SHA512 00d08477b8bff62cfa298d2871d3e58bc0411ea6a36330743b49533e6065ce5c3ae511246c299800b542ca446f31f2fb342f41c1183069946adccd13adb14ef8
 DIST pango-1.50.12.tar.xz 4272856 BLAKE2B 60a06416f82e8e5419bca7c89cae17bcd60605b944f483bc7a4ce4405710f00dd40c78abfbe9fdbf8d4786780540f92adfde45e615be4175450e608ba618df08 SHA512 488a55e875487ded8c298151d67a3a7ec4653f2c311145fe83b1297417b1154d5e86b199013ee986c7d2575c889fafcb2f148ee4e5ff9ca143f9fb716a71512d
 EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2fdc35fff8970daf3699e94e369de66380fc140aca039accd546270be27c809e13c0a71d42ae8df19f64198d22c8 SHA512 8c1c0f11ad9ecbe7f464e7b839de614e4f266d2674b843d133489b882270f02754c61b05f2624a2b4c9d571b7824d2a142ccc2105e2c7e968fc26e97e2936c1d
-EBUILD pango-1.50.11.ebuild 2409 BLAKE2B 8a80f3286eff5f0588692a19d8d1e84385448d8a640725ab1b5c4085d5dddca37595a8efc7b3500438618206167d537e61a58f9906c7a6aab597c484dce6f21a SHA512 306725b129979a7688df2133b302e3f62e8900917a0c584180be9603e286c621ca40fe6f2ba080b9149b038a1e3b859fd8af2520419bcab86124f9bc3be7b6e2
 EBUILD pango-1.50.12.ebuild 2409 BLAKE2B 8a80f3286eff5f0588692a19d8d1e84385448d8a640725ab1b5c4085d5dddca37595a8efc7b3500438618206167d537e61a58f9906c7a6aab597c484dce6f21a SHA512 306725b129979a7688df2133b302e3f62e8900917a0c584180be9603e286c621ca40fe6f2ba080b9149b038a1e3b859fd8af2520419bcab86124f9bc3be7b6e2
 MISC metadata.xml 604 BLAKE2B 94690ca7900ce8d6418fdbaaabf9da8a85471f575a8bf81ab73523e3910d4c8db227bf653be30fe068f9c7c2e2295aa6af52c3e8da2780aaed0947c2b76b3b2a SHA512 314a9b5ad763a0077acfe0afc46fb82e26b28cec783077765f8b42e0828a059fc18804dfa522f9cb3628bf63cce1ac27af3b244c2b2166cfc9e1e5b465dd2f06
diff --git a/x11-libs/pango/pango-1.50.11.ebuild b/x11-libs/pango/pango-1.50.11.ebuild
deleted file mode 100644
index 262982813a4f..000000000000
--- a/x11-libs/pango/pango-1.50.11.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic gnome2-utils meson-multilib xdg
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-IUSE="debug +introspection sysprof test X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}]
-	>=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.13.0:1.0=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
-	X? ( x11-base/xorg-proto )
-"
-BDEPEND="
-	dev-util/glib-utils
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( media-fonts/cantarell )
-"
-
-PATCHES=(
-	"${FILESDIR}"/1.50.8-harfbuzz-4.patch
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	gnome2_environment_reset
-}
-
-multilib_src_configure() {
-	if use debug; then
-		append-cflags -DPANGO_ENABLE_DEBUG
-	else
-		append-cflags -DG_DISABLE_CAST_CHECKS
-	fi
-
-	local emesonargs=(
-		# Never use gi-docgen subproject
-		--wrap-mode nofallback
-
-		-Dgtk_doc=false # we ship pregenerated docs
-		$(meson_native_use_feature introspection)
-		-Dinstall-tests=false
-		-Dfontconfig=enabled
-		$(meson_feature sysprof)
-		-Dlibthai=disabled
-		-Dcairo=enabled
-		$(meson_feature X xft)
-		-Dfreetype=enabled
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/gtk-doc/html
-	# This will install PangoXft API docs regardless of USE=-X, but this is intentional
-	doins -r "${S}"/docs/Pango*
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if has_version 'media-libs/freetype[-harfbuzz]' ; then
-		ewarn "media-libs/freetype is installed without harfbuzz support. This may"
-		ewarn "lead to minor font rendering problems, see bug 712374."
-	fi
-}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 53a951f51b13..50b8b897a4c2 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -3,9 +3,7 @@ AUX vte-0.66.2-musl-W_EXITCODE.patch 779 BLAKE2B c35f3cd21e59b9693d75b00232ef8b2
 DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d0052c0084398f5f4ee30d766a6adb9c4536fdec5027c753d3d710fb7432e67472b7f8ca44f1dd5f51aaef48d9124708975d24 SHA512 89be91cdba36749f97bac872f0f2196be7d36a58beaf94fa24a3ae9c266bdfbf4f4fbf1d10f43a276540653fff7062eb844107016e7f014437f2903d251dc1d7
 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 DIST vte-0.70.0-command-notify.patch.xz 9040 BLAKE2B 108dd05d00409af90b1fd3e9b5c3b0e5586ac80204cef8840fda935204cbc480fec1193e2a0a2782f98e2b094c3caebbfe61cf18631b16921df05cf3808afd22 SHA512 92123e7f5cb6ef876f2b2b108dbef59bce212efebd64cd790d49d9ee3215344acd848eec5d326fe2c3bd236846ed3b896148024390093491b2f6e2f7c46e2bd1
-DIST vte-0.70.1.tar.bz2 502044 BLAKE2B 0a9ce43c1863e823fcd073fd30fb6b2cb39e9168e850796fe12be2b9bdfc0b24ceea974b4c94bcdd10f2225613990e0e079194380241b7e625cb6dc4309a7476 SHA512 88de629b382eca8a42199b2ba9b248e231817e1de7183417aed150bcf61530084f7177d73dee9aab25fe4c3ab80d795b5fdcae336687560d3b582bd04181353d
 DIST vte-0.70.2.tar.bz2 502395 BLAKE2B ae127d8262c7038b3a2cda9a9622e9a075dfc1e06a7710810a4bb894a6646155790776553f663677cb86c3479e6d3faf92c38b5b97dd6970df37cee92dd963fa SHA512 1e113da0591830c057358dd78cfe2f814dd0bfabd037973369266823a9a4936a200b5b23faab3757ced4d08aa96a76d6b1120419815a181598493e35d2ea58d0
 EBUILD vte-0.68.0.ebuild 2714 BLAKE2B 8232cc5f22b7ada5565db344d050099e1e6f0f1dae4e636577a85e3213ec33ad95a85a95f5f76dc39ba476bd92dd9710b3d32def21cefcc6bf4c3864fd263385 SHA512 ee745f6a94cd9e12ecab7209fa91a9144cc56cb7c8cdbb2fc900742c75f34bd2055e208f896c6ab0647b464f033842aec241ca7dcb8b0ecee3cfd3ec837e308c
-EBUILD vte-0.70.1.ebuild 3238 BLAKE2B cf1118c7d64de1a0eef5df7fd508f244181a9fe75223d2c09790878bed9aa2fbeb51f57bb3c55170cda5ad74563cc2deba72dc8c78c88f007e695d1e0b6f4ecd SHA512 d79fd280c968673cf60d4d7e72dff80c1e49788520ddd4bff939e20990f70a711fb263f481f33d0b7d0e5123bd838e3646848ea70ba196d0239b5d6e30cd5873
 EBUILD vte-0.70.2.ebuild 3197 BLAKE2B 2c0dea9da73be636931741698da98d9245309f36b1abe43a7891fc13c361737fd2d731f7145cc2dbbe7d491ac55daa77909f7ee558413449979c0f13edcbe6ec SHA512 1e0dd9f82a1724d62b935a38a1e11b182f4a4b2e0bd9766446e03a68b1d895d6a7d3af9d10c0d3fe1df859f8c466281040c4810b152180b7ee85a7bf94002f3f
 MISC metadata.xml 612 BLAKE2B 3243ec48375bf8e69a367e5d631cf84c0ba60b43d1f4a25c313a407bfb1c9826ddd1cd75784bc302e7d8998d1bedaac9d75c7f329255e605315d9f0bf6154a73 SHA512 0abc6f1deb0a7900b6b35620ad3dfa26a900445526cc6474f974ce5cca2dad65cb3f3c4e3b8a59540821a9922e2cafcc7011d705570e77d2a46c907f3962a73d
diff --git a/x11-libs/vte/vte-0.70.1.ebuild b/x11-libs/vte/vte-0.70.1.ebuild
deleted file mode 100644
index 5d62d5b5c2ab..000000000000
--- a/x11-libs/vte/vte-0.70.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..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 https://gitlab.gnome.org/GNOME/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.52: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 256de11be789..e5432e8975f5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 8dad8b216211..f1fff9e4148e 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -3,9 +3,7 @@ AUX separate-new-tab-window.gschema.override 56 BLAKE2B ca7934aa89ddad5bbc86a35c
 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
 DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
 DIST gnome-terminal-3.46.2-cntr-ntfy-autottl-ts.patch.xz 34980 BLAKE2B 97a634da8f586fe03770540a00480f04de5d3210bb45e9af216ac876a85a8199d2d9ed651cae6631a0b432c96d28b5a07202baf79765a2b3767160c1df5cb84a SHA512 96591f7e1f4febfce9d8b10a0fc8aebc09ad07cb2fb36876affaa47f19360944c37e63c173af6f07807247c6f60f34e4e39590ccb1632a64d6e5dbf3912bea74
-DIST gnome-terminal-3.46.3.tar.gz 2881211 BLAKE2B a5c0aea858692bbab3ed20d4daa54dc97c98d4b920b09fa0aa52963658f6a327e90398c45ae5ed4dd3a40823ba84eff208f6df5e5e0731a1b1e7d8e531ad7b73 SHA512 d1408bfaf0a7c0b090f140c5ac12fe406fcfb18ddda5745616f209e196cc0b29887a312afa29a8ce319cbc7a0093908305a0fc95c357f8c714084cc696c8e79c
 DIST gnome-terminal-3.46.7.tar.bz2 1681251 BLAKE2B 579ccc58cf55e04a0ef43bc840b3623ef3451c60d210f773fc93b4dc0bc6dc3cda63f4cac182d4295bb6dc1df0f78e8509c28d365db16f6a20f92ad5abe73aaa SHA512 b53ec9fd1bd18e51dfc9d5d957082fb1478a824ceb098b0dda2ed8417c4cae4727435f4bce22a949214bdd39abc87821beb36c9e9863691ae0a20f11b34e3335
 EBUILD gnome-terminal-3.44.1.ebuild 2953 BLAKE2B dd07246a8212d5c03274d63cd91ca2a5b74ecce4b1e14fb156b02bc7c3dd17b16bc24b8c4fde71c40138573092fcba4c30b20175209a1d3f2019e6ffbf381fc6 SHA512 a227e96ef2ce12def2a85ca071dd789c6c13a60e15add1a4fba9ef19228406eb2616b0192b92b37a22339f6c4c76ce4bea564a7b9278f2f3d6cf916e997df67e
-EBUILD gnome-terminal-3.46.3.ebuild 3036 BLAKE2B de2d63490e36b30d671a65427bca8117559f79724c6a4ce4178d2341f5f6f535ecfa704fcbd56b9b1d329dcb1f091f707065d4e250e41fcf9bc04447f322417a SHA512 a446ae90b8cad00cb07b211925efd877dbbd8ef2b5b7a4297f5680ee022351290cdeeb487e0eadd1129bb9e7574671e2a2de47eaed9540ad2a5baa6f0de4f22d
 EBUILD gnome-terminal-3.46.7.ebuild 2988 BLAKE2B 4351f09a45ac96d7339bec433f5b6ff24a2b8a0bb4d3ee8a11a576bbd612e700949d4fb6fe575df9584b753e1dd87b551b8d450e622188995d79442f7a873d24 SHA512 ce6cddeb375fee7e0f4936c9d2e2c58c065947390ff9dc1b20dd9db0ee355c915887e078914c512cd0efa88ac5afe24eef35944aea7784cb2da8fc5df80a4c51
 MISC metadata.xml 544 BLAKE2B 9e4dda0925c1f09a6109a01a522965c0bd2d811d91e19054fecf09e2d732f6f03245410e7472c3accf83bc015e2747cf96dcf3ededb62cf4733ece3241e51389 SHA512 e53acf30ece7ccb0307f9bb750ccfb3e90bf5d468098fe42112f4efa0fd1823d10124d8f50bf1ac56fbe4ad188bb7446e1627f1a05188f602e6e11a33496b75d
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild
deleted file mode 100644
index 6275804dad90..000000000000
--- a/x11-terms/gnome-terminal/gnome-terminal-3.46.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="A terminal emulator for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="debug +gnome-shell +nautilus vanilla"
-
-# Upstream is hostile and refuses to upload tarballs.
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
-SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch.xz )"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
-RDEPEND="
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.27:3
-	>=x11-libs/vte-0.70.0:2.91[!vanilla?]
-	>=dev-libs/libpcre2-10
-	>=gnome-base/gsettings-desktop-schemas-0.1.0
-	sys-apps/util-linux
-	gnome-shell? ( gnome-base/gnome-shell )
-	nautilus? ( >=gnome-base/nautilus-43.0 )
-"
-DEPEND="${RDEPEND}"
-# itstool required for help/* with non-en LINGUAS, see bug #549358
-# xmllint required for glib-compile-resources, see bug #549304
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
-	notifications of long-running commands finishing, you will need
-	to add the following line to your ~/.bashrc:\n
-	. /etc/profile.d/vte-2.91.sh"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.44.1-fix-missing-wexitcode.patch
-	if ! use vanilla; then
-		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
-		# Fedora patches:
-		# Restore transparency support (with compositing WMs only)
-		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
-		# Restore "Set title" support
-		# Automatic title updating based on currently running foreground process
-		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
-		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
-		eapply "${WORKDIR}"/${PN}-3.46.2-cntr-ntfy-autottl-ts.patch
-	fi
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use debug dbg)
-		-Ddocs=false
-		$(meson_use nautilus nautilus_extension)
-		$(meson_use gnome-shell search_provider)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	if ! use vanilla; then
-		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
-		insinto /usr/share/glib-2.0/schemas
-		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
-	fi
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 16d15aa9e9d2..7dc174fb6bed 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index 4a0fc7314a60..eb126f46e3e2 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,4 @@
 DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3
-EBUILD herbstluftwm-0.9.5.ebuild 2986 BLAKE2B a2eb901d21217a3960324ddd2eccfcd8e26254ca9e88ac6de266e6e97629ec2cc9f53018d0683620044d348eb348bed2cc5f0f0a4329e815f00fad8dbadab991 SHA512 b7c7900c1f84c4a2e75c61a009d8d504a5f0009b3d1b61ac3a58fd0562b3661468d266975e2fb201143dd9ba6258e11dd51af376b288598a4abfece06a2a8a79
-EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d
+EBUILD herbstluftwm-0.9.5.ebuild 2992 BLAKE2B 72d653974516d0287ed3867ad139eb6dafb3b221369047d6c8574fb1f0048f0edd2f376da19e6153c2d4e344432cd97034233939aee5d3ecf61862e8070f1bd2 SHA512 cafb4c1db100bf654753d55776eefc2e7302a7a65a29cfe85ca881fc62a2a23b651cd108372badfa0d890dbf78a5c337cda69a78dc2897a146ea9d6b22024f64
+EBUILD herbstluftwm-9999.ebuild 3406 BLAKE2B 8fbd649e820dfc4aeef6dcf270f8465760acb4d4155e6b3a783a4e6e09e154a02383478cdda776224dc1420d7f45d8365e0614f53315bf05a90e3baeecac2250 SHA512 a0f3e12ac7c1535c0092ab40f36faa42038355f15d3f8651acb182b86118d8efb8935594a31c75cfa350781de63a158d194bedf910721b9e85bdd098138b4613
 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
index d69cb69d2351..e732c8be90e1 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -80,7 +80,7 @@ src_configure() {
 	# Ensure that 'python3' is in PATH. #765118
 	python_setup
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
 	cmake_src_configure
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index 4bb6c21b60f1..051f9ba720c9 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -89,7 +89,7 @@ src_configure() {
 	# Ensure that 'python3' is in PATH. #765118
 	python_setup
 
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DWITH_DOCUMENTATION=$(usex doc)
 	)
 	cmake_src_configure
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 38753dd1b030..9deba23d840a 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,3 @@
-DIST metacity-3.46.0.tar.xz 1958124 BLAKE2B f7db5d38ab2c9aef8809f02ada76a453e712a471d59c3c991d0e1a5cfa1b9d37f901f38ef9057301a6232fca49846af0e80c6792bb5dcffa85694f64983d918f SHA512 5a203a4190dc919ec83fa3f4f7a86aa1594c82051b4e5afb76eb11acb38c573367deca85dead64564e2e96304903cd84eb5b4fc904ddc0672677114103d299b2
 DIST metacity-3.46.1.tar.xz 1959060 BLAKE2B 84dbe09dd8d6c7ce1894ed806cdc6cc5cc6c302ddf3aae5f7ef479f6c02ef6c2091bb1d815603f5d6e52d583192d43f47d835327e9e75cd626081becbf84bd8e SHA512 f0d8424868edf8209eb4cbd003de68ab892a5b515a1aca7b3626bf52eb8451cb0477ab35f702177c9654604e06adce46471897edcb54931d95e60b36bef92b20
-EBUILD metacity-3.46.0.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c
 EBUILD metacity-3.46.1.ebuild 1295 BLAKE2B a5074328f70255fc349b80bda1229498c7c45111f002978ef6d9af8bdff738fabd5932affbc3c37103494b9feb2fd1dbb094df31e437535c44a943c56e861648 SHA512 d508ed8fc03f232aab0d9a652ee264a1d729dac264e18835a8f0b8b31e1e08055043bd43aa764ecb8842dce17ac07b11b4a6d84210cf98e29b0f48885dfb6b4c
 MISC metadata.xml 587 BLAKE2B b3cf07b5d226dba9d333ca3c897727b165663ddbd112924fe6d751ded222054f560bbf3b541f3d884040a8e25ef672f912d20e4b8cb2290e9888567a2b418f9f SHA512 07f9e9ecdc9d2934c6ec6d2d314336a1887ac1a39b7384cc994a745113949850411c5b0707c61dd6c902dae5fb0578768cf1a03c76daf5ff1071a0b4bb42d6fb
diff --git a/x11-wm/metacity/metacity-3.46.0.ebuild b/x11-wm/metacity/metacity-3.46.0.ebuild
deleted file mode 100644
index c27fd8cb6d9d..000000000000
--- a/x11-wm/metacity/metacity-3.46.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2
-
-DESCRIPTION="GNOME Flashback window manager"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+libcanberra vulkan xinerama"
-KEYWORDS="~amd64 ~riscv"
-
-# TODO: libgtop could be optional, but no knob
-RDEPEND="
-	>=dev-libs/glib-2.67.3:2
-	>=x11-libs/gtk+-3.24.6:3[X]
-	>=x11-libs/pango-1.2.0
-	>=x11-libs/libXcomposite-0.3
-	>=x11-libs/libXres-1.2
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXpresent
-	libcanberra? ( media-libs/libcanberra[gtk3] )
-	>=x11-libs/startup-notification-0.7
-	x11-libs/libXcursor
-	gnome-base/libgtop:2=
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXrandr
-	x11-libs/libXext
-	x11-libs/libICE
-	x11-libs/libSM
-	gnome-extra/zenity
-	vulkan? ( media-libs/vulkan-loader )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	vulkan? ( dev-util/vulkan-headers )
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" # autoconf-archive for eautoreconf
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable libcanberra canberra) \
-		$(use_enable xinerama) \
-		$(use_enable vulkan)
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index ad0d9f603e4b..5c4b80fdc723 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,10 +1,4 @@
-AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
-AUX mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch 3102 BLAKE2B 8adfd306044014776bdfe46bcc45f1333af2ae5ee7ab195fed0c6f1f852723670f90aa0fd7476bd59f0b1c76a4b91521f3a19f9ba0f584f4699075b484aa0dfc SHA512 e751600b5f82ae1330f888c891f302c107fd5da1227392774e8ef2aa681c528be28c78ffd64f832e8aaf31179eeecc12575bc34e3d80d2ab638f3aae099c8cbf
 AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
-DIST mutter-42.5.tar.xz 2743636 BLAKE2B 87ee26ccee6c21404ac069e7b35d2b93ef38d0eda0963107c08a72599915fba56a653968fe456afa42f4eeb28aed5526d23d344f7e1f9f4fdf9cf35b5a66fca5 SHA512 cd7ef29211a1568f5f8d43182da6569db22005c0b67204a300edb4952d9c18f73def1558843a009a7475a82d7ce9754bd8741b214a931764798dbeaaecbbec49
-DIST mutter-43.1.tar.xz 2779416 BLAKE2B 1b7bf1ec44f6e47a859e84adb93a869be261ef3699ab773014e1497ea6c944e91d7a1766a2f126c79c1b21ba78e1ba25314c32113bc194f580d847e8617ae0d3 SHA512 6553ee855ebb3bb88bc12f823a5813c6b1b6ff983f1af716521b5e04903bc30112954e3e5d781516b087e247088cced1f560fce54eac28207a6cbc61d78b05b7
 DIST mutter-43.2.tar.xz 2781032 BLAKE2B cb4fc05ae9b53029649e9c80c8ce450d383a41f142ff1000bca6f9c1ddc707897511b5b54e8e28b4d263d19cffdfa699cef034d667cd8f166f8274c0f237d41a SHA512 ae6afccdf6af99197072afabf0900e1a72f38acfa6c4d039e8db03d21e89513f8828f29eb292ca9dfdec64388dcc4a93db64139e3af66706aaac81461b5da96d
-EBUILD mutter-42.5.ebuild 5467 BLAKE2B 3920ecf49ae942051a6211d72fe2b06553446837e6d97beca4be50b9f4f3ce1b8675ae84bda39c30864b6c5c84f9ca25ff6032a53f85a95584f3bbb949bc52c4 SHA512 d88f49dced450e61b7b7472238d2543939a5eccf1b45cf4cf2150a5d8715444f89a1811d87af241a211c451db0ace8285506da74b322832ab8a9dce528ea87b0
-EBUILD mutter-43.1.ebuild 5793 BLAKE2B 444a74c57ac9385683c3105d20b9d4cef536a8ce0058c2f9c80b56e7973e0274edea1dd2dad0407048102fa6df2772567f63462b7ea172f347c5bbb1f7aa3207 SHA512 6ed94cc3411bb1481efab7242f8b1ee79b37e8fcd3940784dff2fc01525abc22e267111ed80e100708eeb49a2123b3c307c577dd94d75d66d73cc35042d15b95
 EBUILD mutter-43.2.ebuild 5790 BLAKE2B e227c2cbbf1c5fb1356e2cb8afef4a9d1aac6f81f9e6ec3631ea427260795e7986181af0e623a4d3a129121a89107066c284ec6d93e38946b109deca681c254c SHA512 fad7de2804b3f8c7354a75650447c52cc3b8ba1601b889ba72401242c974634366343c501224c2e9590313368a4efe7a3e348e0e89ce3fce86bf71995997f207
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
deleted file mode 100644
index d0e07840d46e..000000000000
--- a/x11-wm/mutter/files/mutter-42.0-Disable-anonymous-file-test.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 8cb699dc59c64dc9f58873b3bbe2d17c3a08d2f9 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Fri, 18 Mar 2022 17:40:52 -0700
-Subject: [PATCH] Disable anonymous-file test
-
-It attempts to open /proc/self/fd/* (an fd created by memfd_create),
-which sandbox disallows.
----
- src/tests/meson.build | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/tests/meson.build b/src/tests/meson.build
-index a19703288..50027d1f8 100644
---- a/src/tests/meson.build
-+++ b/src/tests/meson.build
-@@ -180,11 +180,6 @@ test_cases += [
-     'suite': 'compositor',
-     'sources': [ 'stage-view-tests.c', ],
-   },
--  {
--    'name': 'anonymous-file',
--    'suite': 'unit',
--    'sources': [ 'anonymous-file.c', ],
--  },
- ]
- 
- if have_native_tests
--- 
-2.34.1
-
diff --git a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch b/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
deleted file mode 100644
index 98b58d3dfeff..000000000000
--- a/x11-wm/mutter/files/mutter-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From db854a8588c1164df2f54c5718930aadf353b948 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 18 Aug 2022 10:41:01 +0100
-Subject: [PATCH] backend/native: Don't warn on EACCES if headless
-
-Since commit 1bf70334 "tests/runner: Make test runner use the headless
-backend", tests are run with the native backend in headless mode, which
-will attempt to open each GPU and show a warning (fatal during tests)
-if it cannot.
-
-However, in headless mode we might not be logged in on any seat (for
-example we might be logged in via ssh instead), which means we might
-legitimately not have permission to use any GPUs, even if they exist.
-Downgrade the warning to a debug message in this case.
-
-Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2381
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2584>
-(cherry picked from commit 64a67aa00bfe54fe7219d7f581950897fcbf9a75)
----
- src/backends/native/meta-backend-native.c | 35 +++++++++++++++++++----
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
-index 224538787..a2babb4b0 100644
---- a/src/backends/native/meta-backend-native.c
-+++ b/src/backends/native/meta-backend-native.c
-@@ -514,8 +514,20 @@ on_udev_device_added (MetaUdev          *udev,
-   new_gpu_kms = create_gpu_from_udev_device (native, device, &error);
-   if (!new_gpu_kms)
-     {
--      g_warning ("Failed to hotplug secondary gpu '%s': %s",
--                 device_path, error->message);
-+      if (meta_backend_is_headless (backend) &&
-+          g_error_matches (error, G_IO_ERROR,
-+                           G_IO_ERROR_PERMISSION_DENIED))
-+        {
-+          meta_topic (META_DEBUG_BACKEND,
-+                      "Ignoring unavailable secondary gpu '%s': %s",
-+                      device_path, error->message);
-+        }
-+      else
-+        {
-+          g_warning ("Failed to hotplug secondary gpu '%s': %s",
-+                     device_path, error->message);
-+        }
-+
-       return;
-     }
- 
-@@ -552,9 +564,22 @@ init_gpus (MetaBackendNative  *native,
- 
-       if (!gpu_kms)
-         {
--          g_warning ("Failed to open gpu '%s': %s",
--                     g_udev_device_get_device_file (device),
--                     local_error->message);
-+          if (meta_backend_is_headless (backend) &&
-+              g_error_matches (local_error, G_IO_ERROR,
-+                               G_IO_ERROR_PERMISSION_DENIED))
-+            {
-+              meta_topic (META_DEBUG_BACKEND,
-+                          "Ignoring unavailable gpu '%s': %s'",
-+                          g_udev_device_get_device_file (device),
-+                          local_error->message);
-+            }
-+          else
-+            {
-+              g_warning ("Failed to open gpu '%s': %s",
-+                         g_udev_device_get_device_file (device),
-+                         local_error->message);
-+            }
-+
-           g_clear_error (&local_error);
-           continue;
-         }
--- 
-2.35.1
-
diff --git a/x11-wm/mutter/mutter-42.5.ebuild b/x11-wm/mutter/mutter-42.5.ebuild
deleted file mode 100644
index 4ded64a18383..000000000000
--- a/x11-wm/mutter/mutter-42.5.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXi-1.7.4
-	x11-libs/libXtst
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=x11-libs/libxkbcommon-0.4.3[X]
-	x11-libs/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb:=
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.21
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/python-dbusmock[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
-	"${FILESDIR}"/${PN}-42.4-backend-native-Don-t-warn-on-EACCES-if-headless.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-43.1.ebuild b/x11-wm/mutter/mutter-43.1.ebuild
deleted file mode 100644
index 7da49c14e5e5..000000000000
--- a/x11-wm/mutter/mutter-43.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
-REQUIRED_USE="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
-DEPEND="
-	>=media-libs/lcms-2.6:2
-	>=x11-misc/colord-1.4.5:=
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
-	>=dev-libs/glib-2.69.0:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	>=x11-libs/libxkbcommon-0.4.3
-	x11-libs/libICE
-	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	gnome? ( gnome-base/gnome-desktop:3= )
-	media-libs/libglvnd[X]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	systemd? ( sys-apps/systemd )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.26
-		>=dev-libs/wayland-1.21.0
-		x11-libs/libdrm
-		>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.18.0:=
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232
-		>=virtual/libudev-232-r1:=
-	)
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	doc? ( >=dev-util/gi-docgen-2021.1 )
-"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-#	X? (
-DEPEND+="
-		>=x11-libs/libXcomposite-0.4
-		x11-libs/libXcursor
-		x11-libs/libXdamage
-		x11-libs/libXext
-		>=x11-libs/libXfixes-3
-		>=x11-libs/libXi-1.7.4
-		x11-libs/libXtst
-		x11-libs/libxkbfile
-		x11-misc/xkeyboard-config
-		>=x11-libs/libxkbcommon-0.4.3[X]
-		x11-libs/libXrender
-		>=x11-libs/libXrandr-1.5.0
-		x11-libs/libxcb:=
-		x11-libs/libXinerama
-		x11-libs/libXau
-"
-#	)"
-
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-
-	!<gui-libs/gtk-4.6.4:4
-	!<x11-libs/gtk+-3.24.34:3
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-BDEPEND="
-	dev-util/wayland-scanner
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
-		')
-		app-text/docbook-xml-dtd:4.5
-		x11-misc/xvfb-run
-	)
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
-)
-
-python_check_deps() {
-	if use test; then
-		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
-}
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use systemd)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		-Dlibgnome_desktop=true
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dsound_player=true
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(meson_use doc docs)
-		$(meson_use test cogl_tests)
-		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
-		-Dnative_tests=false
-		$(meson_use test clutter_tests)
-		$(meson_use test tests)
-		-Dkvm_tests=false
-		-Dtty_tests=false
-		$(meson_use sysprof profiler)
-		-Dinstalled_tests=false
-
-		#verbose # Let upstream choose default for verbose mode
-		#xwayland_path
-		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
-		#xwayland_grab_default_access_rules
-	)
-
-	if use wayland && use video_cards_nvidia; then
-		emesonargs+=(
-			-Degl_device=true
-			-Dwayland_eglstream=true
-		)
-	else
-		emesonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
author	V3n3RiX <venerix@koprulu.sector>	2023-01-03 20:27:24 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-03 20:27:24 +0000
commit	27e5574c9ed56a2633e25f7fa8f591554266a1b4 (patch)
tree	eafae39b8faa55ceb7cc8100d5d03a2dfc9b7842
parent	5aede38e7304fc5c3bd8a2034b25758b15a19fa0 (diff)