Updating liguros repov21.1.3

49 files changed, 747 insertions, 289 deletions

diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index a5459e9b97ba..9ae72fa3a494 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,4 +1,2 @@
-AUX cinnamon-control-center-4.8.2-build-fix.patch 1246 BLAKE2B c4e39834c7079573a363c9aa822a84839fdac5de2b9299545fafde9ed718e082ca3d37be63aa514fa43e60b33774d1cd1759202af6ade62b385c00a84cfb3e5a SHA512 3e3deadd7972ba4a642a8b69a809785ae34ff30cec1174e9d2a4ee8f9a27881e22629ae5b17dec92ba78c995bb012d1925d2a53d6acd89a155f17b3a74581df9
+DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
 DIST cinnamon-control-center-4.8.2.tar.gz 3865765 BLAKE2B 8e36888aec00252842bcdb3f29dd0728833c597260fdb6b2b160db455e900686086b1b04b393d58ec358f44aa64c14341e49738de7a85002a5e5d695974c578a SHA512 c64e554488b401291daf125cc5627201cac58d5e6efab697d0b9cac64b666a7d2a7e27f459bb560918876cc8cf5e3720c11a59cee70401e50682a4b82a20f1b5
-EBUILD cinnamon-control-center-4.8.2.ebuild 2096 BLAKE2B c2b97df909b4baf7e00ac5ac956edefcb23fa51e038d6b584711198b0a5a719aea7b346a85d13e31c6bf6a3c2275deda4211369cfee089392995d0009d075545 SHA512 64ae58922c5b93c20cf6cf8e791590fa8fd8bfcf8983daa89ab6d7daa81e7fd08970c81dd5366da5e24dd1c884430e52e90c9d784232226281a8f02b41696b23
-MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
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
new file mode 100644
index 000000000000..c560bf69948e
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils gnome2-utils xdg
+
+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 ~arm64 x86"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/libxml2:2
+	>=gnome-base/libgnomekbd-2.91.91:0=
+	>=gnome-extra/cinnamon-desktop-4.6: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
+	sys-devel/autoconf-archive
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--enable-compile-warnings=minimum \
+		--disable-static \
+		--disable-onlineaccounts \
+		$(use_enable colord color) \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable networkmanager) \
+		$(use_enable modemmanager)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
index 02bbedbad8f9..6faf4e6c0aba 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
@@ -2,10 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit meson xdg virtualx
 
 DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center"
 SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -40,7 +41,8 @@ COMMON_DEPEND="
 		modemmanager? ( >=net-misc/modemmanager-0.7 )
 	)
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -48,7 +50,8 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( >=sys-apps/systemd-31 )
 	!systemd? ( app-admin/openrc-settingsd )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	app-text/iso-codes
 	x11-base/xorg-proto
 "
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index a1d835e496a7..2d8c7724638b 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -16,5 +16,5 @@
 		<flag name="modemmanager">Enable support for mobile broadband devices
 			using <pkg>net-misc/modemmanager</pkg></flag>
 	</use>
-	<origin>cinnamon-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 8e28ab07e7d2..cdb9aa95ba3d 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-desktop-4.8.1.tar.gz 495417 BLAKE2B 3947d39168b2c74ef82a1ad5835d423721d34d1f9f7099050207ba070348abfb0236f08c340bf5896672764a59d19646cb34e342ddd4c7dbb501797ab20cbb10 SHA512 57eaba73cbaf2cd91e07a417bb0573bd0af86712babccfc4f307c6745dd219f0b279277f7a740dcf21d06a6f9a656213436b2e54eda4cbdb2f1f80a5ff085287
-EBUILD cinnamon-desktop-4.8.1.ebuild 1224 BLAKE2B 15c2fe74f6cc93443be0f318dc4306cad22c07921115f6779bf9d73037f64633ad6744aefd89fda111cc40111ee672515a828bff2c0cfebbc2c545f16761bc87 SHA512 e1ec56e8497593200342209a5dd3625efcbd9df2ccf05d54e6a67eac5ad0d74e342a71b9417d9d34ed3e4f071cf568d6b7cba54724c871077cd7e0235eb373b0
+EBUILD cinnamon-desktop-4.8.1.ebuild 1299 BLAKE2B f3abd5da69d7244d1d9093d03de0754b8a77af69a2bb0dc69b56d5a8923d0feb1998307437807a506f176325e2e25853833a4c56402f37fdbb03fc388ab91d0f SHA512 044bc8ce0483e1260db001a063d7cbe4ba8919a4398904d7aca85a83b775cdd007fbc6a4450ef5ce546a59e4f785548670db135f8c3ad05e784ddddf035db651
 MISC metadata.xml 465 BLAKE2B c78166d54a50ae1dbf4580564161bb0fd0c824b0f305d8e211452d089d8b88ffab5207c2ee63fd4bc83f434023fe87ab873b9d39c61a5f3199213647189adcdc SHA512 0298cc730405fdc373e8dfd11150651d29ed9d19c98370b2bb5dd19df1cfe5d83816e45d222c0eb103811d330a6508fef09001c00d6022ffe38997bdae771f3b
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
index 4c66f6a782d2..dd57ab325187 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
@@ -8,14 +8,14 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit meson gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
 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 ~arm64 ~x86"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
 	>=dev-libs/gobject-introspection-0.10.2:=
 	>=gnome-base/gsettings-desktop-schemas-3.5.91
@@ -30,17 +30,23 @@ COMMON_DEPEND="
 	>=x11-libs/libXrandr-1.3
 	x11-misc/xkeyboard-config
 "
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto
 "
-BDEPEND="${PYTHON_DEPS}
+BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
 pkg_postinst() {
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 4ee923d916d7..050263ebca10 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,3 +1,2 @@
+DIST cinnamon-menus-4.6.1.tar.gz 96294 BLAKE2B bdfacd5f4c5344833c9804b79846c5ac9908e74381c2e84b29b8cb765b10578ac69155d93e1c0bd8b6b8100d5e5f34ca1bc8bd77edb681eb705d759c5d9275bc SHA512 ef37662d4e1a49494c22481456b5e318039ec8c873e6ffcc0c55f89edbcc918d3bc97664b33007194da268b43884fe5abd08b27ac8bb5e7ba7bcb9928546aee9
 DIST cinnamon-menus-4.8.2.tar.gz 101831 BLAKE2B 6b731c21bee03fbd69360258d7573e35b774cc42ffdaf7536e7c8a3779e8ef9e8bc3684166a02f114838144fa9b7ea71a46b439e00f90abee56da1925bafec76 SHA512 6aa44e55ebcc60236361cd390fffbccd13422355e9fb4c61c8559479892d85890611d66971570454ce1a87a459c4a7de51cd2751eae4a042490155e0a9030e0a
-EBUILD cinnamon-menus-4.8.2.ebuild 780 BLAKE2B 593fc510bf88ee6b7eaa0359a9f681418f0707dec0334b5d0ec18ce504a8b764811e3b498188faacea4ab8dc10c10aa9480392cc92cdfabf157546f24d8de417 SHA512 8c3b644a36f86bcd5f7e5aae9353bb0b2fb1b5b9e3c9d36b2dea9091ffede031f56e9b82ff9b1ecd793ac267b889b26fa2554f881d9ea0077366d388a228c466
-MISC metadata.xml 463 BLAKE2B 41f1994f18142bb9c28d5b60d6a3d2afaf4163dcf04fdf20c663361064e93d61e2ae363a6d8aad667186e39873ea85ed571e35ebd1b4f2d1ce59441a3ac51665 SHA512 14e5471c3ee6048d5e976cd8734b91f9f27818df88014e8ace1c22c9cc9121f167064dea98a36d4cc80f5c01f9adf90df095902e6ea86f80d1c3dc86447bfe37
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
new file mode 100644
index 000000000000..d15da61087fc
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 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 ~arm64 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.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
index 642f2a26d98c..0809265efdbd 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit meson xdg
 
 DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-menus"
 SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+"
@@ -18,7 +18,8 @@ RDEPEND="
 	>=dev-libs/glib-2.29.15:2
 	>=dev-libs/gobject-introspection-0.9.12:=
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/gobject-introspection-common
 "
 BDEPEND="
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
index aa19915ffbbe..6c846d9e52ba 100644
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -12,5 +12,5 @@
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
 	</upstream>
-	<origin>cinnamon-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 08bf14533823..588df44b60d3 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-EBUILD cinnamon-screensaver-4.8.1.ebuild 1536 BLAKE2B dc993f905994d20e211f3a99e00a6294925e6d90df83ff6da51d2839c3aabc0a9a0138080e9e39fa318c51fcc2d6ac53d1f58ff41ad0cebb6f3c5a6a5d142bda SHA512 d8a578045a0af960ebf1f12a9c63fdea403839cbbfa6a67b247e13aa1499b6859db71be7a4dc625eb64fcde4ec41d683f38b8f7a1aa05249b9d059fbada675ef
+EBUILD cinnamon-screensaver-4.8.1.ebuild 1631 BLAKE2B f23043ebd02b35afef4999d73ad604721db99b7b50fef9d34089ea40e49952b0178a3408be09f25a3747fb8ca8e3a5825285d191a59780ec4ae7dcea5edbdcfd SHA512 96acba07f07ec3d0581eb9411113c9e988f244f65973d0690ea1ab1d698377a3b1bf916a2379e67d9ec754c52c2d6cd3e573fbcf109dd3b2700e65c8014998d6
 MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
index 65e50585ac70..f51c592981bd 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit meson python-single-r1 xdg
 
 DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -32,7 +32,9 @@ COMMON_DEPEND="
 
 	xinerama? ( x11-libs/libXinerama )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
+	>=app-accessibility/caribou-0.3
 	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
 		dev-python/psutil[${PYTHON_USEDEP}]
@@ -44,7 +46,8 @@ RDEPEND="${COMMON_DEPEND}
 	systemd? ( >=sys-apps/systemd-31 )
 	!systemd? ( sys-auth/elogind )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 BDEPEND="
@@ -55,8 +58,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_src_prepare
-	python_fix_shebang src
+	default
+	python_fix_shebang install-scripts src
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 311cd95468fb..db0e26b749cf 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,3 +1,3 @@
 DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
-EBUILD cinnamon-session-4.8.0.ebuild 1298 BLAKE2B b5b0a1faac90a0f5ae212b8d27031931009c85ef3248a00062f77eb63f010204a2a3cf53fee1531e79e20495cd5ce53482cbe24c72ad4ea42a99016f7cda7eb1 SHA512 1b8a3b8c6c75901ea8a114950ef32bf55e7c626389d175ba6454e5087018cc2d9c8f8f2d7394e13fd160e7d357775aa3e0c32ffe3adc7fce0d33c382c28b9cc1
+EBUILD cinnamon-session-4.8.0.ebuild 1425 BLAKE2B 1145cfb24cef9662954eb9518c3282f4c3c4b36b4637e5f152da3e87750690d373121d01b899d7ab813438fab021bb3a3a1075e6d7776011ed977a6cda94de95 SHA512 8ea6a44ccd989a527c731fa972289b663a30d4aa9e2c8f9f9251113214a6c074fdb02e26799cddca36207e22bc1e75e790a4e02818cf9c98df0f9d2be8d20350
 MISC metadata.xml 465 BLAKE2B e67971b7481b6dff91982fb7b3d72db752d62b683cd0043e215589aea4a026e5150b4da5a3798b8d09d39933b0bb41c5a62bfb41ff70ead0dcb01c2e4e732053 SHA512 35772b3727591d6cd02458d0862bdbd2346cb1d7a2640e9871a7dd0fa279ae7aece23e4f0194f10d67ae24ca999fd7463c6e29be470653d520c1295c7d679771
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
index fc2172130da6..3bba1773ff65 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
@@ -3,10 +3,12 @@
 
 EAPI=7
 
-inherit meson gnome2-utils xdg
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit meson gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
 SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
@@ -14,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc ipv6 systemd"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.37.3:2
 	media-libs/libcanberra[pulseaudio]
 	virtual/opengl
@@ -35,12 +37,12 @@ COMMON_DEPEND="
 	systemd? ( >=sys-apps/systemd-183 )
 	!systemd? ( sys-auth/elogind[policykit] )
 "
-
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	>=gnome-extra/cinnamon-desktop-4.8
 "
-DEPEND="${COMMON_DEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
 
@@ -49,6 +51,11 @@ BDEPEND="
 		dev-libs/libxslt )
 "
 
+src_prepare() {
+	default
+	python_fix_shebang data
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dgconf=false
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 0e87d15aac34..0042c32211a1 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,4 @@
-AUX cinnamon-settings-daemon-4.8.3-build-fixes.patch 4622 BLAKE2B 301777d6b59ad87e05c130633a9085a6f8abd3ebce84b22a1916223c9d81290c7518914a0c5c7dad257dee0e6dda3f8f33ab3412941efaa4cadc1f2b2c0322fe SHA512 23fdc5d7b213c0507dfa9e2555b18a8e840c6b9e0582a7cf13d1392b1af3b09509fc720aee35e4738b726a88a615ee0adc7b9ecab5ddc83916cf391cc25bfd17
-DIST cinnamon-settings-daemon-4.8.3.tar.gz 661907 BLAKE2B 928a73645585f21ed74bbf2bcbfbde6096fc229c17848c6d82dc7a81066b5d442665e9b3dda39e058a87996ee8fe2eb3c55e56ceeae3793166ffdc4110d411e7 SHA512 5399d1d7d2cf0bbba0eb825620c75fbb41cbe35bb10079e722e87f3ce67630a8e2abd963afbe2f05224d46f2d2109453f24435914411ac4e5dc3e525adbcc3e1
-EBUILD cinnamon-settings-daemon-4.8.3.ebuild 2191 BLAKE2B 29d0993b428a9c977e0de259b1bde83028e99b7334217b5b0d24605d995d36f5ca4825f9eb428fca05d7279b0a8ff4054b5eca5764f745a3065fb016a6315bc3 SHA512 db448c5a8557a1a8926deb5e89aa4cb72348a80d7ed6d4c9fc594758c405c828d49dece102a01cdcada73bb315be83f6842da35d3d683813d1fe409000d63c01
+AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
+DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
+EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2352 BLAKE2B 790ec1427beb54e7b39e9b48cc0901e6a9b581cf3d7c51c35f81fed85742d204da25338de22e46d8843d630918b65e28a11033df20ba0bf59063028236bcbc83 SHA512 6718d32318853f114c73617ef21972123d49f4d7f26d9fc1f8cc9018cae2a7a1a102846d0745ee79ff877035aaba311187c58c4a14bbda73d0b1495434c9aba8
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
index c01e1df0976f..e7c26326f770 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -2,10 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit meson gnome2-utils xdg
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit meson gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
 SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -49,11 +52,13 @@ RDEPEND="
 	systemd? ( sys-apps/systemd:0= )
 	!systemd? ( sys-auth/elogind:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	dev-libs/libxml2:2
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.37.1
@@ -63,9 +68,14 @@ BDEPEND="
 PATCHES=(
 	# Miscellaneous meson configuration/compilation fixes
 	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
-	"${FILESDIR}/${PN}-4.8.3-build-fixes.patch"
+	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
 )
 
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
 src_configure() {
 	# gudev not optional on Linux platforms
 	local emesonargs=(
@@ -76,7 +86,6 @@ src_configure() {
 		$(meson_feature cups use_cups)
 		$(meson_feature smartcard use_smartcard)
 		$(meson_feature input_devices_wacom use_wacom)
-		-Dinstall_binfiles=false
 	)
 	meson_src_configure
 }
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.3-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
index b94e57aefa2e..f70d1e544e94 100644
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.3-build-fixes.patch
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
@@ -1,8 +1,8 @@
-From 8e9508e7d67b242f25548e1cd62f1bfab4539921 Mon Sep 17 00:00:00 2001
+From 281bc6b8e0085a91b7e59af45469c4da397646c2 Mon Sep 17 00:00:00 2001
 From: Sparky Bluefang <sparky@bluefang-logic.com>
 Date: Mon, 28 Dec 2020 17:05:21 -0500
-Subject: [PATCH] Meson build fixes. Add missing defines. Fix optional wacom
- build. Make build options behave consistently.
+Subject: [PATCH] build: Add missing defines. Fix optional wacom build. Make
+ build options behave consistently.
 
 ---
  meson.build                | 20 ++++++++++++--------
@@ -12,7 +12,7 @@ Subject: [PATCH] Meson build fixes. Add missing defines. Fix optional wacom
  4 files changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 63cd9c8..553a545 100644
+index 0e11d50..0d6c35a 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
@@ -23,7 +23,7 @@ index 63cd9c8..553a545 100644
  
  # directories
  prefix = get_option('prefix')
-@@ -42,7 +43,7 @@ endif
+@@ -43,7 +44,7 @@ endif
  cinnamon_desktop_required = '>= 4.8.0'
  canberra = dependency('libcanberra-gtk3')
  cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
@@ -32,7 +32,7 @@ index 63cd9c8..553a545 100644
  cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
  cvc = dependency('cvc', version: cinnamon_desktop_required)
  fontconfig = dependency('fontconfig')
-@@ -55,13 +56,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
+@@ -56,13 +57,13 @@ gtk = dependency('gtk+-3.0', version: '>= 3.14.0')
  gudev = dependency('gudev-1.0', required: get_option('use_gudev'))
  libnotify = dependency('libnotify', version: '>= 0.7.3')
  kbproto = dependency('kbproto')
@@ -48,7 +48,7 @@ index 63cd9c8..553a545 100644
  x11 = dependency('x11')
  xext = dependency('xext')
  xfixes = dependency('xfixes')
-@@ -79,13 +80,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
+@@ -80,13 +81,12 @@ librsvg = dependency('librsvg-2.0', version: '>= 2.36.2', required: wacom.found(
  xorg_wacom = dependency('xorg-wacom', required: wacom.found())
  
  lcms = dependency('lcms2', version: '>= 2.2', required: false)
@@ -66,7 +66,7 @@ index 63cd9c8..553a545 100644
  using_logind = false
  if not get_option('use_logind').disabled()
      logind = dependency('libsystemd-logind', required: false)
-@@ -124,6 +124,10 @@ if gudev.found()
+@@ -125,6 +125,10 @@ if gudev.found()
      cargs += '-DHAVE_GUDEV'
  endif
  
@@ -78,10 +78,10 @@ index 63cd9c8..553a545 100644
      cargs += [
            '-Wno-deprecated-declarations',
 diff --git a/meson_options.txt b/meson_options.txt
-index 2fbe526..db8e970 100644
+index 0a6941b..e3c89f3 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -35,17 +35,23 @@ option(
+@@ -35,20 +35,26 @@ option(
      description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
  )
  option(
@@ -108,18 +108,16 @@ index 2fbe526..db8e970 100644
  option(
      'enable_debug',
      type: 'boolean',
-@@ -57,4 +63,4 @@ option(
-     type: 'boolean',
-     value: true,
-     description: 'Add symbolic links to the plugin executables into the bin folder'
+     value: false,
+     description: 'Show additional build warnings'
 -)
 \ No newline at end of file
 +)
 diff --git a/plugins/meson.build b/plugins/meson.build
-index 0de6faf..11ba50c 100644
+index 0d11a52..069366d 100644
 --- a/plugins/meson.build
 +++ b/plugins/meson.build
-@@ -25,7 +25,7 @@ subdir('sound')
+@@ -24,7 +24,7 @@ subdir('sound')
  subdir('xrandr')
  subdir('xsettings')
  
@@ -129,7 +127,7 @@ index 0de6faf..11ba50c 100644
  endif
  
 diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
-index 6ad7ecc..4b223db 100644
+index db2bf73..3296f1a 100644
 --- a/plugins/xrandr/meson.build
 +++ b/plugins/xrandr/meson.build
 @@ -11,6 +11,7 @@ xrandr_deps = [
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 16ce667f40a3..d6c7dc7e6892 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,2 @@
+DIST cinnamon-translations-4.6.2.tar.gz 11728647 BLAKE2B a1c8feb175be6bdb3bca3040c1e4a9227ccca744128f28b3ffd1e1ae53e103e6c2e40d5f2af54aa69ad9489d5be9acf4bbeda5175bd2c6f271bfbf6415494438 SHA512 b3bd19f140792988ce05e5a33e1beed9018048690bbd38db050c1c7b8c60091466892bbcfecc056118321a16aed80ca79df9a1c5b756c3c28539f940d9408517
 DIST cinnamon-translations-4.8.3.tar.gz 12010514 BLAKE2B a1635f08376ff85a082078e3da64d0f5159d818ba1c57ae79439168553dd8c7e80e2d1aed93361c9df164d790f8be41059e7227c76ebee2285ea53a10df4f9ae SHA512 e7e674be8c542bb34cab9e191f4124b17d0fd932315838be241a7e0fea82aaa72f35e3ecf2d01972def7bd8c4b7a697107a6a14a64ab26c0d1cea4692cf62ff1
-EBUILD cinnamon-translations-4.8.3.ebuild 1282 BLAKE2B b779fe99c7d383b06caf7ec703a2ef5fdf7dd566a5b1a6b4a33ff838db1a9858f8779fb4836c9f5b4dc5c1017f59e22dec219381ab62990fa19cc73d175d5a88 SHA512 a8f80a6e0bce3745b04cc4b296def2136823c205dc7167e5dc795b3c6215b8cef1ae2ec9793d39a82b23d3341db9816c580eb92f53f2c5ea6ae56b81b5c99c7b
-MISC metadata.xml 470 BLAKE2B b0df2af77ac75dc30330b04e80fb609138bc9ed1fd470cdb25dfe8c53052bbf0ae454e1b3666e118720d0bfdfed604f1a295de04954d28798c4e51a6cff73ae8 SHA512 248dc0f84f5d43861ca7a96baf2d25959d76a7f9e0cdeeb7aac738b5a0b30eef8e1b7c113a5e3d89a0e5c0c4226e28231b98967b80b237dbfd0f4c88ebdc7b5e
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
new file mode 100644
index 000000000000..22c68103a2fc
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 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 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 ~arm64 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.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
index cfa40e8a3358..e835a818fc94 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
@@ -8,7 +8,7 @@ PLOCALES="af am an ar as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia
 inherit l10n
 
 DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
 SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
index 4949d4983ca0..59adbe481da0 100644
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -12,5 +12,5 @@
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
 	</upstream>
-	<origin>cinnamon-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 6f90318b37cd..4b8090b8a3d7 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,7 +1,2 @@
-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.8.5-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
-AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-4.8.5.tar.gz 2378048 BLAKE2B 0ff600d12df765bd6717ab4679d677fa7f8a6c8dbf1411ef81ead51d59a112970ca7de0f9b8dcc82745c3be0255da4a6483be2603c5cad5bf1e2db0c34a71c9a SHA512 86c511ac12327c2daeca49d75b83a9836036474a8ac35ee946d6b0c05e104b8ae96aff90e9292efa231832090d9041cc135ad607c2e78798d88163cd0ccac51e
-EBUILD cinnamon-4.8.5.ebuild 5014 BLAKE2B 3794cd808ca7a250cb267f3ca020e13949178740acba97846fac4976f3fcb368c13bc10edbc670e96546c8a8f11245a554247e1aac94de27d6219ee6a9a7c416 SHA512 342e5303c4f4d28180c82384665dd178d5bc8ea0e6d86e89bbeacaacfcceb77eb77f2ed309d1502a731d3d42ae0073b25fe22213e58832879ebd6ca1f73326da
-MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
+DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
+DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
new file mode 100644
index 000000000000..cced48c504ff
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2-utils multilib pax-utils python-single-r1 xdg
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="amd64 ~arm64 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.6:0=
+	>=gnome-extra/cinnamon-menus-4.6
+	>=gnome-extra/cjs-4.6[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. adwaita-icon-theme 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.6
+	>=gnome-extra/cinnamon-settings-daemon-4.6
+
+	>=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/distro[${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/tinycss2[${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.6
+	>=gnome-extra/cinnamon-control-center-4.6[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-4.6
+
+	gnome-extra/polkit-gnome
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.6 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+BDEPEND="dev-util/gtk-doc"
+PATCHES=(
+	# Fix backgrounds path as cinnamon doesn't provide them
+	# https://github.com/linuxmint/Cinnamon/issues/3575
+	"${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
+	"${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+	gnome2_disable_deprecation_warning
+
+	# 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
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--enable-compile-warnings=minimum \
+		--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() {
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	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() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of 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
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon/cinnamon-4.8.5.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
index 4451a956d9ee..a1a2f1b533bb 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.5.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
 
 DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"
 SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -17,7 +18,8 @@ IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+DEPEND="
+	${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2
 	>=dev-libs/glib-2.52.0:2[dbus]
 	>=dev-libs/gobject-introspection-1.29.15:=
@@ -49,7 +51,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
 # caribou used by onscreen keyboard
 # libtimezonemap used by datetime settings
 # iso-flag-png (unpackaged) used by keyboard layout settings
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	>=app-accessibility/caribou-0.3
 	dev-libs/keybinder:3[introspection]
 	dev-libs/libtimezonemap
@@ -88,7 +91,7 @@ RDEPEND="${COMMON_DEPEND}
 		>=gnome-extra/cinnamon-translations-4.8
 	)
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
@@ -108,7 +111,7 @@ PATCHES=(
 
 	# GStreamer only needed for recorder
 	# https://github.com/linuxmint/cinnamon/pull/9809
-	"${FILESDIR}"/${PN}-4.8.5-build-fixes.patch
+	"${FILESDIR}"/${PN}-4.8.6-build-fixes.patch
 )
 
 src_prepare() {
@@ -120,7 +123,7 @@ src_prepare() {
 
 	# shebang fixing craziness
 	local p
-	for p in $(grep -rl '#!.*python3'); do
+	for p in $(grep -rl '#!.*python3' || die); do
 		python_fix_shebang "${p}"
 	done
 }
@@ -143,7 +146,7 @@ src_install() {
 	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
+	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
 
 	# Ensure authentication-agent is started, bug #523958
 	# https://github.com/linuxmint/Cinnamon/issues/3579
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
index bc4476a5892e..bc4476a5892e 100644
--- a/gnome-extra/cinnamon/files/cinnamon-4.8.5-build-fixes.patch
+++ b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index ed5a62f8db6d..19c42a944197 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -12,5 +12,5 @@
 	<upstream>
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
-	<origin>cinnamon-overlay</origin>
+	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index abeb265c4bb1..fb88df0317da 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,4 +1,3 @@
-DIST cjs-4.8.1-rebase-on-1.66.1.patch 17811 BLAKE2B b48aa6895b70e9ccaef143abc7a1c4eef16bcb87f73669041a41942d4f192d12aea96c132a6c6cee337f6daecf1ae1caa0ebeec90197b8fcf2bff2ae44610c89 SHA512 40aa2c70d591c8b8e56b0e6679d9bbaa5db937c9c5cf8bd00346716d10e12b89cf8a1174da61a320c47e347f69a3c7d601190b9ec7eae52f2018c9d79a8e3ef3
-DIST cjs-4.8.1.tar.gz 599988 BLAKE2B 56132b44cc5181d0e31db0356af77e47a5dfb049085da75a2e717e89befadce8320e1ada9614e9deb88fa90b02d58690a0526d5d8818585e2348d820489a8f38 SHA512 24eb1efb2b7de0bcad1f4445a5c3d0b911636ff7e62c858e756acd47c86f9960738d9421c6e4db7d21efde8916cac7313489f8a90ac034d68521dac6f358b368
-EBUILD cjs-4.8.1.ebuild 1607 BLAKE2B 4dbabf1db2ab3e61bfb1da45d49250f992168d637e07a5825d6b694149d8c0a1c1cceabacc45f67e3c1562f39e7d5c9716a94464df8de64cff6a52d1a33f0ad6 SHA512 23a0eb350b5ec9bd1eb2ceafd957d3ac8c4ce72277abc0c4547dbcd75c5e66680f8d696d0f3402e3158d2322f9f818041d4d279a78730f47493f0dc139543d2c
+DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
+EBUILD cjs-4.8.2.ebuild 1504 BLAKE2B a985dd9f1461902eef59800d4d1df974987e94737979bea32282c7264b52dd9c279baed12c62cb7ea676ab5846be2514af16870db021eaa286d8f766f4b16672 SHA512 b36be7633fbd96c3f48ffcb75575b810036990e735160c745d28c1786bb712e8f556911b2483aabe0b7a5f4847aab5881f5330a39dcaa588718b73a82d4d4ae3
 MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
diff --git a/gnome-extra/cjs/cjs-4.8.1.ebuild b/gnome-extra/cjs/cjs-4.8.2.ebuild
index 7c65308deecf..8616642d67bb 100644
--- a/gnome-extra/cjs/cjs-4.8.1.ebuild
+++ b/gnome-extra/cjs/cjs-4.8.2.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit meson pax-utils virtualx
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit meson pax-utils python-any-r1 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
-	https://github.com/linuxmint/cjs/commit/1210c910935e4e3ab5335725a34adb8f661a8d95.patch -> ${P}-rebase-on-1.66.1.patch
-"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
+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"
@@ -25,7 +25,8 @@ RDEPEND="
 	cairo? ( x11-libs/cairo[glib,X] )
 	readline? ( sys-libs/readline:0= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
 	test? (
 		sys-apps/dbus
@@ -34,14 +35,14 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Rebase on gjs 1.66.1 to fix SIGABRT
-	# https://github.com/linuxmint/cjs/pull/90
-	"${DISTDIR}/${P}-rebase-on-1.66.1.patch"
-)
+src_prepare() {
+	default
+	python_fix_shebang build
+}
 
 src_configure() {
 	local emesonargs=(
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index b5cc1d0be1f1..bab5307aa12a 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-extension-bing-wallpaper-27.tar.gz 7202160 BLAKE2B bb908ccf0c67a06f80ef34edaed6257c5ae1b00570d6f3ab15a9a9c330368a2ae658f019943bf1806c1c97573cc5612b3c7dd22720d3048d628fcc2c15336420 SHA512 eaedbcf7e442d86b06f13745ac7796789bd5c7ccb0e64a4fbe10d4f6a2917ef9b4b9c1733d56c6620e0e8b4c4ef1281fd0d48151938519dd28249f07d54382f2
+DIST gnome-shell-extension-bing-wallpaper-28.tar.gz 7204530 BLAKE2B f52f8e83d203e3c2ca0f5437079d463c9e51a9ff9e594ad26fc291c362c4e340781a362beca316d0164e972b5b52a749a2afaf9ff1af74fb8eff3217deb7dbe9 SHA512 8c292129e539b415f19c732691d833463e437b06e1bca5a42f34885c19f7b8c4ab450a07956c0adcfdf0bf279ca303b1577a9723e3ce535eefa73efded26ae6b
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
new file mode 100644
index 000000000000..c31bdf512404
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-28.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
+HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
+SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.28
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
+extension_uuid="BingWallpaper@ineffable-gmail.com"
+
+src_install() {
+	einstalldocs
+	rm -f README.md LICENSE || die
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+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-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index ececc1f37759..3c8d02a3e957 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.tar.gz 3431 BLAKE2B 6355135f9027d53b10ba1f02f2fdf90dc0acbd090be8905addc78f22f7b136464831985152d8a112febc8891bbd18ea42aedd8009c7db4afc52ba48b6d502511 SHA512 322da0bc511bbb6943713fd3fc3d75d8f32b9872ced9eeb611acc77756392d0b9c9dc1311bdb4e255d131637de6a17a3d0a76f1cebcc71218d67d2ef6078a4d1
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.tar.gz 15697 BLAKE2B e689b1cb09dd7a84b8c542a78fcc45dcf09af16725f44aa325d68009f189d4cd72ee435b8b66989cd18c6d1d33cda5d7a2408533f32a8da93a9b8cdd2f4f0bd0 SHA512 db29ea4ad68ed945857e2aef3c5afcc8449b5eb5163a7940487fa2fe174ab036a2a436a35dac345e3a3d96ec075460afe3ba48f5f460f14ed033ad5307ae5969
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
new file mode 100644
index 000000000000..a2add7f940a2
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Control the blur effect on gnome-shell lock screen"
+HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
+COMMIT="748b95e931b6b1548b90ceeee7a5883da3e0529f"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.36.4
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf LICENSE README.md schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+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-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 00e6ef1d613e..35b78d2f3895 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-extension-dash-to-panel-39.tar.gz 21123453 BLAKE2B 6cc5bc56368d1e65d601894251642fad1a28508b475a8abcd9566c0a5bd9e48677a98401fa1b263b4df6a0650442d253ab297bdfce5409feec96933fa1d3a67b SHA512 37ff633b3ab04024d65c25e42885e6e9f8b11f5d2e7516fefe7b8ae791b7beac62d7c7a2d5f88fbb8e69e28688f90e4b41cd4d330f381aa7b351e5603a14c007
 DIST gnome-shell-extension-dash-to-panel-40.tar.gz 21130921 BLAKE2B 3f5b60aaf4bece5d14adab616580e127ec62abfe3a68e3fdebe25a16c1a7e498932e350489863cc002cdb78ffacdc52dcc4eb79532da7aeb17d3cafaaeead8f4 SHA512 b59c0fe518c950b63119535cf53a51024d9575994de8a7603707d28b6503f6824324e44ca09d89f206c7d33888593e46604cb5745be366731160adace6d64e05
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
deleted file mode 100644
index 23612f13646a..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-39.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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 c302e614b3a8..ead7e8525d56 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,2 +1,3 @@
 DIST desktop-icons-20.04.0.tar.bz2 59444 BLAKE2B 245ca07afaabe5f4e26ed920d4d0caec104f535398a92d79cddb08ef2bef42b6cff389320c48449d6ad904e2d2d0f74140512a6b0214e7a81ab444e5bafee2c0 SHA512 c7b13077aafd1e554e425b2ef323be309b880a38bcbfa3ba849a8bbb3458a4eb42177f75b1004741b85907bc0113cc09c72566401bc99f64f47ad87013659bf9
 DIST desktop-icons-20.04.0.tar.xz 50448 BLAKE2B a93baf7cb37a3f78deb8780dcf4ec65bd20e42ecd9255924c61f457d3f6fe4cafd4865b80e414105f9e72fe835caaf034474f7e587a30b91c233edfc2851ad00 SHA512 6c411e4983901a0646d49ffa58bc9d711c33222b787795f5c237370168fb4bc7ff186cc071675decdcfaae846c1696d718b659b75120ad7777cb04dfd26dbc84
+DIST desktop-icons-20.10.0.tar.xz 58484 BLAKE2B fd41f524803df7e96394c0ef66a70bef7e2522d2dacc7f384101c8524f2193ebd0126334474c27fb2e348fc329e36cae941590ae3875a2ce966ba6d9d8079dda SHA512 b9dbeb22522f02e3fc9388a18e36f11e13932e265e70661152c7dbe2a762e820564484fdf1d16591882ae9f675f1071319d238b6190a406295f07e8675bb9e36
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild
new file mode 100644
index 000000000000..2fc8005e6d09
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/gnome-shell-extension-desktop-icons-20.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 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="5e2d0748cf79d255d7c23df6a6e6901b"
+SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/uploads/${COMMIT}/${MY_P}.tar.xz"
+#SRC_URI="https://gitlab.gnome.org/World/ShellExtensions/${MY_PN}/-/archive/${COMMIT}/${MY_P}.tar.bz2"
+
+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.38
+	>=gnome-base/nautilus-3.30.4
+	sys-apps/xdg-desktop-portal
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+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-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 5bc9f9c85ca3..ecf206795e75 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1 +1,2 @@
 DIST gnome-shell-frippery-3.34.2.tgz 81928 BLAKE2B ae95379333037e4d53638bbdbef2059d36f3dd1007e2d791a3b5eb6544d006823bc62cf671dc772672e07397b20a9f3e25bd803eb143685f05413a23887d3601 SHA512 3fab0778a2076f8c52d8aeb63d8d8b8f6ae2d12a381072fe39c6c318e744b56749776a4aee894e4f1c64bf90ecc3d1bd87ede6357edac9656cd6516866e42484
+DIST gnome-shell-frippery-3.38.0.tgz 82248 BLAKE2B c36b7e01b15cfe61af93377b22a2baa967846dbc69c0a9667352a80a7db62f554e9f66d3990cdbc932096d371c1bf46d300c25a2eb523adc6cbb90d8e9c4d9d0 SHA512 16d212a0fd6ce1625eabf6dced3d64bfb9635e4a67c131c5a9c57041cb53530bb9e514af24190599ff7324016ae86524455091c507f0bfef39ed2d57b3b1cbed
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild
new file mode 100644
index 000000000000..88a2882d2f55
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.38.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="https://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.38
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index 86aeb93c401a..eb25f7e430ae 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,4 +1,2 @@
-DIST nemo-extensions-4.6.0.tar.gz 754433 BLAKE2B 83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987 SHA512 b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32
-DIST nemo-extensions-4.8.0.tar.gz 741427 BLAKE2B 624e1197f5adbf2d5eac5d80d17d9d551beac2991a5e80a72cdddb9f5abe7b645a2988cf35b928479f8f2cc92ea57cd84fc40fd43c09643bfd8a92e0027819bb SHA512 a3ef107d79f0c76807cc7a7ce4290d2de36811e284995a1c1e315fa6b38a2b977975fe8179d2fcb6be524c49903c3b6751a8afc8fc039022bc5974c18cdef21c
-EBUILD nemo-fileroller-4.6.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86
-EBUILD nemo-fileroller-4.8.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86
+DIST 3.2.0.tar.gz 1162843 BLAKE2B 79c864f4d74e2e8d382185abd16c873b64e745ac176a2aa162db37a86a3644d3f0d8ff83c6f2e2a1986d35dba18b5ce0769926a81afd8a193cf35c443f3a1097 SHA512 961aafd1f48033e538b6da2ceee11f98e4319944709b874ad78416790e7d42fd1a82e94a1625fbcd1dbf1fac52f7734be1f58684476e97a66ca63b13ccd7a626
+DIST 4.4.0.tar.gz 790589 BLAKE2B 655edfcfb99baf2b36cc8fea4ee12a1d2f6ed9740bbae0231d8e4daacbf8e2117cbcc12420c0d6eac56eb45dd91dd632e5544581b72063d7095ed6a4dc784c8c SHA512 5ca2cf57950986fdc0f3ed5962fa8ee914ac34bf46c702a0fe0323169060ae8f300406bcb5194fbf88b50aa41e6deb8fa2ee32fdf14eedb7fd9553b10240a2c9
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
new file mode 100644
index 000000000000..83a06b536884
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="File Roller integration for Nemo"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="app-arch/file-roller
+	>=gnome-extra/nemo-${PV}[introspection]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die
+	fi
+}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
new file mode 100644
index 000000000000..a35d1af48b05
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="File Roller integration for Nemo"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="app-arch/file-roller
+	>=gnome-extra/nemo-${PV}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die
+	fi
+}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
deleted file mode 100644
index 06de99fc4051..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Nemo file-roller integration"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="gnome-extra/nemo"
-RDEPEND="${DEPEND}
-	app-arch/file-roller"
-
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.8.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.8.0.ebuild
deleted file mode 100644
index 06de99fc4051..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Nemo file-roller integration"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="gnome-extra/nemo"
-RDEPEND="${DEPEND}
-	app-arch/file-roller"
-
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index d8e801304d95..689d874be30c 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,4 @@
+AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
-EBUILD nemo-4.8.4.ebuild 1948 BLAKE2B ade85f931c89494d99474544a0b70a77a66566d8c50fe911ad020a5b5a9e7d0e5ff5ab2eb819a1997e3d7d776dfc2e0872581daf59d04a0f83ee4ddf1c8d4f81 SHA512 f063652af23b1ab2789b9dfa2fcb5d8c0ca2cc30e5964678f8234ac6e7e4cf0ebda13afdefb89024beb588f6aa556d80f857069df35530d4894ac8867194534d
+EBUILD nemo-4.8.4.ebuild 2146 BLAKE2B 65db48dacd4f8b20a143efeacaf3490a0a0296d8650ee88e29de019023cafc56cda36f77fad6c00ad4516f9acd71c7a7366548e1e47516b427fc1369af870a61 SHA512 72056c8be28d9e5c24aac9851b823b5448cd5ece5142e641a86e665b9a57a0330a322152b77fdf1059d0a807189bbb74256fc530e08a85a74e88c8d199262938
 MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
new file mode 100644
index 000000000000..0ea0c9158ad2
--- /dev/null
+++ b/gnome-extra/nemo/files/nemo-4.6-captions-fix.patch
@@ -0,0 +1,28 @@
+From b0c2b99b46797ca91bdba1d95fda33808174466b Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Thu, 21 Jan 2021 09:41:40 -0500
+Subject: [PATCH] nemo-icon-canvas-item.c: restore the style context after
+ drawing any caption text.
+
+This seemed to be causing style recalculations to accumulate over
+time, and particularly when changing the style for window focus
+in/out events. This would eventually have a huge impact on user
+interaction.
+
+Fixes #2472
+---
+ libnemo-private/nemo-icon-canvas-item.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libnemo-private/nemo-icon-canvas-item.c b/libnemo-private/nemo-icon-canvas-item.c
+index d1b6cbfad..b32de357d 100644
+--- a/libnemo-private/nemo-icon-canvas-item.c
++++ b/libnemo-private/nemo-icon-canvas-item.c
+@@ -1143,6 +1143,7 @@ draw_label_text (NemoIconCanvasItem *item,
+ 		gtk_render_layout (context, cr,
+ 				   x, text_rect.y0 + details->editable_text_height + LABEL_LINE_SPACING + TEXT_TOP_GAP,
+ 				   additional_layout);
++        gtk_style_context_restore (context);
+ 	}
+ 
+ 	if (item->details->is_highlighted_as_keyboard_focus) {
diff --git a/gnome-extra/nemo/nemo-4.8.4.ebuild b/gnome-extra/nemo/nemo-4.8.4.ebuild
index 0b6bb1acda14..6261e2adc077 100644
--- a/gnome-extra/nemo/nemo-4.8.4.ebuild
+++ b/gnome-extra/nemo/nemo-4.8.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 inherit meson gnome2-utils python-single-r1 virtualx xdg
 
 DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo"
 SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
@@ -38,7 +38,8 @@ COMMON_DEPEND="
 	tracker? ( >=app-misc/tracker-2.0:= )
 	xmp? ( >=media-libs/exempi-2.2.0:= )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
@@ -46,8 +47,11 @@ RDEPEND="${COMMON_DEPEND}
 
 	nls? ( >=gnome-extra/cinnamon-translations-4.8 )
 "
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-DEPEND="${COMMON_DEPEND}
+PDEPEND="
+	>=gnome-base/gvfs-0.1.2
+"
+DEPEND="
+	${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 BDEPEND="
@@ -59,10 +63,15 @@ BDEPEND="
 	doc? ( dev-util/gtk-doc )
 "
 
+PATCHES=(
+	# Fix performance regression when icon captions enabled.
+	# https://github.com/linuxmint/nemo/issues/2472
+	"${FILESDIR}/${PN}-4.6-captions-fix.patch"
+)
+
 src_prepare() {
-	xdg_environment_reset
 	default
-	python_fix_shebang files/usr/share/nemo/actions
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
 }
 
 src_configure() {
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index d7defeeaa283..e829b7a41a08 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,3 +1,2 @@
 DIST pch-session-3.36.3.tar.bz2 9575 BLAKE2B 1f7001c50247821b2c9771b8d16bd2b962712c033fde7af225a9aac152abb2a0505b73f5baf5913ce12e05bc7a89abcf0411b2ffa64dc0aa38b2bea0f3f41796 SHA512 b784421b27a446d460191da5a2eb6fbaf53aa4cffbfe8f113bc8c3ef308741ccfd6a208d6f6b1a50839b3a0925b22e6573604fd315496a5c59ae969fc8e6f7a6
-DIST pch-session-3.38.0.tar.bz2 3610322 BLAKE2B 26e9bc7dbdb096dcac9bfda720500f4ca5d54b7021a8ed1c1717fa70d550863506007d21b2abb52d3344db4d09729ab6b306eec6039bd03db00e88cc7fd523a7 SHA512 5ae8ae029d6985741fdf5eba66b5bb1b0bece5904883914b431943a2e421a3e8047ab37c29a6c28807055513f2d9329c600c640185982f04372e0f98fe645077
 DIST pch-session-3.38.1.tar.bz2 3610377 BLAKE2B ef088deff17938419399b5ce7e4970e240bfc792ebb38dfda74d74fcf463859f3e0dad724744a839de87badc91baa6909b8c1a6a61f84e4c040f3adb0701e013 SHA512 738fb998fe62de4dc24685ed7c5867438d41b07115e2018668211a0f80757bba4e76238b277fb07920515f4c15a890df498cacc8c3c0f9a2cc491bd45e3b4a63
diff --git a/gnome-extra/pch-session/pch-session-3.38.0.ebuild b/gnome-extra/pch-session/pch-session-3.38.0.ebuild
deleted file mode 100644
index 24cf70256339..000000000000
--- a/gnome-extra/pch-session/pch-session-3.38.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/gnome-shell-3.38
-	>=gnome-extra/gnome-shell-extensions-3.38
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-10
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-27
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-16
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20200901
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-40
-	>=gnome-extra/gnome-shell-extension-desktop-icons-20.04.0-r2
-	>=gnome-extra/gnome-shell-extension-gsconnect-44
-	>=gnome-extra/gnome-shell-extensions-topicons-plus-27
-	>=gnome-extra/gnome-tweaks-3.34
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 64bf0a289f70..5d5ab54c9b12 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
@@ -22,7 +22,8 @@ RDEPEND="
 	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
 	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig