gentoo new year resync : 01.01.2021

43 files changed, 28 insertions, 1053 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f3e2f72a16ba..bfb72adccd89 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 7d2840fa6ed2..82fb9bb1be62 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,4 +1,3 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r3.ebuild 1420 BLAKE2B 2e250e83e5d8951c905849b1543f9495f53db2a7ca104008e667c23ac569648ea991a2dec8e29163eb5227674bdeabd100cf25be1e6c68de9534121c661f7e8d SHA512 a36c6f0a68540876fbd4b89c40164ece31763f00bf12d372cbd40bd80e5c227c27c15851a9093ff156f3fb87b455f999576dcacc2b793faeb188201a7f1134d7
 EBUILD chrome-gnome-shell-10-r4.ebuild 1434 BLAKE2B fa57a2074931489d365f8a1222cb9b590d0f38864891a6c73c60cb5ce6e160fd9dad3059029544d72691fd560f655c3a3d066c2c8432ef18422342272dfd36b8 SHA512 44e00cda20d0cd31838bbce3bf023c9702619ba392e1dd08427bd2403004d31c9d105734972bce006e26b61cfe0289a6fe2562dcd7959f8c212413ced5272954
 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
deleted file mode 100644
index 1db1d00076b8..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
+++ /dev/null
@@ -1,53 +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 cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if [[ $(get_libdir) != "lib" && "${SYMLINK_LIB}" != yes ]]; then
-		# Workaround www-client/firefox-bin manifests location
-		# Bug: https://bugs.gentoo.org/643522
-		insinto /usr/lib/mozilla/native-messaging-hosts
-		doins "${ED}"/usr/$(get_libdir)/mozilla/native-messaging-hosts/org.gnome.chrome_gnome_shell.json
-	fi
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog "You can install browser extension using link provided at"
-	elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 801b272bce06..876de20cb79c 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-control-center-4.4.0.tar.gz 3868474 BLAKE2B 88e22670427416139468c35918105cc664c531aa5084636226498a09b27f56300c8541feff8f93a5ec860372436af01fdeb2ca2c0761b34a6f298439538dfb44 SHA512 3f176c067312bad68ed8ce2461937d8e8cd188839ab3cf786fb76930905691b8f5a91d700f1d88d75448eeecfd23b645b77ee15c0ec02e08718f7c9ac800677f
 DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
-EBUILD cinnamon-control-center-4.4.0.ebuild 2520 BLAKE2B e03b2b5f1c310ebad94a320aad6271dfd06ab1c50ba1b1224af69e311c1b0a37c39bb26d2ac8ea5837db9a0ee2d44eaf752fd0369dfcbcccab6ed4a1fb2ae979 SHA512 f83e1f69368c7465249ddfe34900168b8257130bd8610a69811c099bf947ae8bd9a94937c4319cbf9153c922b78d23adfef607dc2e27f68942d4ef19f4478621
-EBUILD cinnamon-control-center-4.6.2.ebuild 2427 BLAKE2B 06a1cb6c53580985758b04432ab161a5a3cbfde5927d228a4133a4311859d396acdb7aa90be085a1c8e6b454c2d869d2d22617c0820a9d1107c0a14f83a2ee18 SHA512 f367192f64dad91ec7aa3f03645781fae3673b620c0065cdf4e85ba8c73c59eb1b4e1b52f8f5369de05d255b57bb2cf310a3c6cb4e511b26438c863cac770163
+EBUILD cinnamon-control-center-4.6.2.ebuild 2426 BLAKE2B 6de5c8e4ff99d70fcd6767860b93106592480041159cc9bfb659121a18622215fa096f22679497bf43fa887e01d39a4cec1cf0470ea76e6fbb27a1b56f0cd5a9 SHA512 fcadee18f256224b15a56066f3a421aa98085f28323f2adaca612e033a759e5ce24cdf96e493fe3761453867ee600eff360424201361c27d8852f504fb01a719
 MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
deleted file mode 100644
index e4af1639f023..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.4.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
-REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-COMMON_DEPEND="
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-extra/cinnamon-menus-4.4:0=
-	>=gnome-extra/cinnamon-settings-daemon-4.4:0=
-	media-libs/fontconfig
-	networkmanager? (
-		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
-		>=gnome-extra/nm-applet-1.2.0
-		modemmanager? ( >=net-misc/modemmanager-0.7 )
-	)
-	>=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-5.1
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	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 )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.1
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# cups, documentation, and systemd don't do anything
-	# and have been removed in the next release. So 
-	# disable them for now.
-	gnome2_src_configure \
-		--disable-static \
-		--disable-onlineaccounts \
-		--disable-cups \
-		--disable-documentation \
-		--disable-systemd \
-		$(use_enable colord color) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable networkmanager) \
-		$(use_enable modemmanager)
-}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
index 4bfeb3e86e90..a26fd8b7ad74 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 0648fc140f42..fe051a303ffe 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-desktop-4.4.1.tar.gz 488102 BLAKE2B 8bf770e1f2af67c32381c5ba23e88f259d9d6c6a0b722e61202922da8c8c5374bd297b3866846f28924d6d527e6122432682df98d4b3979eeaf026674b6e5027 SHA512 3e3a1bb007ed6d921c83e377bf05642f01ae2ae29f4fb63d93e011de44dadc4e79967510079c6175b68207263fd4a589587c2d0904f17639f3fffad81ddbbde9
 DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fcb157e9e5b156260f31c4b41244649ce4fd54adfc192654cffb1336d72c678d32ee151b2a7bbe114dccbe078e66f85ad261 SHA512 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
-EBUILD cinnamon-desktop-4.4.1.ebuild 1214 BLAKE2B 39797307951e573217c0b8c112f58cf99262bf73eea1eeb4a4f8ea7a53361a4b6c199f11fff991bcd89876bd29551fb8c9db5931297adee4fb7db28a9d79c4e5 SHA512 b20b0117c711c67cb27b396249e43701f45cb3bf074db146ac9b9d96220f2d166873dd859feebb23ed55f3409d49e4b4190c65e1ab8fb2cb9a7242e780e3ed24
-EBUILD cinnamon-desktop-4.6.4.ebuild 1221 BLAKE2B 41155ad4995d71e97d534901b4299f0560e67463abd4e43da3fe37d4020d7c32b41a1e042985bd77ba25ab8ee1af04210e36287ecf896635ed5925f837381aa3 SHA512 cd1733b345d871e294c0b60d5b40fa0cfb555baf60cb22e56243e370bc771f21d68387255e5a86e13c750a3a185a2af9c98743d384a17bcbc9ba956fa7707e87
+EBUILD cinnamon-desktop-4.6.4.ebuild 1220 BLAKE2B 4537cd9426cf31043bfeb2eb0d57e652564394234402222918fc4ad15ad162d636776ea0c222943c69b578d0401a7ebb524d523be04f1955aa624f7d7e4726fa SHA512 5947c6c95820fdd774942e1180c05ffffb2cba21e0cd82a3b9c1a7f1e4a5823a6d8a31c21f52ca0310a33839a25bd9a9234f79a3cd5356d2dbb2762ccebf3f74
 MISC metadata.xml 465 BLAKE2B c78166d54a50ae1dbf4580564161bb0fd0c824b0f305d8e211452d089d8b88ffab5207c2ee63fd4bc83f434023fe87ab873b9d39c61a5f3199213647189adcdc SHA512 0298cc730405fdc373e8dfd11150651d29ed9d19c98370b2bb5dd19df1cfe5d83816e45d222c0eb103811d330a6508fef09001c00d6022ffe38997bdae771f3b
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild
deleted file mode 100644
index 095f38549eec..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson gnome2-utils python-any-r1 xdg
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	media-sound/pulseaudio[glib]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=dev-libs/gobject-introspection-0.10.2:=
-	>=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
-	sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
index fba7ceb0e2de..6cf301751afc 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index fff2f984e99c..e0f2c0a7d3a2 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-menus-4.4.0.tar.gz 96196 BLAKE2B 9bb16c3d4d0f3b92b38ea9e388e0a17ee80d1143ed77daab03fcdc0de63423e77900174c2f4a49b173b0d2f1dddff43d3864b1ce1c940a64740d5c53a7807f41 SHA512 68d63fc9b79ecd979dea39e284e1b3120e3c889f496a418e060e97acea04c92a07a31cb5a0b4f1a62b4af64731de3b8c5524a8613cab61361ff329f68a19cb90
 DIST cinnamon-menus-4.6.1.tar.gz 96294 BLAKE2B bdfacd5f4c5344833c9804b79846c5ac9908e74381c2e84b29b8cb765b10578ac69155d93e1c0bd8b6b8100d5e5f34ca1bc8bd77edb681eb705d759c5d9275bc SHA512 ef37662d4e1a49494c22481456b5e318039ec8c873e6ffcc0c55f89edbcc918d3bc97664b33007194da268b43884fe5abd08b27ac8bb5e7ba7bcb9928546aee9
-EBUILD cinnamon-menus-4.4.0.ebuild 811 BLAKE2B 9246302f04dcda455ae12ab315d43dcdaa8ad64620e014f514272f83a42b938ce899aef6b1b175726ef450192832cc844786b0893a4d43da1a80c796c917eef3 SHA512 d59203f4dee454c25bce88e714049a2390abdb6435c31869ad328186dcde7dab3f94381acce06ec48803358bd59cc5b6a8227115598c346e4d6310f79377616e
-EBUILD cinnamon-menus-4.6.1.ebuild 818 BLAKE2B 487769acb305e05b54fabb1bb6edb1cfa6b0e4b5ec14de3843ef851107e5aeaebde5b62cfc11e70ab5383a00d8a980e1fe7decd86bc45c6455aacd5833004bb8 SHA512 3654d6794b9d7527c9edf20be2e505fdd8494524fab27c32ea0cbebf0b5f3f21858eabe7ba07591f6b152f749dc23456dc21dac0ec51163953584ed2fd26912d
+EBUILD cinnamon-menus-4.6.1.ebuild 817 BLAKE2B 17b7f687fe14e634d6a174e078bf369fb36393ae213a81c529d74f7cebdb9744a23d0c1a38d6368b45c5e6ac74def90d6f25ac7f62e1b141f6f765368add05b8 SHA512 b3e584c48a9fa0467d2a76ced4e8b78ceaef5718013a78f4f1a444405192a90e842d4499354674ba781f26b5e62229300e32a647d3a673ca6c6b9a855b7367cd
 MISC metadata.xml 463 BLAKE2B 41f1994f18142bb9c28d5b60d6a3d2afaf4163dcf04fdf20c663361064e93d61e2ae363a6d8aad667186e39873ea85ed571e35ebd1b4f2d1ce59441a3ac51665 SHA512 14e5471c3ee6048d5e976cd8734b91f9f27818df88014e8ace1c22c9cc9121f167064dea98a36d4cc80f5c01f9adf90df095902e6ea86f80d1c3dc86447bfe37
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild
deleted file mode 100644
index 7b62b345a9cc..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson xdg
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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 gtk-doc"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	>=dev-libs/gobject-introspection-0.9.12:=
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-"
-BDEPEND="
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use debug enable_debug)
-		$(meson_use gtk-doc enable_docs)
-	)
-	meson_src_configure
-}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
index 73f3666a6fa1..db741899a2c1 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="debug gtk-doc"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index b8be073c73b6..7595681610e2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,5 @@
 AUX cinnamon-screensaver-4.6.0-python-build.patch 2751 BLAKE2B bc1449bba5365bc746c1e3e46075fc279017c29872ef609ad97bce873d34c1fc7e65f5bc76e2ec211689e8e32cf07769fcc481dd2ba3f37d776a8a3bcd10d4dc SHA512 fea53eef6d5aaba7db28e2f6656decdf2bb44a3ab630f82c00da2bf2c94b0200409955cfc06e81b9106225f877a9f46c5b7e9d8da4139bf59db0dd9955e40118
 AUX cinnamon-screensaver-4.6.0-xinerama.patch 1482 BLAKE2B 4908aed13aca65da9cfe91a9c86a202291abb1ee94d63765f3285f259b2076d41db063f11cc04cf1f223699c92f4c5910c520e43f8fa8a12047913cb8badf368 SHA512 ec7b5fd4104ca59b8790ea7925c50765a6e024ca0729754828cea539d99908153784ec1fa8f925997c4d0e58e2e1a21dbde729b21df216274ba479793a09560d
-DIST cinnamon-screensaver-4.4.1.tar.gz 160214 BLAKE2B df19a370c76648e0717565a3aab4785c3d8b48b20b9d87cc5426506f196db72872642d0ed1109a40986311c0ad7a5c17fbdcfc69681083afd3884c04822c6afa SHA512 92050febcfd41ad03b277cef60b95080d56b8fd985d064e9420a3357d7d0475355a4ca55965e581ae45410df8f19f3c031f6df0e3eec5b6b78aee7141d0244f7
 DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
-EBUILD cinnamon-screensaver-4.4.1.ebuild 1475 BLAKE2B 586bec8c310ea88e328e1f9b824d90a90c6b28f29319a66ead39e0eab4abcf47ae81f47c7566ee97a224bf8d31e69ecabd0389f438df5c340d910d21c2900a29 SHA512 443077ba13918179062b2ffeb5ff9f69b3656853135d5acdd8285451ceb16fc0767c65b671ef09e4a3ad9c8b4e5ae1ec26fd85e8f945168ff77351d2072f4b62
-EBUILD cinnamon-screensaver-4.6.0.ebuild 1594 BLAKE2B 725c75e3dbf65ec69edcac4b663137fb66e8b145f09fd17b1aa97411ec2e4212a203c76c4cdee49be89093391989d2d9b91980391542133c105a10d7e17d9744 SHA512 fccd50c1cdd104d8ef8467fa696c5b520131609f939ed5e24753e4bd9136ef6e00b90c7421ecaa3886dfeadff6aee9b98a1a1b3380e41dc30b34f59652ee28d6
+EBUILD cinnamon-screensaver-4.6.0.ebuild 1634 BLAKE2B 0c225bd86ff14462467eeaac910b89c0d03d19f7820eedceb456b66ee772de5c579dfefbfd2b7539f56ec2a4eef5d52b3d1eda1670922ac04f4e9ab84e9b9a59 SHA512 0c2c8809f38a3ded57cfb28a897093c73466d4c2236c07a0411be68360b74040a1d0a76e71e3781cc262e19dc7073c6420e4cbf04ef00cd3b13cca6e786aae1b
 MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
deleted file mode 100644
index d5eb0b7997af..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug 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-4.4:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=dev-libs/dbus-glib-0.78
-
-	sys-apps/dbus
-	sys-libs/pam
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	xinerama? ( x11-libs/libXinerama )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	python_fix_shebang src
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
index df2f0f2494ae..f0257609aa72 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 RDEPEND="${COMMON_DEPEND}
+	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index edd6d4eccc6c..137d33e55317 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,7 +1,3 @@
-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-4.4.1.tar.gz 198819 BLAKE2B bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1 SHA512 f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
 DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
-EBUILD cinnamon-session-4.4.1.ebuild 1417 BLAKE2B 15d200dbc0213a6ecc73a257f80823a4088d30e4e4f44f7fed7f8f1d31572764a21e90523ec389c0cf659f28baf10ab623ab3cf55da888afe72826259b0a5f3e SHA512 c4e5f59281b992e9dc3b4d91564a61bf705b646e07edfd956ad44ef3fd13ee01ba1fdac0da25462ed7819d2f9a2e706bdda30772534d3bda5deb694f07e4be78
-EBUILD cinnamon-session-4.6.2.ebuild 1283 BLAKE2B 033817d9b5fed393b6c8758bdfb5e62860e25fb8abdb4f6c22b8bbc9d772c2bde0b341d10d7b26b1c1b7a25cab0f4ccfde64d47adf07515cba6cb937d93b42ed SHA512 3d5b138c558665d56bb5579d079627941f0cd6b5b9b0d5f35df252832a911e6e9d927e3cb30b1493f14a4dc55b97ee188dd284203448d4c18d53443497c89cf5
-MISC metadata.xml 573 BLAKE2B e7c49fc19d81b1c33ac69bcf57839e5e895bb656cedcb38efa37d5e88310d713705bd42209969301e4ad4c19863c242a4ab91c9d64b8c0924f0d4807ee54f358 SHA512 66288033b458b5c6bdd769c7a053401bebaaa015ea152640298a4cf4f341cc0c96d8024bacff6054c371a7a584f7a2b5e33334c563d2ec788b0bf755e1cef11e
+EBUILD cinnamon-session-4.6.2.ebuild 1282 BLAKE2B 0e3b3560242580f875462196be7994761c7656592f4bbbabebfa280df48b696f784d3a63ee2c432546815bc17dff9bbb6bf36a8ed46ed115ff2db1a2e8e0ee8d SHA512 924e7fbcae153a5b6935e07d8b4a04c5c73af67975f5d2f88979568dda13735d6cb18331ef90f90436b1f82f5e7bf0d28d31f7095d7fbd5d78894d480b58333a
+MISC metadata.xml 465 BLAKE2B e67971b7481b6dff91982fb7b3d72db752d62b683cd0043e215589aea4a026e5150b4da5a3798b8d09d39933b0bb41c5a62bfb41ff70ead0dcb01c2e4e732053 SHA512 35772b3727591d6cd02458d0862bdbd2346cb1d7a2640e9871a7dd0fa279ae7aece23e4f0194f10d67ae24ca999fd7463c6e29be470653d520c1295c7d679771
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
deleted file mode 100644
index 01a4029bbcbd..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson gnome2-utils xdg
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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/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 )
-	elogind? ( sys-auth/elogind[policykit] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-4.4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-elogind.patch
-	"${FILESDIR}"/${PN}-3.8.0-elogind2.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dgconf=false
-		$(meson_use doc docbook)
-		$(meson_use ipv6)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
index 8b32bd223688..eed6cde87b4f 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc ipv6 systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
deleted file mode 100644
index 7ae0fba56978..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 9 Jul 2018 13:26:51 +0200
-Subject: [PATCH] ELOGIND also needs this code that is wrapped in LOGIND
- condtional
-
----
- cinnamon-session/csm-systemd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index dc2aa2e..039abd9 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -23,7 +23,7 @@
- #include "config.h"
- #include "csm-systemd.h"
- 
--#ifdef HAVE_LOGIND
-+#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
- 
- #include <errno.h>
- #include <string.h>
--- 
-2.16.4
-
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
deleted file mode 100644
index 935541cf2a5b..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10148b8831ba26c7991b4643cbb05d92445f4b61 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 9 Jul 2018 13:56:57 +0200
-Subject: [PATCH] elogind
-
----
- cinnamon-session/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
-index 1d0db5b..4be50e5 100644
---- a/cinnamon-session/meson.build
-+++ b/cinnamon-session/meson.build
-@@ -77,7 +77,7 @@ executable('cinnamon-session',
-     xext,
-     xrender,
-     xtest,
--    # elogind,
-+    elogind,
-   ],
-   link_with: [
-     libegg,
--- 
-2.16.4
-
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 67c3b0a3ebb6..46942b72cc14 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
 	</upstream>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8d72eefd253f..7409194777b5 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,8 +1,4 @@
-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
-AUX cinnamon-settings-daemon-4.4.0-systemd.patch 1733 BLAKE2B 950b165f39b6a36cb9ebe47a76791dd4526e8ca4a883bc8f9d0ac93cd8f428ac232c4107d39ee98084292742ef465dab37bbc2059d67b1e2c1cc8cd485e5ac58 SHA512 f52fe67e57eb5213899ec249022b27cdc9ef94bf826604baba8ad6727e30ca0dc6f88a452640ae8536b23f33220d2cadc638b3132360d3d93d289e0ab236556e
-DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
 DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
-EBUILD cinnamon-settings-daemon-4.4.0.ebuild 2325 BLAKE2B dc4e03e93769716d38f615166c0008f53067a1d25821fdf3ed843fff247acd9a6577812de9523477557afeadc70be4aae8ceafbfed19e203ae0bb18b44db48a6 SHA512 20273a9a2eb1189d9fb88592153d30aa6bbd16d65d70b153655f8392c173f98ffcf54fb66c2c3427b684417d0adb72a34b10cdb3d6cbd81a99f7bb65fb2f79be
-EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2564 BLAKE2B fd49e531f11a97788f906e7f0f3ca691570f940541a9380c4c93e9f34aedd47ea24f1ec930af80116bd94c08754964590dceabd49c82ee65e3174b0005e0e89d SHA512 362e972f79f8307c2937d43fa97a6d56d5dd802aa4167b08a114a61058ef23b41ee553aacbaeacb546bc528523171a7c4da41716b4e89e0c20fae6f691c5458f
+EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2563 BLAKE2B ee715bafa2e5fc1ff012077b78bbe97e4e7357404cb0755119221ea7082d614ebd15ebfb01210a8d4e0c9ba2fd3c495bcb31c60a79a482672f1465b69e1fe45d SHA512 631fbac5122c19911ba183d75fa44ae8a2aec436dffe5722cd936cf52515ee2a01993e5361b1537a16d14e30399a8b9f25e204f7e3a6d2be0429fac2c1b8456e
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
deleted file mode 100644
index c38c65257e36..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.4.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 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="https://projects.linuxmint.com/cinnamon/"
-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-extra/cinnamon-desktop-4.4:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	>=sys-apps/dbus-1.1.2
-	dev-libs/dbus-glib
-	>=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-5.0
-	>=sys-power/upower-0.9.11
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=gnome-base/librsvg-2.36.2
-		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-util/glib-utils
-	dev-util/gdbus-codegen
-	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
-	eapply "${FILESDIR}"/${PN}-4.4.0-systemd.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-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
index c3770c9a2fb7..c7e81528cef7 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 RESTRICT="test"
 
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f967..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~	2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+  build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+              enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
- 
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
- 
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [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, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
-         LCMS DICT support:        ${have_new_lcms}
-         Libnotify support:        ${have_libnotify}
- 
-+        Colord support:           ${build_color}
-         Wacom support:            ${build_wacom}
- 
-         Smartcard support:        ${have_smartcard_support}
---- a/plugins/Makefile.am~	2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am	2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background  \
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
-     datetime    \
-@@ -23,6 +22,12 @@
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
deleted file mode 100644
index 90b63731f870..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.4.0-systemd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Wed, 11 Dec 2019 23:29:08 +0000
-Subject: [PATCH] Restore old check for logind
-
----
- cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +-
- plugins/common/csd-power-helper.c                    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c
-index adbe1e7..4d52b21 100644
---- a/cinnamon-settings-daemon/cinnamon-settings-session.c
-+++ b/cinnamon-settings-daemon/cinnamon-settings-session.c
-@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session)
- 	session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session);
- 
- #ifdef HAVE_LOGIND
--    if (access("/run/systemd/system/", F_OK) == 0) {    // sd_booted ()
-+    if (access("/run/systemd/seats/", F_OK) == 0) {    // sd_booted ()
-         sd_pid_get_session (getpid(), &session->priv->session_id);
-         session->priv->sd_source = sd_source_new ();
-         g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL);
-diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c
-index 5a83072..82c0b22 100644
---- a/plugins/common/csd-power-helper.c
-+++ b/plugins/common/csd-power-helper.c
-@@ -41,7 +41,7 @@ use_logind (void)
-     static gsize once_init_value = 0;
- 
-     if (g_once_init_enter (&once_init_value)) {
--        should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted ()
-+        should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted ()
- 
-         g_once_init_leave (&once_init_value, 1);
-     }
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 2355ecf60a04..40dcd278940e 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,3 @@
-DIST cinnamon-translations-4.4.2.tar.gz 11479907 BLAKE2B b1d38e1bac17e254a55d679f6d057ce24b643f0c17126fadb8581e60c81001c0d1dd357244d1f199661f2bddcdc8fece768f37d53c0bfbc61867a8c7ea3b93e0 SHA512 09700cc7fcd2e9e6599db8de994ec257da2be1931c32254af3042583310eeaf729b4dda0006346099922994f95310b32f99239916b5a35f9194bb4f8f8045eea
 DIST cinnamon-translations-4.6.2.tar.gz 11728647 BLAKE2B a1c8feb175be6bdb3bca3040c1e4a9227ccca744128f28b3ffd1e1ae53e103e6c2e40d5f2af54aa69ad9489d5be9acf4bbeda5175bd2c6f271bfbf6415494438 SHA512 b3bd19f140792988ce05e5a33e1beed9018048690bbd38db050c1c7b8c60091466892bbcfecc056118321a16aed80ca79df9a1c5b756c3c28539f940d9408517
-EBUILD cinnamon-translations-4.4.2.ebuild 1339 BLAKE2B 19ef3977cb2b230160dc854bdda597e46f37e7996ccf50881eda930271a86c738b41404bd5813e311bdcf6cfffa2512bf1e7aaf535ccb37fc6a79e85021c3f03 SHA512 7e03a0f489a8c8d46c21e1a22ffff80de2ed7bedc23c0e075de7714242991f6c5474f98245e5d96b506b2b41dc56ccae387e6b03f3f03bd455da58e30c27bdf2
-EBUILD cinnamon-translations-4.6.2.ebuild 1343 BLAKE2B 448f4640741eb8fb314b8cbeddf60739abcca7da58242ecc25f5b451edaee109f8dfe7889d8f39b4393114ff3e7d74eec05ec5b5d6df3bb0630545c3333d429b SHA512 bae2e532788d2330600f9044c39da87204f5e40f63e5ec22f18e009f2e8d51684e503538a257111d1ef02fd17b3df0569506679751a53b8f083780008f381b6d
+EBUILD cinnamon-translations-4.6.2.ebuild 1342 BLAKE2B 212958d4d81cddc2f60b6705091abceffd7811b45689ec77ac172c1f9032af7d365928271fadc2cfee47e36213a5d46ac76a8bccc0781438ac2812885f863019 SHA512 4f51a488f74b0611f36122b7c4b0a2a0ce580b52bf2e0d08d4704b09d78255415ae127c38051a152d305e5e00471f7edf1e9eb6b55f6b683afddc3d97623743a
 MISC metadata.xml 470 BLAKE2B b0df2af77ac75dc30330b04e80fb609138bc9ed1fd470cdb25dfe8c53052bbf0ae454e1b3666e118720d0bfdfed604f1a295de04954d28798c4e51a6cff73ae8 SHA512 248dc0f84f5d43861ca7a96baf2d25959d76a7f9e0cdeeb7aac738b5a0b30eef8e1b7c113a5e3d89a0e5c0c4226e28231b98967b80b237dbfd0f4c88ebdc7b5e
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild
deleted file mode 100644
index efabcda6bd6f..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.4.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig ii is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mr ms my nap nb nds ne nl nn no 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 szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zh_CN zh_HK zh_TW zu"
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-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() {
-		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-4.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
index 8a44e98ba688..ad9c53b0e6c2 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
 RDEPEND="${DEPEND}"
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 8fbc98f0ace9..4ac98023158c 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,8 +1,6 @@
 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 polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
-DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
-EBUILD cinnamon-4.4.8.ebuild 5622 BLAKE2B 89b253b06f80dc03bac458777059079cf7d331b0ae684917e02944d936ad875c2701fc016e0353cbc804988876e187fdaad8b430ff2018edbb9445f9c143ab38 SHA512 702307caa03256616eb68cec0a6d753c81064c68b5f9d7753154551418379251e43ce00f0d56f04896c9a5cc6d0cb0e506f241c8092f12ed2a99d5f7b4c83202
-EBUILD cinnamon-4.6.7.ebuild 5661 BLAKE2B 4213db13987203d87c77b24a8c6d2a07d22a748147ae2890da26f870d8f7b9f8c47f2a21d3b2036f303c295a522825bb72f48b244783aafc7143f401754a73d2 SHA512 04576ecde6536ef2e2b43cb3d153834778315f944484a02dcf1aaf9fb49b7bf9409f39ac9e43bc2f6ff164d078aaee7cd454462e0d1567c2fe804123c4ed9e5b
+EBUILD cinnamon-4.6.7.ebuild 5660 BLAKE2B e77a985e43266f34320c96a6db811fbee3174afbb7f31889d7d6bb3a61e82a97fd6f200a7e7a244ad4d04dd9d49c774a06aae93cf0d56eee6b7a86f0d2bd54e9 SHA512 2b0d7ace129e6ee55a41e9c19fc6b63b92f0a688bdd09ba1915efe21fb616d786466874d218ceaf8db632f1f0628ecd6ea47fc08e6306c256c22686062beeb8e
 MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
deleted file mode 100644
index 8fb8410e1ee3..000000000000
--- a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
+++ /dev/null
@@ -1,176 +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=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-
-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="gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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-1.29.15:=
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-extra/cinnamon-menus-4.4
-	>=gnome-extra/cjs-4.4.0[cairo]
-	>=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.3[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
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.4
-	>=gnome-extra/cinnamon-settings-daemon-4.4
-
-	>=app-accessibility/caribou-0.3
-
-	dev-libs/libtimezonemap
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-	')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.4
-	>=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.4
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-	gtk-doc? ( dev-util/gtk-doc )
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-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
-
-	# 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/cinnamon*.session.in || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3'); 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" \
-		$(use_enable gtk-doc) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/share/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
-}
diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index 99704c766804..0ffc7d806244 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 4f17c65738eb..1803504bb4e6 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,3 @@
-DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
 DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
-EBUILD cjs-4.4.0.ebuild 1844 BLAKE2B bb1da618ac42aeb96813eee02024e9ee190a2eb958c6adf6f06677c61560c4bac81dcd3e418486e700f5eb6acae998ee949b77ee65c1c13f9d6c093723cc61d6 SHA512 c150c1e2fe3b7629cc4e01663967adeca6035a5219326bd7ccb306be2aca20e30cf18ce16420dd093c95c56178b3ddebc7f75319bf723c2821263058a8fa686d
-EBUILD cjs-4.6.0.ebuild 1695 BLAKE2B 51745b5d618e91e8afd2f044dfaf2decb89068173c0534496933990697ca44ecfdcf126a1001aa3b98ee8bd1e42715f61ee8f386d3640587dc24c169049aeb7c SHA512 198ec71a6eb2e0a742c810a234df890ac832c3a68f9922672e948628ae508fd27b0320a18ef593f334e9a9ffa1215ac6e3b5e311612decf3c803ac84af6aa010
+EBUILD cjs-4.6.0.ebuild 1694 BLAKE2B 4f6075af2c26b2a3421e358e12907bf67daf6c6aca9fc139b48de52cdd09393fe5e0b23bfd11315385282215eb01a4fc122f2cdfc660b47d6f590a4c9550b704 SHA512 34557f9154df97fffd1f14be1b7e1f1e9adcb508cb08b7922b9a64e38f71373aa31041573667372e4f44bb86708409a1bb92a1453a67acdcae7b70a4bd4152c8
 MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
diff --git a/gnome-extra/cjs/cjs-4.4.0.ebuild b/gnome-extra/cjs/cjs-4.4.0.ebuild
deleted file mode 100644
index 4bd638f43d71..000000000000
--- a/gnome-extra/cjs/cjs-4.4.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 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="https://projects.linuxmint.com/cinnamon/"
-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.42:2
-	>=dev-libs/gobject-introspection-1.41.4:=
-	sys-libs/readline:0=
-	dev-libs/libffi:0=
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	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
-
-	# Fixed in 4.6.0
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	# Fixed in 4.6.0
-	sed -ie "s/40000/50000/g" \
-		"${S}"/installed-tests/js/testSystem.js || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.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
-		docinto examples
-		dodoc "${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.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
index 2173b520a753..a83515a191b1 100644
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ b/gnome-extra/cjs/cjs-4.6.0.ebuild
@@ -11,7 +11,7 @@ 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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index cd208d7e0472..e4b7949f0183 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,5 +1,5 @@
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 DIST libgsf-1.14.47.tar.xz 691448 BLAKE2B 7be095fef159ff7a52f2cf4d83b59b5bb591e0d4fb1d69d88bc6f2eba4286337af2a2c46ac7d6603d5a68b9b6f03d41f647d34b0bee5e61244696c5ba02be569 SHA512 143d48eb02be8202b9eb97e29e5909061a0e1a562b86e4bb4b2eac3fb0a42b139ead131ed1ffa4dfe304b65527089777823122223a74ebbc9df94c17d013f97b
-EBUILD libgsf-1.14.46.ebuild 988 BLAKE2B 1c6fe043fbb2cd4275e0d050ef922d68038bc717f727a19245d7c5c2b9b24ee91c330374e9438fb70fd80f0b9be5612779b45d747f7a3f1d4386455c9d5cb669 SHA512 18e0b5ff72363f30cda2a5b72b8a6e77c36566e88d877eebd9fec41702ee025debb76db1a82a8ab4f1c239bdcb221ad698be7881624a5325624c0bef4299d397
+EBUILD libgsf-1.14.46.ebuild 989 BLAKE2B 684ae064701f89816d0abe0f5863a9d8393894c0d4ef77a80e1a7c6eada7e94511961595f1959c449a756b4ea2661fb60dfde9159aa4aa2b3db04958e0e5c49f SHA512 7e321997ed91cad4b2fe979d55e29bf1dd59c9d3685921063a183c42dd0e26369e8c557b78d050e61e39fd2614586b53e58990982cbdd3b1ce6051821918076a
 EBUILD libgsf-1.14.47.ebuild 996 BLAKE2B 100c33a5202f5ddd4927d166a6ad2c8b6c647df6dfbe5a4680fc55c7b04440c9ddbcf6d5cbfddd1c03630a8eaf54612031e71cd5fb25614296ba93270f345af9 SHA512 ff72994d3f6bcc908283c584f74be7b635b71e144226d28be39f165d5ea4a5d27fab522f861b002b7dd011a17a39e81df9089dbae6a9b99ea9afd2bd884d7408
 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 3f6eca26eb26..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 76fdcbf610da..91cc7fbf3614 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,5 +1,3 @@
-DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
 DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
-EBUILD nemo-4.4.2.ebuild 1809 BLAKE2B 5641d649cca2dcb39fdc2f9c9984455bc7bb3f76e3a1b706c061380a93c0931837f6d67e676b2bf72b557e62fe557086e7239198e4a732c140b189fa558c6e3a SHA512 8cf22e8df511caf4d79817a7af8865d4dceb4c72683b7de7e20627762cf372ddefa64c02ce3835100d1011be464ae7da41e871335214956be2069f1afa29d954
-EBUILD nemo-4.6.5.ebuild 1886 BLAKE2B 2bb8fe2ff8fe942f25e89ea93824a0d1c10dfc5da33e75b3a84da3cffd43026ba5789400a089173f615c19e3c9eaec9407702deb143a9d722b08999e5cdb62af SHA512 57dd6082d37fd4473d29168691faeccfc260eb543f42ec76ba9919bd301911062faa5e6beaa5746b9d6fa42e3d5093d7b03f5519885c8cdc44c0e1e1c9c6b936
+EBUILD nemo-4.6.5.ebuild 1885 BLAKE2B 68e4f151623be0892122bde949e31eac4426b16a5639797c6751d4aad18943d931ca1734875ccbc11410c33ed009bdc405f8e2b341b5ea906ba45e1670eb3c86 SHA512 9f8f8136b1fb185aefab9c2339f2301c3d41c814bf63339ef7c6f849192c00950a4f359f6df362f83efbce349a2501f6e8700b49dcfb0a3f1ef7136091b270b0
 MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/nemo-4.4.2.ebuild b/gnome-extra/nemo/nemo-4.4.2.ebuild
deleted file mode 100644
index ae981c8d835e..000000000000
--- a/gnome-extra/nemo/nemo-4.4.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit meson gnome2-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-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="doc exif +nls selinux xmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT=test
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/gobject-introspection-0.6.4:=
-	>=gnome-extra/cinnamon-desktop-4.4: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=
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	>=x11-libs/xapps-1.4.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
-	$(python_gen_cond_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	python_fix_shebang files/usr/share/nemo/actions
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo/nemo-4.6.5.ebuild b/gnome-extra/nemo/nemo-4.6.5.ebuild
index bec318af83c8..992dd5c3129d 100644
--- a/gnome-extra/nemo/nemo-4.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-4.6.5.ebuild
@@ -12,7 +12,7 @@ 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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc exif +nls selinux tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT=test
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 36f28437c49a..1bc76f09dc63 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-3.34.2.tar.xz 640968 BLAKE2B 108d3fb52eb0548a9592442287513d3deea4ef595a252d3a46f6936243404bcdb31bb3adc234ba69e28a4de03ae35b1a5cac5ea2b2ffd4c6e4d4245c00b457b6 SHA512 ec31a46c8ee2f751f84fb309bf9a1ee3af090856b313375afb8db0ba17e9758b1616cddda4945de7c65f163893bb89a94a7372f90040b37a836f5d6173c80472
 DIST yelp-xsl-3.36.0.tar.xz 642608 BLAKE2B 59ee903e4d6cf6e0d40ff6ddecab8d65e9d81f9889afc37b4369136728cb5962d6e941ab39b80ed6e0613f172546cf659ea57a4b77c0f4633463f2b760bf0aeb SHA512 50544ae434a93cf37779db3be4e2b8d4eebd3575e9d31d3db8426f686ae262f4655d8d4b957e673daba4314d8e1c4c7a5e6485ca17b6627424b18087acd74a12
-EBUILD yelp-xsl-3.34.2.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
-EBUILD yelp-xsl-3.36.0.ebuild 557 BLAKE2B bddb7cd5cdb86a227e7d952822af17583748910343f306e30637d3bc790357be2cbfdca80afc280e454ba5b44b5b004dc889cb78345e36ba090509b05a0fd73b SHA512 780b30ae2432561ba7d207d25d5101fdedf3fc749dbc2ac01522b74814795049c5057b84e80b20b8755dd813abaee9441b64b0d3cb001f4f1572b0630baa7c33
+EBUILD yelp-xsl-3.34.2.ebuild 558 BLAKE2B d33204aaa166e4afd3c371889a8afb1f9c6181eaa7568a74b9da25d5390c5f24e4bdbe62eb7cf4b20962434b0caefdd4bf291277c393ad756fb7755e2b3e3d3c SHA512 446d82cd5d86118f736a987848062cd415eb5ec599d154d26002282f074ff752acd9becd08993e0c374d1c779f8dc87e8e73c501e24582a1e23a055bd701cc69
+EBUILD yelp-xsl-3.36.0.ebuild 558 BLAKE2B d33204aaa166e4afd3c371889a8afb1f9c6181eaa7568a74b9da25d5390c5f24e4bdbe62eb7cf4b20962434b0caefdd4bf291277c393ad756fb7755e2b3e3d3c SHA512 446d82cd5d86118f736a987848062cd415eb5ec599d154d26002282f074ff752acd9becd08993e0c374d1c779f8dc87e8e73c501e24582a1e23a055bd701cc69
 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 185ba651964a..6ca4bfb5087f 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-xsl/yelp-xsl-3.36.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
index 185ba651964a..6ca4bfb5087f 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.36.0.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:=