gentoo resync : 25.04.2020

134 files changed, 382 insertions, 3490 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 10f7b2ad60cf..23beed1979a2 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index c520c639ee50..4323104525ef 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,4 +1,4 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r3.ebuild 1433 BLAKE2B 0291ed26b1aea206a1ba70cfbe355bead13f0452b15b04b778a675f5521253957494507b5f3960155aa8e3c8206568a9e2cc45be690abaaf4c091a3c5c37476c SHA512 89aed312c59e3612cb4c0023f0bd8608de1df94cbfd35bc38744ac4673a8e83284124174fe0d64dc0bd8194291cc99a8db38ebcaabc6cbc175866f0cc086ce85
+EBUILD chrome-gnome-shell-10-r3.ebuild 1427 BLAKE2B 745e163be9cabeca7d518bfb0f0dcbeb426c3ce8528fe5f31b4a7b74d2220a0265e8ff5154773742a414074341efe6fd66a98adb9b006f136d7f490013474095 SHA512 6d53a976c7ea3e3aa4743b9b1f1a8270845c99d51f55cefc98ef0be2599e257bc574b1161a152c970f35290177d27b076c495978e1b111d3be9b17d6c838f90b
 EBUILD chrome-gnome-shell-10-r4.ebuild 1443 BLAKE2B 299b9bdca0e2e6e1f819bf6b258be131597f9d916f16476e3b5a1d2381b263ae7db1dfba842a897334ac03ff8b141f8a3bc284702c495399a04cbe9e6bed62c3 SHA512 e8d6ec606faada72c84e73c31662242f55ca0d1fd7a35810abe89c7d1de171747788f556900a8889160cbb060567c9f58711dd0590204ba822a6ec187dbdf287
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
index b7c746b42dd3..30e3cf8e3117 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 73d673c5ffb6..977b9174e084 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,7 +1,3 @@
-DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
-DIST cinnamon-control-center-3.8.0.tar.gz 3870700 BLAKE2B 7d75b7697f72e6d1c9af944a6bb0b0b3cd4d6ae387aab744ddd75f5fc122aa9a770d405cc20c00f46802e6bb5dcb40b384b5a75630f9d5a4f3a4b456e31ef279 SHA512 76f85a3d17fb91d5f0d14c784b4a3c5798e9cc74f22990737684808d1e43c6c8cd6e42ca5dcadb4788dc365f7c06dcc945aa13be2a9ecd1c6cbc8ddac550f5e1
 DIST cinnamon-control-center-4.0.0.tar.gz 3872314 BLAKE2B 85a49a6713347741a4f1bef8bdd339645abfbccbe9621de8621b5898586d93d399312794be42834f3338fd70c7408f5d5f314ce03ef332fc0db19e053be70a69 SHA512 4ec0dab3dfe36a1730577abf1ecddfc96194364a1dfaf9cb939686b1621b96d6cefc60b204dd000b7ab017237c32b138cbe15644da5dea4a2406c2bf1a686638
-EBUILD cinnamon-control-center-3.6.5.ebuild 2498 BLAKE2B 48aa011647ba6ce6d5dc0d3542cf1dbfb0cae4fad55aca0ab38120248ae50caccf96b4714661a2469fd3a2d59ca123eae98bb65ff7826f36cc0749a126c52b06 SHA512 850ec0d55fbbc1208a9367a261c0136d6d7ca41a637f8eb10174414d948891bc39ce8efb56fc976a2238b14b3fbb90317d24ba3ef344d79711bf5c14b7bf8ccf
-EBUILD cinnamon-control-center-3.8.0.ebuild 2500 BLAKE2B e78e46f4158da409cb599022e665bef401a70c01aec03c36847c9fd375480207395033cf458bb71c8faff3e70f09e6955c3b6f929608cb510d1bf2059b484779 SHA512 48737ad04bf5c89807ab229c61a7d6e0a57856ce06758a6da4035d264a41dbe8e8b19b4a9ed7c0a42821f16b238ba97f2aefaa78e5e5b4c9ec37dccaf1d68516
 EBUILD cinnamon-control-center-4.0.0.ebuild 2495 BLAKE2B 9e4915d89c26f351f7ab76a59354a384cef8923ef69352a3a23f0e525c744feb73cb7980a276bcba09bdd5f82d8b6b40d316b9751efddffc22025c44dc21b8b2 SHA512 1ac56ab6046b5d8e095ed72fbcff243671f659e8e7648f5ad8d92abe674a165ed3579c4305bdf3bdc1a04fd2ac618b213dcaecb324b63385558e07ef9def7109
 MISC metadata.xml 350 BLAKE2B 59c80693fba99e8dda0c5724c57b430360acfbf04070c11c0ed88f6af76315da568314131655f8ba21ccc9d7eb8101cec83a257bf552e1fa3c9b6d4b5b991987 SHA512 9ad2cb41870f385fe74589cabea4f708647cc8eaff9d6648dae79eafd28644c6cc7b5911a6b8e7dcefbfa4b3764ae255763fed98111d9975e5b7f960eb2a06ac
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
deleted file mode 100644
index f58a8476ab81..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8:=[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--disable-onlineaccounts \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable systemd)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
deleted file mode 100644
index 19a446799972..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.8.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8:=[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--disable-onlineaccounts \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable systemd)
-}
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index bc4e3db5a4c9..d67f1cc373ec 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,8 +1,4 @@
 AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f86be4d00b9c3504ba20348a0382a644b313f30ce4c32e833cbcd690a3dd3d1870851a1b17d3174c7ffe9c6f154e456720c4d6d01a0b71382 SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e
-DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
-DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
 DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-EBUILD cinnamon-desktop-3.6.2.ebuild 1743 BLAKE2B 69c3fa571dd2c104c3f68055a31c31c7103535cd777f5b5e10947054d75634fdf00cc784119e4a0b0edc4433d7d4fb3b6ab4c4193b80c82af029147fe7660ef2 SHA512 c3f038f586b59dbdf00f8c68448212a306352cfa56557ac8701669f8f3cbe1957769aef2364d00862b9b1a268afe4b4a2485aa7618224fed1aeae82e8cbc5d65
-EBUILD cinnamon-desktop-3.8.1.ebuild 1634 BLAKE2B 0eaecb7a494e0cdb860b08023d7cf30da2beca7cb55bed7215d630ee8d4ba4e81afabd28a8a0b77391e03ca5e8b83197504ad989b99bee169bd540b4384f8cba SHA512 517f27825555ec909763d654a1b4bd7102f4b80f7b88fff52f5afb01489a50a11c06137ccf72a03fb9595837e11d0e945ec988e1210328157cd81ded08948909
 EBUILD cinnamon-desktop-4.0.1-r1.ebuild 1632 BLAKE2B b657c7b7a8f4cd7ff3662ceadd2c76c9005942b907dc30c585f1d4a4f98184c8c376dc3db250143343050355320f61462b45e59f52dc21ca54ab921e08347f88 SHA512 29e1b11182972589fd035857957f26d605d094eb011b8b232e7b07ae7a7e034674ad0c8ddedd324115dd66905131b35bbdd545bca3c28562bf4a6445506dd9a1
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
deleted file mode 100644
index a984f3d7084b..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 x86"
-IUSE="+introspection systemd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	media-sound/pulseaudio[glib]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# set sane default gschema values for systemd users
-	if use systemd; then
-		insinto /usr/share/glib-2.0/schemas/
-		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
-	fi
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
deleted file mode 100644
index f9831b1fdf9f..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection systemd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	media-sound/pulseaudio[glib]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_configure() {
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# set sane default gschema values for systemd users
-	if use systemd; then
-		insinto /usr/share/glib-2.0/schemas/
-		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
-	fi
-}
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 4a737231ef59..48ae815e53ef 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,7 +1,3 @@
-DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
-DIST cinnamon-menus-3.8.2.tar.gz 181252 BLAKE2B 9f91d22760d0ee13ce968dc0b553d2bbd8ead94169baf4bc8d4157e23225ec0a9e70d2eff22975aec6c2985517391b5e6293fd630e038061d313098320a8a498 SHA512 ce75e4076fbedffa998654537520dd0efa146ae4419d76921bf7de44a1b16c3431cc819a55436bfa038947d21f83cda37dc56fab5dcb372a90ca8a3850271868
 DIST cinnamon-menus-4.0.0.tar.gz 181311 BLAKE2B 6893e9478220dd2b8d5f9e883bb647fcd529744e4bb858f29ff2332f06abe1581b7abc6f19d78543ded8da7061cdf7095e361df2059e806c821e60847059bfe4 SHA512 8ada5b351d7d7b09dbdb8f3d6650c03e9a78a5ee729a2f557bd2f49180fe9272889a39309751548d4680794c606294f997ea20aea7e6f6229fb7fbde4b038852
-EBUILD cinnamon-menus-3.6.0.ebuild 901 BLAKE2B b0c47f136b4a0b1df9b8ccbc9d8bd5d2d3961b44197535974e9b9098e8dcd87f8f726aebb8f94aabc80048c45e691065f5f58bf8ac37f002dec0cae5dfff0582 SHA512 c64269cc73de2c99a074f43830b756e8cf541b46d66e400b422447d57952e06a20451ec10d141e033b1dd93636a62b7a3237618eb5b7669efed5ff0acc30246e
-EBUILD cinnamon-menus-3.8.2.ebuild 903 BLAKE2B a3e5de87b0329be9c58991d518e9e5e1642eba4fd78529ce0f73f08d4aa3441d4c493ac495137ed7db8cb15dc52ba9c26105831b1dc6cd0ea324f3aa9ba9aca2 SHA512 13d04939f6e1d8ddb8bd6aa8b8f2f9b0260002856293ad1b8aaf0919fdfe41dca7e490ab8a68ea8e3173f556efe111d439cc94f42c6bb06308ad19354b1c1d5d
 EBUILD cinnamon-menus-4.0.0.ebuild 898 BLAKE2B dd36cda0e840829b9706bdff6af37f04febda56e87d8a74a69d4b806e43577b98d1205ed91403e36b98230a6a179aff6de74695875ecb533d668eff4ffd900ae SHA512 9e1de293c33c4ab046662cf6318f2a1a7cf732928e97e352b556569c6534b97d09cbbb5afe52abca360a74c9531b2d499b9b452f2b040bc070e8dcdd99fb4f65
 MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
deleted file mode 100644
index f6c42f53c85c..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
deleted file mode 100644
index 62f8d6bcb74c..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index a851d8d4dd3a..cc505c38504a 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,3 @@
-DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
-DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
 DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2105 BLAKE2B ff5d34cb4f717e3bf6f308943db027bce5efda46c12b6ae9f6992812b0756851883700714bbbfbad7941d1ffd303a968f4b201a7f944400437e907e50a09e278 SHA512 aefbfb732f13e5f9fbf24f0d70d3655dba05a0769076ee82dd2b930c1176155d14d7e28feb1cfe1583455a146432141d827c06f44efae74e28482c4fdd2199d7
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2107 BLAKE2B 70b1a8932cf889d7fb09cbf3e11546555519e1a0d0e4e09ad0089db185ede46368a821838dfcf72f1bc20baa7d36adfbc866465db067a23a957a80568bbe68d6 SHA512 a65b8fa9a8be1839162c7340e8b0a2eb7dd43b7e9ece8062808d4e9d62b42551fffc189ba2b7a730fea5d651d2792dad101cfba13e761aa719584bd826e3703e
 EBUILD cinnamon-screensaver-4.0.1-r1.ebuild 2072 BLAKE2B 006d373a431c276c83af2c4a2af1b18219ea02c52782af790efc67f46dbb1889f2fe672c7cba2bf35882fa2c20e0ba05cba176b7d4f72f5fb16f348904d0daaa SHA512 15f3fd1f49a4010a782ac1ff251881eaf56b87ff972545ca4feb3280cda820696770b3f6948c2540939350e0b89397138e9f1159ba5ccde33c5cd16dbfc987a0
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
deleted file mode 100644
index a9ae0d2b2e4a..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
deleted file mode 100644
index 36c7cc681d2c..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
-		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index ff0daf85321c..deab8eae1791 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,12 +1,5 @@
-AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
-AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
-AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
 AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd640639974763f4aae108ff379adf942289fdbda46367a13a9a640e11750ca978a0f28dc3c6cb17f309c7e7a44bc3b7c8769ea6 SHA512 b0f04b560cf76fa040ce838cd21e811b0e627187e7500e5bf7717f5b1ba242db0485feb986ba0e89e5daa044f0268047c9ff37b9a72c41cbda16975929db7178
 AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2
-DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
-DIST cinnamon-session-3.8.0.tar.gz 197983 BLAKE2B e0a8b57637668586f941c64df6e610a5df385a6ea67a71e1e666344a73e0095861beb9d958344dfd18988960df1e4380e72257c5f490ab344a4e0de6a749c2d1 SHA512 c737ee77396d38e27d93a5d2cec76d9072038f6a096c6071f450a9a3eb71d83beb1da3ff3320820d7989731281e5a108c330eec333a7fcb66ca7a37f16501c76
 DIST cinnamon-session-4.0.0.tar.gz 198396 BLAKE2B 713573d445f09cfa4707c3ccaff04bdcc95ea7b60568fc136359258022af287df66992444da462f0488dc4049036deb190523695e519eb61329e922e05871c39 SHA512 7e91bef4e294175fa3333a96d0cb9d06db36c9b5a86d6e52734447ea62d411535760fc46713961a46299ebeb3767a0abd4768279e9f6c176ae882de9b7aedc5e
-EBUILD cinnamon-session-3.6.1-r5.ebuild 1613 BLAKE2B e52ae9b2f5f3b9c9a959db4037ebbd75bd5fd34c8c07a17b1788dc730e6de82a208d0797b284d712f590922ef36bf83be1a8133644052e506946c731a6a307ab SHA512 06681ec6c2a1cdaabc243880315bafe8a4d332043dc031178145a1596099b0b38fafd6f5e6674c3276bc78b13069ef7c4832adb705a31d12997a6a062ba9c0c9
-EBUILD cinnamon-session-3.8.0-r1.ebuild 1547 BLAKE2B c28815ce1abdcede81fe8f479be15d25cf71baaf9324c09b16b8526176ab6a71c5ee2c636cf619f8c3cfebab7e88f29c79d53152ce2b50efe5f5bb12d49c8492 SHA512 2a83ea20d01142682077cad35f8cd15466ae617b26a0199f82957eace1f3774a1ac3c487ec4815e22b8ba8bcc59e23b3f99c85cbd2f23d6a545fa9abac6f4580
 EBUILD cinnamon-session-4.0.0-r1.ebuild 1545 BLAKE2B 5f2cef2b7bca1f92fe94d66888d796eee226d89eb2b4510262623752be585e3b63fe0b31cca821585606938e7ff47c0b10168b428a7cd4d346e1965051b25bd2 SHA512 72d9629efdef77c31e563b49873651742cf8b2b53c8773c9baae595607b73ffc571354780151bfe676da54f230a56c4fbd910a86824eaec8aef4c4f7e96d8972
 MISC metadata.xml 451 BLAKE2B ef4fb2792b489e2c45e320fd073b71a3ae1095cd18868fb244fe21bd271dabc683b9a0db617338c15ec35e16124f2d851346da60647676053e80e7e21857dc81 SHA512 a96919c80e1cd5ea2536a928572aeb5315c1df6f3414d901f18410a0e2a4cbac8218a4a52a90159df94b35e8946066952fa625ff44ce55670bed9c140d374c15
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
deleted file mode 100644
index 9dc721e9e17d..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.88
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	virtual/opengl
-	systemd? ( >=sys-apps/systemd-183
-			   sys-auth/polkit )
-	elogind? ( sys-power/upower
-			   sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
-	elogind? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	# make upower and logind check non-automagic
-	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
-	eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
-	eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gconf \
-		--disable-static \
-		--enable-logind \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6)
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
deleted file mode 100644
index 54fe4a32199d..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit meson eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.88
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	>=x11-libs/xapps-1.0.4
-	virtual/opengl
-	systemd? ( >=sys-apps/systemd-183
-			   sys-auth/polkit )
-	elogind? ( sys-power/upower
-			   sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
-	elogind? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-3.8.0-elogind.patch" \
-		   "${FILESDIR}/${PN}-3.8.0-elogind2.patch"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	meson_src_configure \
-		-Dwith-gconf=false \
-		-Dwith-docbook=$(usex doc true false) \
-		-Dwith-ipv6=$(usex ipv6 true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
deleted file mode 100644
index 9ca31379a60e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.ac~	2016-05-20 13:03:13.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:36:55.389583194 +0200
-@@ -56,7 +56,15 @@
- 
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+  AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+  [enable_old_upower=$enableval],
-+  [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
-   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
-@@ -96,9 +104,15 @@
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+  [enable_logind=$enableval],
-+  [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
deleted file mode 100644
index fdbda72ca22e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
-index 789d47d..d8093d4 100644
---- a/cinnamon-session/Makefile.am
-+++ b/cinnamon-session/Makefile.am
-@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS =			\
- 	$(XEXT_CFLAGS)				\
- 	$(GCONF_CFLAGS)				\
- 	$(LOGIND_CFLAGS)			\
-+	$(ELOGIND_CFLAGS)			\
- 	-I$(top_srcdir)/egg			\
- 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
- 	-DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
-@@ -91,6 +92,7 @@ cinnamon_session_LDADD =				\
- 	$(UPOWER_LIBS)				\
- 	$(GCONF_LIBS)				\
- 	$(LOGIND_LIBS)				\
-+	$(ELOGIND_LIBS)				\
- 	$(EXECINFO_LIBS)
- 
- libcsmutil_la_SOURCES =				\
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index cef991c..dc2aa2e 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -32,7 +32,11 @@
- #include <sys/types.h>
- #include <pwd.h>
- 
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#else
- #include <systemd/sd-login.h>
-+#endif
- 
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/configure.ac b/configure.ac
-index 38db5a3..8dafc6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
- 
- have_logind=no
- if test x$enable_logind != xno ; then
--  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
- fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
- 
-+have_elogind=no
-+PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-+if test x$have_elogind = xyes; then
-+        AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+fi
-+
- AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
- 
- dnl ====================================================================
- dnl Option to disable DBus user session support.
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
deleted file mode 100644
index a58703bc1bf3..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c46b35f..5bde44a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
- 
- have_logind=no
- if test x$enable_logind != xno ; then
--  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
- fi
- 
- if test x$have_logind = xyes; then
-@@ -124,6 +124,7 @@ have_elogind=no
- PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
- if test x$have_elogind = xyes; then
-         AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+	AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
- 
- AC_SUBST(LOGIND_CFLAGS)
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 2e4dc3b3db23..8e9f36075a6f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,9 +1,5 @@
 AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
 AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
-DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
-DIST cinnamon-settings-daemon-3.8.4.tar.gz 660607 BLAKE2B 1db6e8677c9f9e1fc649d29b3de46d2797f01dbaad3a907329eb6781c6c4ec17706d06045ae230315c7802a5ea176dda73dfcd437fd07e3398ad732e96240a83 SHA512 5bd91e781d47413b50b69b6a8d4cbe9060579452db7408d375f01b05b4070caa684d333ef875a7dda85d1acad3442cddd38e13167fa198e3a5540fef7bedfb75
 DIST cinnamon-settings-daemon-4.0.2.tar.gz 662735 BLAKE2B 158e2ee120e2b359c6d84aa52c6b2c9214148fcf48cdc8ed9c777344f21ce82b5c3e4d0b358046abb1de8fc23a43b7cced02b77b43c1230fc2d97db58423e125 SHA512 3e51628339ae7766c37090c82a7550e2f925843ca62ef9cca606568c9771a8f16035735b3db612aae0938553fd37fb6eaf8d30437baa501160221d1b71d0e94e
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2072 BLAKE2B 6b7401dc241b3488824f5d08cf7af47c28c08b5da397f4a6283acff94fb66159a86c094869623e39eaac0e0324006a7e8e9625517d166d433a5ed5a83875abbb SHA512 bfc7fa4c2360a6aac2413590333a671c7afdcd5aaba999e364508515d29c7b12cc0cd2129fd5637d45c272e97ac3f32d98d1c6afda05ddcac01758f56df1016c
-EBUILD cinnamon-settings-daemon-3.8.4.ebuild 2158 BLAKE2B 2b96a99930d942ad046b7e300b365075fea42f4dab4f0fbd2ace8672cc83789cef755a5855370ac6f903e0f68d9d13b5a6095fba3c9ecb6e6c9bb0842264966b SHA512 caa1f2a3aa00cd33d11cea7f751013a1cfd0f80acb92ac5be1a58c942acc7dd1ae43d46609aa64e8e9db44d4221da8a149edc429847d82498507d9a590a5d192
 EBUILD cinnamon-settings-daemon-4.0.2.ebuild 2156 BLAKE2B 13e3cf48d890322d391cfd2965e45230933d3e876200f0a47d28c95c84ba261be3077eb7e7aa12b4c91c1fb0ddb5b88104ac7d528482377eb8da2ef5303cb19c SHA512 4828186da8669038e71167651b4ca62a73144bc040e01da2593ae270c47d6195ecac0a5ef80cf1e941072eee81c697d6339fc2006ce78fabe8aa778c28f1202b
 MISC metadata.xml 351 BLAKE2B 7693637c46e37d76b95be989ad884a1792426afe83bf8dd4dfcb3b92bca1d5d8c0cdd5cb8df5e14db699064a172136a45ab0673fc138c170f194a4f79f690e1e SHA512 6939d1b669b5c2cc6cdf0a539a632e5b69546e1ba53d88b61c511eb4b7a7465bcf68dd5f132f55241e7615690184f047df98881605ed2632c43cf2e06848ba33
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
deleted file mode 100644
index 243e2ba6d7a8..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT=test
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	dev-libs/libgudev:=
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	>=sys-power/upower-0.9.11
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? (	sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
deleted file mode 100644
index 84d6992255ad..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.8.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT=test
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	dev-libs/libgudev:=
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	>=sys-power/upower-0.9.11
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? (	sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-	eapply "${FILESDIR}"/${PN}-3.8.0-accountservice.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		--disable-accountservice \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 8534a115b12e..50a6181185fa 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,8 +1,3 @@
-DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
-DIST cinnamon-translations-3.8.2.tar.gz 9741950 BLAKE2B 23ae3b3551f911ca23b86d06a60e49ac063be7bb0fee65a05e1b5fe55908bb971b73e24e62b8bd82b5f486dc6d37aa724ad5252d8526f60c00b96e8570727f92 SHA512 8ed052da06764b71a344d2e8eea2d7b3132e5b185167d7d2e95b312df89e5302eeacde15d0ec337ab5573f7497be7b66db3fbfa4cb8a654e8199690315c319bb
 DIST cinnamon-translations-4.0.0.tar.gz 9742058 BLAKE2B e55931643378ea43508488f431f95f83efb4de8691303da5fa1e91bdee7486fec9881ac75123a2775e88708d40f148fc3a6b0580e447cb370b364d412a8a571a SHA512 a4ecd3808e28de61556f6995c3f21c7170c2fabb81f8c10e548909eca2dabc0b33d912aaa41f4fdbc5d66f573c2e50c8ea9fed93d2fc6200a1e1662291a75811
-EBUILD cinnamon-translations-3.6.3-r1.ebuild 1393 BLAKE2B 72cf78b6392340ce9432951ff81c9ef882a51fab9f051ee8b22892d16ed1ba056f24ec07a5b983aa02156a1c9da91cb6002a9dd7aa150bcd03db6f1fcbacaea6 SHA512 08d040c7aa723eb78dc82bf4c31d992c3783fb5de39cdf7bc3996e34f1c7153a8150cf17d2493fcd60b835e76c88ccc48f157293766e80e03549a73a7c5c1023
-EBUILD cinnamon-translations-3.6.3.ebuild 1341 BLAKE2B da3b79b225093075d1797e83eaa6fd158b70e25fa8a59478da41eb234ad0ca904da41e929336754bfd0414ff2048f6f542e3a064f091a54fbd5be0aa6e7d3e6e SHA512 c6db4e334eca9c4f79c2781eb271a7fd5666867d5168b317b4a992079259ab4fdf92c7fb2cdf74c068059e47bd2d401fe03c48b16eb72b5e7c81f5fed95396d3
-EBUILD cinnamon-translations-3.8.2.ebuild 1393 BLAKE2B 72cf78b6392340ce9432951ff81c9ef882a51fab9f051ee8b22892d16ed1ba056f24ec07a5b983aa02156a1c9da91cb6002a9dd7aa150bcd03db6f1fcbacaea6 SHA512 08d040c7aa723eb78dc82bf4c31d992c3783fb5de39cdf7bc3996e34f1c7153a8150cf17d2493fcd60b835e76c88ccc48f157293766e80e03549a73a7c5c1023
 EBUILD cinnamon-translations-4.0.0.ebuild 1388 BLAKE2B e291b6e9927210e8b2dcd7957a675df25f0aa00bb0a1985cb9454adcec90041aa305ffc0acba7ca260c201a65f3fbb19a0d3e226e59826346f356662b6c7a2b8 SHA512 571365e9a34c19804a33289cb71bbd1b00bf685e835cfb59561801449c5cbce60eb0432c4c004142d312fdc0043ff67a9755f4cda6f12500e532676fd983baed
 MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
deleted file mode 100644
index a1d4f0cb21ec..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
-RDEPEND="${DEPEND}"
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
deleted file mode 100644
index 3f983826e048..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
deleted file mode 100644
index a1d4f0cb21ec..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
-RDEPEND="${DEPEND}"
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 32ea776f31a3..f17757e60c7f 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,15 +1,7 @@
-AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8d67f098a7ccde319589c330736a9624537ac2dcfbee75c8971cb6b88cb49ae36b380b0fe3024d55c54e127cc2cec0d21ade17f56b9ed9be6 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460
-AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
 AUX cinnamon-4.0-fix-pillow-settings.patch 1363 BLAKE2B 6683cdb92c4da3e09b8f6759216676d666ce832f3687f2775914e27a0f0a3d1427be7774aabc6525f601204682471da3479b35c2bcc3dce3e08929b7d4761b48 SHA512 cd86597c4c5009d8227774d96c375d52c8ab42b944e7dea7013f94c2616511be9b5e3b79b812c65714f58bc67c3a32f34ec71ff0afd4f9ea3c5aea6664817946
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
-DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
-DIST cinnamon-3.8.8.tar.gz 2234388 BLAKE2B edc27a670d788673602536f960e2859f6cc15a52ebd12cd741821c4455664ca6bfc6f2b2e3282a0797b15bf93a33208f4f4458df7b2cbe17e50d90412811265c SHA512 5f8acf181fde8d9156ef8767f97b24e207f6c44975e5ef97e812fcdd3b2d5ce4c921297b679ad1ade6fa8e4f9c544b74143f4d925d022cc95d6c71561ab40b53
 DIST cinnamon-4.0.3.tar.gz 2325905 BLAKE2B 8ff07f8f76ae0c0e973a9113e258a31948afc68066e27ccd7e9576d6beb5328aa8cf2c5d97e6c564f3eee9a5bf66a23241270de3a82a1fb56fcf79680b219294 SHA512 d29295dc08971ff6dbd71066d700037718fdb1399bbc4f483903be7a10bfa509a904db9de064a263acb6956b4a1623c1e37a0a9f28819074eb3a93d3a5866db1
-EBUILD cinnamon-3.6.6-r2.ebuild 7618 BLAKE2B e3c51299fc745634266d58b90b60fa68cf07a41572320f6a441759d2a3899fe88b53ef4b944eaa5b5962ef0dff1d3a538f2b267142c65c31071c3862ec554544 SHA512 1e15c201c12ed52121e8b606700b3b3db3902eac85ae65643be86b1a1fa36901f4d7c21750de61d6afac7136a1a94e646e3729ae0591300eb5baa5d4716f6f87
-EBUILD cinnamon-3.8.8.ebuild 6914 BLAKE2B 7552ee6c200bcb68d0d44a617519437e70194164f697f8fb0ea896142cdbbe017472b143358f8e39a07dc22a92ccb52dfb591d5a3099f3e13babbc44b12359e5 SHA512 452ee5d1784f02e5a68c0023a4b0285074dc91ec45a991c1e8f22cc7ca68b4b6feb4c2469c70f0051fd87ae948388d92949bcb6219b04ff30c3922b52d4d0d22
-EBUILD cinnamon-4.0.3-r1.ebuild 6874 BLAKE2B 9a21a488211653360dc21fc1ad14e0b4628723917b2ba424a67336d4f80d54f6e6f773ff0bf9c4570651a9558506368e1ddfd5201d43a30eb058c8b35895097b SHA512 d8fbc9f48ee8518cf624ff5e7085c44f95545577aa8790abc45693513ed8c1436f2afc3317f1d8c23db1f790b80b0b896797200f34e91608097b59371eff4992
 EBUILD cinnamon-4.0.3-r2.ebuild 6935 BLAKE2B 41a1a5c262ce2484e95ada2fc8cbeb583547d5a3b384b11c20747b247c1c9804ca3b6510880aeca1a4d232308105cc0327ea9f70b6f5499844f0a5498c58a54c SHA512 4c47d0f3e807c279abfdc5e57413747d57016fb79cbf4383c1bf18a7a9c3806904ff929f043b87ac50fe4b248afb8a96aa14ef1f78ef4348097d0ce42982c660
-EBUILD cinnamon-4.0.3.ebuild 7004 BLAKE2B 84b639e0ba88c8c13d5fb049b8e80de3d719afe228a6c88fc5e4ae431efa9482ce7d4902980fb0d232fad84d2704cf26abdbac92afc624400f75d9e63a589928 SHA512 4faaf6fbb8d93287bdc288097f6eed06175f7470704fce2de2c3573664e3d6d81f0a62aee55c8914160f7ff0050f0a224e8bfa9d6481dcc050fc78ad02125b75
 MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
deleted file mode 100644
index 145d165bcfc8..000000000000
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due to bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-	|| ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
-	>=gnome-extra/cinnamon-menus-3.6[introspection]
-	>=gnome-extra/cjs-3.6.0
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-3.6.0[introspection]
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999:=[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-3.6
-	>=gnome-extra/cinnamon-settings-daemon-3.6
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-3.6
-	>=gnome-extra/cinnamon-control-center-3.6
-	>=gnome-extra/cinnamon-screensaver-3.6
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
-	dev-util/gtk-doc
-	>=dev-util/intltool-0.4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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 Cinnamon'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 "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild b/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
deleted file mode 100644
index 54ba7cc772c9..000000000000
--- a/gnome-extra/cinnamon/cinnamon-3.8.8.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="+nls"
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-	|| ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
-	>=gnome-extra/cinnamon-menus-3.6[introspection]
-	>=gnome-extra/cjs-3.8.0
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-3.8.0[introspection]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-3.8
-	>=gnome-extra/cinnamon-settings-daemon-3.8
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-3.8
-	>=gnome-extra/cinnamon-control-center-3.8
-	>=gnome-extra/cinnamon-screensaver-3.8
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
-	dev-util/gtk-doc
-	>=dev-util/intltool-0.4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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 Cinnamon'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 "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
deleted file mode 100644
index e22f4271642f..000000000000
--- a/gnome-extra/cinnamon/cinnamon-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="+nls"
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-	|| ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
-	>=gnome-extra/cinnamon-menus-4.0[introspection]
-	>=gnome-extra/cjs-4.0.0[cairo]
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-4.0.0[introspection]
-	dev-libs/keybinder:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.0
-	>=gnome-extra/cinnamon-settings-daemon-4.0
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.0
-	>=gnome-extra/cinnamon-control-center-4.0
-	>=gnome-extra/cinnamon-screensaver-4.0
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
-	dev-util/gtk-doc
-	>=dev-util/intltool-0.4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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 Cinnamon'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 "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild b/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
deleted file mode 100644
index 26eaee1c5c10..000000000000
--- a/gnome-extra/cinnamon/cinnamon-4.0.3.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="+nls"
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-	|| ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-4.0:0=[introspection]
-	>=gnome-extra/cinnamon-menus-4.0[introspection]
-	>=gnome-extra/cjs-4.0.0[cairo]
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-4.0.0[introspection]
-	dev-libs/keybinder:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.0
-	>=gnome-extra/cinnamon-settings-daemon-4.0
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.0
-	>=gnome-extra/cinnamon-control-center-4.0
-	>=gnome-extra/cinnamon-screensaver-4.0
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
-	dev-util/gtk-doc
-	>=dev-util/intltool-0.4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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 Cinnamon'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 "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
deleted file mode 100644
index aa2e82bd13fa..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001
-From: root <admin@catmur.co.uk>
-Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index c0e43e1..bc764e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0)
- 
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
- 	 AC_SUBST([HAVE_BLUETOOTH],[0])
- 	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
- MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
--- 
-1.9.2
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
deleted file mode 100644
index d9c14144cb52..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 11 Jan 2015 20:33:37 +0100
-Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
-
-https://github.com/linuxmint/Cinnamon/issues/3575
----
- files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index bf6dc39..83a8b04 100644
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-@@ -198,7 +198,7 @@ class Module:
-     def get_system_backgrounds(self):
-         picture_list = []
-         folder_list = []
--        properties_dir = "/usr/share/cinnamon-background-properties"
-+        properties_dir = "/usr/share/gnome-background-properties"
-         backgrounds = []
-         if os.path.exists(properties_dir):
-             for i in os.listdir(properties_dir):
--- 
-2.2.1
-
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 92f432154678..038fc9a4633f 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,9 +1,4 @@
 AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
-DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
-DIST cjs-3.8.0.tar.gz 446667 BLAKE2B d7d37d2aa47fb32b401727e2d5f7f6bd3779e62f5bdaf77501e0999bc7d74a14c5c9924702091d4b32dc7a572b5e920e2dcf19e50b048907f87993d8be392ea7 SHA512 7f776be2d4863ea7bb32e266efb0c5d5e0f86bab68bdabc1478e04809f8f887b4ff0853075baffa46055d347fc22c6252faefaceba750f61b0b21229f6130bd0
 DIST cjs-4.0.0.tar.gz 459595 BLAKE2B 63ed660480f87fcd57103965226b3457dc70586019c9ea7f446af86f0b18b493c315566c608f5e999f3b64765d71eb5d463053f3d859f7121c95dcc74d04016d SHA512 86baaba3721b71b266c560180ba20af43eed0d2b8fc37af0d24c7c0c36252e2af85da928b42260074f236f0bc4d4f4f28d20127021e67f23a22b042a09a3baa7
-EBUILD cjs-3.6.1.ebuild 2128 BLAKE2B 197398c85e99a5d2ff2ae53049c78252b350e05b7a27a37c29e2073791a9e3d14d01366571ab46a75987c35e2306d45bbbc4c9bd7ef6a07b0fe8b5348325246e SHA512 fbee3abf021008cad7c78b532bab89c16cf534a011da7753ed129d3b69402e50f1f4222381fe1c7b2d1caeae626c4feb86c0e4390787ce1595f8b6b1c9a9314d
-EBUILD cjs-3.8.0.ebuild 2033 BLAKE2B 672e5d47952b6e86b4ed2ec2a7671e0034db87b4b478e41cfa576713daf6dc7ed7b6260a8f23c82e6af91b005523b75194ef94ac5ddb252fe5ed068bee01a2ac SHA512 10d27f6eed91ca36cdb50e5a73c166c650bde01118bb0c7cb8e8858582d98993b1b10af8949fa2254749c00632d3aa0649d6946a7359872712833af107537a9a
 EBUILD cjs-4.0.0-r1.ebuild 2035 BLAKE2B 98606c8974acd3162c3519d6729ba5f2cd718afaacccedabe70e249ff01d49cd8d0d23783f1b443ef1713c732bd12a9b2478cac48de3fb4ba578c0b38ac3df2d SHA512 14e993aa9c7f57ff34d69e12ac0f9eddf6fe49bddda21cef80125ca5823d44d40ca12d71b635dec5f4c50ada953d3748fe843eb91272c6cb549793513b5021e0
-EBUILD cjs-4.0.0.ebuild 2033 BLAKE2B 672e5d47952b6e86b4ed2ec2a7671e0034db87b4b478e41cfa576713daf6dc7ed7b6260a8f23c82e6af91b005523b75194ef94ac5ddb252fe5ed068bee01a2ac SHA512 10d27f6eed91ca36cdb50e5a73c166c650bde01118bb0c7cb8e8858582d98993b1b10af8949fa2254749c00632d3aa0649d6946a7359872712833af107537a9a
 MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
deleted file mode 100644
index 90d097a42a06..000000000000
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:38
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch" )
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	sed -ie "s/gjs-console/cjs-console/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh \
-		"${S}"/installed-tests/scripts/testWarnings.sh || die
-
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testSignals.js \
-		"${S}"/installed-tests/js/testGDBus.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-3.8.0.ebuild b/gnome-extra/cjs/cjs-3.8.0.ebuild
deleted file mode 100644
index a4b03e1ad79b..000000000000
--- a/gnome-extra/cjs/cjs-3.8.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:52
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	sed -ie "s/gjs-console/cjs-console/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh \
-		"${S}"/installed-tests/scripts/testWarnings.sh || die
-
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testSignals.js \
-		"${S}"/installed-tests/js/testGDBus.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-4.0.0.ebuild b/gnome-extra/cjs/cjs-4.0.0.ebuild
deleted file mode 100644
index a4b03e1ad79b..000000000000
--- a/gnome-extra/cjs/cjs-4.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:52
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	sed -ie "s/gjs-console/cjs-console/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh \
-		"${S}"/installed-tests/scripts/testWarnings.sh || die
-
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testSignals.js \
-		"${S}"/installed-tests/js/testGDBus.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 228289a35600..fc4df1057a5f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,6 +3,6 @@ AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
 DIST evolution-data-server-3.34.4.tar.xz 4627704 BLAKE2B d1b93f17eec1dc71b31c9a842af369646c7412c63461a63a0c42026795d97f8b282c498ca56e14b258e7764ce333fad159d4fae534891cd02b99be6166bfbc23 SHA512 e353724591216f472faabaab468d6a8555e05cafda4a8b2c55fa3113226475f0ec9edad65d8acbf95c92844d33f36cf32d49ddc14fe934a2b8c127c32cc7b74f
-EBUILD evolution-data-server-3.32.5.ebuild 4343 BLAKE2B 659f0a4f4d816830884fef39f3f2a546aa20c06b0019d703c2d5bb670112829d7abc0529a631b87decdfe904677c0b02e9c4a3f0b0fc86930a0419c3450acaac SHA512 7822ea9a2984d795a03f28039d2d3580f9b72d5ee3c1ed0afd79f714ae996e97e8ac55ba3da3682d4ad50ec74c1ce4dd972d75b5aa32dea608a47f907af544e0
-EBUILD evolution-data-server-3.34.4.ebuild 4431 BLAKE2B fc478b7ea7a49ba5e0dfddd0d6a7006317b7c2b1fb1c9776a4630053d2a09a792c8bf47500f6e15b635dcc1dddbc5a26ef89567256e46b4939c866c390514609 SHA512 acac520c1326abdc43eb76d79b22efbd37758f0acfd7176f2b35996271cb843907f723ed6aca01cc38c756007714c1f615693bc2ca0791d755430e378623b3ec
+EBUILD evolution-data-server-3.32.5.ebuild 4243 BLAKE2B ee346e8ffa8546d5a6b5d9abdaebfaee9b63f1843daf249f7a609f4793e962f08f535c03faa6022a8d661c3e99c9a22172dd85bae41917a4d35ae89367ac5416 SHA512 df2c900af47b3e17759f3f6a2bb2733dccbb12c59363f1e755f0567f1119884187af5fcb323b9d4b4cd684d4d6b58530ed4921604d68b8f751024b5fdfa5afa4
+EBUILD evolution-data-server-3.34.4.ebuild 4329 BLAKE2B 32512b88545711e9bddfcec3b7efdf6e384ac0397751eb5fa41f47ce97d3fc726a0f63a8e174d07137b8b0d42433cc837b35f27d098800fb1180099921f56a39 SHA512 d708438396f55a08e7a407a3e0967779afa38e7e08e0da61ae01b8e18d37a972ccee4c937d974fe14d8fb8cee210cc6a3e27578654bbcd1d338e018dc46e811e
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
index 1c26f9c18bec..d6a2e24c528e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+inherit cmake-utils db-use flag-o-matic gnome2 systemd vala virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -58,7 +57,6 @@ RDEPEND="
 	weather? ( >=dev-libs/libgweather-3.10:2= )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/gperf
@@ -75,10 +73,6 @@ DEPEND="${RDEPEND}
 # It looks like a nightmare to disable those for now.
 RESTRICT="test !test? ( test )"
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 # global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
 src_prepare() {
 	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
index d8d6502f2ae4..5038eb72784e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.34.4.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
+inherit cmake-utils db-use flag-o-matic gnome2 systemd vala virtualx
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
@@ -17,7 +16,7 @@ SLOT="0/62-24-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
@@ -58,7 +57,6 @@ RDEPEND="
 	weather? ( >=dev-libs/libgweather-3.10:2= )
 "
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/gperf
@@ -78,10 +76,6 @@ DEPEND="${RDEPEND}
 # It looks like a nightmare to disable those for now.
 RESTRICT="test !test? ( test )"
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 # global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
 src_prepare() {
 	use vala && vala_src_prepare
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index c6e457334dae..7a8365e8f76a 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,5 @@
 DIST evolution-ews-3.32.2.tar.xz 534056 BLAKE2B 2f935910cba44d69b2d8bcc3021709502c1a129ef29d18a847bccd14837d0c18c9700a97f978decb36f9c28242df81a9021dfc536e31f3d8f7793a0dc4c6b680 SHA512 5696ea660d0b52c0083664ad203eaed372fb9653399152ccbca0f6360a3e0c4503b5dacf4f9bf5650b1b64696c0fe06e2383bb408bed604ea0312660b4639388
 DIST evolution-ews-3.34.4.tar.xz 538964 BLAKE2B 3b23dee72b13bd7da0efdacc13bf16052b52287dfbdeb913100244cfbdc726fdd6dc526fa38eb3da849ea5e9c95e9bb59fedadbe0238c37698cedefdda05f82d SHA512 397dd89c81c986501aaf5c0460735577ebe2aa0bfe549359073e211e912e3622c7ba61eb90898ec00a06bb1c4d02a565446a3b0620ff8515088d706d5c246c91
 EBUILD evolution-ews-3.32.2.ebuild 1357 BLAKE2B f5204d942c734f70d5007d42896d26f46fed7c2ad6a7dea793772310cbccd617bc8b807589d38b0038066f586b1920c4d1d36d08231c6ae22c98988ece9b3c6c SHA512 920b971eb865c4d333344a87298c5c6d8a2b611db41d9fbafbee171d231db5bb1f6a7bb4f3b5be95e1540980d507db6d024f1d494042fceb6c8e2487f150ebf1
-EBUILD evolution-ews-3.34.4.ebuild 1410 BLAKE2B 0d8b0f84ad75a021656eb7dac6207d129ed4e8fdf4af60f31bbee26a0692d570a113bc04647f03d03f6a3567152fcc2d515d02dc4890afe9198b82916985f93e SHA512 76193cf66e8908e03cad8da4d315939ebc5daf657483b53119ec50e0d2a38655fb218767f31ff44157d7af1f9ea4f0063dbb4adcacaf9dc470903d4366329afd
+EBUILD evolution-ews-3.34.4.ebuild 1408 BLAKE2B 4c50c511fc049d334447938e4e2027bc4e3b353a684f453e90d4e20c3988e113632826b9107ed5726b5cbf59991bca285512cb80ab51071d45eb9e5eb307bfd0 SHA512 b845c4d3b3cfb3760e89c2f8cb8787f5a09db8840984cbc43ab427808db7436b9d58584514b4d83c5eb8e4ad6286f86bf2014c9656e32bade0c7b5dba307b91a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild
index b3b87637eb31..3d5c7d9b8f15 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.34.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 0a3f6c4f520a..c9b405de17cb 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,8 +1,3 @@
-AUX 3.32.2-vala-compat.patch 1011 BLAKE2B 99861d3c6c7ae2c35c118676d6805c09ce6475256eea2a90770e0681d01f2cb33351b24854de341752f3e2e4986c1e43dfb7685dbf081ccf2d06193eb03ee7f2 SHA512 c4ebcfdc838ca088fbab980f745c404264927d274f50d4d135d170ebeedcd4c2dc8eb2345d0ba140e4e474a87083dd283e0734c672cc43a70cbe03292b1dc7e9
-DIST gnome-boxes-3.30.3.tar.xz 1198224 BLAKE2B 1c65d3f051d32dc85284da4d392e3ec418edf028b61f1166173ac6ced3e6cba687b297ea135a4e54058c561eb5fe69d767e9ee698fb6b16f6bd4cd09b00d5c3a SHA512 fc8a06bb8c71356d50002468f7722aee14abe8432ccce319ada3032746b53eb2f679a93f991c04ae34832a315fc95d561ffc169c4560a23573c046705b5446b4
-DIST gnome-boxes-3.32.2.tar.xz 1178340 BLAKE2B 9c345e69cc53b3b06b609c3ddfb0f3e1cb54aaffb9ebad4deafd0414913e6d5bc4faecce6e9714a448da7c6094b27d97f039bb8db512973ffd665a5190ff6561 SHA512 f3208f5185ad65750b2f745e8170aaff6a097aa9d706e5abc74259c0940da8fafb046b55dfcc144e8c64782942dfebb711622b552f6daa2dc45ad863d480855f
 DIST gnome-boxes-3.34.4.tar.xz 1191668 BLAKE2B 98a206abdd8a181979b6d40f176b0a1518b51ebd312929c8eab549e6de83b1d299f4c3177d6b2b07873c2e620a744b627adce6bc1c0ef5ae2aac55189377de4f SHA512 025bfe6fe583cedd80b376b96e87a8ecbbb8f4d723490cf18cc2ca73cb959d9e2bae1b784cc1018866c594962d1e508e5a3b9c9562763eb76e7291c5f6189463
-EBUILD gnome-boxes-3.30.3.ebuild 3919 BLAKE2B 40592b490c835d18da742e89ac44941f1f13beefe01cfec8e4b7727208122a8b6cb5d8be8a90fe49280c75ac76b057d3cf3767f8c37b5c982d7c7a7f43dded6b SHA512 e4d3cf2519a0f542a97786154fa802a7aca0cdb5f35f30f04d98293128f625a3cdb13e68f7971668ce23aa18db8a5e55f6505dd0b00c7ec2af000a4fceca61b2
-EBUILD gnome-boxes-3.32.2.ebuild 4057 BLAKE2B c9bd3b0df53c691eecce0fbe2e504ff23382c00af0d4b6b14b1fdd9b9599e5e707c8c8a78bb22deeb0f335b62086da3fa7b6b24709c2de8e1a241168522c4f85 SHA512 dbc8a3818fd736413f722affe7216b7df540288a606b2e84b2ed479a2fcbad5b565b89a56cfaec8aa2db3bd477a7e61783a3fec03c66befab49bd83bc5f6de99
-EBUILD gnome-boxes-3.34.4.ebuild 3846 BLAKE2B 213a62dc5b30aa8b2946217647e051fbd4d5f996cbc64192a635fa4b5f8d13a1c3db857430bfd92a3ffae382fbd780944d33720c86719723fca88ca2cd05b516 SHA512 252bc7c687cf8d472e1984c7846a0324e00269b3b1288a676dabeada1d2f2df40045bd495e427d066a2816c77fbe492ea74eac1df038fb0da18fe9ad0b6ad9e7
+EBUILD gnome-boxes-3.34.4.ebuild 3845 BLAKE2B 015af32def3ba463bb8e3ea71df4fe49d006c214c520cfbbde098e9aa9c8c48851d64b4c3edfa4870580d1793eb39bc0e09abedec4d2a1bf472ec77819079b3d SHA512 2f256357212a84ca77e45127c3032b3e3de1032e9c0d00a24781fbfd54c37328d63b23f73c5be81a7d3c1fff721849cf5eb2e04d76bc41863f864f831b7df1ad
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch b/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
deleted file mode 100644
index 548064be909c..000000000000
--- a/gnome-extra/gnome-boxes/files/3.32.2-vala-compat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8aaf59870b9972f228e073a674b254b1e4cda2de Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Mon, 28 Oct 2019 10:36:20 -0500
-Subject: [PATCH] app-window: Fix build with vala master
-
-Cherry-picked from a1522749a9651915132fc1171d31a1c22df423ab
-
-See #431
----
- src/app-window.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/app-window.vala b/src/app-window.vala
-index 8a1ebb6a..82a9f834 100644
---- a/src/app-window.vala
-+++ b/src/app-window.vala
-@@ -438,7 +438,7 @@ public bool on_key_pressed (Widget widget, Gdk.EventKey event) {
- 
-             return true;
-         } else if (event.keyval == Gdk.Key.A &&
--                   (event.state & default_modifiers) == Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK) {
-+                   (event.state & default_modifiers) == (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) {
-             foreach_view ((view) => { view.unselect_all (); });
- 
-             return true;
--- 
-2.20.1
-
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
deleted file mode 100644
index 5ea890daa907..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.30.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.36"
-# 0.46 has problems with spice-client-glib-2.0.vapi exposing a bad constructor
-# 0.40 and 0.44 have problems with gdk modifier types, for which we have patch in 3.32 bump
-VALA_MAX_API_VERSION="0.36"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="amd64"
-
-# FIXME: ovirt is not available in tree; though it seems the gnome-boxes ovirt broker is too buggy atm anyways (would need rest[vala] as well)
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-COMMON_DEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.52:2
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.22.20:3[introspection]
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=dev-libs/libgudev-165:=
-	>=sys-libs/libosinfo-1.1.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-0.2.3
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:0/2.0
-	net-libs/webkit-gtk:4
-	rdp? ( net-misc/freerdp:= )
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${COMMON_DEPEND}
-	>=app-misc/tracker-miners-2[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	virtual/cdrtools
-	sys-auth/polkit
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		-Dovirt=false
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
deleted file mode 100644
index b29f17ed72dc..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.32.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2+ CC-BY-2.0"
-SLOT="0"
-
-IUSE="rdp"
-KEYWORDS="~amd64"
-
-# FIXME: ovirt is not available in tree; though it seems the gnome-boxes ovirt broker is too buggy atm anyways (would need rest[vala] as well)
-# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
-# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
-# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
-# gtk-vnc raised due to missing vala bindings in earlier ebuilds
-DEPEND="
-	>=app-arch/libarchive-3.0.0:=
-	>=dev-libs/glib-2.52:2
-	>=x11-libs/gtk+-3.22.20:3
-	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
-	>=sys-libs/libosinfo-1.4.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.44:2.4
-	virtual/libusb:1
-	>=app-emulation/libvirt-glib-2.0.0
-	>=dev-libs/libxml2-2.7.8:2
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	app-misc/tracker:0/2.0
-	>=x11-libs/vte-0.40.2:2.91
-	net-libs/webkit-gtk:4
-
-	>=dev-libs/gobject-introspection-1.56:=
-	>=dev-libs/libgudev-165:=
-	rdp? ( net-misc/freerdp:= )
-" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
-# These are called via exec():
-# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
-# virtual/cdrtools mkisofs is needed for unattended installer secondary disk image creation
-# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
-# sys-apps/policycoreutils restorecon is used for checking selinux context
-# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
-# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
-# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
-RDEPEND="${DEPEND}
-	>=app-misc/tracker-miners-2[iso]
-	app-emulation/spice[smartcard]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	sys-fs/mtools
-	virtual/cdrtools
-	sys-auth/polkit
-"
-# gtk-frdp generates gir and needs gtk+ introspection for it
-# This is only needed for creating the .vapi file, but gnome-boxes needs it
-BDEPEND="
-	$(vala_depend)
-	net-libs/gtk-vnc[vala]
-	sys-libs/libosinfo[vala]
-	app-crypt/libsecret[vala]
-	net-libs/libsoup:2.4[vala]
-	app-emulation/libvirt-glib[vala]
-	net-misc/spice-gtk[vala]
-	x11-libs/vte:2.91[vala]
-	dev-libs/appstream-glib
-	rdp? ( x11-libs/gtk+:3[introspection] )
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-vala-compat.patch
-)
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
-		fi
-	fi
-}
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddistributor_name=Gentoo
-		-Ddistributor_version=${PVR}
-		-Dovirt=false
-		$(meson_use rdp)
-		-Dinstalled_tests=false
-		-Dflatpak=false
-		-Dprofile=default
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
index bdb2c2fdda4f..040ecd6bf7b9 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.34.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index e01c4dc482ae..4540ae981969 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-3.32.2.tar.xz 947096 BLAKE2B 7c511e4d22971b008587aaa9ee7a44bfa663b663ebaddd6b5d4426f673e0f8975506c3b6aaba2781e3ccbe9ab7b9eb9b9d876c1b8acae9e14b195bfbeb207c42 SHA512 ef30ddad8b68367f71c2b894f041affe2b88c8aa90ad40d6128d03e0dc4871fd57d632809a365b14bac0b53dad37a73df564d237b8f45d4c42c38e118cb26de1
 DIST gnome-calculator-3.34.1.tar.xz 965520 BLAKE2B 7dd7af4d2065aee9a8962983ebf723aa06e4b2e3ef98213a89044d70e47057a747a88fdd58185abb272589433f84a6fcd3a3c5fd7dc0281d13f34ccaba690b50 SHA512 43900cebc6b479292a45619f1e4f6afc5264e2dceda5d0049b59f27ebe2a32b5f4b2465a22f33b33b882ab0e737f7048fbe9395b18f9b5d2023da2941b6783f6
 EBUILD gnome-calculator-3.32.2.ebuild 1125 BLAKE2B b30623db22ff60d6a090e9cd5178fabdadd81a4bc87dd154f051ce68ff5717492103827aeeb6959a671aa1c84bb2d9022cf069da6ea537c27240cd25620bc181 SHA512 02c5b2fffb9cf022c20d5385dcda7f31a6130f2f9432bc669f98879f8de73b8e6d197e11dfa24a5688e4025477e4c399278d145dda2ccbbfa799ec3f3e017d0c
-EBUILD gnome-calculator-3.34.1.ebuild 1417 BLAKE2B ba2a9a20dcaeb66c79c361c60d0f0d26a2acb8130c63ae7825acd08e0e807d8f21f56ed415ea7cef82ef13d43c3983065d3037ba276c1ac6639e49169fec2363 SHA512 566d7c7a32a49841f3c42d72d64baae88281ccc6a5c64e551e00fe6f08c6c265de427a7411d51d87b8c9c93125e658ea47d00faaf0c77989e3fe5df2aab12755
+EBUILD gnome-calculator-3.34.1.ebuild 1415 BLAKE2B 7ab760953344be8fbc73f2d5447aa4e04856e9a9bb2c97aeccc4c1f3c276f3adaedd2602210547d771aecb00cca2d21af1931e4d4fdfce9c9f67f12d330133d5 SHA512 04c0c9e04e9f2009b732293648068fc6e0933405aed6006adb3084804657bc0f26dd7f48ff2b8d8d154ca949c064c40a4a9d32d4f32e74ec6434a5692fc951a3
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
index 088b89520529..5512971b8c18 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.34.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 6363e3b16896..4437e4b1eb46 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calendar-3.32.2.tar.xz 695416 BLAKE2B bf5b2b5bd8ea5934075d00614a3888208a06926b8587fc39724850c0fccb7e34920bb650f45a241074f5ea383acb80edf91884936c7b432e0a7f9e672e457b8a SHA512 6a1ee1b41080d7814e9a49b3a95689fb01325c9ac5eb1314b11e7097c3b8b120c7ca45b05c806c3dbac284a70474beaf419773ab185a7cdde96303fcc7cd3915
 DIST gnome-calendar-3.34.2.tar.xz 588996 BLAKE2B 114ea7a7ee2a8d7cbaa1d47bcb782d16891ef1bdd87838b62ac51f6c20d2f5711cbddc12a35278c7710ee660b18538211c9eafb64a1efa3df57f721aa7b1937a SHA512 6c69a1ee46a5ccfb4d6d1b7a60932412b486ad4576a4c78c89e03270147e30828ecaca6b5f0e27a741eb9d5ed74ca474ba0ddfb6d044748877b6c9ab7ae023a5
 EBUILD gnome-calendar-3.32.2.ebuild 1348 BLAKE2B d8334267a432b2d94a1c1fb4b9cf8baf3088bb4e9aad9b9e07369d63519f7a77162943f5775018bef7427c5fcc3f1cc561917877847748dacd5f7a0d9ac60edd SHA512 7163d1f66e96a2fd553a9b1de7f24ae8cf7545c4e13fabd0b51b8a789cd15f3da1959bced7f684e8b0f7095bd9611d9111d86ce4ae061e0130d2636b22c801ac
-EBUILD gnome-calendar-3.34.2.ebuild 1131 BLAKE2B ba1e4d0fe38e8bf876bb978f4db95ba7fc20b970412cc96a229b0397b849277b0c0395d39d24129c3e3080ca3983b90e1840dc77d6d791e81a07b2cbbc79a64e SHA512 4e44a7ac55dc7d97b5c342aa3cf4b1149e56b43f052f0591a9bcd3d23e98609371b263a136e5828dff721cab21aa30a5f2a90b5b23cb30687673dc2feaf6af54
+EBUILD gnome-calendar-3.34.2.ebuild 1129 BLAKE2B 2a12595c66caa9fe91d1ba09d61a4c30c3ed72e111152925c93aabf2b146d97e4bff0d1b3e0bafa60896f9952223b1fa2c453558a40b3461883164965ba9638a SHA512 da592cc9507de330e516c6c2f22804c07695d174a70453a1dcd3c10663893a83f819c9dfaff2febc0f07fb4a448d8a66c5df9d4eaea8067d8f9d3ab9b19ee14c
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
index f5261fb6c163..6578d925bed8 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.34.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 04f235a3c7ef..6a9ec7c818ec 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-characters-3.32.1.tar.xz 186516 BLAKE2B f6c6b95fbaab9f2e2e6454256bff87b243629927b1806161de2294a8b497cc1f601da747252f14dc8c232bbbaa581140b513a4db0c9993ee05295a82e294787b SHA512 d2c18b136da6ab35938de4adf74ee6c3841f5f8e46f3b1ed2bbb8f9d0e953bba1dc43e105ae2aafc880f3cba37b75a55d274e6776d2bc17a5e30364f5d625537
+DIST gnome-characters-3.34.0.tar.xz 188012 BLAKE2B 9e4f6dd972bb1a19a4ef91312bc35b8a4936dcdf8e40c97cb2e1286241ab405136b717e0ae6ec283c2b11a43d29509dcec45f0c8e59a196e98eeb1a19ed825e3 SHA512 4dc2f0027c7079034d50c2743607391a0e529bcaf4f8fdd495b05aa776027609a43686f4621bcf30f09a29fa6f4d5fba6ed6166e51ab66f03dedf3032bc65632
 EBUILD gnome-characters-3.32.1.ebuild 825 BLAKE2B 73d721a8275cb379b193488127e154617302a7b36ce42b3713ff090cad221334b8dce8b0c84131a4c55757177fc27474044df04f64882112eb85bdc265dd67c2 SHA512 a199cd5a561638a33cf2bb31576055c0b234d0e665c3359723ef990fb05df0231ed77335135783dae9dc335ebc2b89f2ff9e706b8771a4971a69eeee593451ae
+EBUILD gnome-characters-3.34.0.ebuild 810 BLAKE2B 0af8f5f86de3717933bb7e91a9cd1d1e04b708cbe69c60549cd54c147897cef742a15bdbc1535ae297bfe7e0a3a05cf69743fabdddb1ebfd70118d38075044c9 SHA512 91d63fb471c596f8d102aeffac9f23d7119e2bd54e70bd2eba981577354e78f415ac5ecb9b047c11fcfb8820fc306428050cb924f6a8294b665a8f4caccfb58a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
new file mode 100644
index 000000000000..bf9a1454f775
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.34.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/gjs-1.50
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5
+	>=x11-libs/gtk+-3.20:3[introspection]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index 35c6a3b24260..9765d0b8b2a7 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-3.32.0.tar.xz 505368 BLAKE2B 54952a9c0340d30e042ac4b947e6a0a8dac9823d8df2c7cb5871a6dca1e259d18a9e212d37d46901b41f1f1e41ce09fa86fb02d9ea90f23bc23bc8d9f159e994 SHA512 061d867cffd3d8fcd09e125f8d053b847f2b197a4354f330e8b6c43d7aa5e0cf2bb51b342545c79c352f9dfbddd1667f3e64a40c1e117e6fc63f54289cf7cd2f
 DIST gnome-clocks-3.34.0.tar.xz 506772 BLAKE2B 04844fa95ac58915694f3bac3fafb78f2117be259fda0b799403563bf5e52a0921d5b7d7fbaa85fd9dd8438b9dcbc2f7aef97f61bd812d62bfd188b81cbe0c35 SHA512 9e59534c5c8257ecab97876fc2742d37fd5dd1aad770ac31dd1c7dbafa9843f992c7cc39e3f5025f5091baf852538eb9d62bb07dd0a5c3c7a6cd69befa61ab52
 EBUILD gnome-clocks-3.32.0.ebuild 942 BLAKE2B e6776b51df2deb0833be9211eb5323998151796c8425751cf27ac94674faa7b6377206b2f49a1d336a59777921f8f118f2a947ffa1712ad06c60d295f399ff9b SHA512 0c4e73a50dbeb5d002dffe0c1dc689823e811ea81b4bdfce6971557859e509ea9827e96d8946315826ae1ec2eca420683b7b4aeff2bfca183c57f4d5bd24717d
-EBUILD gnome-clocks-3.34.0.ebuild 944 BLAKE2B 51c29ef223261e86c18933f06180ec0512eb1e772b409bd429251e387d9e071a62afc136b2303cc498f7112836cc314b941b18d011a13588cf8b74a967977a7d SHA512 efe930f42ac0c6cb51ee94913f20f526cf16b5f237238c6163f9552d0e38ebf6e48e52818434220140e3efb78ab878dca1a84c0f352f44c897eb7d04525ab822
+EBUILD gnome-clocks-3.34.0.ebuild 942 BLAKE2B 4aec57393393da6de41e80abb2f7282f789d71990b4554341dbab14dcd544c1ca063c61fe81cdbed95e35138b12a393dd9acda64ad3448337b1da8e2ce79b50d SHA512 99a5a60322ed7feea4492e90ddd4840522816bdd4bc649d26a00ebc724f207dfa445fda76d9989a8c4cb687bd0ea33b8067181d79734ea8a37628934d89031f6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
index ca0efa59611e..b2a6ca1bcece 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.34.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 9b33e0827ae5..8a6e7e03b737 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90
 DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
 EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
-MISC metadata.xml 546 BLAKE2B f85181a094ce55d8384761d521c8148f348723a18184a5043d534a329e27c98e0e9afc5064ea1abea0f9fd37b7f590c1006ad58e29d06a469f7a419695422a81 SHA512 1a3c426f2c39eab5f91d48200fe04f00d4a2148eee55c3605a46a5fb6991cec2d05de4a954ffd02f1f9cf2df3de134790ff229d1f3917008302cf19842dc3495
+MISC metadata.xml 525 BLAKE2B cc643bcc16f4fd5e8a76dd22ec36d3c4a3226d9062594cb313b445218cf9276e7d1b79b9a7a54afd3a2c9454ca1aa6a0e886bd2e2145ffcb7d656db1d538b652 SHA512 81f5a273a4686935f1b0d267fd056d2ba5a8f13750845ef3feda74586ffea0ce1bf98ac0c8a94b61c6bc893fbb9dc5bcb4864a020817bc27d4e61c9008069d2a
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
index e74931b4d5f5..6f7911fa6dc3 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+			manager GUI PackageKit</flag>
 	</use>
 	<longdescription lang="en">GNOME Color Manager is a set of graphical utilities for color management
 to be used in the GNOME desktop.</longdescription>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 53f98e090d85..76013aa75dea 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -2,7 +2,7 @@ AUX 3.32.1-libhandy-0.0.10-compat.patch 918 BLAKE2B 53fceb62485c109623815a408774
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
 DIST gnome-contacts-3.34.1.tar.xz 365384 BLAKE2B 3563ce0784c19b2cf61e3cad60afaeaa310c53c68f11da459a3053df6be769fe0bdfea84f106e11fd2921c3f6bf8ef6a03b8cd90a680dc5b46d9a0486fd0c737 SHA512 6dad3fd9d199ad87c642e9f36102a142958cd3f577eba36fa3ed2800af5acb44752fa1f8b7eb8991974c514245af51015e6b5e08636274b9048813c37abcc478
-EBUILD gnome-contacts-3.30.2.ebuild 1535 BLAKE2B 83ec57595fce94b72e7b27698b1b61741fe7d4d146d1d1e0b46db1d135f495c82f4bb42d19a35889e8cbf2a155f1c27415b860eb9598d8e6f4c4695d257ccdac SHA512 361f2b124cff1fab69565045246465c69191003911bae74e33ddf46b362c9eb8e9d108a35d9e13fed41f149fdac9b4964792e2814ccccd13eba44aaff2821582
-EBUILD gnome-contacts-3.32.1.ebuild 1702 BLAKE2B d1d4e18d423dbec2f53acb4979a612ba6a8cce1c312b2710755374fc11a8daf913992f97ab3db1a72f4f5065c10149f48017cf5c196d6a17ca77381925310585 SHA512 4a975af07b04be2321bc694b0d8bada6c57cc0721388234fe9904599e01df2d8bfc9c3a57a11a8feb345c87e71e378f21df552beaef117e551fd4caea01d9c95
-EBUILD gnome-contacts-3.34.1.ebuild 1614 BLAKE2B a09962eb4daeb9cb6ef44f220ec19afb77d38f23813e90b35406e5b95145c9ada9aab2b11dac8a3288418fad388fc2739083a68e8fb1604bc0860e9957329f14 SHA512 562f5cd2aea4a69b1c9e015b9bb96bb60835c514843540ba5a7e8bdf302e17e68f857b744cf1b39c7cc67766c07ec0c2e81eb35880e4c268af4f7d72cd56740c
+EBUILD gnome-contacts-3.30.2.ebuild 1529 BLAKE2B 728a5e3fbf49c1153308e26bcd0b541c5168490d20419444c43fc0c709c138510eced523ba90c156df92d60f9d6cbb61e80833a274a096e0fcb252652c80725b SHA512 cfe781f150533677bfa9fd55b45af28eede8241b35ee5039a5e3ae19eac3306200e8d31c8af69ec918c002ca0400ae1730ba39e3994ce8badbb15c0aacc1b099
+EBUILD gnome-contacts-3.32.1.ebuild 1696 BLAKE2B c9527baadb26c0b4e8b4d5ef25259b752e9b5a7dbce0470e3b440dd4e1e4a82a7ac2343e4440d2edaf2a66fa9415716c79bf2a33625d8d390295b7298eeef3ef SHA512 e50e26a19bad02c901339a13ed3b76848d42d8e9f4668cccd8121576603fb61aa6a0d36340794ab50af2144a7827ff8e308ef57ec4883346eee1823e16d2e4fa
+EBUILD gnome-contacts-3.34.1.ebuild 1606 BLAKE2B f59f4be7af2ec1b898ab05debad82d058c75173765c33b6e8377c50acfdf80a8d0bad238313faad22de1bb1e41acec3476e69fed017b945cd50585129069754a SHA512 202d0a52f6725fe2a6063cc608ecb262acb6a9db626562f5f0e361b3566ad4722faa1878dfae2a320ec8bb5a04e497378fbfa8cbc0671a693643cebbb12937a1
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild
index 8ee3bff9f587..dd9c437ba343 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.30.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
index 7c22863f6525..c8e2bc7791a2 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
index ae3a1368f985..1fab11efdac2 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.34.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
index 046560941801..673649c16117 100644
--- a/gnome-extra/gnome-documents/Manifest
+++ b/gnome-extra/gnome-documents/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-documents-3.30.1.tar.xz 4777500 BLAKE2B 889a089e4968e233185a6018559487e0cede40bbe789bee3e1eaab3283bf66f797dbcf7281361432d0b3a41b68b1914efbfb5be4875fa1986cbe3241a40cbcb5 SHA512 89966d49ececa11ab49eb0e192c6a1d398ef13f2f809a02cca2d13f7ffa4cef45a29801971edec22d2f471ab4291a058c702842e323cb2a1ddd7fcc37d51b6cb
 DIST gnome-documents-3.34.0.tar.xz 914100 BLAKE2B 5b59931d488a5b3d3b2940852b64b0af3cff71c685d62e07bee5d0e981e9a78bb913db853c0c3f138ea1728d2ff7495b689f1f5509064131ee2a4649e65d527f SHA512 5867b148aaffd02089e4f1148cf0fbce37ba0ed40c7d255f9261cd225757f56b68293d59476ab7c11ebbe310cc7935081b2770e7bc24bdbddb5934da5ea0cf87
 EBUILD gnome-documents-3.30.1.ebuild 1671 BLAKE2B 1f79ceabf9acc8ae0909908236cd2beadcc01473411728202eba56550ae4814e1d2a2c2c00278d8062080be58ac9e1d6804f2224128a3b8f879c380a6f09a3e4 SHA512 0cbd3fc7fc0f57e3515b1a22c80111d634eaebae76e60c2972da30ad444e14fda5eebf7353f12b3b6b5b158c9c91eee3e169aee0e5594ba87dfa7f8f39a91e1d
-EBUILD gnome-documents-3.34.0.ebuild 1609 BLAKE2B 4f8be96a3eb3a4518dc760239418dc6066ff9eebb4d1591dab97bc6c0e85287332b47f8d3d242462e694c96ecd61004acfba7a73f14c729b762fa0f7ac681249 SHA512 4e4f1750dc1a5559ed00e1f72af2ef3da0cb0c6ec08f172d27e24966f5c144caf83baf17317b86343aa62cbe1a24bbd4870ef115bc8e36d35666704f45c895f5
+EBUILD gnome-documents-3.34.0.ebuild 1607 BLAKE2B 0bc7fda83f03239982ad15356e499ac70540b31e9ba866d503f2339ed72fbf0837864649435b5f6d5f7cbe052cd4f72038d94b17ace289ac788987a5a94fb527 SHA512 2223750d3e08696d4d4c5b1bba0a74aa488e174da0feeeb930b5f6b7b8dff1050204ff1b3374b971d287b582de3012380684bac6bbec99077dbffb66cef3cf16
 MISC metadata.xml 545 BLAKE2B 8439ff865c4f511b16c015eb14f037331dd31cb8430bbd2fe3dc3ddaddc8eafef6f25b9284288e9bd7606ae02170466bc5635629f7bba13dd06a35ca8b121f86 SHA512 ce74bded73ae951c37b8bf2d4d703dcf0e546b786da7e1874a9bc3078d9bb455e17abb2380fabca0b9cb00425117db7782dbc18c9f16d056cc489b2bd1ad53e7
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
index 6e5ef81238e5..75ed2285acd3 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # cairo-1.14 for cairo_surface_set_device_scale check and usage
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
index 96286f5ffbce..b4a38c88dcb2 100644
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -1,4 +1,3 @@
 DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 BLAKE2B ff08784a7b7e995a0bddda724cd000a2f98da22d7e27897a837e345523c02c2bf016f96861341181b0d4f1ee9afc5104675f1ab2c77ab14815f08f34324693d5 SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40
-EBUILD gnome-dvb-daemon-0.2.90-r1.ebuild 1238 BLAKE2B 1f84590142fbe1bba355364ff377b267f00c01be38955d2ba8e0aa7a77d38752c65b0edab9606b1f3d30231ed6490bab7703ecce61ffbe0ccf84ff8db41ca191 SHA512 f9811a24e47bdd256258f61326612e5c3d653d7ce123b538594195b033834d5bb2b351ee69c87044103aab0e3c79d5858d6cf34f5a61bc06e7a63528c1e4b75b
-EBUILD gnome-dvb-daemon-0.2.90.ebuild 1670 BLAKE2B 563debd3f8d7bfb0d84d53e19bd812a4ca77b1b32e85a53ff74c32aa306a653a3bac66198737c6eb4018c332fd560596634ffb7dbd88b0aa832a233f9644861f SHA512 35b461c857dc7ddaadf7e02ff48e92040c4b67e3eed2293643f5962139d137cd3128037b60b15bf74084f70235274ccac87d45a9bce4e2d042aa9e572b7ceeec
-MISC metadata.xml 587 BLAKE2B bd4ef7c759254cf493e4b55166deab4f94eea2226fbaa5630708b4217f2fda2f2b6537620b5a0fb94cf3cad8db87f29c7da05c42c85060475667df71cc8a88e8 SHA512 e3f3fcf4fefb21c6d5cdd394c3c663ba1f178e7f2f7432e3e03a0c2a546baaf328d25fed7dff1145833d8df17f955acd0e2d49db404385c4eb6155c961380243
+EBUILD gnome-dvb-daemon-0.2.90-r1.ebuild 1237 BLAKE2B a29280a6449e9ad0c3b2599a6222751456f852dd421d31488a7ed57a0b5f594128938fb55b1b7575e25859a958b2fe1eb187ebb933120a26be27aae3a3ef57c6 SHA512 6dadb613bc64f69bfa35f0632a90fbe42efacd8d893cf0a1c24409fe81f44d441883a646135bdac8014c21d14972daaf737d99ddfbb5d45c33f1403176ae53b9
+MISC metadata.xml 499 BLAKE2B 196e31566bc7181b8f4ca791e7d43062092dde4cb932fd3d87519a7685b9ca1e4b8803f3d773242bb2c1b251c8a6d46243005b7f9e53504fa528d4fa51251d92 SHA512 beb670424cdcc964d0a3628e40c84f3244909e998d69efe644af500f678995ca78bffc5195349c20b2ebb1977e9f87d36d1f03f2827bda191d2aa843fb57dfac
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
index f13dd4ed9f63..6544de395e31 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/DVBDaemon"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
deleted file mode 100644
index b7703aef136b..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_6 )
-VALA_MIN_API_VERSION="0.26"
-
-inherit eutils gnome2 multilib python-any-r1 vala
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="https://wiki.gnome.org/Projects/DVBDaemon"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="nls totem vala"
-
-RDEPEND=">=dev-libs/glib-2.32.0:2
-	dev-libs/libgudev:0
-	>=media-libs/gstreamer-1.4.0:1.0
-	>=media-libs/gst-plugins-good-1.4.0:1.0
-	>=media-libs/gst-plugins-bad-1.4.0:1.0
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-db/sqlite-3.4:3
-	>=media-libs/gst-rtsp-server-1.4.5:1.0
-	media-plugins/gst-plugins-dvb:1.0
-	dev-python/gst-python:1.0
-	>=dev-python/pygobject-3.2.1:3
-	>=dev-libs/gobject-introspection-1.44.0:0
-	x11-libs/gtk+:3[introspection]
-	vala? ( $(vala_depend) )
-	totem? ( media-video/totem )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.8.1:0
-	>=dev-util/intltool-0.40.0:0
-	>=dev-libs/libltdl-2.2.6:0
-	virtual/pkgconfig:0
-	nls? ( >=sys-devel/gettext-0.18.1:0 )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-	if use vala ; then
-		vala_src_prepare
-	fi
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #569992
-	addpredict /dev
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable totem totem-plugin) \
-		$(usex totem '--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins' '')
-}
-
-pkg_postinst() {
-	if use totem ; then
-		python_optimize
-	fi
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	if use totem ; then
-		python_optimize
-	fi
-	gnome2_pkg_postrm
-}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
index 001aba64a9ee..5a4aadc6227c 100644
--- a/gnome-extra/gnome-dvb-daemon/metadata.xml
+++ b/gnome-extra/gnome-dvb-daemon/metadata.xml
@@ -10,7 +10,4 @@
 	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
 	by any application via its D-Bus interface.
 </longdescription>
-<use>
-	<flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 974d10cb3732..b0d604796d1f 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-getting-started-docs-3.32.2.tar.xz 110300936 BLAKE2B 214e9896c0b3c3a4886cf24cbd5448d27a47cc14f0729e7c790eedd8a1edb3bd11dacae76b16f7b940bed81b74168927a0d708f6ab9e74ceab1c22dc22a7c651 SHA512 19b9c8fa9f03799287989c7cffb74bdb17b12d7045a61dd9d3d2921e8f06071f5f01b2d9ec956cede159208fd7ca4f367e11ef9820224e9a5f611100962c21fc
 DIST gnome-getting-started-docs-3.34.1.tar.xz 91398724 BLAKE2B fc208c7f88ee2ea00af74362540d22ff70cef14aad246021e416ef1b36c3cd33ca783c9947c0a60c8d83f65c7cf289c3c2e284d84efe61d6ec24f7a6d1843673 SHA512 a4e7088cf1eeb11ae8f863ce0496ca312d527b678df3867a5995d51b620a1db56e57afeb7623edbfbb6184aaf792864f4759d237a255a2fd51d0dda64aeff356
 EBUILD gnome-getting-started-docs-3.32.2.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
-EBUILD gnome-getting-started-docs-3.34.1.ebuild 420 BLAKE2B c538a7321e2b358c714d90c017d76e6a8802de11b7f3ed293b8d826c007b3838d828235f8130d6ea84b1b2d18073f53eefffb54385f82628b33828c0e8ccb9dc SHA512 4c2f07f20e0915386a005900534b626443edfa3e15c67ebbd749bdfe4899d2e989cc527492dcfe7a474ada7c60cb2901e0fd178382f9f173aaedc9a069c5719f
+EBUILD gnome-getting-started-docs-3.34.1.ebuild 418 BLAKE2B ec3e85f27f7e6ebb7833f2e9ac90911d98e807a4b8b1b8dd7655cd3071179f91a7f7bce9f40c9f68a1df246e8f70444aaa777ae0735c29173adbccf67c358983 SHA512 e86cce3515aef24960dfe44e05ae429e49ec2f892a44098ff8ab3aed1a13410369486f5f90672e18cb08d7566c5d92580e413f2d06e35d35be80a42ac6ac908a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild
index 643475314c66..f9651ce7e447 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index e40d2c76caf4..6132dd522127 100644
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r1.ebuild 1071 BLAKE2B c35e1686a3659f84a30da2e1903326947dafe3c87523a08092a81c2d4e2df4eae4f9d0c318c835584a2828ac54e605eb9cb2ec8649d90fb070e628ecc34a19ac SHA512 22ba583e5b386033b892807175a480b1d1256e8d5580e6bbf4f35fb395d97b3ba4a207cd47d3327df39442df172b9756c5c47c1272dd99b1465f5b7af5646b7c
+EBUILD gnome-integration-spotify-20140907-r1.ebuild 1091 BLAKE2B 84ac5073342a70d53ba4ed6f4b5c46bd44465522f2553dd8d92ae0e998657c5a6ef19b499427723cee426e00d25d91da4a11cece3ca6a50c354b4319d1c3df19 SHA512 cb317bc0933ef6a1c1a2c6ef90de0e832ee8986ab2ab948b53df8b38f6262a8a1d238fb093b434d85430527785a8450983f03983154a3ae45d8e67a5404f59c9
 MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
index 1a9557cc16d7..161922a45854 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 9c15b662f2f7..847672c36405 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-logs-3.30.0.tar.xz 1289980 BLAKE2B 51c99c335b72039eab96feae8acff55f17c65b44959ce7b0f6a310a71dc4d372fd7e225a73650896a7177650ca77df6cf340a91cdbbff0cd18dfc1b2fd658d1b SHA512 940aa6883538aad28ce86e313425e28f2633d68f55dc3b17260bd81f6232799b29234d9a26dfd0cd26af0d0debf0cb832e76b5b8743d95b8e32514ac5fe6ece0
-DIST gnome-logs-3.32.1.tar.xz 459524 BLAKE2B c3330257df4e6baddb7cfe6053787d2084ea50ca36b2d792c940be997a07b198a3b1277ab5e0d9ccaa272ffead8df05d27cf7f9cd637f882ba0fd23b0b199a91 SHA512 bb2bec86c68ed9850bae99420d5ca7855ae557acb5712ec17c67c071faf98b84e8562d27acf09c7feb08a62eb1570d0c72d28a1415924304b2ade36692428da7
 DIST gnome-logs-3.34.0.tar.xz 755704 BLAKE2B 2f9c494f062adce6f325baf5eb29bd6b9ad8144bf1e5ca5ee5672922ed6086f3ddf5be9dcd0d33c74b9c8ffacd1f2de060b2d62f3ae4b9d2206c1f74d7e88260 SHA512 4c93f85539c0cf51de9fb27212800466ee36bc1e105906456db3854b663bee68024eb10b288327893ba27bf1f5c10feeaf0101baba6a34cf18171a3ba5c8c48a
-EBUILD gnome-logs-3.30.0.ebuild 898 BLAKE2B fee69afffd4975c489be85e502aead7e803c98a5288d485e9e86b7bf67bd91671a0a53d0474fbae8de14f462f207b5bae401575ab857b5ad3946f624cd706ede SHA512 5a9752c433b7a8f7a13f59e75a441bded180b8c43d641a5f4384604a2376cce58cbaff272aa88652858119622c0857c5fdcd3aac671554f3543546031c182dc4
-EBUILD gnome-logs-3.32.1.ebuild 899 BLAKE2B 1ef591cf196c29bb4969e844df740b49b88a3bee02de8cbc0d8b991c8f3ecbd4e3cbaaf5d8c8f11e39e77ae01c546d2b581ab1078f8db00f7c3bd9221c027f78 SHA512 3a7fb30629439f9f6586ab3648cec06db687fa5900c86b0bbf3c53e4c92da256d037c7eb1d32207d515656fc7998b8a8b56c89027d419c03b9301bb297e4f9f3
-EBUILD gnome-logs-3.34.0.ebuild 777 BLAKE2B 513715e8472ab902fea643c44cf760af4aee46935fb33b5e64aff8ba9d4131f9263eb56a569d0ac3309bbe5753f23d68e6f8ce0bd14f44a4f96d589bbf531399 SHA512 bd297025332da2b1c8fbcbe9e4fc0f5cf4624e49df7cbfea8e0386d27220a4bb7a874193194ea143ab058b66a5d73cdf77deaf6bd340804dc24cbfc5cb286ed6
+EBUILD gnome-logs-3.34.0.ebuild 775 BLAKE2B 3448ed177f9cc53d932d69bdcb29c70c5861e45144b3427de7fdf972a63f6aa9bdef2ae5f9ca7e881b037fb4e4c93493600841cefb7b64da6631d38a4f2106f5 SHA512 cd05e10779a19c4474f133146a87bd436c5a64184222f83a98c4b5eeb20dbca46924dce21ba02852d1d9c7f7a30dde4220ae24e5cfd83a7c054972a99e210604
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild
deleted file mode 100644
index 2fd946af7577..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.30.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/glib-2.43.90:2
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/systemd:=
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	~app-text/docbook-xml-dtd-4.3
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild
deleted file mode 100644
index e5c5db386565..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.32.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/glib-2.43.90:2
-	>=x11-libs/gtk+-3.22:3
-	sys-apps/systemd:=
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		-Dman=true
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
index 0b0cd46dfb9f..e4ad50940fca 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	gnome-base/gsettings-desktop-schemas
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
deleted file mode 100644
index 4b003319ca8b..000000000000
--- a/gnome-extra/gnome-packagekit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
-DIST gnome-packagekit-3.30.0.tar.xz 1744188 BLAKE2B e346d76a835a84a0b8be46da7af1dba63ef96826e978d06e38490aa44485a010f76b2ed44cde310b8128150f5cf7461cde8007ee5ef7603221f9b947c0e48185 SHA512 69416ccb61effca112ef62ee7a7ba29c262ce768ee41a8bd24a064b66a7106f5e968dc01c6cc3d30d270bd9ebf8cf353044531ad3a19d63b174f097c67edfe9f
-EBUILD gnome-packagekit-3.24.0.ebuild 2266 BLAKE2B d7912c0de18a313ac7ef4205e795287aad317c76f6d0308661904e857761cb1e1afeb24f09d6f00d11448139ff8e41ea9e912eeee2a88c7b34df311e41401915 SHA512 f263dfcf1e526b6b5ca66baac4b14dfdd855035feb947f1f4c28ab5f7e23beea2e0f72be9223e05d8c9dbeaf1691dad2616fe74eaa01912d8843edc968012175
-EBUILD gnome-packagekit-3.30.0.ebuild 1254 BLAKE2B 421aa9937f80541bb262ce51c1669351604ecfabe3320130774c5e208f11ad643e8dc0b0d70ed5d0f332f2ddeb233f2df300ac452ddf928ff7b10ee040c68701 SHA512 e37a02488c75304ee93837eb5a15fcbdfb39d31724dca6ff6b6a2b905ec0364ebb891d2daa94e708e962e1b3cf5cc1c7fbeb731faf3abb6676cbff2e45428cb4
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
deleted file mode 100644
index b57e3b9ceb8f..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-RESTRICT="!test? ( test )"
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.15.3:3
-	>=x11-libs/libnotify-0.7.0:=
-	x11-libs/pango
-
-	>=app-admin/packagekit-base-0.9.1
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( dev-libs/libgudev:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.9
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
-	# * disable tests with graphical dialogs and that require packagekitd
-	#   to be run with the dummy backend and installed .ui files
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	# * gpk_test_markdown_func: no definition for that one
-	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
-		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_error_func/d' \
-		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
-		-e '/g_test_add_func.*gpk_test_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
-		-i src/gpk-self-test.c || die
-
-	# XXX: g_autoptr requires explicit type support
-	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
-		-i src/gpk-self-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-tests \
-		$(use_enable systemd) \
-		$(use_enable udev gudev)
-		# $(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
deleted file mode 100644
index f95e27f607e0..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.15.3:3
-	>=app-admin/packagekit-base-0.9.1
-	systemd? (
-		sys-auth/polkit
-		>=sys-apps/systemd-42 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	app-text/docbook-sgml-dtd:4.1
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils and dtd required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_use systemd)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index b5f319fe16be..3c424a3d6566 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
 DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
 EBUILD gnome-power-manager-3.30.0.ebuild 1094 BLAKE2B dc026aee1e73ff75549bf0f4dff27303ff4e11f039f65684b9cb812b8f04d0e7db920b0507872924b714152855cfdff3ef5e1b34bb6246608e82893a85626ffa SHA512 99d2492bda2450d55244196fcc63eaf814cb110eac13f1bffb058860ce481e2d0fc7daf5fd5be4f200acb115466c6ef0770c4101ce904ad8603609efe14795b7
-EBUILD gnome-power-manager-3.32.0.ebuild 1098 BLAKE2B b5b5299a35359cfd2b35253f59bc6def491e1abe4ec5047b6a2b92cf327a8986e9c9d6dd458cc1f31b42cd816e3425ea5e20cb8a7799ae5d8116ad0638e12f11 SHA512 7996569a9dd26826ff5523537a19bffa82cbafa72c5dffecad2d0e6dbab57c6d4f60d5cbaa006d0ad6f08fc55a51941980fed090a232de6076c1cb952c2f5ca6
+EBUILD gnome-power-manager-3.32.0.ebuild 1096 BLAKE2B 2f9a87bc5f6840bf1fd89d0f8d184be320d44b62b0137476325560330bb025f3ccd797f594fa5356cc84c7cc5eecee86d3160ecb7d191e95981444167a0ebf9e SHA512 b46d68fdfcc3d9be886945cc8fa279ce0470355f09ec73306140c655dc7b46780d67f3a4c5c1c3f807d48f2e05f776b71e467e50e84f7e23416048dba0d20936
 MISC metadata.xml 600 BLAKE2B 31046c118a172aa788bcafc57e5a2615d22a9ddbcd56886607a6b07a496adb950f3e05067470ea3b85298acf9ee045fba5fa315e9fe7eb7e72dc3fc9511f5dd3 SHA512 05290535ed07687c59013dbf7b3e527063a48f99da84fc6603ee48b4548d08e0ffe4a2f5836a100786f0ed87bdc43a68cca707c5f5f0c36a8126f53822561ef2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
index 459646ac6915..643e7e2521a6 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.45.8:2
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 7d0be0a40663..db26336fb530 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-6.tar.gz 79354 BLAKE2B f9e6aee73c742a080ad82434c3741087a2db1d9ad91ed377d380267edaadc4754a7e2621f228ebcac7c3eed1fcdd83960bbc949f38b07e38dfffeac4452f3a9e SHA512 1c12434944e8803dfd6e5e95fd932386345c4632214059070c56d1640a7c13a88240f225fdf6efe2fd1deb0c8d0a07009e01dedd4f56f029303fbd5e33faa116
 DIST gnome-shell-extension-applications-overview-tooltip-7.tar.gz 79965 BLAKE2B f7698bdad46837f1ae736bbb2d9b376a28946df5f8a00d2e9b19d48bc4c2f4e742030f952d14bf5816ca1aae9b172a2639e2170d6bd87f373ff23c7ce9bd8912 SHA512 1cfaf23fefe5a940ae448658e176c69da9bb319f6200983b4ac14f65e76f5e449b9a235e6c1ccaf9b6d6db0fda9576e963fa1273b776dbfb5a72c608961e2d48
 EBUILD gnome-shell-extension-applications-overview-tooltip-6.ebuild 1257 BLAKE2B 10d0f9276023a390dcf219620e7047fcf5439dd3b2c0dc7495303578c78eab7a5bfc6e2ec1909de96eabb9c3258593aea4e0e21955f9ec190ff23779deb4efcd SHA512 ac19312f3e552bd867eab9dd192a9140c891016423a1f40d14b35935961348959c1fb60ad278ede23c38b3afcc95e7a4a8e7a6f9c533cdf8ef7ac04e390d85a4
-EBUILD gnome-shell-extension-applications-overview-tooltip-7.ebuild 1259 BLAKE2B f67489ce0d5bb6ab6f01fec03f30d6b9b50fc48b220e910c7f93055bd945629cd7d2345d1d9c7b491965d59a1b30e728ac1faf33b05b708e74d9dce1fb01a110 SHA512 49caa780b4898dc9849617fdfc17edd4c6aaa164b749dd9b4833a27c7749bd823d9cd3e1cd783c2078a54d7c2515275771cf78941b99e1e1f31399994d5c5629
+EBUILD gnome-shell-extension-applications-overview-tooltip-7.ebuild 1257 BLAKE2B 0aa3332efe830f8924e37dfa0d601c13c8e2e5109a4ffb5096fe62a4762f36d46b6d828d09a077a235ed8bdabe79274b6091a1098c2ca7df711e0b0ee3002d88 SHA512 efdbd3153a58a13fc3ea5e66d438e6913b774ae4318f81b417b00d920a6f75043aab9cee11074322c5025c678d0d5f45ceb930ad88d4cd114941fc62b6b343b4
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
index 8d4ffa583955..749eb17dd185 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index e30233b25e4f..e19a50526066 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -1,4 +1,4 @@
 AUX gnome-shell-extension-bluetooth-quick-connect-10-3.34.patch 218 BLAKE2B d44cf86a76c0a5a0596db9b49f96b1105a05493b2d39b13c6934c4410c8f1c997053b7d36ac20f1e7815ddbd0e536715da7e8be794ee941dc3333e4c08dc7986 SHA512 cb72680ab9ee09d1cf47b104dcb98749633ebeda2e8aaf2d7757387600287ed0846dd3cc4851df65d0aa61c5c434fccdf3ee9a41356da5287ae11f9ffd22afa0
 DIST gnome-shell-extension-bluetooth-quick-connect-10.tar.gz 18214 BLAKE2B 6ca20071041605c5b0a34198562b0d913d4527b2521a0f219e7533730fece41607b2270f0349f0511a6270a9f5b4f5d936247be740a6813aa9901adf3cc0fdba SHA512 5d2dab53b5377cba00743de6501259691c519dd404922bab0e500ca54bcf8942731795aff122c1669471fd3d6a51521ecea966cd2df843777ef1aa871a548772
-EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1187 BLAKE2B e847f4312ebddc3a2c0c309201990fbdf122f31bec592c90ed4c2b43979d9b47ff0a34c6d312e11eb04a183c199b354ab15c475f0abd69cfe020170631649fe2 SHA512 b353d379b8d582ce6af377b265969d20cac22b804354da381f8569ab54e9dcb53466bd042d6a0fea52c51f0f37dd9fa447c51b09f9767b4ac6a34a06c145d5e5
+EBUILD gnome-shell-extension-bluetooth-quick-connect-10.ebuild 1185 BLAKE2B 5c2b96964368d4fd74251f9eb8bad7b84f247eae4dc0b8768e5bb53c4bcdc71d8cedeb71182bffcfec5eec066afc53fcbcee0c4f5197c833f8d9217b3afcacf0 SHA512 5fabfe97d49fcfc2f873b50757b26aabdbfe0ad1923e13d8922d41c5dfd0bd7c030b56832bcd7a82b71c40de64667172cfc4147fd3851e15717711b6900c7849
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
index c0f1c95db975..281272309a72 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index ddfac98931b1..12f8f0c4ef0a 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -2,7 +2,9 @@ AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e12456114
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
 DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
 DIST gnome-shell-extension-dash-to-panel-34.tar.gz 21115843 BLAKE2B b1bb021b324fb69d65341aa83c528ef4029a282ea951361bc81860b8941a804b48b3713d095d5f160f8673e6de93855d2d34b63c7a04102f1d8995333cdbcbca SHA512 05acc8607175b99dd501e07624b242994ecdcc8d722081a37d254852de5b23de45ee9846d27ce9440c9a3c5ae4b279e6816c2c8a6fcc048fc5b01c9b72b005f2
+DIST gnome-shell-extension-dash-to-panel-35.tar.gz 21115881 BLAKE2B b04e363a0ddfbcc3c9343fb756999d756ced1e2ee24718836acf22e7c8de25d58513caa865b45b0a5b92f5220bf79c120d13763a852933dec3330a66bec90587 SHA512 6d1ed6fac48953d9b15265b969e50e65892ba36cb420794960b789e215f8f69c6f3797065aebb5890aa5e2c23f3e34ec796b76c7972fd2f8cb9a02a422be10a4
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-26.ebuild 1700 BLAKE2B a205c07d88a99441a2f2d21c94746bdb555bd9892e15e0d7ec4d2ef1e7676915b54bb01fbd253a9e040c820c4fd952326d23c6be71c46fd21f234dc6d8b7e870 SHA512 121b9e2446e6484876c1412e7f3032d31fe1a2c1e507c8b4156faea89ca8a73607a79999933e47a3fe3139023b55ec866392604b54cfd37b28d9e0dc2042ee83
 EBUILD gnome-shell-extension-dash-to-panel-34.ebuild 1702 BLAKE2B 9514ce8cc1dd5ea768fbb20ea2b9c803144f22345d431d66ad560c1d74be07c98be15497cac65d28e2ea7f969b4eb1c9cb3d9529be60989bb29a7b216a0fb384 SHA512 36ba1fd0008239e33017b58fd9ada13b41669cf3fb9c0d21b3d8fa54aa39ccb240d0e14662ad0042af81a52d82235a1fd0035422361d098e119284c30ef764d3
+EBUILD gnome-shell-extension-dash-to-panel-35.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-35.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-35.ebuild
new file mode 100644
index 000000000000..23612f13646a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-35.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="An icon taskbar for the Gnome Shell"
+HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
+SRC_URI="
+	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="branding"
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.18.0
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Enable by default custom opacity to get panel slightly transparent
+	# as was done in older Gnome versions
+	"${FILESDIR}"/${PN}-26-opacity.patch
+)
+
+src_prepare() {
+	default
+
+	# Set correct version
+	export VERSION="${PV}"
+
+	# Don't install README and COPYING in unwanted locations
+	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
+
+	# Provide fancy Gentoo icon when requested
+	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
+}
+
+src_install() {
+	default
+	if use branding; then
+		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
+		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
index b82c15ba8789..df7bad558885 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,5 +1,7 @@
 DIST desktop-icons-19.01.4.tar.xz 46712 BLAKE2B 6991d45bf7e8e0373fa42985d5e6a416a3cdbe90abe539dcfc474bbae58763843ec73fb379f4ed69637c31916b1a11ee3e08f4166b691e76691a03d77be33d08 SHA512 db840b2a5a5848c1bf151b59c3c35dba163f23026cc0d0a859cab5746ed15569153c70357dcc9d38637ef1af27a2df0d2e942a97521e4f750265ae4bc6bc1666
 DIST desktop-icons-19.10.2.tar.xz 47920 BLAKE2B ac53da69fd76985b134fcff50d3340ad804e0a466ddf179cf06a7dd14ceaa1841a99341471a8dc2fb09e0e4794d1fee718ce516750381f71bf5e70b5ffe4a32a SHA512 c6af4ffdb6dcc2c163dcf4dcac69911746fdc1dc89b1f590b82e962b8c400327ae459d648157d784c154c45488bea5961e01fc64c04ab72b5da3ca07229f80f8
+DIST desktop-icons-20.04.0.tar.xz 50448 BLAKE2B a93baf7cb37a3f78deb8780dcf4ec65bd20e42ecd9255924c61f457d3f6fe4cafd4865b80e414105f9e72fe835caaf034474f7e587a30b91c233edfc2851ad00 SHA512 6c411e4983901a0646d49ffa58bc9d711c33222b787795f5c237370168fb4bc7ff186cc071675decdcfaae846c1696d718b659b75120ad7777cb04dfd26dbc84
 EBUILD gnome-shell-extension-desktop-icons-19.01.4.ebuild 997 BLAKE2B 753f98ee73a40efd6aa3b89768956612c93900d335a792801e3900c8f3d75735d1cd5e6ea70ead1e592b0aed1ed8e9c4ac4405158d58735df7eb60de36b4a144 SHA512 029ba176191379c71287152d43bc29a6df9f3b01bfdbd88828c6a69598d08300966c6615abcc375fd7ffe360480b956271686666e67b254ccbccfd739a924d63
-EBUILD gnome-shell-extension-desktop-icons-19.10.2.ebuild 1018 BLAKE2B f72555cab3f18ea0dfa4280a21a840d8c51275df3ae980e45635a3f4981b35d52dc9b11c1e6b87a9bfa7ded6894e6dc89f4e012ce2f66f889f937dbe52994193 SHA512 f239f0cdb9e14b8047eb7cf9994f1ce478ecd649be03bd88c1fd0666114a1041e008a9cdc759ec89364dd20a8b49b825c262770315cae8b45cd2a3f8e225855d
+EBUILD gnome-shell-extension-desktop-icons-19.10.2.ebuild 1016 BLAKE2B f6ae679fd1f3db81de3eebd37f6b6c2f3fb25ea436c451a38f94daac82d53a729ea143f5b30ab0a8bd485c794678e4552e1992a635e9aff184b49874920a7eff SHA512 963bab8faf1c4b93a26d72dea65b8ee704af0127a1804698c707d9bcc390fbbcbef67fff5af70c47903e217c84c7c4f77817c52d2a71e639a54f7953c674960f
+EBUILD gnome-shell-extension-desktop-icons-20.04.0.ebuild 1018 BLAKE2B 50824b510342ffa7d816c01427cb281acd0be979fb20ccab9100a8e2ffe41e8201265c519dac04911b4bf6cf2cf37b6089e56933eac283f758fb29a1551600a1 SHA512 14c5ed1d0b5b7fc7de5108576d1614ce21ff03d7e7260f91c5cef6e8ddc6e895c1e7bff0d42df7834972bf792697d3c4b710b16a57b4f0d3a6ab1ec4d86331f4
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild
index 7996c7b33dd8..54ab2f0c340e 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-19.10.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMI
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0.ebuild
new file mode 100644
index 000000000000..f377f4d5228d
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.04.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="${PN/gnome-shell-extension-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A GNOME Shell extension for providing desktop icons"
+HOMEPAGE="https://gitlab.gnome.org/World/ShellExtensions/desktop-icons"
+
+COMMIT="2df80cf3c27bad3202ca184ea098c770"
+SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	=gnome-base/gnome-shell-3.34*
+	>=gnome-base/nautilus-3.30.4
+	sys-apps/xdg-desktop-portal
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 80b4a6babe55..0d842a193ea1 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -3,6 +3,6 @@ AUX gnome-shell-extension-gsconnect-33-notifications-limit.patch 1506 BLAKE2B 12
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
 DIST gnome-shell-extension-gsconnect-33.tar.gz 314704 BLAKE2B fa4f2eb6325356a058b24b92b683ca7331af30112d27060e8ee191c21a3269639da58992d53434c7121ea511ee9e07869b082f908b59e19fc2434f3c07e09624 SHA512 26ef929b9b128db0cb29fba22203a3afd500c5b1c3bac6917926a60350d271e67bb0985866f84877355c079fe4a5656b8ac5e8dae976d17d9a068cc825293bce
 EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
-EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1666 BLAKE2B 09ba266222d604588dd06c10e4f8e15d5dde7b043f5961ad50b6b5be3ddbf028ab6cdbc3c35180dc1ba2fa83ce7a174c9ee406feb5f569fb59ae5b7510366226 SHA512 7c534f61f68bd5a42a093cfd7b8891b4988797a58410bcb8594ba5eeb456279229bcbad15827c161ba281fa60da2cd3a7edeb9006da13f46c8167ce5fa6718b7
+EBUILD gnome-shell-extension-gsconnect-33-r1.ebuild 1664 BLAKE2B bddb769e769f33c01755b4eeccf9e7765e525a9467c49b6ea9c14cff293305ab20f342b44acf4a4e1f159e7814d519b7ef522743714b3fa48f5fd556411f8ca4 SHA512 af81ce708d1fe19d409ccf64ef40b6acdcd02c76607565b3bfee7f097480eeedc159c58d10de4b6a8639abfb03ec19bd6ab9ccc91229afadad7f4ad7bd73732e
 EBUILD gnome-shell-extension-gsconnect-33.ebuild 1536 BLAKE2B c00fffeed8cd0ac7444cc1dcb4629742da2327b058c6be3d4c9183793abeccbce7e2a6ea5aeb82053fe65b828ccd32084eb544cc496f723c9145d3c91240391c SHA512 4d9ae97e9949ea93a2fddb48184a3c5d015b3e39076ad2241c196f7f662c2b05de5017ccf761d4fbeb13ebec1b953fb540f35187e874e520cdd44e3970d38376
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
index 680156b1810b..a098cab435c9 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-33-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index bd4b68cb6f2c..6666efc1aea6 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -3,5 +3,5 @@ AUX restore-3.22-compat.patch 1800 BLAKE2B 0289a7849eb57f614945b19872427d56a0873
 DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d
 DIST gnome-shell-extensions-topicons-plus-22_p20190929.tar.gz 2759460 BLAKE2B 2eb001f472395ade58503a860d3ea8248bb8aeb36b4d6f13f65e1074694aecc02f814d18d449206e1055984177896ac787fd925b4cf2680f226ffaace042cc5d SHA512 47cb156f7a61780a53311855d716c4e4f539832080fc011db634b472b5a8aa0e9fad5b6f44bf2da30665cd97b850725822ee9fb9ed9da014388cf4adeee60fbe
 EBUILD gnome-shell-extensions-topicons-plus-22-r1.ebuild 1471 BLAKE2B ae60e6e306d0f3762181305f7f49e8bdc6552b7402cc73348008916ee42b9675ff53c199346aff51b7ab43a08013c1b53a5ba7a2d9f2b3b16cab853f1e8c2f07 SHA512 9720ce22068caa723a892b9e82604ee093c01f2848149e3d701d234dc76e20385b3b54ee0a68e05413a5f548a8ae54767abaed51f860fc8c237085251b309b2c
-EBUILD gnome-shell-extensions-topicons-plus-22_p20190929.ebuild 1490 BLAKE2B 304e24e037375396e39c8389bf1ce421b5343cb89ddbf6734aa4d4b3f6438e0708acfe15ef265d19246a6afd934075c0b7f9d431c9711faea0d5bdfea5581c3c SHA512 2d971db6415fadbb92484f11de572da2fcc630ced470bc7e0dd41bdba43a6bed53e22cb6f011f92c556bfa1fadd446d269ae83c6ba954f4b0874f6df1778ef64
+EBUILD gnome-shell-extensions-topicons-plus-22_p20190929.ebuild 1488 BLAKE2B b4e6fc474080d082bab98cb5dd7d5a1e71a8a225216ca64308d5502cff7ad2294764b1669529fc8615d889a688d2f9cd6b5576e349cd7a45cc2c25bdba031e5d SHA512 ec7e20f84b1b16e3c7f42eae287cbe11520b081a953fc73363bf5905dc83cf3d8279d315ab2600cfd30764c25365332d020803b33daf35c6de98ac2fb15f55a5
 MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
index 31bf7980e4fe..90c74ea49a0a 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/TopIcons-plus-${COMMIT_HASH}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 7f94959d3bea..719ea60b6e6e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -4,5 +4,5 @@ DIST gnome-shell-extensions-3.34.0.tar.xz 204624 BLAKE2B 6d502927df71cc8bb25ea24
 DIST gnome-shell-extensions-3.34.2.tar.xz 204860 BLAKE2B 8abd569a18f693f4f7ffd4a20c65453a33bf17cabcc2e77a037085d75936a7fb4a7ee83829c71056830b825e4a9c694ad346e5fb3a844ad41140b6bba8226e68 SHA512 1611115fbedc2f8708b5596b5c44092e5df6666d43596d7a87ec32ee5f83e9e39d2453cffef0e3445f63e811d21ce20f5587a5a27e0fde280d9715d5cc7dc290
 EBUILD gnome-shell-extensions-3.32.1.ebuild 1990 BLAKE2B 04bcd97ca920d55f7dfb0f22976e38b536513f11dcc9a33f0d332e56269925c5910a1e6e0d30a796c4378ab38652b575132a34eccb1b61b6f705f44913e7454a SHA512 f72ac6469afa26399c1f5ab6411ab495e255ffbf6374b700ecc319cf0f1ae9d2bd419ee26cf1601afecc2bdfc42ce61f15d144932989ba64daf9d825a426916b
 EBUILD gnome-shell-extensions-3.34.0.ebuild 1883 BLAKE2B aa5b04cd36b8a5b8207cd093ab041e055480dc583604233722c92c313315f591f0aef889816a21a1ecd65bb803180d8539b6506297657f7d69e42c299b8c4490 SHA512 225e08d11ea03f15454fa40eaa76106527e4d7c6eee7c486fc65f96fc6c5145e748bcccfc95c5f3407cc9d969877b9387965fefc7d68449402eff9de1edfbb67
-EBUILD gnome-shell-extensions-3.34.2.ebuild 1883 BLAKE2B aa5b04cd36b8a5b8207cd093ab041e055480dc583604233722c92c313315f591f0aef889816a21a1ecd65bb803180d8539b6506297657f7d69e42c299b8c4490 SHA512 225e08d11ea03f15454fa40eaa76106527e4d7c6eee7c486fc65f96fc6c5145e748bcccfc95c5f3407cc9d969877b9387965fefc7d68449402eff9de1edfbb67
+EBUILD gnome-shell-extensions-3.34.2.ebuild 1881 BLAKE2B cd917333aacbd79a1b33d1c21d713dc402824bc1f2689c47becc23926411baf21474dbc0a98261f46c9fb8b17b3e906fbeeb9da9abde19b2399681841f184798 SHA512 0ad35ffeef92e2721eb5b8aa02654ac1edf566492316081a34d4c963aae558801b5034de790bb4e2e8abc6f975621397c3e973c294b9638cca93fd18953bf3ed
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
index 8697411fea58..db67936fca27 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 2ffcc0fa8a2c..0f9def4f5985 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-frippery-3.32.1.tgz 87307 BLAKE2B 06226a084be2587db1114d69d5f5c04a28682d3bb98e72c4d6d9ab34e8c4173c0e57c8cfc6a8b204b6d53a8ba3b5dccc9ff2db8681012176364eb20f2c6851fa SHA512 56604c7b47778454e61839e4c81445232357c5f6243974643cfc5f0524eecf8109dfba7af425ec0430aeb4c2845f58bcc9c0710087e6032b0b438e7db8be87aa
 DIST gnome-shell-frippery-3.34.2.tgz 81928 BLAKE2B ae95379333037e4d53638bbdbef2059d36f3dd1007e2d791a3b5eb6544d006823bc62cf671dc772672e07397b20a9f3e25bd803eb143685f05413a23887d3601 SHA512 3fab0778a2076f8c52d8aeb63d8d8b8f6ae2d12a381072fe39c6c318e744b56749776a4aee894e4f1c64bf90ecc3d1bd87ede6357edac9656cd6516866e42484
 EBUILD gnome-shell-frippery-3.32.1.ebuild 911 BLAKE2B 518cdda9c7364f603a1df07142206664fca30d4d7cf0ba5d8427396c70acaf27ec61e689fb721cb88d37e35d73b85199af28330639cc3b1756b37526dd0edbf4 SHA512 77181aea64f07696764dc3216fbdbcfb6cbb31214b5a9acc801b994e63aa59feabf4a90dd12f2e6ba00a3d5359c283478141e6757db568de85b95ac9eca92897
-EBUILD gnome-shell-frippery-3.34.2.ebuild 913 BLAKE2B 2cfa26f6ba4f293a5c173ffc66c93ce3dc1909e7e318665f4da68e0610789e95a413f78dadef68f1022a51f03548693d2a231c727899aea4ee5517b6691d6e67 SHA512 581b1d308f26fe7da465de0b9c16eed9237c0c15482509ce14671af4857317bbae963634a76085f55ae9d09c5bc9fe1b3b8950f60c1cae1216d2c4459324025c
+EBUILD gnome-shell-frippery-3.34.2.ebuild 911 BLAKE2B c2b4bc1ddbabf3ccaf68aac55400f32b7b939e99d47097d92f876fe4c19198612deb26c7b1aad6b622f284f8483165bf4e60f9e8f8e564b6344ed8bce78d78dd SHA512 258c1dbf7f5e8ce65114cabe0eb9ceec362cb3b1feb1c2f9a1efb9ee5197aea14644ce45d6a165fd4903330293433e451d17be4a1a8c1cc707218a1d8a143d54
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
index 5e3bd7107e8f..82234d9abd25 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.34.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 5b3686184fd7..d20ecd474972 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a
-DIST gnome-software-3.32.4.tar.xz 4852860 BLAKE2B 334eaeccbcd897720e11f0b7b9d4cd9f88c848e536c11e74217074044cfc40ea41fe452b68b6c45787a8369b49268dd704a2efeaf6378e35d3a878ec24f6907e SHA512 81a32477fe755f57465cfbc3d1c88a2f460d6a21222fd73aced06c92b409023a1ace002c338e713135658896c2c14a7ff8508eeefbc5f648e66d8c8777dee881
 DIST gnome-software-3.34.2.tar.xz 5945736 BLAKE2B 89e7e0a606a832aedbfa32024f201e71b3edb3c8df527efea1be72236b4bfb86901f3af689b10bf706f9c4f16e6badc00080a1244ce30eb09dfd1dad5833e8cf SHA512 4deb09530fbeeadd54e69d03ef4cecaef47c6766bce0ec5230bb090d27e54664577a227416933b6ec4780249f4565e51202a25517fba5dd040fd895bd3a26397
-EBUILD gnome-software-3.30.6.ebuild 2531 BLAKE2B dbbf3176ecaed83bb3310531ed437afe91793c1ccbd1b788ac9ff05af8fb5342d0c147b0eeca9e94cd3e8637df8aac12324ced104c2c5416680bd8960cb6ca3b SHA512 53a36a9d2dcf7f75d73f56eeb75d6a6fe785984f3dbbc0df87ea965f53ba30c04b1a8839a77ab455649930834507dd04ef31d63f92d0963dfa91f50c8b797855
-EBUILD gnome-software-3.32.4.ebuild 2511 BLAKE2B 287cc883208934666ec0f2205d9152a76483cce475b622ed5f705aa654e230c3c8ae74c792e0d568d0a07397b8c7964da35c4ad54ef93498e34188e27c0555ed SHA512 b473dde75bb656b29e97874e9d6704505d6149e689aaf260b4af295fd931f9060871645c5fda38d396870355b50c15b343d255b0ca4a7eeae5175389cfe1bde8
 EBUILD gnome-software-3.34.2.ebuild 2573 BLAKE2B 42962cce1d59f2bd34f7240953e81ab0efe7764b8d8e0a2a23d7df67434649fb36e4be83616e75ac6b61c0d3188b18b89534f96e5c8450e746f4b1e22717e95e SHA512 93d58befc3d225c99656b6e13267e0a99b06c54550125151a786fdbc6f67f6add53725dc327adbae745f7a726382fddfc54bfe9964b503182b7510f3a5b46642
 MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7
diff --git a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
deleted file mode 100644
index abaabc99d6ed..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell test udev"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/glib-2.56:2
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/json-glib-1.2.0
-	app-crypt/libsecret
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-# test? ( dev-util/valgrind )
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Drpm_ostree=false
-		-Dsteam=false
-		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
-		-Dodrs=false
-		-Dubuntuone=false
-		-Dubuntu_reviews=false
-		-Dwebapps=true
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson test -v -C ${BUILD_DIR}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild b/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild
deleted file mode 100644
index 41a258a51acc..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.32.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell test udev"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7
-	>=dev-libs/glib-2.56:2
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-# test? ( dev-util/valgrind )
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Drpm_ostree=false
-		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
-		-Dodrs=false
-		-Dwebapps=true
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	virtx meson test -v -C "${BUILD_DIR}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 48a48f8660c6..6e85b35c7e53 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -2,6 +2,6 @@ AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332
 AUX 3.34.0-fix-python.patch 2967 BLAKE2B a1a2859dcd5ecd1028b1b08d266960bb0366d0a940c81a2e9e338af02b72a01939a835dca37ab05b8a5b0ca8e118e2e0b5178479aa90b61a59b3f426f83e95be SHA512 097abd98bd2124c5e2536ed7bc8f337f836da4a4dda4e2566d533c16e771d91690f43f47e7d61a9a238e2c9cf6e687a057b6857265ef3892eacfa7f2079a00b0
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
 DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
-EBUILD gnome-tweaks-3.32.0-r1.ebuild 1233 BLAKE2B 9241987e7079112f706e7de2153153502efa9ec9a187666e2792d797932c03744e1032be24679407fa99ee499b2da205c35335ff3b98a166c2fcebaff1d16967 SHA512 773dcef7bd2f9747dfecdad0d405331a394eb3dfe2a715d14ca828cee634c8e3f92fe76a768f3d1ed368ac8cc771c08a7600ef43fd746ea7ba1eb8592cbf9fc2
-EBUILD gnome-tweaks-3.34.0.ebuild 1277 BLAKE2B b9e1a689c5c3ae687454990d2750187ddc37f7516b9f10e423c7b795ee6a67aee89d8443ca854cfceed2a4a260b3511412dc8570d5ad972e511d5a02f968c7c3 SHA512 a1af14cfa406fdd41e68ffddf415500429bacf0c678a7736960e6bfe3e0d23ba2d3457e98d8efc87a223a4a916ec63ce2183afbc9c9ca2c770eb4d45141e2b00
+EBUILD gnome-tweaks-3.32.0-r1.ebuild 1227 BLAKE2B 35cb3f645e0174d515d5652579495222181f32c9f0dbe893ffc449c038fee8d33e565ad03f94d61c5af39bc601f5ff62f4ea96fab2d331bd85b10fcd28f2518d SHA512 111af59d300ac973812150ba1f0000e7f67a50975be8768bb0421ad3101ae5f152875f37183b38a28ae59df05ef9a7ce4d31593ed11a74957361b9f47d01fbb7
+EBUILD gnome-tweaks-3.34.0.ebuild 1269 BLAKE2B d7dff6ea7652815bcbe22a88ea51c6690cc3a86dc72bb25f2489dd47f3537704d751ffecc9ff19c96a5019d20a88ada90d54687f1a7cc140f1239144457f3309 SHA512 b2cdf68c05cc4e71bea22a3be8321bae0ae4ae9c793e57575373907ddcee611f2091d07377a15666f226a5e7893eb7a572daea2ad858da2182937c72df8e8d9a
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
index 40f1b553668e..9fcf3109add4 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
index 7a5ad14a25b8..2f288eb6ed57 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 38d06744a95b..0f64b26ef955 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-3.32.3.tar.xz 15861776 BLAKE2B cc4a73319ced02d7e087d2e9e1a70db22fbac3f9bebc34deb029c913573b34b58977007fe274841c6b61d05c3e169f959425c28846f1c741944f61c1c01b53a2 SHA512 4b62be1812ae67283281ec9d5dfd7e694dd01c04ede949cef76ab42dde72b74f90a67bc359e86700f515ddff920fb81a40e91acef56c85b40b49ce0505c1f7ed
 DIST gnome-user-docs-3.34.1.tar.xz 15983924 BLAKE2B 5e9c07cb1e5d33b4fc220a00e679e26d804963fa7ee8d42d4e805e8abaa1e8717028c03815ff3bd82f81d3a61fcf38b258940ec88ef2e9b1fbdf4df6d94bb8d0 SHA512 f9e65f4d0770ce97493f2eaa6b7743575e3bca3d816d0cd06ee35af99016722631086502450db5900693527a71bec9d65c97829c1486b6aff4a137a7f6016baf
 EBUILD gnome-user-docs-3.32.3.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
-EBUILD gnome-user-docs-3.34.1.ebuild 949 BLAKE2B 4e576f3a233baa42375a2086e5a18db47ee0d0316063faff9f6bfcf6e4cf766ccf64e12f93d2d300907ac06ff085cd21544782e5d81abc76fa69883b92b2e8fe SHA512 b0cf4e019833cda7ab1e35eef0855fc82fe9e648d4cc3f9f56fbdb2f6290023430645f59540fecd1fdbb316e6e42f68c744118d5f1026590bf17e2c677123888
+EBUILD gnome-user-docs-3.34.1.ebuild 947 BLAKE2B 2d63b7d012c49dd350c274f6e7bc2776c58cc2637512bd9dbf139f53a0d1500c7869832f7a0bfd4ed3ca941e459e3d0ba411c4183ac4df738a91f01cacf6bf32 SHA512 e53c4bbe490e9ae8b08abf8bce2e297c665b38bad680cb52866ffa567240d90757a0f9e1bb8f1e9746ed27d227a5f5b0dfc582cf9a25231d73eb50d462e51dbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
index 1c83d246f5a8..33297d29337d 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.34.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index 72b8f095313d..6b38ae416168 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -2,5 +2,5 @@ AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6
 DIST gnome-user-share-3.32.0.1.tar.xz 439696 BLAKE2B 278e46adfdb2a24a2b9d8d76e38bb9a6cb1b5ee85c820fbc38aa1ebbed2481537dc8686dccef3d213c0c83bb236f1431a9706b3d6cceace78172d93798534d76 SHA512 d644aaf0c0b593188936505391b1927d883234ffa5acd6d04675575fc68409512b416d87ca6d0a7960187b433a874f2da6ec2d304eccbab8846446f89df8297e
 DIST gnome-user-share-3.34.0.tar.xz 109560 BLAKE2B 02d0788ff6b4b1a87ebd1d5dee2a853ce0418a553aa2be262227f0b8984ed8bcf84bec774b43952425e96d8b14f4100fd42e0dbec02cc91e67e0881f9155005d SHA512 7aa5f0cad4b96af41b5e4b4a125cb7a9d7a7c27ba10cdf7c4acd2aaffe5bfb3494c9319b997e547c996017827383f7653905c3e0af67c65922635b7ac49803f5
 EBUILD gnome-user-share-3.32.0.1.ebuild 1302 BLAKE2B 47f30955ce9feb450b618ebdd019283627d038dee881551d29fef3c8a62a5ec454d136747d3cf39e16aacdc1af959c9fd5a8e3c0329c6688b96c06d660307f63 SHA512 ffe2f8a27ed53c321d68ed04c17e1d47bff42cc51322429268bd557c4980c9714bca3c850495805dea27ab7ebe4a491be5f981af915dc949ea456f0fce8ff241
-EBUILD gnome-user-share-3.34.0.ebuild 1313 BLAKE2B eadaab492536bf8730085ff5a6e1381ec3427bcfc4bc58d3b41fe320407dd2ab27526466ed699da24e4d26e93958695374e84a6f217b9e83315780d80ca1f23f SHA512 d9cea0ecfbc9f47d13edd38ca251df757e966314c0dff9fbe27093a04d0e4cb53597a494cac1e6f1c3591923b4b1a168bbe7af7ecc1fb80e31d8436b976df0d5
+EBUILD gnome-user-share-3.34.0.ebuild 1311 BLAKE2B 5ac0f7cc893855fdd531bb4e3b4ec97a67b5be57ae47e5a28190a4cb4c7a160efad244a358bc92071aa717a441a2ef353a2da8035812b15a834d13d4d1823afe SHA512 7f5a4f75cc115a2f9d264591f095937cfd0bbbb08cc4f71b3b6d2c9a08c4500f6ec7db31a750584ace850f787bd20d51837fbb3bc4611880521f8cc59b4c777c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
index fac4406caa6b..e609be40b3d9 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 25a336f8640f..8966f36daa09 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -5,5 +5,5 @@ DIST gnome-weather-3.34.2.tar.xz 5957924 BLAKE2B d6257fb7654862f5fbd308bc202ce8b
 EBUILD gnome-weather-3.32.2.ebuild 1245 BLAKE2B b8568a1990fd9f366784171f02b555c75a51ec9127fb0571d5aa60a67d9242c0081fb9dc2de57857daa3c415e24fe2ec59d795c86669dd5f3d9d1c7b768d8b56 SHA512 5fa1e70740f4d33d27db6e063df07b2c8fb691e5acc98247ad91e6e748271fe3ae48b554b4548512eb0c1a5a1ad531cbde99c1582ed8c9fc072b40a0f4c1369c
 EBUILD gnome-weather-3.34.0.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
 EBUILD gnome-weather-3.34.1.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
-EBUILD gnome-weather-3.34.2.ebuild 1335 BLAKE2B f2213bda169d47563c1998d28c107229aaffdfedbe3126a34c181db83f40a06f0ecb30ad3184ce4df3dcf4f1326116ceefca14d0565138bcc81f180c02f6c788 SHA512 beb6cdc6253ce24bfe9a479cfd47ecc277ed011e8ce98ca0c0aedfa1f89db672eeb2167ac0ba114ea74bca5fc18654957fdb113ef4254f2ae3795dbfd107cd90
+EBUILD gnome-weather-3.34.2.ebuild 1333 BLAKE2B 8a40937674d245eaff3481b2e76fe9e1d0d176b5b6c23067a8bad7bc90a4f6b3027862176649051e814b128986e7680d24ed48f417635728fc4359b35a715379 SHA512 4fdace50c44207d79068e06da79d7e88c436cf364eb044798e1872d58cd41748e6fc07b3687bece07b98a182bfa74e93c089deab0effa0015386d319325f23a7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
index fa585992b10f..7dbc4abe0b21 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
index 2f280e3a5984..17e9740ac03d 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -1,5 +1,4 @@
 AUX enchant-2.patch 1480 BLAKE2B ba37c6d8370b3cb1d8fea4a36de966a2f2ee3202f4228d4e3d2bfad580a5478ade92b510895c8662213a845ccf4a6652796ac2851493ede1c0a03dbc51f2f5dc SHA512 2517bcf65d7ab7c328e38a2d34543630877fef5f14caa64a11d514e39171417d8075180b6f3bd747d8b9b60c49973510983413c25cc3e9e52ea82c78aa4e060d
 DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0-r2.ebuild 1025 BLAKE2B f53539269fa4f4eceeb3c4a2c32ac356e0a705642d57ca1c1672f38c5f20df48105b386d96ca09d77fa5437aa65f556b7c2846e3110c7ac9201183491ba3d2d0 SHA512 7846bc309a48102b4307a4dad27860e26541cc4e855fcd5eb3678c30dd31cb65b32bea4650b8b17139065cad3049ff51faab562c9681de43c8b1b5ee492915f1
-EBUILD gtkhtml-4.10.0.ebuild 978 BLAKE2B 525230be17cb4bda227415152e83c22ee462dd7748ba5030522355994f7d357c6c942ebf92f0787317346d42496a6ddce497e9a82bbeed0b8792ecd151611a73 SHA512 cab7c98ee05f11b864441e976ad47f8af21cc6ab5a33c245b8da79474b6bf943d1212a0302ecc51fb323361305ccb9ce43145a28c997777fbf9787b6c0576cc8
+EBUILD gtkhtml-4.10.0-r2.ebuild 1023 BLAKE2B 18424c1ded44652be1d7e154a3b141a4c29ad48fa3a33d7e2d3a11d4db05e286f6ecbf4b79ec771007c44595cc48b7b0e4335377e49810a27c02a903997f98af SHA512 0b1a8cd61d860de06ea350b12b23ce068f9c3131b2d10f08d2bf04412c6bbef3917dfd448c2fad252dbf4cbbfe32401a0120d8017f07cc800e498bfe315a986b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
index 57d3fb7bf343..b77e196585f2 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
deleted file mode 100644
index e83b54fcb0e7..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://gitlab.gnome.org/Archive/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/cairo-1.10:=
-	x11-libs/pango
-	>=app-text/enchant-1.1.7:0
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-devel/gettext
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 5e941f066795..f5c79373d082 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,5 @@
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 EBUILD libgsf-1.14.45.ebuild 988 BLAKE2B 1e99126a497b30b51db98758a7a8dd83ad53523d56d77a251db6d6dc7e2334b960c47dd81862fe62bfb6e8bba558fa13067a4e25d961c84473a02b31422a9a39 SHA512 70c8f860a6fcbda9ac93c7d39f4e5bccc76cc2ab203a4382b6de7b68bca6c32415638b16ce44158c736d030395d7d3cee2971f6277eb5a7c8cdaa7d2698b52f3
-EBUILD libgsf-1.14.46.ebuild 990 BLAKE2B 6b6d67aa95ca260b0b1fb25191b4f81c3ac70fbad9496b959b23695b396afe224fa2e2d22db3ee01ef205b75b98b7f57b791b334cabd50c416c8cab6cd89baec SHA512 e16802dbb1a61eefc3f0187a8dc3a92e7fcf4f5f2a2a0654898961ec36b3db42af15daf7fb4d753e14819d542490c562e7a12e14e6b1487453f6b2d385c675aa
+EBUILD libgsf-1.14.46.ebuild 989 BLAKE2B 684ae064701f89816d0abe0f5863a9d8393894c0d4ef77a80e1a7c6eada7e94511961595f1959c449a756b4ea2661fb60dfde9159aa4aa2b3db04958e0e5c49f SHA512 7e321997ed91cad4b2fe979d55e29bf1dd59c9d3685921063a183c42dd0e26369e8c557b78d050e61e39fd2614586b53e58990982cbdd3b1ce6051821918076a
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.46.ebuild b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
index 7440be2afc14..acbac6b8d2ea 100644
--- a/gnome-extra/libgsf/libgsf-1.14.46.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.46.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 943adb5c94f8..75b914147886 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,9 +1,4 @@
-AUX 3.6.4-tracker-2.patch 779 BLAKE2B cd678e663a2579521cbd91af2bf194c436be8b7d2a1b749728a3fc3616d7fb1585922c4ca76c27e7079c1fefd1dc1bb7a595716576b23f097aed7ae6c8601983 SHA512 a3ee36493aef8ef0b5d32a4ca43d961420a263f970f4081888a8c7cbb52e94b9c7c3bfcb9b9ae50454c773305915f1e201b4d1c85520a91d9c0233c35195b178
 AUX tracker-2.patch 821 BLAKE2B 748b88d6487780c35f51fda765fe6539d2ff137123a34f5dc2779332c8d5445a3f7dd40aebbfc0080acf812a766e18b7119b64f283f76552b44c025c9a1370c4 SHA512 0a07de349129f7a81e2e02ec99008d091544b0961efd3188a2309489c3c48385d485194615bbb4d7817c0e651ec6a6a197861cb5f2d5841c990d2d540f58672d
-DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-DIST nemo-3.8.6.tar.gz 1425290 BLAKE2B 15e82a6b6c298e66f6d752f738bec31d1d4fab726f86baa5d58c5d47cfef2de218c18c711ee95588f68c4bd8bced41a993af3c100b8478707a746857cce906ad SHA512 88cc268aabd9fadcb87df55e3872bc69f136e68f252ad2077e1cbf86e3c53d027142390883cdd61235171d04807d8ae85893abbdc65ff34cc6207d10879b1797
 DIST nemo-4.0.6.tar.gz 1449313 BLAKE2B 0d80e23a503c34e52f126635a7b3df54f7f0d336a637f14e11ac8e1d252a4b7bd43173c362ea0f24602fc4eceb71c97d651ddec2f2922d70c32518fbc8d15424 SHA512 87006f345317b37093daed1081880a4c28eb84438b9c43f9b62211824306074969e5e21df57cfc5fa163d66d16bcf7ba6c26674e27353cfd8a91cf2bfe82099f
-EBUILD nemo-3.6.4-r1.ebuild 2128 BLAKE2B ba681f1fa35f5025c2d1718ed566d530450c1b3ee875575124134e5173d7e2fe561ac002ff12abce1934707edb5b279351a5af6d1b17df1cfe8255cb8c008ae7 SHA512 2f102a1c41655a867b3adb978664994165d278205a59c47774b7f2c7a69ac22cee652a2b46f037ca6177d1ee736d80a006ad16d45abc5ea917721c56f75d13ac
-EBUILD nemo-3.8.6-r1.ebuild 2023 BLAKE2B 89e83b14ffba749ef8cc326b5b2e86653017b90a63ff4a0ce99bb25dcf2c878b8f92c852d6f1e7113dab0956f3de571291622068c90f72df65bd3e55b8a9d513 SHA512 377c2b4a9405e523511cd437a6151398e2e281881408ba42eb906e9467656a69afacabc4bfaa6d86ff8456d6adb22fdc4a05507ff3e539e5f818d7ca85c47757
 EBUILD nemo-4.0.6.ebuild 2021 BLAKE2B b7a9026c2515f7b91eb747249a15b86f6f59102273ec8871463ff99ae1939ae13db957872d9aceabd963deb1033e76433f4ab8618c308e00c319874ee8cb1835 SHA512 eacd7f0ce6a3f4974262bfa35c2acdf9e63165817ee7d94412c486a7c47741975f23e94c8f6ed3094cc260929ca734e54e787a2000e64a5fd39846a26df1ecce
 MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/files/3.6.4-tracker-2.patch b/gnome-extra/nemo/files/3.6.4-tracker-2.patch
deleted file mode 100644
index 3ce71c3b6c2b..000000000000
--- a/gnome-extra/nemo/files/3.6.4-tracker-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac	2019-03-31 12:55:38.555837300 +0300
-+++ b/configure.ac	2019-03-31 12:55:53.882694611 +0300
-@@ -190,11 +190,11 @@
- 
- build_tracker=no
- if test "x$enable_tracker" != "xno"; then
--  PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0, 
-+  PKG_CHECK_MODULES(TRACKER, tracker-sparql-2.0, 
-                     [build_tracker=yes],
--  [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18,
-+  [PKG_CHECK_MODULES(TRACKER, tracker-sparql-1.0,
-                     [build_tracker=yes],
--                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16,
-+                    [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.18,
- 		                       [build_tracker=yes],
-                                        [build_tracker=no])])])
-   if test "x$build_tracker" = "xyes"; then
diff --git a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild b/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
deleted file mode 100644
index 277e124fd0b6..000000000000
--- a/gnome-extra/nemo/nemo-3.6.4-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.18:= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	sys-libs/libselinux
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-PATCHES=( "${FILESDIR}"/${PV}-tracker-2.patch )
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
-}
diff --git a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild b/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
deleted file mode 100644
index 4cb8a272e230..000000000000
--- a/gnome-extra/nemo/nemo-3.8.6-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit meson eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://developer.linuxmint.com/projects/cinnamon-projects.html"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="exif +introspection +nls packagekit selinux tracker xmp"
-RESTRICT=test
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-PATCHES=( "${FILESDIR}"/tracker-2.patch ) # https://github.com/linuxmint/nemo/issues/2065
-
-src_configure() {
-	meson_src_configure \
-		-Dexif=$(usex exif true false) \
-		-Dtracker=$(usex tracker true false) \
-		-Dxmp=$(usex xmp true false) \
-		-Dselinux=$(usex selinux true false)
-}
-
-src_install() {
-	meson_src_install
-}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 808c4d381c58..5729cd925c42 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,6 @@
+AUX 1.8.24-fix-bashisms.patch 5304 BLAKE2B d564e84e12033826ed4e1663336d20a0591058a0d50201b3d91180f26f9d46380dea35cd95fc2b0e3bb94dbda70d8f55b7885c13c73f14a526a3e6473863d7d6 SHA512 c8acde4a746d83666671aa0bd1c64b24710219dd932d28eae7ddc56de2e430ef745f92953608ef277ff5d4d94270876ca4d1b6c8ac338571a0af6cef6516b804
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
 DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
-EBUILD nm-applet-1.8.24.ebuild 1728 BLAKE2B 40fd22bbf9026619a4cbb38760e03b7fb498e3e9e13baf93df8b369e4cb22c9cc0677cb96122d14d621af443f6ddef4496910a88320e84129923774b5281f3e6 SHA512 196335486adbb889e21b4abb5332a7aaa664f0515b7090473a9b369a03614232304e9d7507c7e86c0eef340f018377f35284cd42bbc4bc6f2a19bd9fca2ea5fe
+EBUILD nm-applet-1.8.24.ebuild 1806 BLAKE2B b6ed9e016e7a9b91f7d0c8a884aadc5541c1266fcdd479ed7232d2b707782a69160bc323d68a96965eaf40214a15ce4175dea62609dcf8ec95c734cfcbdf1fae SHA512 6f94b1fe3b6f07002c7782e7011550bf1149803d39551c6b4931956a6680146e9b8ac9b3331e9a310086be61b9f119dc7da80b2dee5c580bb0f73b58979517f1
 EBUILD nm-applet-1.8.25.ebuild 1774 BLAKE2B cc259671e2b77a821e533e27eee8f0b17f2738d841dee25b126787e598dfc74f86c3ad5bbbc3167b3df23ef8f4847c7f4451a61e0a30886f40b94fbb50418832 SHA512 dd32925a9aeed3637d5ea88f02d292cb446da2d3ceace191b0d23dee6794439e9694aeb186072154ef5c8322daf934b33644016ff7cc5baeffbcaff60fbb415a
 MISC metadata.xml 709 BLAKE2B c5ee0c7c876b849c7f640a64d5d6ae3325b693be9b7733e9757ccb0418f6d6b4ad2f85afe033ebfd6f3f4cfd6f907160095141998ce5c01e2faa87456ab58856 SHA512 0449bc9810e4b7b85307bcd8bde24746697641cf82e34790d7a8c280951c5814646c2a6bc7a3e8e0245d1deb24f9b8a0890d1d5d8227dbaf6c92dd966e5ea1c8
diff --git a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
new file mode 100644
index 000000000000..36851e1ca3af
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
@@ -0,0 +1,130 @@
+From 64143dc3da8f04478acc7a875b7e9d6cb0d653b9 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Apr 2020 15:08:20 +0200
+Subject: [PATCH] Remove subshells and fix invalid test syntax
+
+---
+ configure.ac        | 22 +++++++++++-----------
+ m4/introspection.m4 |  4 ++--
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 22f34589..56a56fee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,7 @@ dnl
+ GTK_DOC_CHECK(1.0)
+ 
+ AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib (deprecated)]))
+-if test "$with_libnm_gtk" == yes; then
++if test "$with_libnm_gtk" = yes; then
+ 	PKG_CHECK_MODULES(LIBNM_GLIB,
+ 			[gio-2.0 >= 2.38
+ 			 NetworkManager >= 1.7
+@@ -145,7 +145,7 @@ Configure without --with-libnm-gtk if you do not need the legacy library])])
+ else
+ 	with_libnm_gtk=no
+ fi
+-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
++AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" = "yes")
+ 
+ PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
+ LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+@@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
+ 
+ AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for use with GTK4]))
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ 	PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
+ 	GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
+ else
+@@ -214,7 +214,7 @@ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+ 
+ dnl ModemManager1 with libmm-glib for WWAN support
+ AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
+-if (test "${with_wwan}" == "no"); then
++if test "${with_wwan}" = "no"; then
+     AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
+ else
+     PKG_CHECK_MODULES(MM_GLIB,
+@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
+ 
+ dnl SELinux
+ AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)]))
+-if (test "${with_selinux}" == "no"); then
++if test "${with_selinux}" = "no"; then
+     AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
+ else
+     PKG_CHECK_MODULES(SELINUX,
+@@ -241,7 +241,7 @@ AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
+ 
+ dnl Jansson for team configuration editing
+ AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
+-if (test "${with_team}" == "no"); then
++if test "${with_team}" = "no"; then
+     AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
+ else
+     PKG_CHECK_MODULES(JANSSON,
+@@ -253,7 +253,7 @@ AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
+ 
+ dnl GCR for PKCS#11 enabled certificate chooser
+ AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
+-if (test "${with_gcr}" == "no"); then
++if test "${with_gcr}" = "no"; then
+     have_gcr=no
+ else
+     PKG_CHECK_MODULES(GCR,
+@@ -311,15 +311,15 @@ else
+                       have_gcr=no);
+ fi
+ 
+-if (test "${have_gcr}" == "yes"); then
++if test "${have_gcr}" = "yes"; then
+      AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
+ else
+-    if (test "${with_gcr}" == "yes"); then
++    if test "${with_gcr}" = "yes"; then
+         AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
+     fi
+     AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
+ fi
+-AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
++AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" = "yes")
+ 
+ dnl Check for gobject introspection
+ GOBJECT_INTROSPECTION_CHECK([0.9.6])
+@@ -334,7 +334,7 @@ NM_LD_GC
+ 
+ # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
+ # https://github.com/ebassi/graphene/issues/134
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ 	_CFLAGS_SAVED="$CFLAGS"
+ 	CFLAGS="$CFLAGS $GTK4_CFLAGS"
+ 	NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
+diff --git a/m4/introspection.m4 b/m4/introspection.m4
+index f3bda0e7..8c64bd04 100644
+--- a/m4/introspection.m4
++++ b/m4/introspection.m4
+@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+     INTROSPECTION_GIRDIR=
+     INTROSPECTION_TYPELIBDIR=
+ 
+-    if test "x$enable_introspection" == "xno"; then
++    if test "x$enable_introspection" = "xno"; then
+       found_introspection="no"
+     else
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
+@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+            AC_MSG_RESULT([$found_introspection])
+        ], [found_introspection="no (not installed)"])
+ 
+-       if test "x$enable_introspection" == "xyes"; then
++       if test "x$enable_introspection" = "xyes"; then
+           if test "x$found_introspection" != "xyes"; then
+               AC_MSG_ERROR([introspection enabled but can't be used])
+           fi
+-- 
+2.26.0
+
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index f8af43807f49..09b643ef42f0 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2
 
@@ -48,6 +49,10 @@ DEPEND="${RDEPEND}
 
 PDEPEND="virtual/notification-daemon" #546134
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-bashisms.patch
+)
+
 src_configure() {
 	local myconf=(
 		--with-appindicator=$(usex ayatana ubuntu no)
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 856c56c965a0..64430cbe3c6a 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,5 @@
 DIST pch-session-3.32.0.tar.bz2 8940 BLAKE2B f7b96486fda4b38e0c548b950d60cafc7f150dc8c3f1e671f04d070b937e6f9ae753db6bfc5a81061c107483dbec752ebc85515133f8a62235b3c68c51091474 SHA512 32d6393ef74cea1a7eff3e5361732f3ac47ef1ae993c33bd17a3629f1491c129ea043688dbce11dfa331d4cbe89395966b98f58c1806502a9ffcdaa62c303e91
 DIST pch-session-3.34.3.tar.bz2 9189 BLAKE2B 82c8f346ef8b627c4756f6781e0ccc9274c5152cd723ddcf00e23411efdf3ff633ca0078cd0a4b3ebc24e1f2ef79e7d736fdc6f9b46b750f7f88177c7977a408 SHA512 dcada2ac88fec4fe2d893bd0fd76e63fb574452612b3c9286fe42f3c51fba3b2f3992ff3015b11867c01c1d328fcd8f007f9dc1e1e3030c1e722d3b4df4740b5
 EBUILD pch-session-3.32.0.ebuild 1018 BLAKE2B 82975d0d263a93903ef9cdfcb05b9d104539f7dc03bd70ddf05f7e23e1b22df412d2ef0ef2707bbde4d193ade09eaca422cb725ba76a9b0c65d63ff87f15169a SHA512 47468c1b2931034e968c37e757aaedaba5d0401ef7c94114ba6af53eb80569f75052d5ddd571f48b7022dc9b79fe169c621ff028dc73f5f0aa27e3098bf8c7bb
-EBUILD pch-session-3.34.3.ebuild 1118 BLAKE2B 360d60ce86f12daba00536f21b713aaa28ac68d43025a1f809ea1098bff2f8b07858782d464ab68ddc1264b3a5b240ceef66e1e63e14e0f7c27b5e57fe3c41d3 SHA512 e90ac0c9c4a42529b5ca766e1c8260b84a0673f62940e73a001584d0f0e67e6596238bcc4c95436d13f74170345dd2cd65056e94ca7edcd46c3725b4c3f3bd43
+EBUILD pch-session-3.34.3.ebuild 1116 BLAKE2B c40d8b6fe8e344c57ceeebc9ef1299fd77810a8fce722aa9469c9cc327ee288f1f665dab820835ca914b7c7e07dea82344c64fe0795f03a2050d09f3adddd42e SHA512 a0c2d66acf1d40d340747684904b6f08e8fcca8a336828a4711aa7bd8d5f300eb69e6c5eadde8fba8b2a4d38a291008a0b7b74949f8838bf57cabf02cc2c9d07
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.34.3.ebuild b/gnome-extra/pch-session/pch-session-3.34.3.ebuild
index 2092efd09a72..220ec8debc7a 100644
--- a/gnome-extra/pch-session/pch-session-3.34.3.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.34.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # gnome-extra/gnome-tweaks to configure extensions easily
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 684e0a8e6e95..9889a161c50c 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,6 +1,6 @@
 DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
 DIST sushi-3.34.0-patchset.tar.xz 8744 BLAKE2B 45077c7e78ebea5900ff8a1e8749f88677a6990d41cf44505437c5cbd05ce09b2ddef11de8e9078d419b1130f14d8ef4cbe7c6f15c80cee02dd72b17c4e84cfe SHA512 7c3d8e044179202a37c09436192436102a1ca223e358de1bc3857b0900c9921c72b1ab588fb08cfebe6ae440669a68786c3c1e83c1f6a3c489d4a5ce665217b3
 DIST sushi-3.34.0.tar.xz 74240 BLAKE2B 8b194be7ec831ce4f13549d465d6f1e6ba09ae4dc7ff86b1c214b79baac226654b75401d326d5d7d8fc0cc9fff28d8125aa4f5a9d3cdf54e472e5565815af75d SHA512 bde009b30106bf31199c8c3b040743de5f5c782fd540612a34055bef9a22f9a08c4ed0ae7c5fc3cbfdc67a5d12f28bc70ca5135ba227403e8d127295a1253d18
-EBUILD sushi-3.32.1.ebuild 1349 BLAKE2B 318a284fe3895586ddb9ff4a2069704f2b8d5060926cb288b5065a7bd192cf3a26965dd943a493beeda75c02b23f46cf6c42db7616979ee6d13c6467518815d6 SHA512 69c401e1fad00f18d7d5396e0d217b7be7f35db0e303944e7ac4545c68d0422c7be5d4bc78744f9a9bcf18ac82a506e6a069c9b13dff9a5d7a993215c39e87db
-EBUILD sushi-3.34.0.ebuild 1542 BLAKE2B d7a6417a0ae6e443a5fd4fb7f4a3bbe10bbd5b52d0b2e9b0b498da8a80f9d7d135b3ac57daee607fdd58787ff782d8b741a0db6e90d8d407599f4b694a451f21 SHA512 ae12dcea5ca61514a6f68e24ad90dbc4d99bb0b4e967a3d9c155dc797e6b177e6f676ab85938c628ee17f077fbf11f00a425bab04d3a6ef2943dd0ca272e83cd
+EBUILD sushi-3.32.1.ebuild 1343 BLAKE2B 1ffcdb711f9afd5bdc0c431643a6d894cc34668acd37ef14f049e22462a946ded303cce32841ef58fca5aab516e3b46953d6d011482df6a00956dc5d73bbb7cf SHA512 b15a29e9941b199ee2703d8704df07970eda39b9ccd8180d3bb0fe1c5587f964bbac7379dd08114a36620dfa489bb36b264c1807586d04fcea01e2cbd5c6a83d
+EBUILD sushi-3.34.0.ebuild 1534 BLAKE2B a0188342492dc51a58e6144538feef99e5a283ce9025b867d8c388ffda463e0f9a20f77d6e0f429a461c7de66832d265b75eadbb4a76f843a8e98722078af7f8 SHA512 8e3b7abb1b4eb9f5958f6416c4e45a5fe3240c96979327c873d08d954754b1f4b89b9ee17deaca7e58e105aa69908ec0aba5ca8d540155f76c29d3e356eee85e
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.32.1.ebuild b/gnome-extra/sushi/sushi-3.32.1.ebuild
index bcfac9734eab..1655c429548f 100644
--- a/gnome-extra/sushi/sushi-3.32.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.32.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="office"
 
 # Optional app-office/libreoffice support (OOo to pdf and then preview)
diff --git a/gnome-extra/sushi/sushi-3.34.0.ebuild b/gnome-extra/sushi/sushi-3.34.0.ebuild
index 80116931e29a..0a4774a4221d 100644
--- a/gnome-extra/sushi/sushi-3.34.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.34.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="office wayland +X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index bc229464cb7a..c6251d9b2e2c 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
 EBUILD yelp-xsl-3.32.1.ebuild 574 BLAKE2B 0c51d2be30a2bedf87ce1fb8b4d88e4e6b7b00a2962fe6c31b4d94e1a6d0476f1dbb8552196714407c5dc4ada3d02a704c68b9148557c24b9753e9f7977130bb SHA512 4aab22ce9fd16d45da239a51f1c09c87a4d2f0af3b4b7f43c7684f85232b11731a392f0d347d70abb7359b9a311453814f8e7d27b5d20c05fafe09252d0eff83
-EBUILD yelp-xsl-3.34.2.ebuild 566 BLAKE2B 2f9c5b6e1a35587611956ed392c563f41406a40f03db3881c8feb74b885bd904427d7d1df5d3a6634f85df15ed0fbc87264885a9d57b541f4041c3f390b9c3e1 SHA512 18f003fc43fc925eb3b05c27787001dc4be392403e35039efba3fe00b75aed96fb6525d6b8939eaeb90a88a843bc562e8888b012d3844d91d20c7582a4f43bcf
+EBUILD yelp-xsl-3.34.2.ebuild 561 BLAKE2B c203e0380f092f18f190e8c25977be9846019150da9aa22200e55942e1b0f62417774ee700416c068175b0d66c29b1286f34e0982f6e623ac0ea37d5fdec59d0 SHA512 a4310fa0dbb147cd063d7b7ab0f056576e7cb807468b6fccf5f6dcb559162de207f6193b811928e5ba0c2ff323333e6624ac3e1d98ad7335568695a18a994a8d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
index 28f7695035cc..c5008ed4ebaa 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.34.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 599c8a7edd4f..72b8810788e5 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-3.32.2.tar.xz 1538964 BLAKE2B f4d7947f29b40bc033e2d3e010c39f8ff43de765bc4a2c446f02beab4888ded287681db2c140951f19aa9075aceff6f08658d0f434b5cd9d39e7e53e6cc00c31 SHA512 be0e2a7919ba8aef8eeb13e4d195e745afcd113350b32bad5ccf204f544107bebcadee364508402ad7906dd5484b9f21288ae13edcaab47a02b54e31f3379cfd
 DIST yelp-3.34.0.tar.xz 1538980 BLAKE2B 5b9af7a0f1b334555d6a4af2aff658a20e1b703f67663437fe4a967d5501382b23b2c8247908a232c79ec93fd6c7e1634816b3ce34eb11e609f4a6734ab06f4c SHA512 799a55df98bf176ee19e9b48ef321734b5df9d8c83bdb5c8c910b3def214039c8730a079d032b88dcc886c70418abb968c85c5c998b8ac340fc5ce27e6228eaf
-EBUILD yelp-3.32.2.ebuild 1241 BLAKE2B dc6aababbafbf7451396d75235317cb82578e015c7c40d4da7ddd265f6e1ea94bf5b2e459c855b433c2231673aa0cd8758d6ea23fc20e6ca3fa17a4a24305816 SHA512 052135b016b3ad439c9b653b50a42123383ef7183c7200cb77540c4c02fd4bfdffeea4f79ed13da2bc00afdac4cb1ea980592fae84ff839f199e7e27f414f492
-EBUILD yelp-3.34.0.ebuild 1256 BLAKE2B c4df054beb0bcac56e6cea585c31cbc26dd1c548fbd96276109e78320feab56c4b11842dba6b844cc17fda34d942cacd8c7e7a4ab5607a3e35170d129046c709 SHA512 3b6b3355bde1056daefea8cdae986156f08cdea9bb33914cb15a5d6fab573485125d02b1e4c068553243662dde84be0ec089a98b41e9b749f37ffd86ac33ec72
+EBUILD yelp-3.32.2.ebuild 1235 BLAKE2B 01d0ef0eb0a753a4aa27758dae4568483d59b064e5ebbabd88b83c94a36e6b5ac179ba776795f4a7fc644725ec0d4a557ab0e0014eb2a9b78a6b34eed4bc01c2 SHA512 2fe9dd216db187d133fe25aaf2dbd644d3980051f708eac801baca3ef792a6346daf67f53f4bd3a39b43bf3d67afee455a1ada4f525c3f010021dad3bbf6e583
+EBUILD yelp-3.34.0.ebuild 1248 BLAKE2B 03cf088e4cf4420ef391793521f7721ca7f5d434c763c0ae3ee2c493aa9d516c06641e4f719ec98c089ad4c70fba4aef01099566a74614252965d72c30586786 SHA512 c11a93f9442dffd4be36b62e6330aded2b136dafdb03bd38c544175cf9b4a63147af1c254e26c0b03f71e3a378442d5d7b070237a99821bdc2edeb732cf4e71a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.32.2.ebuild b/gnome-extra/yelp/yelp-3.32.2.ebuild
index b0f547681cb8..4c02512ae6dd 100644
--- a/gnome-extra/yelp/yelp-3.32.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.32.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/yelp/yelp-3.34.0.ebuild b/gnome-extra/yelp/yelp-3.34.0.ebuild
index 49c176d1e2a4..bf631a4f8e09 100644
--- a/gnome-extra/yelp/yelp-3.34.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.34.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=