From 3c54b2473c5fb6fe0fc543b15fc4678471922cb1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 21 Jul 2022 08:43:51 +0100
Subject: gentoo auto-resync : 21:07:2022 - 08:43:51

---
 gnome-base/Manifest.gz                             | Bin 5047 -> 5044 bytes
 gnome-base/gnome-control-center/Manifest           |   2 -
 .../gnome-control-center-42.1.ebuild               | 174 -----------------
 gnome-base/gnome-desktop/Manifest                  |   3 -
 .../gnome-desktop/gnome-desktop-42.1-r300.ebuild   |  80 --------
 .../gnome-desktop/gnome-desktop-42.1-r400.ebuild   |  73 --------
 gnome-base/gnome-keyring/Manifest                  |   2 -
 .../gnome-keyring/gnome-keyring-40.0-r1.ebuild     |  79 --------
 gnome-base/gnome-settings-daemon/Manifest          |   2 -
 .../gnome-settings-daemon-42.1.ebuild              | 147 ---------------
 gnome-base/gnome-shell/Manifest                    |   6 -
 .../gnome-shell/files/42.1-polkit-g_autoptr.patch  |  53 ------
 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild  | 206 --------------------
 gnome-base/gnome-shell/gnome-shell-42.1.ebuild     | 203 --------------------
 gnome-base/gnome-shell/gnome-shell-42.3.ebuild     | 208 ---------------------
 gnome-base/gvfs/Manifest                           |   4 -
 gnome-base/gvfs/gvfs-1.50.0.ebuild                 | 149 ---------------
 gnome-base/gvfs/gvfs-1.50.1-r1.ebuild              | 149 ---------------
 gnome-base/librsvg/Manifest                        |   2 -
 gnome-base/librsvg/librsvg-2.54.3.ebuild           | 109 -----------
 gnome-base/nautilus/Manifest                       |   2 -
 gnome-base/nautilus/nautilus-42.1.1.ebuild         | 114 -----------
 22 files changed, 1767 deletions(-)
 delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
 delete mode 100644 gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
 delete mode 100644 gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
 delete mode 100644 gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
 delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
 delete mode 100644 gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
 delete mode 100644 gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
 delete mode 100644 gnome-base/gnome-shell/gnome-shell-42.1.ebuild
 delete mode 100644 gnome-base/gnome-shell/gnome-shell-42.3.ebuild
 delete mode 100644 gnome-base/gvfs/gvfs-1.50.0.ebuild
 delete mode 100644 gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
 delete mode 100644 gnome-base/librsvg/librsvg-2.54.3.ebuild
 delete mode 100644 gnome-base/nautilus/nautilus-42.1.1.ebuild

(limited to 'gnome-base')

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index bc8a83128e67..1e0c62ad83b9 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index a651d3535f26..807cb5389e9d 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,6 @@
 DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
-DIST gnome-control-center-42.1.tar.xz 6239960 BLAKE2B ba539267a00bca7218a8088fba1c2790d26239ea57ef45cdbbe6b54b687b30ab15ec4ced0078d9fab48a7d6d8fd9e966ffa3dd92bcae164d99a5e64c458e5852 SHA512 a29df2604d90e42a602060a7042d70238eed9e59c46b500610c6b5842e015ba0d9567528a3dfd6bf365973f274de47ccd4b8f2f50cfa35c8f88bb05cb31e774d
 DIST gnome-control-center-42.2.tar.xz 6240632 BLAKE2B 976a07c1351e629ede3c8dc4f02ce98d93398450ff64af15775800d819c7dcddca43837a4eac6bfb8263a6cd8b2dbe7523a90576dece9959e32a7307f6884e1c SHA512 f8fda1a501939788de62a33d1570e45b95392165d23f90cb4c1ae94c92f61d5f5d72d1e25df1a9fb355ea88abecf7bf38bc67c69fb2b3495d027365deb44f21c
 DIST gnome-control-center-42.3.tar.xz 6242028 BLAKE2B 8b757e3286acb2b40732ce601d63be4de0fe0f16fec652e3be83b6c7ed6718d89b6e15608d29ce3f295453510b8986ea410c0de96bb0d9dabb4f3b9c77c2fae5 SHA512 eb82f65b580637fa057196daed836b3ea24a223b9932a2063b2879357f8a62626a6939835dc165a6d3c5706d16b99192301d4de021e68faaabb8d2ecc2a317a3
-EBUILD gnome-control-center-42.1.ebuild 6055 BLAKE2B 370738c28df978c2a34082910b872fcae15084439963fd82e1b37ccf24f9bd6511f819af5c315fb66bdee0e905e2862d623261bcc31d9274799b7a69d139a851 SHA512 b10d5dfff1efdb878a6850eaae0ea7f63e46307bf7bbf3b167311bcbf642307c62bfb55468b59fa349182cbf51e717295d08d9e2bcdc2bb345e2f522161e65a2
 EBUILD gnome-control-center-42.2.ebuild 6040 BLAKE2B 9581684ba42d915ec4e0366fe27e5f883079cbefdf3423bcbfde4a24d3fc62938f0754f5a089cc911f14b609e9af08cbff788cc9d1ce625166f1212edd97a80e SHA512 8042d47b418776ccae8a55820fb6051e24764f52d20c9e0df989c3889d834cc9882eae18720f62236a53b0424da7992ebc1f507a788c2c1f35c983fb3b3eef0d
 EBUILD gnome-control-center-42.3.ebuild 6083 BLAKE2B 53e4e9e24d2470ee686aa6664b934c97fd51a13721808142b6abe3c2928ac2f324e70a0ed8da40037cf1be21b0c6bef8e0a6241c5a2f5b0957bec75c6276452f SHA512 172471de8bc1ee8d950e4653205cd2ef3f82695dcb46723379a91f6c7239fac21c782f16a3ab0c513e5d7f349050dc92bd186a97fae6216ad763310827889d1b
 MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
deleted file mode 100644
index 0108ced00471..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
+++ /dev/null
@@ -1,174 +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 xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-42.0-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
-	>=media-sound/pulseaudio-2.0[glib]
-	>=gui-libs/libadwaita-1.1:1=
-	>=sys-apps/accountsservice-0.6.39
-	>=x11-misc/colord-0.1.34:0=
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=dev-libs/glib-2.56.0:2
-	gnome-base/gnome-desktop:4=
-	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
-	>=gnome-base/gsettings-desktop-schemas-42_alpha
-	dev-libs/libxml2:2
-	>=sys-power/upower-0.99.8:=
-	>=dev-libs/libgudev-232
-	x11-libs/libX11
-	>=x11-libs/libXi-1.2
-	media-libs/libepoxy
-	app-crypt/gcr:=
-	>=dev-libs/libpwquality-1.2.2
-	>=gui-libs/gtk-4.4:4[X,wayland=]
-	>=sys-auth/polkit-0.114
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	networkmanager? (
-		>=net-libs/libnma-1.8.36
-		>=net-misc/networkmanager-1.24.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	bluetooth? ( net-wireless/gnome-bluetooth:3= )
-	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
-	kerberos? ( app-crypt/mit-krb5 )
-
-	x11-libs/cairo[glib]
-	>=x11-libs/colord-gtk-0.3.0
-	media-libs/fontconfig
-	gnome-base/libgtop:2=
-	>=sys-fs/udisks-2.1.8:2
-	app-crypt/libsecret
-	net-libs/gnutls:=
-	media-libs/gsound
-"
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( app-admin/openrc-settingsd
-		sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	>=gnome-extra/gnome-color-manager-3.1.2
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
-	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.2
-	x11-base/xorg-proto
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep '
-		dev-python/python-dbusmock[${PYTHON_USEDEP}]
-	') )
-"
-
-PATCHES=(
-	# Patches from gnome-40 branch on top of 40.0
-	# Makes some panels and dependencies optional
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	use test || return 0
-	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	# Mark python tests with shebang executable, so that meson will launch them directly, instead
-	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
-	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use bluetooth)
-		-Dcups=$(usex cups enabled disabled)
-		-Ddocumentation=true # manpage
-		-Dgoa=$(usex gnome-online-accounts enabled disabled)
-		$(meson_use ibus)
-		-Dkerberos=$(usex kerberos enabled disabled)
-		$(meson_use networkmanager network_manager)
-		-Dprivileged_group=wheel
-		-Dsnap=false
-		$(meson_use test tests)
-		$(meson_use debug tracing)
-		$(meson_use input_devices_wacom wacom)
-		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
-		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
-		-Dmalcontent=false # unpackaged
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 10119c4750f1..1a48198c3f9b 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,9 +1,6 @@
 AUX 42.0-meson-Add-optionality-for-introspection.patch 3275 BLAKE2B f3629eab79b830397646ea855991daf5d61a9bb992262deb452e32a19e1564be20f98dfa49f8b08f6ca6a36b69fe44e46bee16b23533a27d089b77e2ae524a07 SHA512 9982e691e080dfa03c5ee6038b9a3a0e47521272240082d0da1ebf00c75f958d60c5d764ebae580415489e39b18ee77bb0c99587d32b4575ae0495fc88793c83
-DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab8888ab0837c650f3e6bad600a4327cdba02b3fbf7cf7ff845669075cbb56b69ca600b8b63b4f05dce93b0a71e76cedbd7 SHA512 a084f705aedf2d159da91dc54f38261760a50e51041321e6a69ee0dff499e11f0a440f5a9582a31977b0270c87e3ba7de0f5c9cc182c0631858afa1d9508ecf4
 DIST gnome-desktop-42.2.tar.xz 743268 BLAKE2B 8f8ee5ada3bf8b11f9bd6ddfa9925d50ccc22bb3b02f4cd8caefefe76b162347dbddb5de0d6200768e0bcaf6b60c6c774155dfc3767a827c575c48ddc40380a3 SHA512 6c7d90b539b80e45f729a14dd8bf553abb09f20d16e1a2cda751b81f1e2a52e2dcb98551faab3cd4ad17206300f45c9bc968d160fddab0b71a4933f0adc22e0e
 DIST gnome-desktop-42.3.tar.xz 743196 BLAKE2B bd2c8fc49bec5b40f48f5f85311a1566fd996b2f330dcd8d3b00c2331f4800ec58b7d0281be79d29e859c8731664c6953a9ee27af92ee091d621964ac4eb51b0 SHA512 aa8e492fc09bc409619747ad53dbfd13b80251dc849db9a82fcf15c2373582af9a89f769302c8ae12330580f4a7d068f22f7fce4c42983e7848acbcd9be09d15
-EBUILD gnome-desktop-42.1-r300.ebuild 1934 BLAKE2B 6920f1ce50aa1edd89676b5be034d01c8d71df6e687dddea1db296064ab63549448ebde729705710ea0a17756855261efbd5c0ee07e733e2c2181d3ba4693b7e SHA512 d16202197817d69c3280f703f287218c8af3e16ecb05a2e165a5018258009a61dfb723c6994272ee2ac67c7220f7584ec176be33d1938a589de062d283eef2d1
-EBUILD gnome-desktop-42.1-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
 EBUILD gnome-desktop-42.2-r300.ebuild 1930 BLAKE2B 8ff065ab7b72b046349107f4b86a326500a28d64f34fb1b4e95876eb2d6261b1aaa94a2eed2f5ed7dbc863d097a4a75992334f7dd89e47162d7ad0679d994356 SHA512 3a97c4bc9211a9d362291d8dfae6811d2de4424bcfd296eeebde7087c1345d02367464636f628a8e3bb14c82d951c2ce30a7bf6280d77b220f0a8bcabbb7462f
 EBUILD gnome-desktop-42.2-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
 EBUILD gnome-desktop-42.3-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
deleted file mode 100644
index 213db2dcf6c5..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-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.1-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
deleted file mode 100644
index ce09a049440c..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
+++ /dev/null
@@ -1,73 +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 +introspection 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:=
-	introspection? ( >=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
-"
-
-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=true
-		$(meson_use debug debug_tools)
-		$(meson_use introspection)
-		$(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-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 5a216d016db9..502d03cc9250 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
 DIST gnome-keyring-42.1.tar.xz 1346284 BLAKE2B ff6093cc16c649cda1e6cc2848c2198a502d8aa20a56f0a4dca00550e99f18820028427a7ec3979b6871648a7931da19fced3210558d5ca3de47983b7c94452d SHA512 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57
-EBUILD gnome-keyring-40.0-r1.ebuild 2163 BLAKE2B 485eba5ca1fb6af6c8df505277098f8c1b8ba385424f45a1810a2207697ec3ccba6d911a26a24dda5282807b4e5a35d3165aac310d5782755b373f62ec79753c SHA512 533a1d220e18f940c9558ac88cff1377826ecdb197b3104d60a5df2ae546c4d36ac40861f8615bb52f98171773ae8a11c918e5987ba6f0a0b750591c112ebc69
 EBUILD gnome-keyring-42.1.ebuild 2195 BLAKE2B e64a90d92cc44ee814758efe57c8a5c5ef28dab396896633cfe66a2b3e1549910ed900db1d2bb3facdf677bcfb7193951cb49dfb13a5bfb97bc14ab269fd3a18 SHA512 b0a6acd4b1e893945de8dc838202e79742fa178bbdf6900b3b341e1958a5307adcdb4ecc6cea6e5468a77c2f6cca3349e2092e6bdac7a45e1c436f0edba7074a
 MISC metadata.xml 884 BLAKE2B 7453133f82b652fce07202db1a10c488a32355dd9398847e3d2f7d1cc62ad466c25febb6713318ba6d77d006e3f87b15c593c5020d1f187e2d7704a4c676dade SHA512 d5419c6a5b09fc57cb877210e59f82717374ea5ca7914fe305b2f3625e190c4438f76b24503698dffd00633ba17bcd70a0068765284ccfab730c5b7e8c1b768d
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-40.0-r1.ebuild
deleted file mode 100644
index a039095d65fe..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-40.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=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 pam python-any-r1 virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="pam selinux +ssh-agent test"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.27.90:=[gtk]
-	>=app-crypt/gnupg-2.0.28:=
-	>=app-eselect/eselect-pinentry-0.5
-	app-misc/ca-certificates
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	pam? ( sys-libs/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	ssh-agent? ( net-misc/openssh )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--without-libcap-ng \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	# Needs dbus-run-session to not get:
-	# ERROR: test-dbus-search process failed: -6
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	GSETTINGS_SCHEMA_DIR="${S}/schema" virtx dbus-run-session emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng, but that breaks with glib-2.70
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 195d4e883e09..5fa95be63de8 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -2,9 +2,7 @@ AUX 42.1-build-Make-wacom-optional-and-controllable-via-meson.patch 1759 BLAKE2B
 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.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141
 DIST gnome-settings-daemon-42.2.tar.xz 1483864 BLAKE2B c2051f129e66df8ca55eb72b0c3a037275c89d3c519fe01822aa4ad2309af9a27e840f4f797a8ecac8e0767d8e7894ffe9c5942840b0ca57536325e3cbe12617 SHA512 66f1e766a7d1c36d4609c9505ba5d99516505ecfc5123483a3cbc6189d21cce23abf26da067bf9c05c3c25bc96d4568a8b07477f0722b0cb9442085f6d886e5c
-EBUILD gnome-settings-daemon-42.1.ebuild 3907 BLAKE2B 17b1f98a007a8f0fc2963525bc7c9c13732c00b6ce698d17bde31a8791b45ff2a2ae4fb381d3f91f8ef3736878d4427e3e5659a2eb7b045703fdaec7842a92c2 SHA512 ebf63538d7317c8bb81a0191df08d3902033402154b49fc54c4633be3e6e931a08191b09a83c2aae77e9e6c479cd9717fcd41e4c3a974a46e844199ca32040d1
 EBUILD gnome-settings-daemon-42.2-r1.ebuild 3626 BLAKE2B 3b25e3a7da9114a6137e3eccb650d491a414aee8414633dc7531a1ba95a1a7136077595f320cdeb58871ef2296217bd9563dcfdcbf03c1d7005bc9f8ef856305 SHA512 94d4e45b6be00ed81b2a4de2f445f53a274e7340f39efba87a1eb1cb8e170c024938ddfffe4496570391604f1a51324da06c53c8f4c9dc24688f8e7a3a5e21ff
 EBUILD gnome-settings-daemon-42.2.ebuild 3920 BLAKE2B 93b78ad11aa13b25927dcd2d836c0a68e1582baac03db3fbda241da4e9c70ad7fd6dcacbeea459ad502f3f6e4727a59b6ad3bd4c07499a87151d101c09a6234a SHA512 d458a43c6d902a3c59141c7621cfe771d9aa65b6d80a4673b2330ce499b4cd7e74541e3947f5a804395762d6347555eb4bddd09094bb01f3d0fd4f97f953df3d
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
deleted file mode 100644
index 51c1ef9c0852..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
+++ /dev/null
@@ -1,147 +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 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"
-
-DEPEND="
-	>=sci-geosciences/geocode-glib-3.10
-	>=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=
-	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:=
-		>=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
-# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter)
-RDEPEND="${DEPEND}
-	gnome-base/dconf
-	elogind? ( sys-auth/elogind )
-	!<gnome-base/gnome-session-3.33.90
-	!<gnome-base/gdm-3.33.90
-	!<gnome-extra/gnome-shell-extensions-3.34.1
-	!<gnome-base/gnome-flashback-3.33.1
-"
-# 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
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
-		has_version "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() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 748a01b7f891..5670bf2ff291 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,13 +1,7 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
 AUX 42.0-optional-bluetooth.patch 2032 BLAKE2B 635ba18f5bb5ca0c9f44fe11c2b52652355e1de4647c277524e3f19ef6d57870e75f32b8a2be10eb4e3be4ecf885765b8f0899ab71906f71324795763effa23a SHA512 5fb17c6ffd0486e43b5451747b346e5e9feb3f918f4ef23adc517c43bf61eb5b8850b03022e84848e446de1f0b2145a9dd2b954dde9994e9da176559cd6e48a8
-AUX 42.1-polkit-g_autoptr.patch 1760 BLAKE2B d1d873af81e9b7641f0f2627c4c38cfa281f8ebb50b96af0c8bd6b71ee675d69865565d365e18b8cc09e1345239165cf1eed6bf9c130a68267c133e334a87381 SHA512 0b1bb7e984f9e714d6225c6016299abfe6d9b5b7ff1fb06bfa2f0a88d5191eb2fd3690f0ed1e8b1381440daf2896d17a9ee44c4e42bab68a2cfd004539ac2bfd
-DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
 DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
 DIST gnome-shell-42.3.1.tar.xz 1927696 BLAKE2B f0f0e19dea02ccd1bb271af189d9a9e2bb3ebf47da2d68f4852de7a9dddb1c0db96f5371e0c6c421556ab8e242294115e041a433d68c79e6ef6607b1e7e85ff1 SHA512 f548a2aa1e0b56396efdcd7839091bdb8f44a605eddbf4411a5066f99adc38bf10b1a5eb984262bb44e04e96dce715d1481e807200d9ea9fdc91d111defb2fae
-DIST gnome-shell-42.3.tar.xz 1927500 BLAKE2B 942c1fcb374cbaa4542484d03ed09c196658a8b830a2c2a84dc112c56d6bdb6070de8d2f463f147f41803ff52d8f937444e6c7e2b704d636d872b2dc332444af SHA512 9c8d967f7a46a3a93f9f07b2e8cdeae698fd0de9fdd61ce5fff10b89e44a68eb7ae3a4ef72d5605bf5fc78d4fbd24ccad220306749c1886919ee4668feada729
-EBUILD gnome-shell-42.1-r3.ebuild 7490 BLAKE2B 5ac71aef32204d503da5369c6b2094e5f03591d514a5fe8087a338f537b244096c945fcc81c6ea76cd0bf510167e18e496c5840e8417b682651602f056505193 SHA512 447ea4e9af49dfa9e625caa81f80d6f2184d28ea7aeccb765d3b4b37e02d66c636793ec6793f7858361c85d0b2384c108cf9d105b0e747b9556e80245ac9f008
-EBUILD gnome-shell-42.1.ebuild 7353 BLAKE2B 6f9a84055d0e94cd98ee0bee5598f3f827d23969249b8d29ff4f29392699289c0bf23872a6dd74844627df66031b10bdc0157873aa12366fa52a44f437c7a25d SHA512 b274bc62c5869fb8c5dddd42aa93a783fa98f59523d7e5c9342799b14fbcd405650bf5b3b0eee590d8b9ca23869978fe12d1fac63dc4b84be11de4b3912af735
 EBUILD gnome-shell-42.2.ebuild 7412 BLAKE2B a939e9c4e5b5281d1d9e338d23af7a32cd851b0dfda0673b76444cb692d396eba00185912220a5699fc8b80a1a5609bcceebb8cb94dd57a08f3c86c210445ee0 SHA512 156fd9ae5b3fe0864f86ab41ab699ecd024456093b64869f03a815ea68704ff15d9adf5cf8c0d9cffc3c7bc1c36f6fcd284e4b3d929012cc5f904c89e592dc69
 EBUILD gnome-shell-42.3.1.ebuild 7465 BLAKE2B 3ebefa3fae1ce9f3abe3d7b36fae016bd86fdbfd2722a7f31b4cf88a930e42ef99d65ac289c315a2ad9fbcb8c92109c052046f6edb5be66da0b567a040d7d9ab SHA512 720f571efe2c789ffc7264a50f88fb28d6d12cbadca549691d9d8fed0718b03ac441af7a82f7a9c1f7d0b690f793787dd94ed699925087f8a51fde31abacd97d
-EBUILD gnome-shell-42.3.ebuild 7422 BLAKE2B 988acd4da43490621a669d155599be765e304002bfaacfefbacd4589e5428079f13a1ffb7431be051675b2ecd1c7f6692b02a45c095c85d1ecf829aa9acf0031 SHA512 43a8fe2f285cd06427c953082c9b22767b09766aa6cf06316612938f1773eb76cfcda406b85d7a75c233d7dc2151449f8eac58412887e00a57d943a1f3f581df
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch b/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
deleted file mode 100644
index 78d3de086260..000000000000
--- a/gnome-base/gnome-shell/files/42.1-polkit-g_autoptr.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75
-https://bugs.gentoo.org/844919
-
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 17 May 2022 15:36:43 +0200
-Subject: [PATCH] build: Do not redefine polkit autocleanup
-
-PolkitAgent recently added autocleanup functions itself, so check
-for their existence at configure time and only define our own when
-they don't exist upstream.
-
-https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5490
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2296>
---- a/config.h.meson
-+++ b/config.h.meson
-@@ -33,3 +33,6 @@
- 
- /* Define if fdwalk is available in libc */
- #mesondefine HAVE_FDWALK
-+
-+/* Define if polkit defines autocleanup functions */
-+#mesondefine HAVE_POLKIT_AUTOCLEANUP
---- a/meson.build
-+++ b/meson.build
-@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK',
-           cc.has_function('fdwalk')
- )
- 
-+polkit_has_autocleanup = cc.compiles(
-+  '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
-+  #include <polkitagent/polkitagent.h>
-+  void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }',
-+  dependencies: polkit_dep)
-+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup)
-+
- buildtype = get_option('buildtype')
- if buildtype != 'plain'
-   all_warnings = [
---- a/src/shell-polkit-authentication-agent.h
-+++ b/src/shell-polkit-authentication-agent.h
-@@ -14,8 +14,10 @@
- 
- G_BEGIN_DECLS
- 
-+#ifndef HAVE_POLKIT_AUTOCLEANUP
- /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */
- G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref)
-+#endif
- 
- #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type())
- 
-GitLab
diff --git a/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
deleted file mode 100644
index 5cee4f6b828c..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-42.1-r3.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..10} )
-
-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"
-
-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[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.71.1
-	>=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
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-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
-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]
-	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 <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
-"
-# 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/chrome-gnome-shell )
-"
-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
-
-	# Upstream backport, bug #844919
-	"${FILESDIR}"/42.1-polkit-g_autoptr.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-42.1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
deleted file mode 100644
index b17edeaa6984..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
+++ /dev/null
@@ -1,203 +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-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-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[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.71.1
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-42.0:0/10[introspection,test?]
-	>=sys-auth/polkit-0.100[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
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-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
-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]
-	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-gtk
-"
-# 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/chrome-gnome-shell )
-"
-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-42.3.ebuild b/gnome-base/gnome-shell/gnome-shell-42.3.ebuild
deleted file mode 100644
index 4eb1bfeb86f9..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-42.3.ebuild
+++ /dev/null
@@ -1,208 +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"
-
-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:=[introspection]
-	>=dev-libs/glib-2.68:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.71.1
-	>=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
-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]
-	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 <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
-"
-# 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/chrome-gnome-shell )
-"
-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/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 63a2cf32147d..d428ba6310f5 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,10 +1,6 @@
 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.0.tar.xz 1213456 BLAKE2B a560794677693f449fd71f314d18a8ad8bb38ce6ac6eb312d020fd4ed2b55c9e1939cecc993869b3f489c0ebddfa057bf76af04e6c6f700323dc7b99fa052af1 SHA512 6eea3c59b239fe9674a83db4e182c0ea2ab7d56e29f5d5c4a7af9cb3cb0fd9222721796754f2f502291049c158e8bd3771cbc5262d10bfa684c207cb3281dcce
-DIST gvfs-1.50.1.tar.xz 1214536 BLAKE2B 678c89d08255e577afb3a4999cef341fc5449c5ab615c5e089b14cbd2d0a882830dff71af6ab7a978d8b23a3aaeea197badd21d8c4e702588e626f3b4d917c55 SHA512 7a1ea47658dbd74673e1aea7c344d3f9e8a26fab844a26220cedcb19da6b4a0cac6b369d2b5107f649d6e7b2331894c89df04c6dce3630be4b289e23f56127a5
 DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
 EBUILD gvfs-1.48.1-r1.ebuild 3917 BLAKE2B 06f752d9d82ec7144e6957ee018fc86228952c8c50428e13d9df121455ff1b1d7d7afd3f8bdda4393d30bcdb2e3b6c26f028901269262930d1f59e80aebfbed7 SHA512 0a542600b93a05ccc4ad3f10d20bcdf05d15c0757a19008e524ce5ba0d64a1ce79b33733987794799180f1a957e7d812e092de17ea9056f826a0baae614fc553
-EBUILD gvfs-1.50.0.ebuild 3905 BLAKE2B 4f4815a8cc27343fbfb67b7b04d60a52d121587653d56905f076956a1cf97fdb87bec0825bf9851f89cc74f7140089c6d50aceb4b243833c748119aa13ce10b1 SHA512 d12ec5475e7909f3397e852c20e06e01c2189fdc12625a8fa81ff79b2205323b2e22bd85d799304cca39360ca9097cf6cbbf45d7708f5ebc82d9c8fd9d34cb19
-EBUILD gvfs-1.50.1-r1.ebuild 3907 BLAKE2B 2c5989a41a1453c73c4526f9529dacb871e72e0ed63aa4abff722c4c9aa86f8e50ece57d88019c18606bccb9c124d201c978e19d16be694e4192fee12b6f8497 SHA512 5ef9b6478d8455062a4e157dae80369a15ba76e91b240eb60a3283908d68f195150ac9c4e0821fbcec74c290a8c55d59cba607629d1421f97019df85666ffa83
 EBUILD gvfs-1.50.2.ebuild 3907 BLAKE2B 76543ae5eb141f67c50c70b0a409e3782fae78663daa2f3de9a64c86a0ff61998254d333acdea7308b85b49aee7eb469fad55a2b7a15c8c5c4f01cf60dc2b5c4 SHA512 d60b23ea3c2dfa6d6e3f9fcb3002726ef80d94a4c50ae8936a987d36e3469a029a491b00dacf8148060d4de602c9bfef760ddfab050d3351a07099a0965e29fb
 MISC metadata.xml 1700 BLAKE2B af3b3595b38c93739128edb4678d17d1166b91abf851098b892c7240bff0f98886bd39a1bd85a218a8378dc9f7df9759e4ced4ce8183b652f6e1d27900e22220 SHA512 7b4f4d8abda474c6670d3ef278801d61d285ba48b07f7023ddee5eaba01ed695edd16ed946afa5c90baf394e87b3bfff6135380e4f3698e188a209f954b6cabb
diff --git a/gnome-base/gvfs/gvfs-1.50.0.ebuild b/gnome-base/gvfs/gvfs-1.50.0.ebuild
deleted file mode 100644
index 61a64ed1d03f..000000000000
--- a/gnome-base/gvfs/gvfs-1.50.0.ebuild
+++ /dev/null
@@ -1,149 +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.70.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap
-	)
-	http? (
-		dev-libs/libxml2:2
-		>=net-libs/libsoup-3.0.0:3.0
-	)
-	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 )
-"
-
-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
-		-Dprivileged_group=wheel
-	)
-	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/gvfs/gvfs-1.50.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
deleted file mode 100644
index 0d640c04c48c..000000000000
--- a/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
+++ /dev/null
@@ -1,149 +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 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.70.0:2
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	sys-apps/dbus
-	app-crypt/gcr:=
-	policykit? (
-		>=sys-auth/polkit-0.114
-		sys-libs/libcap
-	)
-	http? (
-		dev-libs/libxml2:2
-		>=net-libs/libsoup-3.0.0:3.0
-	)
-	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 )
-"
-
-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
-		-Dprivileged_group=wheel
-	)
-	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/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 86ae373674ee..f7839f209439 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,8 +1,6 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.54.3.tar.xz 28215048 BLAKE2B 3685b9c0eb923874e6829c365f437095b595ccea997b7b1411ab82117d09b84261241594959a049bd712fc0791d359c6bf536acfe022c44bcbd7804a2a59ef28 SHA512 153bb9d5b2e04ac87127663ab2cae1ae9e3c23666e54234efb3e247a6c3fdd67701f8baa31e06bba673c0cfc71202001c46fb8e0398770dfbc59e10f6de78077
 DIST librsvg-2.54.4.tar.xz 28214908 BLAKE2B 9aab1175494e50c9b4a1b74c76c0db4f052e42d98e48842c87a5434382983fc63f41923c67dc86c31988c114c4a18056d52a99c8ac2d5c1dd90af3da4814e4ac SHA512 e3415044a4faa48ec83e25cbd86dfbe7bc997286269298fb913a61a13d55195f660bcef459950979c2b8d60b144b29e33b278b2c4da0c376de65c34f39687e9a
 EBUILD librsvg-2.40.21.ebuild 2607 BLAKE2B e1c974514e0deb7c81ff027747a00bb8bfb1902a140711a7207e4d126c59ef5ebc0252cb64c6ff379822db65bcf3b60992ec72accf3d1d3d6681ea65d1df6b49 SHA512 a2ba181144cb049e66af4743e1b84ff3865d7aed0b4c1f06c985616fb1fc72f39845926def6b81fafef041f59bbaa8b136782be1de99127af651d2b916724ed4
-EBUILD librsvg-2.54.3.ebuild 2809 BLAKE2B 732ecd76072d64e43e9f48e44bc2d7ef30196dd688d60aac56b141385aa2f163ae3af8a1e0f456fce8a747fd8cd592fd0ebc5557db810e84c2f326dbb34b3d83 SHA512 1fa43b593333ee9ad9187a791a59988240fca44d3db2880ee4324b3a917054bc8cd2b9bdcf51a22da1f7b69cc4504abe60b8f010598142a94aa11a6f0b21b5cf
 EBUILD librsvg-2.54.4.ebuild 2765 BLAKE2B 7daa13c608be61bbc3cc872d37d2d84e1e540e4b8227354e4d1bd9293ecba56286310ffced20063b281ec2e8f4f49770a2ec3967ebf2d55368f076268d280fe8 SHA512 9c8780cbbfd1b5d2c4ffe516e38033de0c795c599f2b2cfd07fec53fa17e3c36acd73f969bfe5253a8156ff68d5770028faa5766bb5168130d998df58908a4c3
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/librsvg-2.54.3.ebuild b/gnome-base/librsvg/librsvg-2.54.3.ebuild
deleted file mode 100644
index 8ef771052666..000000000000
--- a/gnome-base/librsvg/librsvg-2.54.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes # for patching configure.ac
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit gnome2 multilib-minimal python-any-r1 rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-IUSE="gtk-doc +introspection +vala"
-REQUIRED_USE="
-	gtk-doc? ( introspection )
-	vala? ( introspection )
-"
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-RDEPEND="
-	>=x11-libs/cairo-1.16.0[glib,svg,${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
-	>=virtual/rust-1.56[${MULTILIB_USEDEP}]
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	gtk-doc? ( dev-util/gi-docgen )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-"
-# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
-
-QA_FLAGS_IGNORED="
-	usr/bin/rsvg-convert
-	usr/lib.*/librsvg.*
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-static
-		--disable-debug
-		$(multilib_native_use_enable gtk-doc)
-		$(multilib_native_use_enable introspection)
-		$(multilib_native_use_enable vala)
-		--enable-pixbuf-loader
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# Set the rust target, which can differ from CHOST
-			RUST_TARGET="$(rust_abi)"
-			# RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
-			# far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
-			cross_compiling=yes
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-
-	if use gtk-doc; then
-		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
-		mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
-	fi
-}
-
-pkg_postinst() {
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 04409a3418e4..5509211a19a7 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,7 +1,5 @@
 AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459
 AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155aa36bbc9234f4c5bf6baddd7f91d69e2713172685687a0bbf8fc646a97df857cfbce2a73768beb4eb5dae32ace893d07 SHA512 5f90d946c7bea63da2ca20397b0606747383b781dc972051082596d4fd0522a22c0d40440129e41ff4faeb5e9fcdfc5abb14318a9dade5b0343003bf86c7e339
-DIST nautilus-42.1.1.tar.xz 3259444 BLAKE2B 4737c44a6b30c61eeb850dce266f5ee1ed50dd5f2c7da868efb4b407e60a99b1ac0ea2c865a3e4710afabfa8c96c8d29f2dfaab3c56c5ef0236fa0c10a8c1864 SHA512 f8961c41fa2d5109e7011311f79caa1d3b9b71a3cf946a90d1a4dd03a4f0f7daac902e61bc01f6b86c2552255b9dbe0573474dcfe2ea08e0218a3c2bcbc58e48
 DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
-EBUILD nautilus-42.1.1.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
 EBUILD nautilus-42.2.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-42.1.1.ebuild b/gnome-base/nautilus/nautilus-42.1.1.ebuild
deleted file mode 100644
index 8cb207e691f8..000000000000
--- a/gnome-base/nautilus/nautilus-42.1.1.ebuild
+++ /dev/null
@@ -1,114 +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 readme.gentoo-r1 virtualx xdg
-
-DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-3+ LGPL-2.1+"
-SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-libs/glib-2.67.1:2
-	>=media-libs/gexiv2-0.14.0
-	gstreamer? ( media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-	>=app-arch/gnome-autoar-0.4.0
-	>=gnome-base/gnome-desktop-3.0.0:3=
-	>=gnome-base/gsettings-desktop-schemas-42
-	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
-	>=gui-libs/libhandy-1.5.0:1
-	>=x11-libs/pango-1.28.3
-	selinux? ( >=sys-libs/libselinux-2.0 )
-	>=app-misc/tracker-3.0:3=
-	x11-libs/libX11
-	>=dev-libs/libxml2-2.7.8:2
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-3.0:3=
-" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.51.2
-	>=dev-util/meson-0.57.2
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.10
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk(+)]
-" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
-
-PATCHES=(
-	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
-	"${FILESDIR}"/42.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
-)
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Disable test-nautilus-search-engine-tracker; bug #831170
-	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
-		$(meson_use gstreamer) # gstreamer audio-video-properties extension
-		$(meson_use introspection)
-		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
-		-Dpackagekit=false
-		$(meson_use selinux)
-		-Dprofiling=false
-		-Dtests=$(usex test all none)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	meson_src_install
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
-- 
cgit v1.2.3