gentoo resync : 29.01.2021

39 files changed, 1242 insertions, 128 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 093139d1c00a..b2017006023a 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index addc3fee5b6a..ea0fb08ffce8 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,3 +1,6 @@
+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.6.2.ebuild 2425 BLAKE2B fb6fc81908ff306a1d552aa97623f10b3f96fcba7748f3a846eff4d60595afbafc9c2ee174012f47f6c7fa5cbb36fc92a223a6d298e70ec487d82a44970545e4 SHA512 29e9215b3e5c9bb4755777c09f6b90a425ee9c30b295ffcfdc693c0763962856915bd7629669252e0bb8eede546c48883a16d95ddb53956d3675bbd58f8405b7
+EBUILD cinnamon-control-center-4.8.2.ebuild 2154 BLAKE2B b956a520abe6024d3c47105e6231d49db258d92362d95559eabaf0eb7ae3c17dc842bd2c30cbf6e4ae017ae6d70c2ef0d1ee8c68320ce894312c372ca37a72b1 SHA512 b22c27cf6872717908298e5925d3a6eaaf4bd2497d26d3d2bb647d0d667cc20c6ae70ac1aebe60cc5c424564d9aa02cc12f231bde4b158d09ce6c52c1d2b0442
 MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
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
new file mode 100644
index 000000000000..6faf4e6c0aba
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.8.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# 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/ 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+"
+SLOT="0"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
+REQUIRED_USE="modemmanager? ( networkmanager )"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-menus-4.8:0=
+	media-libs/fontconfig
+	>=sys-auth/polkit-0.103
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.16.0: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
+		>=gnome-extra/cinnamon-settings-daemon-4.8:0=
+		>=x11-libs/libXi-1.2 )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.2.0
+		>=net-misc/networkmanager-1.2.0:=[modemmanager?]
+
+		modemmanager? ( >=net-misc/modemmanager-0.7 )
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( app-admin/openrc-settingsd )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/iso-codes
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix build when modemmanager is disabled
+	# https://github.com/linuxmint/cinnamon-control-center/pull/257
+	"${FILESDIR}/${PN}-4.8.2-build-fix.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Donlineaccounts=false
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
new file mode 100644
index 000000000000..041a5d23e500
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-4.8.2-build-fix.patch
@@ -0,0 +1,36 @@
+From a9d7d0f7f36bc724ecb65019999fc1c4d671bcba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
+Date: Thu, 31 Dec 2020 10:09:17 +0100
+Subject: [PATCH] Add ifdefs to prevent undefined reference to modem functions
+ in network panel
+
+---
+ panels/network/cc-network-panel.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index 8b28439..38d9842 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -29,7 +29,9 @@
+ #include <NetworkManager.h>
+ 
+ #include "net-device.h"
++#ifdef BUILD_MODEM
+ #include "net-device-mobile.h"
++#endif
+ #include "net-device-wifi.h"
+ #include "net-device-ethernet.h"
+ #include "net-object.h"
+@@ -651,9 +653,11 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
+         case NM_DEVICE_TYPE_ETHERNET:
+                 device_g_type = NET_TYPE_DEVICE_ETHERNET;
+                 break;
++        #ifdef BUILD_MODEM
+         case NM_DEVICE_TYPE_MODEM:
+                 device_g_type = NET_TYPE_DEVICE_MOBILE;
+                 break;
++        #endif
+         case NM_DEVICE_TYPE_WIFI:
+                 device_g_type = NET_TYPE_DEVICE_WIFI;
+                 break;
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 5415fa412bb8..9c145b5ed1ad 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,3 +1,5 @@
 DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fcb157e9e5b156260f31c4b41244649ce4fd54adfc192654cffb1336d72c678d32ee151b2a7bbe114dccbe078e66f85ad261 SHA512 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
+DIST cinnamon-desktop-4.8.1.tar.gz 495417 BLAKE2B 3947d39168b2c74ef82a1ad5835d423721d34d1f9f7099050207ba070348abfb0236f08c340bf5896672764a59d19646cb34e342ddd4c7dbb501797ab20cbb10 SHA512 57eaba73cbaf2cd91e07a417bb0573bd0af86712babccfc4f307c6745dd219f0b279277f7a740dcf21d06a6f9a656213436b2e54eda4cbdb2f1f80a5ff085287
 EBUILD cinnamon-desktop-4.6.4.ebuild 1219 BLAKE2B 6f6993b929fd28819cfbc5093321aa2651adba63eca7c6df5ae71e3a9b203ec7b7854f4ed36d275cc5efaa4c5174b5da7033be2a8b7b3e11b4f517d94f523ef1 SHA512 112e257232e79e1090f6f1c33b52f2ef6b0fefb49a1af1c4d666ed7730b61f4d3a9c122ac4f3cf6b44431b3225a8c72782bbf301f90074f6823379c8a3a93cce
+EBUILD cinnamon-desktop-4.8.1.ebuild 1235 BLAKE2B fadc4b0bdd2990aa73c9c49172af4990f60924c208ba2e4bb9f434d03ce66700ce6e10a0ca4c11851584e6df85aea7235534c8aae6a578304b40ae99dfc54a79 SHA512 7c6c92dd71362c130b8811bdde6309f717966a93ac87bf719e5f7cde2eb9cdc594d3294826f17ad57c8c6875c27f1244841948922a1480bc9185793aec815107
 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
new file mode 100644
index 000000000000..0564f48c1333
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
@@ -0,0 +1,51 @@
+# 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} )
+
+inherit meson gnome2-utils python-any-r1 xdg
+
+DESCRIPTION="A collection of libraries and utilites used by 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"
+
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=dev-libs/gobject-introspection-0.10.2:=
+	>=gnome-base/gsettings-desktop-schemas-3.5.91
+	media-sound/pulseaudio[glib]
+	sys-apps/accountsservice
+	x11-libs/cairo:=[X]
+	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
+	>=x11-libs/gtk+-3.3.16:3[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXext-1.1
+	x11-libs/libxkbfile
+	>=x11-libs/libXrandr-1.3
+	x11-misc/xkeyboard-config
+"
+DEPEND="
+	${RDEPEND}
+	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-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 143a1b039350..f9764bab9f5f 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,3 +1,5 @@
 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.6.1.ebuild 816 BLAKE2B fe4fc761d8977ff3b02b31599d3e85b5f1fbe8643125036fe1475d767f5aaee5dae3ea7669be06563c1efa57d128899ca3dbac5ee0068467389255f2f7a4558e SHA512 4d24f0612e6e5a31b756af7c07f0f2dabc6755eb02009e6bddc2ac15a5babaf654f937d891af71f996f3b0c6c6458895790de78d15c8732d5e07fb3442e7be5a
+EBUILD cinnamon-menus-4.8.2.ebuild 826 BLAKE2B be6e87668bc7fa1acbfbdfcd845c082005c7aaa026b8ac4331111d463ea3be80338beb5e642fc19a76a25ada66b95de0e57d1d3351d28eff3e3ecdd962f830c8 SHA512 e13330e80f2eb4828e67d915c2d15a612c9352318bcb2711f235bdb7c56111735025ea84636bfafa4322770a893edf32ac82d12eb4e621d90a023a76673333c2
 MISC metadata.xml 463 BLAKE2B 41f1994f18142bb9c28d5b60d6a3d2afaf4163dcf04fdf20c663361064e93d61e2ae363a6d8aad667186e39873ea85ed571e35ebd1b4f2d1ce59441a3ac51665 SHA512 14e5471c3ee6048d5e976cd8734b91f9f27818df88014e8ace1c22c9cc9121f167064dea98a36d4cc80f5c01f9adf90df095902e6ea86f80d1c3dc86447bfe37
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
new file mode 100644
index 000000000000..0809265efdbd
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
@@ -0,0 +1,38 @@
+# 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/ 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+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="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 gtk-doc enable_docs)
+	)
+	meson_src_configure
+}
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 300637136f59..d6d57ee109f8 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,5 +1,7 @@
 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.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
+DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
 EBUILD cinnamon-screensaver-4.6.0.ebuild 1633 BLAKE2B 35061a3257b4fbb30a69647ceddc57d15ec5161c8f63f258f50fb6bc487a5b80a2f2cabdca87551ecb08df04279cb27f69443b5dec37c0c29ad4bc85330a2c0b SHA512 5f351b647cf07064cee4ff1359af798394ba4900fcddb57ad446aaa3cbc1a603bc76233d0049e4d353d491c1297d8366fd73fac2a5945e9650d196991dbfa4bc
+EBUILD cinnamon-screensaver-4.8.1.ebuild 1590 BLAKE2B ea92bea5a61c56cee996fbab74a5d5dc14b3108faebe0b001009ca1d35a70f9943829d3880b20f7925270fb1bc572169792fb6b70854862b7753983566ee2e97 SHA512 5d7726f21c775164e659405fff9b0c0de06486a4da80f8253bb1b41650fcf9b0ba08880d6a2f7d449aeb6d2e830b48bf16c72a46e737636a0e698a740d0c8d7f
 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
new file mode 100644
index 000000000000..6a0184b1c28a
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
@@ -0,0 +1,74 @@
+# 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} )
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Screensaver for 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+"
+SLOT="0"
+IUSE="systemd xinerama"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/dbus-glib-0.78
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	sys-apps/dbus
+	sys-libs/pam
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-themes/adwaita-icon-theme
+
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/accountsservice[introspection]
+	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+	')
+
+	systemd? ( >=sys-apps/systemd-31 )
+	!systemd? ( sys-auth/elogind )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	python_fix_shebang src
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use xinerama)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize "${ED}"/usr/share/cinnamon-screensaver/
+}
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 5e2397e697f5..49897e6b30bd 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,3 +1,5 @@
 DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
+DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
 EBUILD cinnamon-session-4.6.2.ebuild 1281 BLAKE2B f25092c655f38b9ec095a317d6a587cc2ba1eb606dc1a19a9ee7bd96d2b4d64ea391cef52c510942323e1ecff791f97d13e56cb60e838b726e616f7deb8c82ae SHA512 eff29152fdb20453e07f16b96a79736d2eac2d37c2176aa344ff8e35b6db1af3b5f3c28f43a332ba4b88736c17c727fb7ebf2af1924fd7082d6aed238c9cf1e0
+EBUILD cinnamon-session-4.8.0.ebuild 1305 BLAKE2B 9f24e5c4af03240ddaa147b494beef1a264ca70a2385725b949569258cf7faaa595ca8fac20aeb8ca57a609d7598a7608947d686b232efe8ff9a499c1d6d22e7 SHA512 bd66970e0f3d4f4988fc4c703f0c3ddf882c3b1c2008d718c43e34f4776de7fe3f91c2ce1d991266fe693787312be56605a2848b09b7ed499f2ac128318037fc
 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
new file mode 100644
index 000000000000..9efab00f5a58
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 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/ 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+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc ipv6 systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.37.3:2
+	media-libs/libcanberra[pulseaudio]
+	virtual/opengl
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3:3
+	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
+
+	systemd? ( >=sys-apps/systemd-183 )
+	!systemd? ( sys-auth/elogind[policykit] )
+"
+RDEPEND="
+	${DEPEND}
+	>=gnome-extra/cinnamon-desktop-4.8
+"
+BDEPEND="
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+
+	doc? (
+		app-text/xmlto
+		dev-libs/libxslt )
+"
+
+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-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 300324aef06b..fde98d5b5808 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,4 +1,7 @@
 AUX cinnamon-settings-daemon-3.8.0-accountservice.patch 2213 BLAKE2B 2e867654ff2cb062434621e3f336aa9b833f31c2e7dfc214dbefc74bc2655b95376b945386e29873c9fc696b6e6c027fd6d2d1296c0002a0322e3a1f921c2d76 SHA512 87a15d3274129ea8fe9195f3abb0cfe1dc6d11337e5f2748197cb8b1ecd062e9da1967fe83f11fa7b98af2d95eef9fa4a3f6c55642be2715bcb76355a30fe8ca
+AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d091c816a74e6bc1c50260210e726251dad5ec310f68f450ccd5ec39057c15139218b65afef6e130efc8610b897f0720043a42cdc5702758458f7 SHA512 4f9fee4ec02b11789f387405f0b75f9eabdcc72d78e109b4015fe13575967ad7610a6ad208d8ee31e5b68531e6769d2a07ddc6a9b82db71bf03d7c70920b00a8
 DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
+DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
 EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2562 BLAKE2B 9ca766a67b310e90461b3dfe889b75a20e0698ac5205600a09ce92b7e5d87676d84bcf901b4669db238a73fdbba5db79065e3b68ae0df2670821dab941d99bcc SHA512 f576c527dbb4aac5145e8b0b56f3a4f5e5c3382e9f5cb766abf29fa1a6fa652af99005d7d24a3d508d2c3341e65036046ff55f34fc5b258b82a52d1ba2d1c557
+EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2221 BLAKE2B 05986492eb00c87560c61741b53d0c8f4e435cd7bb7a31f00f461ff1a44305489ce16de2cc565e73a530c0cf73e195c915ecd11f134d18655726f5e9b9e06c3e SHA512 024bb484e2e5f11b79882c36248f730b8a13cb076f70b9b341f5a0870698a2371820e0ee85166f6fb339fbeb825457af0e184c1b5091f35330bbacdda13f633e
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
new file mode 100644
index 000000000000..decd70b8dc19
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson gnome2-utils xdg
+
+DESCRIPTION="Cinnamon's settings daemon"
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+colord cups input_devices_wacom smartcard systemd"
+
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libgudev:=
+	>=gnome-base/libgnomekbd-3.6
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	media-libs/fontconfig
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra:0=[gtk3,pulseaudio]
+	>=media-sound/pulseaudio-0.9.16[glib]
+	>=sys-apps/dbus-1.1.2
+	dev-libs/dbus-glib
+	>=sys-auth/polkit-0.97
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14.0: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-libs/libxml2:2
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.37.1
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Miscellaneous meson configuration/compilation fixes
+	# https://github.com/linuxmint/cinnamon-settings-daemon/pull/314
+	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
+)
+
+src_configure() {
+	# gudev not optional on Linux platforms
+	local emesonargs=(
+		-Duse_gudev=enabled
+		-Duse_polkit=enabled
+		-Duse_logind=enabled
+		$(meson_feature colord use_color)
+		$(meson_feature cups use_cups)
+		$(meson_feature smartcard use_smartcard)
+		$(meson_feature input_devices_wacom use_wacom)
+	)
+	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-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
new file mode 100644
index 000000000000..f70d1e544e94
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-4.8.5-build-fixes.patch
@@ -0,0 +1,140 @@
+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] build: Add missing defines. Fix optional wacom build. Make
+ build options behave consistently.
+
+---
+ meson.build                | 20 ++++++++++++--------
+ meson_options.txt          | 14 ++++++++++----
+ plugins/meson.build        |  2 +-
+ plugins/xrandr/meson.build |  1 +
+ 4 files changed, 24 insertions(+), 13 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0e11d50..0d6c35a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -9,6 +9,7 @@ pkgname = meson.project_name().to_lower()
+ api_version = '3.0'
+ 
+ cc = meson.get_compiler('c')
++cargs = []
+ 
+ # directories
+ prefix = get_option('prefix')
+@@ -43,7 +44,7 @@ endif
+ cinnamon_desktop_required = '>= 4.8.0'
+ canberra = dependency('libcanberra-gtk3')
+ cinnamon_desktop = dependency('cinnamon-desktop', version: cinnamon_desktop_required)
+-colord = dependency('colord', version: '>= 0.1.27')
++colord = dependency('colord', version: '>= 0.1.27', required: get_option('use_color'))
+ cups = dependency('cups', version: '>= 1.4', required: get_option('use_cups'))
+ cvc = dependency('cvc', version: cinnamon_desktop_required)
+ fontconfig = dependency('fontconfig')
+@@ -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')
+-nss = dependency('nss', version: '>= 3.11.2', required: get_option('enable_smartcard'))
++nss = dependency('nss', version: '>= 3.11.2', required: get_option('use_smartcard'))
+ polkit = dependency('polkit-gobject-1', version: '>= 0.97', required: get_option('use_polkit'))
+ pulse_required = '>= 0.9.16'
+ pulse = dependency('libpulse', version: pulse_required)
+ pulse_glib = dependency('libpulse-mainloop-glib', version: pulse_required)
+ upower_glib = dependency('upower-glib', version: '>= 0.9.11')
+-wacom = dependency('libwacom', version: '>= 0.7', required: false)
++wacom = dependency('libwacom', version: '>= 0.7', required: get_option('use_wacom'))
+ x11 = dependency('x11')
+ xext = dependency('xext')
+ xfixes = dependency('xfixes')
+@@ -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)
+-has_new_lcms = lcms.found()
+-if not has_new_lcms
+-    lcms = dependency('lcms2')
++if lcms.found()
++    cargs += '-DHAVE_NEW_LCMS'
++else
++    lcms = dependency('lcms2', required: colord.found())
+ endif
+ 
+-cargs = []
+-
+ using_logind = false
+ if not get_option('use_logind').disabled()
+     logind = dependency('libsystemd-logind', required: false)
+@@ -125,6 +125,10 @@ if gudev.found()
+     cargs += '-DHAVE_GUDEV'
+ endif
+ 
++if wacom.found()
++    cargs += '-DHAVE_WACOM'
++endif
++
+ if not get_option('enable_debug')
+     cargs += [
+           '-Wno-deprecated-declarations',
+diff --git a/meson_options.txt b/meson_options.txt
+index 0a6941b..e3c89f3 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -35,20 +35,26 @@ option(
+     description: 'Whether cups (and therefore the print notifications plugin) support should be enabled'
+ )
+ option(
+-    'enable_smartcard',
++    'use_smartcard',
+     type: 'feature',
+     value: 'enabled',
+     description: 'Set to false to disable smartcard support'
+ )
+ option(
+     'use_color',
+-    type: 'boolean',
+-    value: true,
++    type: 'feature',
++    value: 'enabled',
+     description: 'Whether the color plugin should be enabled'
+ )
++option(
++    'use_wacom',
++    type: 'feature',
++    value: 'auto',
++    description: 'Whether the wacom plugin should be enabled'
++)
+ option(
+     'enable_debug',
+     type: 'boolean',
+     value: false,
+     description: 'Show additional build warnings'
+-)
+\ No newline at end of file
++)
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 0d11a52..069366d 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -24,7 +24,7 @@ subdir('sound')
+ subdir('xrandr')
+ subdir('xsettings')
+ 
+-if get_option('use_color')
++if colord.found()
+     subdir('color')
+ endif
+ 
+diff --git a/plugins/xrandr/meson.build b/plugins/xrandr/meson.build
+index db2bf73..3296f1a 100644
+--- a/plugins/xrandr/meson.build
++++ b/plugins/xrandr/meson.build
+@@ -11,6 +11,7 @@ xrandr_deps = [
+     csd_dep,
+     libnotify,
+     upower_glib,
++    wacom,
+     xfixes,
+ ]
+ 
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index b1680ebce4da..3c18624a034f 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,3 +1,5 @@
 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.6.2.ebuild 1341 BLAKE2B 1b7282d32367215f6532f271b37734f6aff0b75c7d6632d2ded2d20eebbf5ea98cf6e127b2999f4d0cedec0b06282f89467cde18d01c05522fdc557e2cfac82d SHA512 5a226e61147e8e21b0cefebcdbbd9cde4d31da43f0f081749412e528034bc78efc20348a9b56af07c57342de9c3bc1630ced8d798cbc9de63050b68dbd23ddd3
+EBUILD cinnamon-translations-4.8.3.ebuild 1333 BLAKE2B bbd31170630b66a7cae1cb42468f2a3bcae3b2eac40c96c23c47bd7d0ac12a8ed18574cfdfbcf55d3776fc764315918ac458dc2b79de700d53a55bc44c6c9bb0 SHA512 92d33c5a00ea502f43a55c43427af6848488cc422d968bf729db4626f8d843db28452771bd271cc5b836fb61cf68c251b6b6960beb4130772d7c9a3168ffd58a
 MISC metadata.xml 470 BLAKE2B b0df2af77ac75dc30330b04e80fb609138bc9ed1fd470cdb25dfe8c53052bbf0ae454e1b3666e118720d0bfdfed604f1a295de04954d28798c4e51a6cff73ae8 SHA512 248dc0f84f5d43861ca7a96baf2d25959d76a7f9e0cdeeb7aac738b5a0b30eef8e1b7c113a5e3d89a0e5c0c4226e28231b98967b80b237dbfd0f4c88ebdc7b5e
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
new file mode 100644
index 000000000000..e835a818fc94
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.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 ber 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 zgh zh_CN zh_HK zh_TW zu"
+
+inherit l10n
+
+DESCRIPTION="Translation data for 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"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+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/Manifest b/gnome-extra/cinnamon/Manifest
index a561bf2d3a9a..dfa2dbef747c 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,6 +1,9 @@
 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
+AUX cinnamon-4.8.6-build-fixes.patch 981 BLAKE2B 735028024dfe3b0d280875411d03a2a005efb6344650e2278778621e655818c074c894f0988c1f5974ee73e341f8a4304c9834e205701fb2fe0646fbf9b7c9a4 SHA512 6a9de0e477bec8cdddf302c0878dd213f02047a71cdd6b6090cf8ed6616d185880fa18033c24c13bed6e0e651224ddd9c779320c3f441398d6c36b2741a6bd4d
+AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
+DIST cinnamon-4.8.6.tar.gz 2378117 BLAKE2B ae98bf81aa3b2f26d33aa1b5a8109b50d969cb3568322159808c23d13fea6a11790d877a446b3ee4a54f5811fddfb5fca220f46bc213ffc2aa4560e344563f9d SHA512 827d93fa72213e00977d6318da25d9b03279666485ed4c4fd45ece9914c7481f39fa98c64940529a7459cc239783caa9427a2a702f77ffb77fb2c38073e42bbd
 EBUILD cinnamon-4.6.7.ebuild 5659 BLAKE2B 7e66fd6076bbdd5b418fc66cd28337c304caa1cb2bde809bb42be81b34c710e7f6062a1f99593a648e3a524bc5a1d6ac8faacf998d4de6c67c4b09a92a6f6674 SHA512 d4162ff7dbcb506f0b49d8a320ca0d83a3ffcff4508b95d5257439d9725815384df1ddc4bb8afc6a8dca899f0f54627ae9c5e59d499fe751341bbfd8c092a61d
+EBUILD cinnamon-4.8.6.ebuild 5032 BLAKE2B 6ac504657b0a5f95a8924e52f8ed19c0a4ac39ce1d08c789f29fa4f5405a18cfc77c4733547d766bc6d1f8a6b7e18b4bc6190bafd940367a3f47314206fc202d SHA512 d0fb3d0be3ac78e1c4bab7db0624bd816c7ee795659e78e780cbc665d475de7d9108953255dc89affa7b137da9c06ac7723a19b87977c23af67906fa0a6c51e5
 MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
diff --git a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
new file mode 100644
index 000000000000..bba04d8152f6
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
@@ -0,0 +1,176 @@
+# 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} )
+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/ https://github.com/linuxmint/cinnamon"
+SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-atk:2
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=gnome-extra/cinnamon-menus-4.8
+	>=gnome-extra/cjs-4.8[cairo]
+	net-libs/libsoup:2.4[introspection]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=x11-wm/muffin-4.8.0[introspection]
+
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[introspection]
+	)
+"
+# caribou used by onscreen keyboard
+# libtimezonemap used by datetime settings
+# iso-flag-png (unpackaged) used by keyboard layout settings
+RDEPEND="
+	${DEPEND}
+	>=app-accessibility/caribou-0.3
+	dev-libs/keybinder:3[introspection]
+	dev-libs/libtimezonemap
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyinotify[${PYTHON_USEDEP}]
+		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/tinycss2[${PYTHON_USEDEP}]
+		dev-python/xapp[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/dconf-0.4.1
+	>=gnome-base/gsettings-desktop-schemas-2.91.91
+	>=gnome-base/libgnomekbd-2.91.4
+	>=gnome-extra/cinnamon-control-center-4.8[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-4.8
+	>=gnome-extra/cinnamon-session-4.8
+	>=gnome-extra/cinnamon-settings-daemon-4.8
+	>=gnome-extra/nemo-4.8
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.0.5[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-4.8
+	)
+"
+BDEPEND="
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	gtk-doc? ( 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
+
+	# GStreamer only needed for recorder
+	# https://github.com/linuxmint/cinnamon/pull/9809
+	"${FILESDIR}"/${PN}-4.8.6-build-fixes.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# shebang fixing craziness
+	local p
+	for p in $(grep -rl '#!.*python3' || die); do
+		python_fix_shebang "${p}"
+	done
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gstreamer build_recorder)
+		$(meson_use gtk-doc docs)
+		-Ddisable_networkmanager=$(usex networkmanager false true)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_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 "${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 use gstreamer; then
+		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
+	else
+		ewarn "Cinnamon's built-in screen recording utility is disabled."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
new file mode 100644
index 000000000000..bc4476a5892e
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-4.8.6-build-fixes.patch
@@ -0,0 +1,28 @@
+diff --git a/meson.build b/meson.build
+index a4d49a16..eff937ac 100644
+--- a/meson.build
++++ b/meson.build
+@@ -36,8 +36,6 @@ gio_unix = dependency('gio-unix-2.0')
+ gl = dependency('gl')
+ glib_version = '2.52.0'
+ glib = dependency('glib-2.0', version: '>= ' + glib_version)
+-gstreamer = dependency('gstreamer-1.0')
+-gstreamer_base = dependency('gstreamer-base-1.0')
+ gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
+ muffin = dependency('libmuffin', version: '>= 4.0.3')
+ muffinlibdir = muffin.get_pkgconfig_variable('typelibdir')
+@@ -53,6 +51,14 @@ if has_nm
+     dependency('libnm')
+ endif
+ 
++if get_option('build_recorder')
++	gstreamer = dependency('gstreamer-1.0')
++	gstreamer_base = dependency('gstreamer-base-1.0')
++else
++	gstreamer = dependency('', required: false)
++	gstreamer_base = dependency('', required: false)
++endif
++
+ # on some systems we need to find the math lib to make sure it builds
+ cc = meson.get_compiler('c')
+ math = cc.find_library('m', required: false)
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
index 24e14f267e23..c0cccca89d58 100644
--- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
+++ b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=PolicyKit Authentication Agent
+Comment=PolicyKit Authentication Agent
 Exec=/usr/libexec/polkit-gnome-authentication-agent-1
 Terminal=false
 Type=Application
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index b28330432700..e0456c0cc0fb 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,3 +1,5 @@
 DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
+DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
 EBUILD cjs-4.6.0.ebuild 1693 BLAKE2B 0e85f00c9a38a3b83231a5770ea9e906fd3754de9a78c70ccb05f9be4764c4764335c8af557dcf18f1caccbe2cd5d734f5553c1668d0f53b59c478a3b2112fbe SHA512 9a84918c0453f47af3e65400dfd9ff8b021e94f289d402888b06b0639135588649625e73ba1e086a07011ec9ceb3018a0a2d631f55d4ff3840c21b2cb3a12aa7
-MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
+EBUILD cjs-4.8.2.ebuild 1383 BLAKE2B 87d62b29c5b744834cc6020bdf11722695e27b66d3646a8c9d2f0d3188ff911d82d10eb0add33ed446add1d389cba985c973f00621c830813e9a126b65be9632 SHA512 030b1363087aeac571d7e422dc8ece1672b025de2792523ccc0fbb6c6b5f106557023a0f14b7594d5729c6be3ede07b151fc11cb5d7f7f464cddb6a880ba931d
+MISC metadata.xml 577 BLAKE2B 7b78b21cf3c8fa925625a56ece9a134b4c3ce3d40a8ab2dc33449c0fc37702ba6284c95f21404a864ff920b3fee2e53a5dcf85ed03b5f72fca4c8bfb32d3ef65 SHA512 e7524b00348868c07b931d72bf765f5d1690ca8c273c5d9a61123f78e57fd5d0680efc8074c6ef19322047fe9d26b8d7de843260dcf745006e585dd990c37c47
diff --git a/gnome-extra/cjs/cjs-4.8.2.ebuild b/gnome-extra/cjs/cjs-4.8.2.ebuild
new file mode 100644
index 000000000000..2daead9e520a
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.8.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+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"
+IUSE="+cairo examples gtk readline sysprof test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-lang/spidermonkey:78
+	>=dev-libs/glib-2.58.0:2
+	>=dev-libs/gobject-introspection-1.58.3:=
+	>=dev-libs/libffi-3.2.1:0=
+
+	cairo? ( x11-libs/cairo[glib,X] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="
+	${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	test? (
+		sys-apps/dbus
+
+		gtk? ( x11-libs/gtk+:3[introspection] )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	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/metadata.xml b/gnome-extra/cjs/metadata.xml
index 5951e2df228d..3964c39d71af 100644
--- a/gnome-extra/cjs/metadata.xml
+++ b/gnome-extra/cjs/metadata.xml
@@ -12,4 +12,7 @@
 	<upstream>
 		<remote-id type="github">linuxmint/cjs</remote-id>
 	</upstream>
+	<use>
+		<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 6de38d5838a5..a6a530b82c23 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD gnome-shell-extension-bing-wallpaper-27.ebuild 1103 BLAKE2B 890f5954af5f0d692aa02c9935e476e4560269a3c34b94bb44d3638df6d968493e1867862f5c85fc714b4659b4f5d34048c621d552191dc812a9a18fd12fab86 SHA512 2b7bc8e72d7c4b6d588148731adf5b8d5ca981a67cd11b36aff632a6494909234e5591b39ac87e2c17d14a285e9f5895ae39704a984e199d2f946ca676f2b847
+EBUILD gnome-shell-extension-bing-wallpaper-28.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
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 cf4143c5a395..1071e08c8161 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,5 +1,7 @@
 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
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200713.ebuild 1330 BLAKE2B 5fa31ccac489303a350c07a479310b22c18a1cdb18d3946b8f2345b72ac6a6c46ec9d2e6b6d8a41db5a54d8fa0095b181661cde21049a0565dca57e35ed2e716 SHA512 71643acd4848f8432bf80d199ac8e13e560e571d9d60edb608ccd98eaf82059909a74321e90ae39ba3bd25493bfce5437faf34f27badd675ec97bafa10fc67da
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20200901.ebuild 1332 BLAKE2B 00489b78e1bffebf5c01404fc01212ca13da07581d262797d1dc0d26f7d2026f3fa2dbd202aea6b1c028f3c6a1f8f547f92cc26412a05a8c3a72f284538f0f07 SHA512 c3c4c3cafc30b73d4977f6ba96a7a02f06972cbe7047ba53f3dbb03ec8512a6dcc108af9d6622e30fc1d0e7d01ab99d3f9a593dc52159661061b3b561bfd8e1f
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1326 BLAKE2B d7cccb0f995d94d53550f77c5e06d21fb3091db4cd84225918a7404612fbc220cde74385fe46a53c46917069a6ca3b3c52265c57e8b01a0774309e07ccea03cd SHA512 712aadeda8942f32b6d7f3ad020fb2ddb62386d677bc85c53c9b4212aaada11ad7c88aad057fd0f0a47056881da6b17a03ddc3a36c239fa8dde7890e510b60c7
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
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 4e69ae842ed5..c55e20bda4e3 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,8 +1,6 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
-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
-EBUILD gnome-shell-extension-dash-to-panel-39.ebuild 1700 BLAKE2B 4350cfab57f90892f8ac0f236ca9780170cb4b4d1fecca2984c2e5665ceaadb45cae64f66f41d2bb2d81268a2a90c0bb4b432414188ea95d21a94526f3e51ad1 SHA512 61d1f5bead3b607b87e1a7a43c25ff1af33dc3064eeec6d710a3f3453344bc492f16dd6ac8c824b3ddb066263a60ef8e8e3c0fa388b5025b292243b4bb01d826
 EBUILD gnome-shell-extension-dash-to-panel-40.ebuild 1828 BLAKE2B 6180baacf1d2e4dc57afdf92d8c4f205b8459c2ae81b3df6d89fe1276792e7dc8f3d4db3ef795c88388e3814f5962b8092926e45ebc68f38b8792286e9da2ab9 SHA512 a320b154e0b349d1e15ac209d926ba8d3a309ec84db3089a4b7bb5353b7e4623ee0df165929f04a6bbfe3e67748d121d2f045e37a511a9c65d7f85077cd554ad
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-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 82096214bcd7..1409da9bdc84 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons/Manifest
@@ -1,5 +1,7 @@
 DIST desktop-icons-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
 EBUILD gnome-shell-extension-desktop-icons-20.04.0-r1.ebuild 1016 BLAKE2B cebf2c21fc354e65ab3efce5315be2ef41d8467e2f7468973cd3214aaac553bcb39dfd0df08fcb4a11ab4f70f5c6781aa7fe19a8999144f4d2afab1d7a641271 SHA512 858121d02dd47c198e25c599833aafd6c893a27a9035d423e18581a750f931c10a1f7bd10f6d1be94851b292104ab4115b2eeac40586f5b8f2f6ef3daa91e68b
 EBUILD gnome-shell-extension-desktop-icons-20.04.0-r2.ebuild 1164 BLAKE2B b03de2d74f78f80794aa0221862a9733546e6539486e3d90a9e468e86e1811653f04b8dcef5ce5af16a660d9397103f3be55c440b5f0ee39a4365add76bb1e0a SHA512 b4a3219a2f30d423245bac2413f45e4dc2220d2be4df7b5961cec4a77b52fee1abdb47f049395aa0a70a0ab65b3b5e169dd0e98334d0a55a8907ddccd8b6c86a
+EBUILD gnome-shell-extension-desktop-icons-20.10.0.ebuild 1156 BLAKE2B ee700f35add0d0e69df2a88ebcfd60ef1fb2c2dfb2e8a3bedb46491758c98e4c54998a39739f6f572208670e9c2e2c98831b9e972845d3e684cb516876a9279f SHA512 02c50cc46b35effbcbad8466b17e4467b87ce84bb41dce7e421b2a55b361c392ce63a7dd6463a1479349db7b4fe89801f10bc0e800ab85926f01673e1874f799
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
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 5c5774fa0955..038a51e0142b 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD gnome-shell-frippery-3.34.2.ebuild 911 BLAKE2B c2b4bc1ddbabf3ccaf68aac55400f32b7b939e99d47097d92f876fe4c19198612deb26c7b1aad6b622f284f8483165bf4e60f9e8f8e564b6344ed8bce78d78dd SHA512 258c1dbf7f5e8ce65114cabe0eb9ceec362cb3b1feb1c2f9a1efb9ee5197aea14644ce45d6a165fd4903330293433e451d17be4a1a8c1cc707218a1d8a143d54
+EBUILD gnome-shell-frippery-3.38.0.ebuild 913 BLAKE2B e80c51a8e49c3c73bf02367611226be7aea78b6427dde7f01cf7c7a45aaee74105066868737de2a614612d81cfff24cf222e8c466a0015740a10618ac229c748 SHA512 de10cd2e231f852b66875b7fdaf0783a6afac84e96163286e82c07636bc9a784b87309946159499d473d848d0f7cc86734994d5ed7794c85bae460677d7cfdd1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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..fc8efefccf22
--- /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="http://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/Manifest b/gnome-extra/nemo/Manifest
index e7f6d251559a..d17814a34553 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,3 +1,6 @@
+AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
+DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
 EBUILD nemo-4.6.5.ebuild 1884 BLAKE2B 6073beada447e38bc02870e676ec08a4e2e7c9eef8cd8bd769fabd4d8bbb936e99c5386e2bc44560b16f097fe204b30895b976f743255dffaadab0b6417a09da SHA512 d647af0f8dd43bbcfbf2dc55162a531ff56ccd1b1e058d4b97ba73090ae9344a6f7ef677b5b9dd12288ae9646e83d68dd911afc85d19dd420aed1216885411fc
+EBUILD nemo-4.8.4.ebuild 2153 BLAKE2B 5549668523257596008a9ddadc37c4c6e813428edce4e661ddef01a071087d2b72829543f2fdac8bfb00eebea3406f8399b2c76cecac7cff698bea10414fb999 SHA512 42bd77186ff98fa55047adc52cd2a16d7893fbb4c0268d7ca53afadb6ae623b1b4602086ba0f3c8ab2c46a397fc0d87fb5463e0bbc7e152a42b99c2b95cc752a
 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
new file mode 100644
index 000000000000..d306690d78f6
--- /dev/null
+++ b/gnome-extra/nemo/nemo-4.8.4.ebuild
@@ -0,0 +1,101 @@
+# 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} )
+
+inherit meson gnome2-utils python-single-r1 virtualx xdg
+
+DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc exif +nls selinux test tracker xmp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://github.com/linuxmint/nemo/issues/2501
+RESTRICT="test"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=dev-libs/gobject-introspection-0.9.12:=
+	>=dev-libs/libxml2-2.7.8:2
+	gnome-base/dconf:0=
+	>=gnome-extra/cinnamon-desktop-4.8:0=
+	>=x11-libs/gtk+-3.10.0:3[introspection]
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	>=x11-libs/pango-1.40.0
+	>=x11-libs/xapps-2.0.5
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	selinux? ( sys-libs/libselinux )
+	tracker? ( >=app-misc/tracker-2.0:= )
+	xmp? ( >=media-libs/exempi-2.2.0:= )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	x11-themes/adwaita-icon-theme
+
+	nls? ( >=gnome-extra/cinnamon-translations-4.8 )
+"
+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 )
+"
+
+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
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif)
+		$(meson_use tracker)
+		$(meson_use xmp)
+		$(meson_use selinux)
+		$(meson_use doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 7df13beb85a9..f6e701487f35 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,7 +1,5 @@
 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
 EBUILD pch-session-3.36.3.ebuild 1284 BLAKE2B afa6c9ea764c95d17425fdcf30ca1a4c870c57333c31de2d69be68d5cb98d88991dc5509546bc288657233a88299ca8ba09ebec54840af2218a4e1acd5697792 SHA512 d3c8c23ac76a2b141518d6d604ba4c8ee40f378d88cd66b6f967b5a4699dbde4b7b21317c0c7a0430a1fc2f61742eae03a2c3e9fa92fc90628c8f41b8761a14d
-EBUILD pch-session-3.38.0.ebuild 1232 BLAKE2B 68b9fcbfd8fd4496a719e3c757d55ad901c55349cd207dade8e746ebf55aef64f2ccdf1ba70cf85416c4674bd6314ca43e85c22f580a91cf75245e37e299f334 SHA512 5364114bc5fe8212e101f6c530b7bfabdc5607d58f2fc5987922f91b597e001789a6fa83a230cd42f7592896ce9197d467a2de6b3d0841fbc73555d644f14c82
 EBUILD pch-session-3.38.1.ebuild 1232 BLAKE2B 68b9fcbfd8fd4496a719e3c757d55ad901c55349cd207dade8e746ebf55aef64f2ccdf1ba70cf85416c4674bd6314ca43e85c22f580a91cf75245e37e299f334 SHA512 5364114bc5fe8212e101f6c530b7bfabdc5607d58f2fc5987922f91b597e001789a6fa83a230cd42f7592896ce9197d467a2de6b3d0841fbc73555d644f14c82
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
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
-}