diff --git a/Manifest.files.gz b/Manifest.files.gz
index 36d2093c8b77..a21d365e33fb 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index daf57ac9e4c6..4c7fe2efcd23 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 048cbaa3471e..4252929f87b8 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1 @@
-DIST at-spi2-core-2.38.0.tar.xz 190540 BLAKE2B 6c5c479c279285460a5ff80533d600b5173fe9bedacfa1522bc37da4a305b965cec2c677eaae8be809ed1a5fd8aaef6475fd27b80510efd1c530e46368e954af SHA512 3a1eb27cff6e0dd03119b4f8361a3b6037b26c511e80e2d003d1d5c41fede6d49eb5e0ac1ee45cfb4f3ca8e53292a7e2da67df80be28e77014775e41777a96c1
-DIST at-spi2-core-2.40.0.tar.xz 197080 BLAKE2B 56c0ca8138b5178d713851ffb9a9299544a65708a3e5bf37b1e59e515bb30fccffd8b8cc9dea1e78c32a5d1fa3d21de506ef674c5e0ab8067a8ff5df206d349a SHA512 45f9123dac27982003e4c5e357ddaf31dbe945ff334bf1a7d02e81011b841bd69c717233e8b2d33abb6cfe16320bfe5893499f25d9f603cde5d11d63315e8725
DIST at-spi2-core-2.40.1.tar.xz 197064 BLAKE2B dfa19413e6688678fcc0c0ed76d0fca0d5de5039c9b1e42dc10c9c387c0cbffb3c6a38570f9e74c343fa86310f2c3f6fcf0e311c57d11b5adeac5faf7bdf9630 SHA512 fcb73e78a85db9b982ae10d8c968c7732079832877fa0214c30a04b9e27910448c3f5456b8628ed4a3d4dbd59037c8c206916ad1462ca5c7a44409a702096b14
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
deleted file mode 100644
index 6d76ea6b9014..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.38.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
- >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- )
-"
-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
-"
-
-PATCHES=(
- # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
- "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Dsystemd_user_dir="$(systemd_get_userunitdir)"
- -Ddocs=$(multilib_native_usex gtk-doc true false)
- -Dintrospection=$(multilib_native_usex introspection)
- -Dx11=$(usex X)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild
deleted file mode 100644
index a38a43100ab7..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.40.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
- >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.62:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- )
-"
-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
-"
-
-PATCHES=(
- # disable teamspaces test since that requires Novell.ICEDesktop.Daemon
- "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Dsystemd_user_dir="$(systemd_get_userunitdir)"
- -Ddocs=$(multilib_native_usex gtk-doc true false)
- -Dintrospection=$(multilib_native_usex introspection)
- -Dx11=$(usex X)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 62785f28e3ef..fd5464ad87f4 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,2 +1 @@
-DIST orca-3.36.6.tar.xz 3465112 BLAKE2B 227610b5a01027c292cf9a99ecc54f76ad6053d6923325825ed5f81183b39e1e38e70e7a7d88561f0b0c4d212f16465542d57bf4aeed2fa893b8893fa1d3dd49 SHA512 be2752267d46077310eccc4d76dc5e87ce8e1715cc33ff6f8f15b83c9891a2ba98a2d681f893c88df5b0c5ffd8a1ebadc3a4286debf0ff14ba17803d20f902db
DIST orca-40.0.tar.xz 3603368 BLAKE2B 3ac99f32ee496004e568ce61d5862591556bedfd8dc7ef1b707b62b120f1349ae38bbd427b0d3cc67c7be7334bcc46b067ee44a45c51bcdbdf15ee78c0243f64 SHA512 16e15b1cb4b5a2a3d14ddf9e9277e6b0c65e2ab0a7370fd8bfb830bee9d208ef6b5b3d0c19cc2ff6107f3b0cd41e8ae00881033645f7a309ca3ce65aebd73a1b
diff --git a/app-accessibility/orca/orca-3.36.6.ebuild b/app-accessibility/orca/orca-3.36.6.ebuild
deleted file mode 100644
index 11bf35d7d34e..000000000000
--- a/app-accessibility/orca/orca-3.36.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=app-accessibility/at-spi2-atk-2.34:2
- >=app-accessibility/at-spi2-core-2.36:2[introspection]
- >=dev-libs/atk-2.36
- >=dev-libs/glib-2.28:2
- media-libs/gstreamer:1.0[introspection]
- >=x11-libs/gtk+-3.6.2:3[introspection]
- $(python_gen_cond_dep '
- dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
- ')
- braille? (
- $(python_gen_cond_dep '
- >=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
- dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
- ')
- )
-"
-RDEPEND="${COMMON_DEPEND}
- dev-libs/atk[introspection]
- $(python_gen_cond_dep '
- >=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
- >=dev-python/pyatspi-2.36[${PYTHON_MULTI_USEDEP}]
- dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
- ')
- x11-libs/libwnck:3[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-# app-text/yelp-tools
-
-src_configure() {
- gnome2_src_configure \
- $(use_with braille liblouis)
-}
-
-src_install() {
- gnome2_src_install
- python_optimize
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 330583521f58..be888ad919b0 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index a342ce17c6d8..e754e09a8ae1 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,2 +1 @@
-DIST file-roller-3.38.1.tar.xz 875572 BLAKE2B 29a05d48971c2172177bd1aa52448ed5432a69733644b131517dbd7dd50cab971801d1bff5837dba74ae48ea0487614c7c7ebd4669f04f7d42e6257161fe1776 SHA512 b1936481140084c84d7bdbf361859b0ff1fed8329e26b692f0f0c8d1a3a1ec494b493aa0fb4de9f0ea5004b18e4bd69859656fe424bf413d720b04fc56e453f6
DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
diff --git a/app-arch/file-roller/file-roller-3.38.1.ebuild b/app-arch/file-roller/file-roller-3.38.1.ebuild
deleted file mode 100644
index 7a57fade4cb0..000000000000
--- a/app-arch/file-roller/file-roller-3.38.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 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 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 ~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:=
- >=dev-libs/glib-2.38:2
- >=dev-libs/json-glib-0.14
- >=x11-libs/gtk+-3.22.0:3
- 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
-
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Drun-in-place=false
- $(meson_use nautilus nautilus-actions)
- $(meson_use libnotify notification)
- -Dpackagekit=false
- -Dlibarchive=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/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 87e8d0478b2b..9fb52075f90a 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,2 +1 @@
-DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc
DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
deleted file mode 100644
index 407c5ae032fb..000000000000
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- >=app-arch/libarchive-3.4.0
- >=dev-libs/glib-2.35.6:2
- gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/gtk-doc-am-1.14
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable vala) \
- $(use_enable gtk)
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 2c703ffbcb50..b4acd3c45eaa 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/brasero/brasero-3.12.2-r2.ebuild b/app-cdr/brasero/brasero-3.12.2-r2.ebuild
deleted file mode 100644
index 3c5638c56409..000000000000
--- a/app-cdr/brasero/brasero-3.12.2-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="CD/DVD burning application for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
-IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.29.14:2
- >=x11-libs/gtk+-3:3[introspection?]
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- >=dev-libs/libxml2-2.6:2
- >=x11-libs/libnotify-0.6.1:=
-
- media-libs/libcanberra[gtk3]
- x11-libs/libICE
- x11-libs/libSM
-
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- libburn? (
- >=dev-libs/libburn-0.4:=
- >=dev-libs/libisofs-0.6.4:= )
- nautilus? ( >=gnome-base/nautilus-2.91.90 )
- playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
- tracker? ( >=app-misc/tracker-1:0= )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0[mp3?]
- x11-themes/hicolor-icon-theme
- css? ( media-libs/libdvdcss:1.2 )
- !libburn? (
- app-cdr/cdrdao
- app-cdr/cdrtools
- app-cdr/dvd+rw-tools
- )
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- dev-util/itstool
- >=dev-util/gtk-doc-am-1.12
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-# app-text/yelp-tools
-# gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_configure() {
- gnome2_src_configure \
- --disable-caches \
- $(use_enable !libburn cdrtools) \
- $(use_enable !libburn cdrkit) \
- $(use_enable !libburn cdrdao) \
- $(use_enable !libburn growisofs) \
- $(use_enable introspection) \
- $(use_enable libburn libburnia) \
- $(use_enable nautilus) \
- $(use_enable playlist) \
- $(use_enable tracker search)
-}
-
-src_install() {
- default
- mv "${ED}"/usr/share/{appdata,metainfo} || die
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 347fd2bd88df..c7162b317b58 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -6,8 +6,6 @@
Gentoo GNOME Desktop