gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /gnome-extra
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
89 files changed, 1633 insertions, 1056 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 360d2c6f8da5..3eb5fe8aae0c 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 415cc6e2735a..d4d9ca6de5d5 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,6 +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 434f1bf3193a4b900c464f567f20a03d54734dc8d66cea915880dec4921ea7edf5135e251325fdff88ba621e71e359f28aa2e6cd4160c00ccad81b6f0cf4b468 SHA512 bd7b0264dd456860b365dc3cf8b4cd997726062e219c85f4c5ab2714b052605f927869fb1ddcc92ca17cd4699df216f1ee4dcdc8e6ccdd1c8b1c2ddc250672dc
-EBUILD cinnamon-control-center-4.8.2.ebuild 2154 BLAKE2B b956a520abe6024d3c47105e6231d49db258d92362d95559eabaf0eb7ae3c17dc842bd2c30cbf6e4ae017ae6d70c2ef0d1ee8c68320ce894312c372ca37a72b1 SHA512 b22c27cf6872717908298e5925d3a6eaaf4bd2497d26d3d2bb647d0d667cc20c6ae70ac1aebe60cc5c424564d9aa02cc12f231bde4b158d09ce6c52c1d2b0442
-MISC metadata.xml 638 BLAKE2B 25be7d4f085c31019ad60e98002bf4fb7eac75710c4ae9357748839ea93da64f7bf87b5c1a19ba5d8ff5d248ab6d09285a78be89eeabb5e8a58a271704cd5ade SHA512 27b0859230c32c474a9b8f89fca13279678172ab2ff1a6724ccd7303fae14817844b7ee59d2ec2ce169c0ce3b3e462ca972d4d50a8f3a2069a84c3b534861ce7
+DIST cinnamon-control-center-5.0.1.tar.gz 3866795 BLAKE2B f9c88aa3ad585f9fd867055b247d3cbc7442fb1b4e205dbac7de889e8dd6faa3c2cdee9a6f98b877054ace9d3ff5694e469df3ca35481bd768e019bf6c611541 SHA512 3b3d64cf68ddc831a025e3f111ba5a58536ee6900a61a7bc86847b094f6d73292d56b98f6d94f1b2a03a25d820022383b4860f91d1ccd3f7e5327399da4b82cd
+EBUILD cinnamon-control-center-4.8.2.ebuild 2152 BLAKE2B d052a536b7af3cb8452c98d3c3273091335faf5d3106985c2ee2e8f2214a082fe7c487620467d35ec5c3f39e1f6cbbce67604ccf108312a95e8c1e89848ad02d SHA512 b4d36b1b3a76c6122d2bd041d871adfc637a1fc922a3d52816a83788291422515bc0a1571e164a22784c18190687343c964bd5440463cc70bcae335cf8241900
+EBUILD cinnamon-control-center-5.0.1.ebuild 2381 BLAKE2B d2be6a762c12c73fae2c1c1daba3ffa0d6e5583d305d306b21910681c1cd6402a1a346247c6495f6fca2ea8eb247a9e0b4444cb48e33a40b662ff1644b4e4f8f SHA512 7bdf8e0deec0cbcdb98f4233dbcda22c001ff45fd4146d87609fc7b0d55be5220ac78a5381563e22fd4eed817ab7fda2a15ab38b73f6e525ac1b4d45e714996a
+MISC metadata.xml 761 BLAKE2B 42172f2c3b7152b342295687f5d0e1b34e3a4caf367a0766a6c4c263b85ac4c411ed6c0283b58a3d110bc35205ec5d0f99bf21eb980bcf06c0f5aca167d24134 SHA512 f99fda20543f6fcc7ffe1ba8105084ac30e4b3caa29ccee52f9e8d3dba10f2861f3b35e72c25683a31924e455e024d5c78bff0fa24a27854eb27ac68bc4bac91
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 6faf4e6c0aba..ffeb6732bad9 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
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord input_devices_wacom +networkmanager +modemmanager systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild
index da31ffb6d75b..26539402f249 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.0.1.ebuild
@@ -2,87 +2,98 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils gnome2-utils xdg
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-any-r1 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+"
 SLOT="0"
-IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
+IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="amd64 ~arm64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
 
 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=
+	>=dev-libs/glib-2.44.0:2
+	>=gnome-base/libgnomekbd-3.0.0:0=
+	>=gnome-extra/cinnamon-desktop-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0: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/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
-		>=x11-libs/gtk+-3.8:3
+		>=gnome-extra/cinnamon-settings-daemon-5.0: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 )
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.18.0
+	)
 "
-# <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 )
+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}
+DEPEND="
+	${COMMON_DEPEND}
 	app-text/iso-codes
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40.1
-	sys-devel/autoconf-archive
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	gnome2_disable_deprecation_warning
+	default
+	python_fix_shebang meson_install_schemas.py
 }
 
 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)
+	local emesonargs=(
+		$(meson_use colord color)
+		$(meson_use modemmanager)
+		$(meson_use networkmanager)
+		$(meson_use gnome-online-accounts onlineaccounts)
+		$(meson_use input_devices_wacom wacom)
+	)
+	meson_src_configure
 }
 
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
index 26d10b9bc09a..94f82836a4a2 100644
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -13,7 +13,7 @@
 		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
 	</upstream>
 	<use>
-		<flag name="modemmanager">Enable support for mobile broadband devices
-			using <pkg>net-misc/modemmanager</pkg></flag>
+		<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+		<flag name="modemmanager">Enable support for mobile broadband devices using <pkg>net-misc/modemmanager</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 3e48ef8d53b2..747361984f81 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +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 1277 BLAKE2B d9d508f32c273b768d01dc9fe0cede0d660f1f8cc0efa926861f779be5a95fd32d5a863a396b1830c7f0f120d88d447455d912bc4ded497027c9663506fbffe3 SHA512 51ea1a2c794d2c43fbf7c5100bcfa7a81a2d5b6b936fe34b65b86c370e496cf2ff4a30817e8626cd291b2012e8c711fb3dd04883a2a5a37297104054b7f1e59b
-EBUILD cinnamon-desktop-4.8.1.ebuild 1293 BLAKE2B d13cfb22b3f2e19fc74526feac885728e809f451fd7e8ccfe74284fb07eaf0d2136d93493c25951a5054fd8e5f83c396017f4b203ac66f56cbc5a108d3a66aee SHA512 c9c8d6300997d3c7ae3a9189e9d1d3de3ccd3e2223d8c27b8f479cc69ecc4e4cd67cf92249cba805bc1736d3122585a7ed50baa3ea718a29a6f9d939f76d3a52
+DIST cinnamon-desktop-5.0.0.tar.gz 495362 BLAKE2B 955fea37ceca3d5ee33ab94aaa4e22cb6973fc87a53f05486cd16e7d05e6e0a5ca7d548f68544fbc13ecebe2f59aee07db73b0db2e810d020730f77f05843cf4 SHA512 1191feeea4a35b6cae5708e62ec472bc865e3e209717b597eb5853673dbe29d3d03b0be5d5ee486e74748fcc2f60ac0012900aa6340a85da8059eda4d40a2263
+EBUILD cinnamon-desktop-4.8.1.ebuild 1291 BLAKE2B 33971dce1fe8cdeae09572d9918108e29787f299f66dabd238a650131019732db7e9f8e81add1f7c7d880c75e4d10e7f57a4434effd24b327d259e5d2543543a SHA512 16b4fd71b58d6d143d59bb809f376bd5d55b28b321b305746458083c7863959e73057ed8f5e7991e55ce8fafd8719c2aaff6397102a93a527c453016ab0846d9
+EBUILD cinnamon-desktop-5.0.0.ebuild 1293 BLAKE2B d13cfb22b3f2e19fc74526feac885728e809f451fd7e8ccfe74284fb07eaf0d2136d93493c25951a5054fd8e5f83c396017f4b203ac66f56cbc5a108d3a66aee SHA512 c9c8d6300997d3c7ae3a9189e9d1d3de3ccd3e2223d8c27b8f479cc69ecc4e4cd67cf92249cba805bc1736d3122585a7ed50baa3ea718a29a6f9d939f76d3a52
 MISC metadata.xml 495 BLAKE2B 25761428b46e827092d89cdabbc5b145ab5069b3fe11a907c008a20c6853fa8df546e38f51cfbfe5bcb85c0b70b8c8d1a0a6bf0081eb23a7d27cf63d802f4338 SHA512 06b8903158444e3a21fc0f8162f508f7ca55180aa3c310c1e706a9d0e91c5769160e47b0c25ab70329cd607e2ff9e0415c098481a59e7574bcfb8e3a68dea9f8
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 699cc4264097..97d38e57bf62 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.0.0.ebuild
index aa76e6dcb9c5..699cc4264097 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-5.0.0.ebuild
@@ -2,38 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson gnome2-utils python-any-r1
 
 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"
+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
 	media-sound/pulseaudio[glib]
+	sys-apps/accountsservice
+	x11-libs/cairo:=[X]
 	>=x11-libs/gdk-pixbuf-2.22:2[introspection]
-	>=dev-libs/gobject-introspection-0.10.2:=
 	>=x11-libs/gtk+-3.3.16:3[introspection]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
 	x11-libs/libX11
+	>=x11-libs/libXext-1.1
 	x11-libs/libxkbfile
+	>=x11-libs/libXrandr-1.3
 	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	sys-apps/accountsservice
 "
-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
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index e767f28600f6..a56a053c3a79 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +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
+DIST cinnamon-menus-5.0.0.tar.gz 101957 BLAKE2B 1d2f95d5b599f73f8161caf7964d3508f34c4c28f677dc8367d4ba67004d77c00e1f77cb1851084bcf26482d1689da7d1734c21649ade89ca6d9ca15475623b8 SHA512 1f8d7b417f947909d9187288ed916739b5b146a8f9cade2f8695d4c59b56a69286c0db48ac026cab3342e571d40013595fb32155065355d6110a43a1cac7096a
+EBUILD cinnamon-menus-4.8.2.ebuild 824 BLAKE2B 7763ded54fe36d1b044bbc13cd4862ab47c481470d75b3ca9eab2ade6a97053d27b2ffd916ad01630942c5cc53afa18865fbfe19be489c65c10a4cc61ec271a9 SHA512 4349f776c47e78358c64bea2afc08d695ef28a8b6793b6185643cd3c2a903d00421898e94a90321c45ea136deb432a63b977766ebb843dcf2a52d241e3d1c649
+EBUILD cinnamon-menus-5.0.0.ebuild 826 BLAKE2B be6e87668bc7fa1acbfbdfcd845c082005c7aaa026b8ac4331111d463ea3be80338beb5e642fc19a76a25ada66b95de0e57d1d3351d28eff3e3ecdd962f830c8 SHA512 e13330e80f2eb4828e67d915c2d15a612c9352318bcb2711f235bdb7c56111735025ea84636bfafa4322770a893edf32ac82d12eb4e621d90a023a76673333c2
 MISC metadata.xml 493 BLAKE2B 9fc18ceed70ace9610211b88dbba12c773874bdb3ceaadd0d7811c35eb7274599a50259eb5a8e9ef65a0b9f92badc35c3ef41733a0e5a400821b264782b79657 SHA512 90a41ebbf88d17e5d8bc482d595054bb13e701c37335a514ff1d52066dddacd25f2dd62af44ef3eb109874671ebea9b09ff9e07d1c3e256ed53691fb9f986fe5
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 0809265efdbd..5ba6d82435ff 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.8.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gtk-doc"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-5.0.0.ebuild
index d15da61087fc..0809265efdbd 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-5.0.0.ebuild
@@ -2,34 +2,36 @@
 # 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/"
+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="debug gtk-doc"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="gtk-doc"
 
 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="
 	>=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-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index d95cde4a5c8e..e35120665eb1 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,5 @@
-AUX cinnamon-screensaver-4.6.0-python-build.patch 2751 BLAKE2B bc1449bba5365bc746c1e3e46075fc279017c29872ef609ad97bce873d34c1fc7e65f5bc76e2ec211689e8e32cf07769fcc481dd2ba3f37d776a8a3bcd10d4dc SHA512 fea53eef6d5aaba7db28e2f6656decdf2bb44a3ab630f82c00da2bf2c94b0200409955cfc06e81b9106225f877a9f46c5b7e9d8da4139bf59db0dd9955e40118
-AUX cinnamon-screensaver-4.6.0-xinerama.patch 1482 BLAKE2B 4908aed13aca65da9cfe91a9c86a202291abb1ee94d63765f3285f259b2076d41db063f11cc04cf1f223699c92f4c5910c520e43f8fa8a12047913cb8badf368 SHA512 ec7b5fd4104ca59b8790ea7925c50765a6e024ca0729754828cea539d99908153784ec1fa8f925997c4d0e58e2e1a21dbde729b21df216274ba479793a09560d
-DIST cinnamon-screensaver-4.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 1672 BLAKE2B 8020bd0aecf18fa044f477bbe702d79f1ed67425e9c3cd81f84ba8a23ac34d3efee118c40f23ad54969e2d21a45a9e639f277b03b046a9ef89fd02eed90401f8 SHA512 5e3a30c36adb4de717363a092387c35ed664f01e43b9cde26d71b232dc220d6bf30746615645e594ce8fb0602477b210d858703ae9a44c41f08411ecc3b2f0a7
-EBUILD cinnamon-screensaver-4.8.1.ebuild 1629 BLAKE2B 79882f5056919c8f47e8f64616de115fb8f3dc3c3223d841ccf20b6b72b8b73f77ae7131e369aa288864c358441de1df3402cf4a703d984cc2116857952c68eb SHA512 68da60c0a1d8c03782631874c97ec72ded3733cc7bbdd18982070cb4b17a94829155a628ad5d0b07d362a4319ce74015f27607e44d81d79b6d323192c967cdcc
+DIST cinnamon-screensaver-5.0.4.tar.gz 154088 BLAKE2B 2aed90c5498bf9a6e39436c87fbcc58ededebbe9a7e977385a8335bbb11f900e27dff59815513d239b92a8feddb596b1ef56a2dcfcba97db937fc6074b139c5b SHA512 4510da4aa9372bdc683a9aee2b4388cb332a733dabc8666b5529783a0f7c4428101ae1f55d90e9150ba97a56f628a728f82a9d9edaffadc596ab246798bd60c1
+EBUILD cinnamon-screensaver-4.8.1.ebuild 1627 BLAKE2B 7c70e371cda0b6de480e1f16ca781dd4b0df12ee6662e0b7ff59cd3aeba7ba225ebbd66c68ef3f12423ae5443dec4a565ccf989dfb1f6d66f97effb5c33d6de3 SHA512 974d19a75d0040350abb5584ec3a3d7cf28887d9711aaa8d5022b4acea68ec72a848633f353054fe34f2b32dccb8a27cdf93446e17cf8ce5c4497ae0a27d0a32
+EBUILD cinnamon-screensaver-5.0.4.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
 MISC metadata.xml 499 BLAKE2B cdc003bc99ca0cc2d1aac9255edc856e0a0856377957340cfb2654f6e40db406169a95789ffd1c8bbc3b91cc6ad1cabacfc880f8ae70244587bddf697c0cf1da SHA512 ade4955b678ef51cad43c4809c7165fdd084a18cd89f977e0f4daf8234ddab3fdec289ad43c60ca2f85251dbc7da368113294d8f0f955b92809ef373c13a8584
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 90fa66ab4774..2f57c3ceb435 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.4.ebuild
index e25d02acbe8d..c0d4a43f7ae8 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.4.ebuild
@@ -2,50 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 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+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=gnome-extra/cinnamon-desktop-4.6:0=
+	${PYTHON_DEPS}
 	>=dev-libs/dbus-glib-0.78
-
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-5.0: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
 
-	${PYTHON_DEPS}
-
 	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}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
 	')
+
 	systemd? ( >=sys-apps/systemd-31 )
 	!systemd? ( sys-auth/elogind )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 BDEPEND="
@@ -55,11 +57,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-python-build.patch
-	"${FILESDIR}"/${PN}-4.6.0-xinerama.patch
-)
-
 src_prepare() {
 	default
 	python_fix_shebang install-scripts src
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
deleted file mode 100644
index 1e43396257f0..000000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From f838b2ab03af0285043d980feba9d52d96d66164 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 15 May 2020 08:34:40 -0400
-Subject: [PATCH] Build: Only generate python bytecode during builds with no
- temporary install folder.  Package managers should handle this otherwise.
-
-This eliminates a lot of warnings during the packaging portion of
-the deb build.
----
- install-scripts/meson.build             | 16 ++++++++++++++++
- install-scripts/meson_compile_python.py | 10 ++++++++++
- meson.build                             |  1 +
- src/meson.build                         |  2 --
- 4 files changed, 27 insertions(+), 2 deletions(-)
- create mode 100644 install-scripts/meson.build
- create mode 100644 install-scripts/meson_compile_python.py
-
-diff --git a/install-scripts/meson.build b/install-scripts/meson.build
-new file mode 100644
-index 0000000..667d669
---- /dev/null
-+++ b/install-scripts/meson.build
-@@ -0,0 +1,16 @@
-+# These scripts run as post-installation scripts.
-+
-+# They're designed to do nothing if DESTDIR is set, which happens
-+# during debian builds for instance - there's a fake install target
-+# so running these would be pointless.
-+
-+# When using deb packaging, these aren't needed, as these operations
-+# are run automatically by the package manager.
-+
-+# They're really only necessary in straight builds where 'ninja install'
-+# will be run directly, to install the program onto the system.
-+
-+
-+# Generate python bytecode
-+meson.add_install_script('meson_compile_python.py')
-+
-diff --git a/install-scripts/meson_compile_python.py b/install-scripts/meson_compile_python.py
-new file mode 100644
-index 0000000..9ec0f4d
---- /dev/null
-+++ b/install-scripts/meson_compile_python.py
-@@ -0,0 +1,10 @@
-+#!/usr/bin/python3
-+
-+import os
-+import subprocess
-+
-+pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver')
-+
-+if not os.environ.get('DESTDIR'):
-+    print('Generating python bytecode...')
-+    subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir])
-diff --git a/meson.build b/meson.build
-index c508770..d7dcd31 100644
---- a/meson.build
-+++ b/meson.build
-@@ -123,6 +123,7 @@ conf_h = configure_file(
- 
- inc = include_directories('.')
- 
-+subdir('install-scripts')
- subdir('libcscreensaver')
- subdir('data')
- subdir('src')
-diff --git a/src/meson.build b/src/meson.build
-index 7e0978e..f04fda0 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -64,5 +64,3 @@ foreach script : app_scripts
-   meson.add_install_script('sh', '-c',
-     'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
- endforeach
--
--meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
deleted file mode 100644
index e3240a010012..000000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 13575ae3f332e33a1952a803f2392d6d70df2028 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Wed, 2 Sep 2020 17:59:45 -0400
-Subject: [PATCH] Fix meson syntax error when xinerama support is disabled.
-
-Fixes #346
----
- libcscreensaver/meson.build | 7 ++++++-
- meson.build                 | 3 ++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libcscreensaver/meson.build b/libcscreensaver/meson.build
-index 1800c46..c2c3757 100644
---- a/libcscreensaver/meson.build
-+++ b/libcscreensaver/meson.build
-@@ -145,13 +145,18 @@ gir_sources = [
-   dbus_built
- ]
- 
-+libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m]
-+if use_xinerama
-+  libcscreensaver_deps += xinerama
-+endif
-+
- libcscreensaver = library(
-   'cscreensaver',
-   cscreensaver_sources + gir_sources,
-   version: '0.0.0',
-   include_directories: inc,
-   cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
--  dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m],
-+  dependencies: libcscreensaver_deps,
-   install: true
- )
- 
-diff --git a/meson.build b/meson.build
-index b15c3fb..2f9a9a5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -61,7 +61,8 @@ foreach sym : [
-   endif
- endforeach
- 
--if get_option('xinerama')
-+use_xinerama = get_option('xinerama')
-+if use_xinerama
-   if host_machine.system() == 'solaris'
-     xinerama = cc.find_library('Xext')
-     xinerama_h = cc.has_header('X11/extensions/xinerama.h')
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 5c05c3a26444..f5d1c40507e5 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +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 1416 BLAKE2B 3d4089f43abe155d7f8a54ed1bf81bc172b78e067e2c46e6a796b22844808adf17e7a29b3c83a53c9471a362266f254e2c301ebcfff5881d33ff535ba506e73b SHA512 fb06b0991774065a279b46ec857e22424b6b222814adf4b1705fc6a35e09a8186131cbb5aa267d1e2df249faa1eccf18aaeeb668c5eb2588a7a011e903fe1d0d
-EBUILD cinnamon-session-4.8.0.ebuild 1441 BLAKE2B 8671cfdab5344d90f5e3e7ef28b667b27d5b25b1dcfa7bbef8c6d3f1c67469409758eea0821003cb07b09893ee228b5ef07d59a55598328663ce50060cd6b8c4 SHA512 1c36fb317fac0f938ec5729ec6023e7b96dc93b296d86d6e87b71178ca117e9ec5c14894b366ebc68f7dc79c6a0b1bf3cb4843043836749740b1e22c2f410900
+DIST cinnamon-session-5.0.0.tar.gz 199887 BLAKE2B c009a690c479944f8b3879a3ebff24ea3d44676b9235fcd36049e1680e5a1358266b75ca9f6e193fc51f11d8d94cf0c592dc22cbae2fededf41281748f9410cc SHA512 98ab99d09b8d4904446a38888380beb3a403457e3da4c0f4160633156a490040924743d63eaa13e23b9e5f5c45c9392be082c39c969e0639b0bb06d9c1a2207c
+EBUILD cinnamon-session-4.8.0.ebuild 1439 BLAKE2B 49215712f53037c72db9ab6a18c8c7e08a08ad3dd954910a2b7c50192fe90ec9e2e413d9a3fdbb4fd641f3c6acced73f49728cf5cea46c2f62706541f2d1289f SHA512 be4d9a0179d5f47db2bec25fea1fe066f8e6422b31a039a01347b14d2d6a0fe0c700ec09f545b4bafff33d64156e2dd3c8f4e1a7cc70daf94af39b03b5f7d812
+EBUILD cinnamon-session-5.0.0.ebuild 1468 BLAKE2B c8cea6a43ed3895b45984abca1ae0b6d43ee103ba13506ea91201ff2336c55512dfe2c8911e032f4c939690d60aa32e598cdc0bc4fe69696635de99d31368638 SHA512 0545842a2ec8f7754ba27bc3323f8d9056f1dc854fce8680167ba8d84af7ccb1d250bafbafd24fa912f1097cb5a5db7496ae51decdf150442e9a69f24c8597bf
 MISC metadata.xml 495 BLAKE2B a8a525b00061705e885d1a884c7dd9b53e4476769d59fd23fd66e8e7c717a3f9f4564f403a1f5d679b7c45ba889fc65812d96805f469e08a249c645cd3f59019 SHA512 1b8c4c3659fb88b4fd490cc8cf011c247094326dd6b9d9776fcefddd6fcfcbb947ba28fbed35a89db22cc01ffbf8a12829be981e336aabcc32c2d6430442c376
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 48382c50c3d2..3d78ae2a526b 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc ipv6 systemd"
 
 DEPEND="
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.0.0.ebuild
index 3bf079671799..dfb7bf69e579 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.0.0.ebuild
@@ -3,25 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson gnome2-utils python-any-r1 xdg-utils
 
 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+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc ipv6 systemd"
 
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra
+	media-libs/libcanberra[pulseaudio]
+	virtual/opengl
+	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3:3
-	x11-libs/cairo
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -31,20 +32,21 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapps-1.0.4
-	virtual/opengl
+	>=x11-libs/xapps-2.2.0
+
 	systemd? ( >=sys-apps/systemd-183 )
 	!systemd? ( sys-auth/elogind[policykit] )
 "
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-4.4
+RDEPEND="
+	${DEPEND}
+	>=gnome-extra/cinnamon-desktop-5.0:0=
 "
-DEPEND="${COMMON_DEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
+
 	doc? (
 		app-text/xmlto
 		dev-libs/libxslt )
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index 8a86cf936f6e..8bb5c0c4d89f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -1,7 +1,6 @@
-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 2350 BLAKE2B 70436726dbad58dab73be4f1263d35200c282a1ce7fe1821bd5a31b784c87024d4f860f334a1995579b984b7c49a5f646709312ea5d91a22ff7e92aabb3a414c SHA512 40e3de6507e938492a9e539b93b606ca50f36ff216896dbb78675aabf8e71bd1c22afda209647d7706376d9bb810843891f1ab46fc7c6141817bc013cfff244b
+DIST cinnamon-settings-daemon-5.0.1.tar.gz 662519 BLAKE2B d481dbde1cb1c39298296f8bde506921ce75ce0e70fe443b7c9101c62a4163b0457f4df5127fd676ebf535a0d83792d83a95b3b230a46e62b978ba65c6af2fee SHA512 81f618587576cc0e7a65e2658b6a4ff941ab0d87d0db2629427a79de7e82cc58ef1301568f2ed232aed0edf2e79def4a7ccb8f76becec1fe50b4b528d01c3c58
+EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2348 BLAKE2B c463d0b1b7c5304f4c8a485cfa30b9dc1d50057edc9b909ba339f988d760ede512896604be52c2ad9871bd1e2cdc13b731021c7847d1201b98f6ac0b35f9352a SHA512 6fa3c7aa4b52e67eb94cab700c78c110205f846858771afdb4ef4f05b8b0452a7540f3647a99da03ee5423337909926188ebf5c2e6ae2b7968cb3b5e94c7df5d
+EBUILD cinnamon-settings-daemon-5.0.1.ebuild 2171 BLAKE2B 221635ba6ec02c68a0014dc63bdc47e75deb739a53f164152c3fd9c4470887ec7597d5fc06b95c5858a7a7ec1a8522011cac0206a4e3dd9b0067c0afe9296671 SHA512 dfa4d2689f60e09227155b5738b08eea15e522a6a2ba63b37d36880d04fadb5003938c25179935ee12bf17b68ab3f73b75754abf05c76abdffd5f9b9b83d1f15
 MISC metadata.xml 503 BLAKE2B 140d4e0ca8fc8c1706d856b305a12b9cf26d7efb2f7fa3292423e3617e109c42ddbf7b651923b5f84a1f56422a0b2e780ddce2573b5db2bd3f91a81ccd139c44 SHA512 0caf37ce7de312218834db1ee57f9a5e860eb34d32fd80cd96407b0f28b678c70de171a491695b32c47fd54cd1058a145e40bc64ecb3b51d47718f2215af1ed6
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
index 67d58faa2c5e..f28af6802a1c 100644
--- 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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
 
 RDEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.1.ebuild
index 41f1514f1b04..6e71b246e5ee 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.1.ebuild
@@ -2,32 +2,34 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils gnome2-utils virtualx xdg
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT="test"
 
-# udev is non-optional since lots of plugins, not just gudev, pull it in
 RDEPEND="
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.40.0:2
 	dev-libs/libgudev:=
 	>=gnome-base/libgnomekbd-3.6
-	>=gnome-extra/cinnamon-desktop-4.6:0=
+	>=gnome-extra/cinnamon-desktop-5.0:0=
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
+	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.9.10:3
+	>=x11-libs/gtk+-3.14.0:3
 	>=x11-libs/libnotify-0.7.3:0=
 	x11-libs/libX11
 	x11-libs/libXext
@@ -50,57 +52,36 @@ 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
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	# Make account-services optional
-	"${FILESDIR}"/${PN}-3.8.0-accountservice.patch
-)
-
 src_prepare() {
-	xdg_src_prepare
-	eautoreconf
-	gnome2_disable_deprecation_warning
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
+	default
+	python_fix_shebang install-scripts
 }
 
 src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	econf \
-		--disable-maintainer-mode \
-		--disable-schemas-compile \
-		--enable-compile-warnings=minimum \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		--disable-accountservice \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-	dodoc MAINTAINERS
+	# 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() {
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
deleted file mode 100644
index c12f2730ceae..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.8.0-accountservice.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 15b1c1488f28e69cee86ff25bf0c95ebf5245add Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Sat, 30 Jun 2018 22:35:52 +0200
-Subject: [PATCH] Make account service optional
-
----
- configure.ac                                | 6 ++++++
- plugins/background/csd-background-manager.c | 4 ++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index af5d3a4..a30126e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -166,6 +166,12 @@ else
- fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
-+AC_ARG_ENABLE(accountservice, AS_HELP_STRING([--disable-accountservice],[Disable accountservice]), enable_accountservice=$enableval)
-+
-+if test x$enable_accountservice = "xyes"; then
-+	AC_DEFINE(HAVE_ACCOUNTSERVICE, 1, [define if accountservice is available])
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl - common
- dnl ---------------------------------------------------------------------------
-diff --git a/plugins/background/csd-background-manager.c b/plugins/background/csd-background-manager.c
-index 282094a..a692c6e 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -135,9 +135,9 @@ settings_change_event_cb (GSettings            *settings,
- {
-         gnome_bg_load_from_preferences (manager->priv->bg,
-                                         manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
-         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
--
-+#endif
-         return FALSE;
- }
-
-diff --git a/plugins/background/csd-background-manager.c
-b/plugins/background/csd-background-manager.c
-index a692c6e..a99b478 100644
---- a/plugins/background/csd-background-manager.c
-+++ b/plugins/background/csd-background-manager.c
-@@ -186,8 +186,9 @@ setup_bg (CsdBackgroundManager *manager)
-         watch_bg_preferences (manager);
-         gnome_bg_load_from_preferences (manager->priv->bg,
-                                         manager->priv->settings);
--
-+#ifdef HAVE_ACCOUNTSERVICE
-         gnome_bg_set_accountsservice_background (gnome_bg_get_filename (manager->priv->bg));
-+#endif
- }
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 383e6f532fc6..d9dd30bea0bc 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +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
+DIST cinnamon-translations-5.0.1.tar.gz 12201535 BLAKE2B 13455216b988a9901e51dca02977c8520225d4b24633557b28c72c97a9d2222ee08d4d311dc8baee64af12a6e778b49e67a43222fce142b0dc53f2239a07f1ba SHA512 3c33d4799ffb44a04d639e82253bbf6968551a8b06b94807d2a8b1b2ea4e982f8d61664bf815fff571a94ed44c60c6d98344604d168e6a602df58306a3e3bf81
+EBUILD cinnamon-translations-4.8.3.ebuild 1331 BLAKE2B b17432dd7e425789c5fbbd2ceb1e7fd00d6a402aa34359ea8faec762e273a9d66821a757e8708bda1f9bbae2d95a53c94f7881097ce7f0e7153f94565f72d00a SHA512 ed2d18fab97233ed88879af1417aa7f42277a2af8a3224d62b6d3b349bfe940e7c97c9f7451f2741bce2d4b5b01ad3c1d3f9d4a2141795b182bae8ed6eb88480
+EBUILD cinnamon-translations-5.0.1.ebuild 1340 BLAKE2B 06f651a1c8b53b047a96bf48d798b2449020a30de4dde6480fa0ac8db70c9e3f9d0e7442d0944dd1ccaa6a553169f423d763fd7c3052f4cbc355fa6c799a5fd5 SHA512 f0f0183f78ac9aaa0fd8019d894c2223079467f801e9230cf881b30b0786f8cad4418c7e77e81a02f48c8dd0a6e3ffc8a62ac122f241cc1b0a9f4e049811b0c6
 MISC metadata.xml 500 BLAKE2B b320afe0e72c5d2664e88acd7e4c532ebbe99def2a7bb47c0178c51c41c45f063fee9ffdaffcdfd2e5a0fd4bd4c73bdb924a131b0cb82c77d31442dea30860f3 SHA512 2cd989b1db3b951b3927679591b7f42e0527daaf979fd93175c4cb5ba95fde556aafbdaebc9265cbde6df239253e2c64462aa3fe89e0451653052b5245dba4a4
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
deleted file mode 100644
index 22c68103a2fc..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 e835a818fc94..f7d4dfb914b5 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="sys-devel/gettext"
 
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
new file mode 100644
index 000000000000..91e11858bec1
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.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 ary 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 mo 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 98ba081488eb..3fab4747190b 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -2,8 +2,8 @@ AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
 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 5657 BLAKE2B b3b49a03cf3829dbac90c966f4135964caf0ab1b45e6c28448a517a23c9dee2125a6206c2a34b9183c9750b8c760cb14b7fc993716ed4824ed21acae178a5db0 SHA512 a377c3c1d34c69238813960238733f512a67b6002fd47d215b0b80a4ed290e37511a41bd33af783b9506ca4698060e31c97b1574f54980a7295d08ea1ad0f318
-EBUILD cinnamon-4.8.6.ebuild 5030 BLAKE2B cd1656ff0daf268ee8cb172b2ac65497e4dcf5b0a3284619420093b150dad49a5b78a47248422c97ab342989176b1407878fd12ad8ef0c17f1ec523951e855b9 SHA512 e6bf27f1db6308f84b5efffcc57aa80e4c5faa39fb5ed41a7fa40fe7ef405c0e8ebd897f456ade8de8ba61cb57ec93a505278b421da17367f6cb8918465b678d
+DIST cinnamon-5.0.2.tar.gz 2395838 BLAKE2B fe7962f4d6481a1584700b3ad5495d2cdc79c4f61aa01b7e330929ff83150ca9a024a00bece4df0fbd18dc68df164c5c27024320c8e46041ae1eaa7c36c8c620 SHA512 f75e9f8382b27b0b29d37274b8687f861c6b46a46b378ee297024069ad70e0e5b48089cd724210148d657d25bcce5d3f18b6ba4826b8ff582c0c1afb5fef9578
+EBUILD cinnamon-4.8.6.ebuild 5028 BLAKE2B 3afddcd102ded05641665b6b0ba2571119296a4d58aba59bea55824fcbf3e0eef53f84e0a3ed88d168ad4cb06b9169771819d75d46270a01503e0c0aed84ffc2 SHA512 398060a0c4e903a8ebccfc7995ac823f14518fcedf81a1ab771996e7e9314accadb84def76b557d72aaf56c4f43dbd4ca8c09fe1111526f0eb5b8c0c93cca2af
+EBUILD cinnamon-5.0.2.ebuild 5001 BLAKE2B c17c9256615cfec063ffb525f253bb9f8661df31076a174bb8b2a3c22699304155bb37eced47d4a7b1d3ba7709e1040da5cb0c3521c8443f6fbb448c106169aa SHA512 5d5bd3ff9a7d7285b580eaed307d436e24339879688f0e327bf475d6afce51da6732eab175d9b0227d359488c4e28e2a0675163142520d1fe7d60f67791c0842
 MISC metadata.xml 487 BLAKE2B ec4d9655fccd9121ddb07b22cbc1ad94ceaf48c1994b1e27f6b0e1d5866b70d9b058af3c36c20a3856770428b6c17c6f97973be2a2040dba63fb45406ede2f2c SHA512 f6d2d4bada61a51e2af982dea1d908d31eec02f794cd72cdb80935320c17b1c25dd91a80c8b28f1d4b7c92bf40e4ab958ec394d3fec6ea90d602d6df485cc3c0
diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
deleted file mode 100644
index eceb8c0e5f49..000000000000
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-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 )
-"
-
-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.6.ebuild b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
index 8b959450d8de..768aacbecf1d 100644
--- a/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.8.6.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
new file mode 100644
index 000000000000..f8888fcdd160
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.0.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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-5.0:0=
+	>=gnome-extra/cinnamon-menus-5.0
+	>=gnome-extra/cjs-5.0[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-5.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-2.2.0[${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-5.0[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.0
+	>=gnome-extra/cinnamon-session-5.0
+	>=gnome-extra/cinnamon-settings-daemon-5.0
+	>=gnome-extra/nemo-5.0
+	gnome-extra/polkit-gnome
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	>=x11-libs/xapps-2.2.0[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.0
+	)
+"
+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
+)
+
+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() {
+	python_domodule files/usr/lib/python3/dist-packages/cinnamon
+	rm -rf files/usr/lib/python3 || die
+
+	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/cjs/Manifest b/gnome-extra/cjs/Manifest
index dc9a56deecc1..a1a3bd0f1219 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,6 @@
-DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
+AUX cjs-5.0.0-fix-test.patch 903 BLAKE2B d559a60ac73aa8ca4c77ef5b96321dc95edf87c6891257220e20814a827db3a1e7e5eafa5d2217867f24cb4e9cbeaf2231de5563695814c9440fb0e59ba1fb98 SHA512 bcd207a060dbcfa9f50bfd609cc8528c8121b029c547a148c90e1a976e6b99936c88ac742cd12595243acf162d4862be9c92479d244dcbf1476d2195e3438d00
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
-EBUILD cjs-4.6.0.ebuild 1693 BLAKE2B 88f3f41dc6b2e2d10bdfdaf7c0b2ad563e8509a7fdfe93110d45aaf9b8350aa36f63414cdbb6c1d4673799eb8ad2bd644474758e8346a80f39f7c00da5ecdd68 SHA512 59a3090fb7d56a3d606c3d2c75fd78024e2bc030b9b86c125fad1e4307bd72dbc2e479b3fdbc3af075d1cda603bd73d2abf708a1b844130eba1306555608c923
-EBUILD cjs-4.8.2.ebuild 1502 BLAKE2B f16b1a4fd392e78984d8c3c73e2aa04ceaf50c422d8aad5aecd1112bea02cd85f12ee0e732862e1e4cbce10ebee7c3b6904abc1801ad70a639a619b9a118abcf SHA512 3f02401b9061c5d2161b90db5b22fa85eddf85c6ca0f60be6fba6ecb7cc1c35914bedee6c1a74a6fd7ad3ba80c308f67ab97ffb1dcad2db6c346379d8c4707f1
+DIST cjs-5.0.0.tar.gz 601928 BLAKE2B b8d4e64472eefe15678fd2ebcd270161b779e5081b1f9fdff61c4410fdef601cff9bc948b423308059aa73de0b960d430711e8741c10511f758b41da8d96892f SHA512 32524de39e17ffc3e70f83188aed5d6bcb39e9ac4d4a1aa980a1f45dfc7970c103868f270775fcd290de0a6c70035b61b04dc575c6bcc1375972aaa0abdd8e59
+EBUILD cjs-4.8.2-r1.ebuild 1500 BLAKE2B 98ddb93f7a2821d36c85711294e7c5980a93e5acbfcb85e664a40cd612c692306c5c49b145c77c264015383671340b53a1a6ad3ef7fb052a2f985ca567539c2e SHA512 a0f6e4494134d72a9f04d291c4d79557c9fee193c3fb07aa757724e6df6bcaef04e43837bad39c2c8e273ae9e9bf158d365b381a82369f707e8f129efd266fa7
+EBUILD cjs-5.0.0-r1.ebuild 1557 BLAKE2B 297b2f1e0899ed36d8457f95147883056ae0be15d63169d2a56b2e4168711657a32c248748c5320b842e90fae448d7a01833d3b37b7cd2bbfd4209966bf2b533 SHA512 13b54829b9092ab8cd5fd7646a080126ce606d823bc9b8fc54242382e296df18730a1797b486ad8900cd5dbd8bb1948e828730e9a7725011d137fee23fec1abd
 MISC metadata.xml 607 BLAKE2B c08d54529aa035fe5008bdb76cfa944ed7eb63f183e0522a48e2b79758cce23ae56db7a87e019a8ecc767846d60c8cdd9e6e43cb82c7c85720582700f73ac96b SHA512 4971937c41e167e93266d694ff5f70d4c1118c07934f7a695242c5fc702655f335eda00beef5c97bdc84a68acef02834f6a5ffdbaaec9383c6a9fcdcb96464d8
diff --git a/gnome-extra/cjs/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
deleted file mode 100644
index bbdc3a6ffabe..000000000000
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools gnome2-utils pax-utils virtualx xdg-utils
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 ~arm64 x86"
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/spidermonkey:52
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/gobject-introspection-1.41.4:=
-	sys-libs/readline:0=
-	dev-libs/libffi:0=
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/dbus )
-"
-BDEPEND="
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	default
-	eautoreconf
-	gnome2_disable_deprecation_warning
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	econf \
-		--disable-maintainer-mode \
-		--enable-compile-warnings=minimum \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	default -j1
-	find "${D}" -name '*.la' -delete || die
-
-	if use examples; then
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/cjs-4.8.2.ebuild b/gnome-extra/cjs/cjs-4.8.2-r1.ebuild
index 59ef8a7d5a6c..921184eaa289 100644
--- a/gnome-extra/cjs/cjs-4.8.2.ebuild
+++ b/gnome-extra/cjs/cjs-4.8.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-lang/spidermonkey:78
@@ -27,7 +27,7 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	test? (
 		sys-apps/dbus
 
diff --git a/gnome-extra/cjs/cjs-5.0.0-r1.ebuild b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..1cd6bfb71f44
--- /dev/null
+++ b/gnome-extra/cjs/cjs-5.0.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson pax-utils python-any-r1 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.40.1:4 )
+	test? (
+		sys-apps/dbus
+
+		gtk? ( x11-libs/gtk+:3[introspection] )
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.0-fix-test.patch"
+)
+
+src_prepare() {
+	default
+	python_fix_shebang build
+}
+
+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/files/cjs-5.0.0-fix-test.patch b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
new file mode 100644
index 000000000000..347ca090782d
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-5.0.0-fix-test.patch
@@ -0,0 +1,24 @@
+From ac2737f524b4d667a7700b8ff077cd603ee21c59 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Thu, 3 Jun 2021 05:21:51 -0400
+Subject: [PATCH] fix failing test checking for version number (#94)
+
+---
+ installed-tests/js/testSystem.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
+index a4c098c0..8ae8c74a 100644
+--- a/installed-tests/js/testSystem.js
++++ b/installed-tests/js/testSystem.js
+@@ -11,8 +11,8 @@ describe('System.addressOf()', function () {
+ 
+ describe('System.version', function () {
+     it('gives a plausible number', function () {
+-        expect(System.version).not.toBeLessThan(14700);
+-        expect(System.version).toBeLessThan(50000);
++        expect(System.version).not.toBeLessThan(40802);
++        expect(System.version).toBeLessThan(60000);
+     });
+ });
+ 
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 396096ac2578..98af7bef6b4f 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,7 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.40.1.tar.xz 4625316 BLAKE2B d795183d07bc7b58a00e3c6f60d3704cf7e0cc6237b079c49f2e21dd7c22098c2b7b3fd2ca50fd3d9268aff8e5eaeea2e0e6c65d09c8bd68b7364445eb926c7c SHA512 47964a0965d412c329743423483c6694d078835b375d457aabe7e45a2b1b3406e4e0d4c1b855460f3c9b327d4d9320e659b0e43243816ec1e9bc49d0fea90f7d
+DIST evolution-data-server-3.40.2.tar.xz 4625240 BLAKE2B f7c966e0e092ce46157e55d1a096e5ce69ae5103c0d777f262b62cac4185bec88c4cf84b9da4927cd8e008310f09bedcc017cb4ec39e4c90b3a36c1444b3507c SHA512 495e264cc92b31e6bb76b205641f4c030e82a010f0cf58f712d5c05b5a06f0a60c5b83b31f95ececf9e553f2e816bb9bab2df54cd9982a81eb2bb7f936016639
 EBUILD evolution-data-server-3.40.1.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
+EBUILD evolution-data-server-3.40.2.ebuild 4240 BLAKE2B 174c00b54304e86aa8197988fe2f5352ac3f53513d6f3e8ae4d98777a812dee8fdaa6697f6b6506b2dbb8dba21583a840b1c4f9778e5fcc37d32a40a221f885b SHA512 9dafa06c7614caab9ca4b8ccd07d783c6d3a31294e6a5c38df0534883edf784b920a9bfdceb9a8c35f424694c44ac2cf41216e4bfa1bd833038ba0945ae2c96b
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild
new file mode 100644
index 000000000000..02f51c3698ce
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.40.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake db-use flag-o-matic gnome2 systemd vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/62-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+gdata_depend=">=dev-libs/libgdata-0.17.7:=[vala?]"
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_src_prepare
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index a469e53eaa59..594c0ecbe2d5 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,3 +1,5 @@
 DIST evolution-ews-3.40.1.tar.xz 672448 BLAKE2B ac6548c2567dd1ca303def27a21974f93d44c1175e8474bebaa6576dc63f8624c32e9357186e2c1412ca2091412b17e0f244c60919652ede55fb77e1bb384b90 SHA512 8d0477b500ee1b0c6a9527f2d63fe0b4238862425a079729478a8df880f35e6a1166d2f8f77cafa73844351f0cffe171d857366c4527770d7436d8b4ace29b99
+DIST evolution-ews-3.40.2.tar.xz 673592 BLAKE2B 0b11b77c729102ecc0602abde323817782b9d56939a708bf9a506f2dc2d9d0edb43f7607e0a970db3144965aa669691d2041d99841d70ac604feece721e11979 SHA512 a42f8ee092aa1fdfff07729bb1c3d0f80a25f6073f07135f0fecb8f431cd5273c2afd292752457515b0be71f106025d413948a97f2a4d3d43b049989dc296175
 EBUILD evolution-ews-3.40.1.ebuild 1406 BLAKE2B 3f9e641161aed979aeb855552dca3675183ca22390d3d1016e280416b227ba571b8af864ef02d5628f757ad33c6f523f50e269e6637958f36f7fe2375c777ffb SHA512 05b7067ab291bb6e126a2cdcaa28309ebc22669bd4a870762df1b292c0d0b34f0263f56fa652702606036c7816ea1ceb98d95d1bb9a41749259510244d594b2b
+EBUILD evolution-ews-3.40.2.ebuild 1408 BLAKE2B 1d9a1cada17b2ccddf741b59f1b9171249f7ed899a469c2ab93c4d11c36c21ab9d30a73c811c64ac2432ef1083f7d57be78f6c4fd9b7ec7f9776781f157dcd6f SHA512 d89043f8af284e90ab7692eb25be59413af3f8c36534eddfbd81b021bb22439b8346a17213314c7b881fd33d795e752d29e3656a26dab064c1cd27a86dfd6b42
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild
new file mode 100644
index 000000000000..2088827c2022
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake gnome2
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 7b3174586ed8..0f0ef537338c 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-boxes-40.1.tar.xz 1696528 BLAKE2B 7a593d535d2a6f0b0750c542a86a8210ac697fe8340f44830134c840d3a7500a6f6ecbbf901d6f37273f3354342b68cb1bdaf4cd7a5a98fc3047ee2ca5cc8b6a SHA512 a035454f3bdecc75222b27b6c1bf9807b21b9b3846300f2afafa3f30d4069b32a258e4d82f38cfeb407b21bd40d84031f57ddd63322dd6ba576c9795f355f33d
+DIST gnome-boxes-40.2.tar.xz 1697352 BLAKE2B 07f9fbad526bea4239a6eac3a3a26a53d30daab938158c4904b5ae674cf64cb2dd0fc6de073c41fc023c66df0328bc02dccf994ef09af597f117914c11bedefb SHA512 22f4a66bb60b47ae7c5ca7fb6f60eddf16a1ad209aa4541f05f732d815a2ac9f2fdac9f6d87cd5cf44d402d0f0d114466efbf129b22fea7b9b054e1b3c3ac145
 EBUILD gnome-boxes-40.1.ebuild 3883 BLAKE2B 078f3a13009bcc8a5b82097812d5c6426c43552f1668e81eb8cf7cb5e51fb72fd82b5f03d70fbcacc0a4031b1a2e73672a52d6d45f579d3f2c80d03541d4fb83 SHA512 b74a8cb8dd12ac1654d0f84ccf976b498d68f90f3a60545fef7c50c3e33ae36402ce9d5e3682cb0ea84155dc3d7e5137423d2f7d9c675deb13b77f139024b939
+EBUILD gnome-boxes-40.2.ebuild 3884 BLAKE2B d9321b6bfec5b631ebd52e1bd318fd58ceae6753c5119f9d9dbfeb5c8bbc96509fc8dfcfedcb4d2641de18420a72d288817dd8b541289f39142a2be661603564 SHA512 1740b1ec84b0d53783463a5c3ffce68a42b17aa5546e8b2a00cc0f219bfea60644dba9e489a9b12924a07c2666805405a21bba6a9d172981cb792be3cfb98d06
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild
new file mode 100644
index 000000000000..2078408e917a
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-40.2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	x11-libs/gtksourceview:4
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+	>=gui-libs/libhandy-1.0.0:1=
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index e27889cc7eb1..2d7de445a795 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calendar-40.1.tar.xz 553592 BLAKE2B 83517f9fc23d3b61f4b9ee824e7a95d0b002b61a6e8afc68805dd28b947347b9d68751e4ad9ce5a92287e3973f19a99e5daa3ad6829eae961988b56d9349f6b7 SHA512 f04db5da5ceb5518766d57ddf14eb0c3de19c499ba00a0f426f4059cf53b064529c2e317198d92f45f400d6f4ae2d34d0fde4dc60293a480584a199d2d3a3a5a
-EBUILD gnome-calendar-40.1.ebuild 1151 BLAKE2B d5f2a06f532763a4d35e03b55e5f91ec793d3f38f48a577bbe40675955ac41d48b7e3e9dffe90346fbc30c34ad4389d5c2c0dedf40a7de74b4c098b33b15f96c SHA512 f5fd61dd41338dfe0fe9b144bd06af5db9478588bf0af5ce5c82d568c69a3c521820bb594238b70fe1f5a564a4c8049e2762fdad9aa95d22da54dd2a9f4630c7
+DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
+EBUILD gnome-calendar-40.1.ebuild 1158 BLAKE2B 3b410dcfe3fa532437b76c03fecbf1fe0d0d35603b19fb6b0e16de0bd58f8977caa6f329aee12544dadd9d5179b0870f14dec6db2d3faa8e06c39c6315c1d191 SHA512 b59b169f1c59647b7f14986ecf47acfa9d3a58f341b98219f035176201b378abe05841216291ed1b9d97c0b925562ecb5eee4a3b15ff8dae2b8a18d5b5fd3ffb
+EBUILD gnome-calendar-40.2.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
index ec92dd3fcfdf..3b44fd1d02ec 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
new file mode 100644
index 000000000000..ac5e1d4c4c46
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+DEPEND="
+	>=dev-libs/libical-1.0.1:0=
+	>=gnome-base/gsettings-desktop-schemas-3.21.2
+	>=gnome-extra/evolution-data-server-3.33.2:=[gtk]
+	net-libs/libsoup:2.4
+	>=dev-libs/libdazzle-3.33.1
+	>=gui-libs/libhandy-1.0.0:1=
+	>=dev-libs/glib-2.67.5:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0:=
+	>=dev-libs/libgweather-40.0:=
+	>=app-misc/geoclue-2.4:2.0
+	>=sci-geosciences/geocode-glib-3.23
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index c09124641de9..a84eed143844 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e
-EBUILD gnome-characters-40.0.ebuild 830 BLAKE2B eea129b0d7bf12cd736dd923addae15b967d093e7025acfe30e475be00f65414a0ba06259eb0518e24ba7997d16df844a2f133c5faa08f939ef8b1dd6c7f23f4 SHA512 253f507b93b5657bf6d7933839686d300229c474991028a7f53117ca84c2675e16f712d83e0a16fd9a6da0ab60c860fe7229070a42e687733f01fb8ea0431ea7
+EBUILD gnome-characters-40.0.ebuild 837 BLAKE2B 530e25e6eb97d9e44a0245c8e95c4afdbf5dbb478bae92fea21d52c3fb91af0be1ebc5f363b461ca4dbefc5f500c709e3e3b5018e5051e75b6b9b214fea14c2a SHA512 5fe89365cbf7f5ccf22ce1c5f2f9cee0b735aa4e1dd9b1fb8402ce044243e6a73a8a31b43b5c6be5e1d8687b8339a3f0422ccaff2f6a5df0b0ab2ef1dc9d2342
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
index 37a15a0b4058..ad852bf83560 100644
--- a/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
index f199a5e909c9..e520acfe7923 100644
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -2,5 +2,5 @@ AUX gnome-integration-spotify-command-line-parsing.patch 357 BLAKE2B b1e823c8477
 AUX gnome-integration-spotify-correct-interface.patch 797 BLAKE2B fab74ff1202d47b60acb4350fe542116d9eae8abc4efff748713f6026e8adebb33a48ff89f76375510951f27a9c1c93a8bf9dbf6c6403a0d8745b660a027f0e7 SHA512 d875db53ea7eae23a1280534278ac17fd12a75673162029a86d9b232bd6cc27ea71287f5d904a0fa9328b2716d3e115675a72e5729748491ee1482ff0522f9b2
 AUX gnome-integration-spotify-use-glib.patch 1209 BLAKE2B 1cc5ca0d145dd73d2ad78b43d291034ee291e1974b110291560c8d952afe0e2170f205f78bb477a06bc0153583a0cc2bc02150701baa170b8466825665730bad SHA512 daaa2ba1f3484946c916e1cac821d9d09b54c2ca1da0cdbd0db58d6b576d54a68cdb285d9e424fa070ebf1074f32a4cf43305741314ae49026eaa9bf2fde6a37
 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r2.ebuild 1283 BLAKE2B c325ab9144a0858188d3b11f5f2685d2679e50f11ea4339aa0ae98180de2a587af95127e26d58bac2c5ed21949a232adfc289af06eff6965aa6da0b5ee4ba4f2 SHA512 2920b7230673fabd509473e0ec23046ef910e8735f3df18245edeb85eda7930521925680c4548e9f714d12a5646d198aa452549d7adf025213e3349e42c1254a
+EBUILD gnome-integration-spotify-20140907-r2.ebuild 1293 BLAKE2B cbe4c59cd511a986d8d31919703020f95b650619030d63f5d6d32be01bcc69c76ee57626276239118d9d51fa50175eb5a4e531526f995b46da1f05296ceaa341 SHA512 15f6b9d9541ff7d59de203d9a245f54b58daa7fc1db5cb1a7f2e53df452c42c5626a2a2fa274922ab88ac755c681d9cfd296114097974f5c490813e204f15406
 MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
index 049a2479a33b..5e822f8ad79e 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_7 python3_8 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
 inherit gnome2-utils python-r1
 
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index d35c5ca36949..bbe8c8c492c4 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-shell-extension-appindicator-34.tar.gz 34764 BLAKE2B 3a619f810d9ddf7984fc3b0c96735eb0f9233f36ff3cbddc5b28a8243f55d57cbc9c58b49516e99b30f35b12b6e747b7fa288fdc36f99cf7e61b7ad8cc2e84de SHA512 1f02a7cc3cfb90af8ee1a0bb39135fb3203bcc87d13cda0cf7f110db4b838a7c082eba30246a913306ef0e4b2fdb7c9f52f24f62525013ff8f1de9d054d45425
 DIST gnome-shell-extension-appindicator-37.tar.gz 39830 BLAKE2B 6e8af3acf6c9a4478fd663aa5814fae5a59e5ed01a759d7aa37d056794c3ea6c595203b622087f02170d9f05e6fa1c47138da9962ae33d9f398a7659a645be57 SHA512 2aeb93ca015936577f314e0313dd963d3712edf27a5e9721813b6d72b5050de9427d7aa3a296ced40352a421251ecae7022fb58c1da02947bc0a6205e2d41d1b
+DIST gnome-shell-extension-appindicator-40.tar.gz 48681 BLAKE2B cec52930bcb163a6761662deb3bd52202abadfc90fdd12877c711e4f4cf5038b9e7f3822259ced5ba39a632d2a1e0a83ffc4dc563ba184742dd1de2941acfe73 SHA512 72b3ecf0eadde40fd3567b19d7c7064953847ec86298691097f9fe14cada37206f8edd898c1d2a8fe71aeb0ace4921d1797d2dcc9eeacc0cb04a25841125b2ef
 EBUILD gnome-shell-extension-appindicator-34.ebuild 899 BLAKE2B 3827e3dff875e238cf07e61be9caabccd2d04f1b515cf2c3697595f163da0e5865bcf2eb9f88bb1d239f04b84b7846b2382761976c7e16df069ed45e95846671 SHA512 49f7bba575fbf669f12595328349958aee645d1e7ef3572f1ffebcb8c5fa6b8896afa7c6fcab4f12391fe3834002e15b2e081db4b2e470dad3ae9808103015ee
 EBUILD gnome-shell-extension-appindicator-37.ebuild 937 BLAKE2B cdd832bd03c3ca6e39a1f273d5a91b70fd0e0fd6ea2db5889c1efca2dcf1383331cff7a1c8a34c1da8a3ada5489f774fad3e515692d30b5c03c5847c6ba68aa2 SHA512 d61874c0aedce603f251aa1071f253fb63ee83cff873ec510e978053d5d105d299786ed16a9ade53556c457db278dcf66b77ffa050ea69406d433426d4f50b28
+EBUILD gnome-shell-extension-appindicator-40.ebuild 1114 BLAKE2B 074ff5e087b34a22c440ba21f2130f163261dbb0c0a4da8dc516fd5c516f66d30fdf467224a746b93b7f4960ac4fee643f121617f399f43ee51fe35e54af5719 SHA512 3476ab9a8909bc89a59ec9c674cc662a1dfba826c52259e208f2be019b72f0c17b15cedf3c4bd91b0c5315ca423263b8da29d35ebd39621f3c570b080246ee51
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.ebuild
new file mode 100644
index 000000000000..12e3b6cddea6
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-40.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils
+
+DESCRIPTION="Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome"
+HOMEPAGE="https://github.com/ubuntu/gnome-shell-extension-appindicator"
+SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	dev-libs/libappindicator:3
+	>=gnome-base/gnome-shell-3.34
+"
+DEPEND=""
+BDEPEND=""
+
+extension_uuid="appindicatorsupport@rgcjonas.gmail.com"
+
+src_install() {
+	einstalldocs
+	dodoc AUTHORS.md
+
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+
+	rm -rf schemas/ AUTHORS.md LICENSE Makefile README.md || die
+	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-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 7337b43e1804..05a029110f72 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-32.tar.gz 4186897 BLAKE2B 2d8d119ef61c426be5e1ad3070fa038fe34f1cedf706a748a9943eaa2ef9bb0ce75a8df99abad38d48fd8f25ae532ae9dd425ca00d7165c06b177580cbed89a3 SHA512 c72473df4b5882ee5964c74fa42d270097526337230e538c1fcfc6e7bee5ab492857ca0f48e019ba7cd3ce6808b22c7751333275dd074b057fa4e09030afb609
+DIST gnome-shell-extension-bing-wallpaper-33.tar.gz 4218373 BLAKE2B e5f7c9845a20eded7dfa56865ce145751b88f92c5c0c89bf305e863aa03e1ea8e305355d34833387a60b26e75aafa4739ddf4a13dac871835d604bade2f8ce5e SHA512 8de4f4a721cd8ca905212a9ebb3e4d26d90832353fca7641eb240ebe12f3fa4cd10acf257823a4a986b18b98216786daf46f3570dd87f2f17e6bfdd6507a687f
 EBUILD gnome-shell-extension-bing-wallpaper-32.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
+EBUILD gnome-shell-extension-bing-wallpaper-33.ebuild 1105 BLAKE2B 9d0ed7edea8b098da017ee6d201d59a6353ac8d9ba20c7b2ce7921c62f9e4321976ef016082b7185b4b65be5e149b8d1965df477299c01b957f2ff03afc6165a SHA512 44a4fcc8a00a1a2b4339f2d96ed960b7099b55234f2c6bcf7443042b207324e5b6aace0d6f8fc381f333d14b2de78496e5bac5d6645464be7b937fe5a813db6c
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.ebuild
new file mode 100644
index 000000000000..c31bdf512404
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-33.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 6f019d6a0d67..198152a0854c 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,6 @@
 AUX gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch 539 BLAKE2B 0b26d5b929f1f9305912a3dbab1a117a0dd54d2831c7ab9d7054be9b766928243ecf22f2ed4d16ec90e1ca94cb2e19b3054b9a23043cc0bd8f5944380549f784 SHA512 f2cf7681c9629fdd56237f81b9304bca83152764d5201a5d9584ca90466e405aa9b8c1b42ef9833b7c6937fae56e7115cba2fc61948dfafd4303943655a742ec
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild 1451 BLAKE2B b24c04f5146dc6ab5293b090fd06c26597580ed370953f6a96d9ec5abb054270e5d42fb720af5714a33ae135cf4e891cd95b98cd2506e8a812396e7a75852548 SHA512 25e5cc00061c94ec4d41d180bfa5617e4a080be76ec4461c11cb537ac31e123bf58d9b3d23252941ebaa7044e4ae3318641a2c4d7f294c5b236fbff373839a04
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.ebuild 1324 BLAKE2B befe19cb160c2a269b3c4dcf1f9a00d56f4d85540e59b9b4840db04d0cd1e7f1d51bc0406d8e772a1a507aee55d3f001c4739d4004f379cf485f2df6d7cee2b9 SHA512 26fbf34cce123893a05552ce239b025b604f5f64c13cbdaab82a22ccc62901a1679fe70ac07e06f096f678cc995ee59ca1e46ec28c5d7fbc1eee1b34b781a4d0
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild 1340 BLAKE2B a3fc51cb786e859ec9345f68e9056dda2d3efc976875fcad60e67e2f8f16b9fa8c9a4a040e2e24ece6a61bebecd36d5ae2d6a53663b4c2dc783bbd182452a7b1 SHA512 98d6efa4a26996f2caf9e3bd522704bec8abac93681164aa007fe18e0ef9e8a5790515212d8e902d23b94b532e1af81fa79d9767972ba6b770d7af3ffd277bd6
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
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-20210614.ebuild
index 529d874917b6..7156fa24cd70 100644
--- 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-20210614.ebuild
@@ -6,12 +6,12 @@ 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"
+COMMIT="71afc1a01df765bf03cc756d309be1e040184f20"
 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"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
@@ -20,13 +20,13 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.36.4
+	>=gnome-base/gnome-shell-40
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND=""
 
-S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
 extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}/${extension_uuid}"
 
 src_compile() { :; }
 
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 82ed56d577f6..b67122f7cfee 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,3 +1,5 @@
 DIST ding-0.17.0.tar.xz 71596 BLAKE2B 38770f2935c47242a47b377bc18c2599a6a54b9a13a7085c24a13a4b46c007c297adda1515cec9fc11cdf38ceb8d2ecebaedf6c1e64f27351ad6b923d0b02182 SHA512 425da33c45c908bc907ef2440c6d363fa666f460a997ae14ae53c39c398307aa96150b31fba21b7e7d39326dcff6f23951d4cb80937616003c4883c96e44d635
+DIST ding-0.18.0.tar.xz 73584 BLAKE2B 26a98d4b16ce559b710154707a4365df32001e1f3f4a16f427d5d0aa8b22ba6d94db86928297c88a4e31d6df251778ca841946dc5ecd692cfaae38c5d1ce7459 SHA512 2a269d944d283db229247a028c1882ee9eafd1a543840b4309ea3ae87ab0b8753eb19fd0052236c585888d8ef461626326bf41db184527bc2a447e26e3cddb31
 EBUILD gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild 982 BLAKE2B 0e04254e7e6043fc7854c3c7fb3eca59d71fa5a31b37680f3922576d893c89fe52cf98ab665632c60303715807fe548a0c9fe183da139853cb6685f864694f9e SHA512 e8f06a86bef1217a387bdddae31c926c2669a7250eae5bd067b900a318aa4bffd4ee38b394e8a2ca33eb4e22b6a3916bb3505461cb6e89ca2ed548ada85d7412
+EBUILD gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild 1003 BLAKE2B 78bdcbba33c3b4c639916b75d76c7537f0e49bb924fc94288829bc7678e02e15f4fb7e534c8d9e377c5ccb14307a55dba3bf313d85cba0ad2f622f7ca4ba0390 SHA512 d01cd5fa022b3afcb7288fd9b34b1cb3cea4ec5cc927fd69712dccfab5c0cbf3d20098d0ee6cdf8583ea21c0a339d033d1697d278c9484b6727519c62e585d34
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild
new file mode 100644
index 000000000000..f4e79ab01c28
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2-utils meson
+
+MY_PN="ding"
+MY_P="${MY_PN}-${PV}"
+COMMIT="c0c952a76f1da4a33e3830619bbea28d"
+
+DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
+HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
+SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-3.38
+	>=gnome-base/nautilus-3.38
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+extension_uuid="ding@rastersoft.com"
+
+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-pop-shell/Manifest b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
new file mode 100644
index 000000000000..f1badc98daa7
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz 1018667 BLAKE2B d09becddcab7f24b8efcdb8a6c3b9a121de1654d54c792865e28a08412feeb58d3bbd7698811b840eb7873d3ca7854469f96d1b43bc806b2b3e680b2493beffe SHA512 72cb8a71560d97c92a44d988e8eb0293012565d4eea7b49d6d83be6b844f182db22c7c9d41e68ea3fd272ef7f8b88d97afbce3f867e899e162032507be082a40
+EBUILD gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild 1366 BLAKE2B 3a693d9bbe2bc3898950a695d19d5fe5a3d4f520f91d559cf1cfb5613bd529f774f169eaf2383a9bc37a5387928dd7345daca1bb52a91006825d8a21961139ca SHA512 d5898912558ca91df564886faba346e27ac76e99a19292516906d1991f3b70fd5de50978561f5f8b07472866599c1fe779ba8e463deb825f1dfa6b5b36d1d27d
+MISC metadata.xml 352 BLAKE2B f4da02dd27aea654c318c70d46b78655eb52554425b3a5ce137228860514177376419deac645ab945e5ea98fb386e8619e1dc29f801f3c0667e413763d58e5f6 SHA512 187cfbf61182c405799d32555c76759b25168f3806e2b0b48ab497b879f99fce89cd6cb988bb22c263a8ab551eba42ba57535371c7006c3ee05b2fdbe55818eb
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
new file mode 100644
index 000000000000..3a9c7f3ff47a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils optfeature
+
+EGIT_COMMIT="f7cbe060e8d293bfe3b0b759032a85773b542645"
+
+DESCRIPTION="Keyboard-driven layer for GNOME Shell with tiling support"
+HOMEPAGE="https://github.com/pop-os/shell"
+SRC_URI="https://github.com/pop-os/shell/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40.1
+"
+
+DEPEND=""
+BDEPEND="dev-lang/typescript"
+
+S="${WORKDIR}/shell-${EGIT_COMMIT}"
+
+src_install() {
+	default
+
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/org.gnome.shell.extensions.pop-shell.gschema.xml
+
+	exeinto /usr/lib/pop-shell/scripts
+	doexe scripts/configure.sh
+
+	insinto /usr/share/gnome-control-center/keybindings
+	doins keybindings/*.xml
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+
+	echo
+	einfo "To configure keybindings run /usr/lib/pop-shell/scripts/configure.sh"
+	echo
+
+	optfeature gnome-extra/gnome-shell-extensions "better tiling via native-window-placement"
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
new file mode 100644
index 000000000000..89f0ba8679cb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">pop-os/shell</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 1ee198a3e64e..57a01dc3eb1e 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-extensions-40.1.tar.xz 218084 BLAKE2B 0f54dc53ce279af424658d540961bda698c4d6c2968bf778e626a91c7da47b8f56bd4b1dd874956dce9fbb0d1719bd64b8cf8883788d625049aa14dcc02ff313 SHA512 e537312c0790b6e54b3eebb0df189f65f093e81ec7cf1cde886df747188765775fc4616e98bff0157b543bac26c51a5c7006f1505f4554fea00972f790e781f1
+DIST gnome-shell-extensions-40.2.tar.xz 218032 BLAKE2B f4b8daf2fcd62eaef0ad0960c930fc9368bd426b867a31351b39a2a628dfe9c0631419a5f067b4ac1eb03d2df931ba3a8ea99d4e72043459463b86eb00f6787b SHA512 f02a02a8410e77e8c8b0a764bb7949727974e9a4c0125ac2b6e68c1b20b663ef2de82ddaaed882dd5ffb3a6fd9898b372b6201d53da33f11677c32e82272d2aa
 EBUILD gnome-shell-extensions-40.1.ebuild 1747 BLAKE2B dea69b28f618b887447800e85a3f06b775fe0b73842ab6c258c5f7df4a5f6a66b47b2338380a583bc3559e6e8ecc1fb7000a617609361b06d958770b6362f6bd SHA512 e4ea0fa97656ab0150d7895ea9c258d0ff4c26634abbf92c00f13298550b75619e215139992c495dd53d01da74a5328dbfe8cf01d478e9af54d5393e84e6ab69
+EBUILD gnome-shell-extensions-40.2.ebuild 1749 BLAKE2B b390d4f85164e8329c4f1693747df7ec0e0fb052dfc594e37332019f139f952a82ea7024e7004568ddf9821c1f8ea9ff9c604e024255c93c77ba1b37f5524924 SHA512 e5539db5696a3caf24a980eaf1141a402f2e19d45ab186e47e45083ee195c135779c072de3f4ed0f0165f5b732e330c20e138ae98b67dd9fc20cd2fc23765662
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild
new file mode 100644
index 000000000000..f5bc021adcaa
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the https://extensions.gnome.org/ web interface, the
+gnome-extra/gnome-tweaks GUI, or modify the org.gnome.shell
+enabled-extensions gsettings key from the command line or a script."
+
+src_configure() {
+	meson_src_configure \
+		-Dextension_set=all \
+		-Dclassic_mode=true
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 9d18cc67c013..76fffa53246b 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,9 +1,3 @@
-DIST gnome-software-3.34.2.tar.xz 5945736 BLAKE2B 89e7e0a606a832aedbfa32024f201e71b3edb3c8df527efea1be72236b4bfb86901f3af689b10bf706f9c4f16e6badc00080a1244ce30eb09dfd1dad5833e8cf SHA512 4deb09530fbeeadd54e69d03ef4cecaef47c6766bce0ec5230bb090d27e54664577a227416933b6ec4780249f4565e51202a25517fba5dd040fd895bd3a26397
-DIST gnome-software-3.36.1.tar.xz 8277796 BLAKE2B bf3d5f3f67b211cfd4af87ae500691085ab83aed9f85e211972d408a1bfa5d7c6de162acc2088bf9ba9323369e73dba27a06b2491745ef2ceb04943e4acbf72d SHA512 7d0e8c16192bbbc8f166db137dbd2e6ff9e85f7d3d37f63f41211ba3838e392bd87a8d9bf09d31b43f6d21e1a099ecdeff9114ae27fae40d563671f0bcbe50d4
-DIST gnome-software-40.0.tar.xz 3087252 BLAKE2B 4b834113c0770a3acfbcf21b5db3d6da57a885e6b235c3328947f218f28daf70c6f636253283dd77d0c4a1fc59f8ac66a140412694a61352147c13c27e7a76af SHA512 052c520ab25af4257bb978aaa9e1c7a555f8d24dbd782d9f12f3c3def22e65588d3c76d16e4b3dc26f034a762c2ee3e773026b158d468e9e169369dc3d156a2a
-DIST gnome-software-40.1.tar.xz 3093832 BLAKE2B 0da79bd28f8db55816543490518dce880878a7619d05d789d4ab1795728025e9eb5ec4ad330018bfae036d3cc79b712178bea9e219b357bb231ee898eb0e1744 SHA512 ae805d01896d761dd82a21dedbfafba7e8ffd2d98e99da4548d846aafdf07f9a26dfa2e083ac2dda576f8b1db05bb3f26642d3a6558da86921450049870767fe
-EBUILD gnome-software-3.34.2.ebuild 2575 BLAKE2B a3f3577b57b71d05e902ab9b9ef9fc036abe6af0c77508fd04f8b918be16a0d9fd0aeb6d050202cf97f30d01ba52dbf42d430d37760b714bff81276bca52e155 SHA512 cc26a7d5fdde91d32e878cceb9d04811809dcee768519a271d0b950fd6806c2f10c501a403c78b8ca6e1b5e4013978ceb18d63ad74894866e4a3d546ddcbef6e
-EBUILD gnome-software-3.36.1.ebuild 2839 BLAKE2B d98fbd6f2300d6fb96c26b0f2dd06abed0610d982136ac571d245ff1560d3e306f638ef015d5bbe190ce696f1e815ed6108c05a2daba6358c0a137ce78d5b8da SHA512 ab945043f956b40f1131b96a4adb6942b5383086ac81cf37171950de5e81e27d5b409b00e07cf116d9d4578a46484d7ea2be2b486cbb4c248a7373e368c0029f
-EBUILD gnome-software-40.0.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
-EBUILD gnome-software-40.1.ebuild 2934 BLAKE2B 81514c43f2dbce4137c71089ca76d7557b023091f402636d929e7b729d593f5458180a0fa314d91dd1ba607adcaf5e1866f680aa3f017d7d281ec964ac357816 SHA512 ea3da637de40af1487c8fa561e1b7c38f0565f78e5df91211c127e9f776ca399546a8b22fa7e15c9c6d02b67dbeede720e06a58b912784d8718314218d400f11
+DIST gnome-software-40.2.tar.xz 3093012 BLAKE2B 0d51e7e752b9399f79c2fc16ea12b99bb58a486fe050e38a8fd606a2afd9db32d67d14b4ed50d21da163238b30fac20f93f8947b165d8ae611c27057dd572d34 SHA512 ded29be4c59130a4016d43d3e18a67c8cf3fec4761a7a57c067bf075a6f1da5b7726000172e2303ba129b3b5cb8bd22ebfad8fbf0e3248285a4864350f3a1679
+EBUILD gnome-software-40.2-r1.ebuild 2934 BLAKE2B 3d551cb5032801a734b265f9f3f295e21429d5f2f5c22681a599471288ed0d83c22dbaeec6ff9726b16db2c32475078904c5358cc3b0517df05aa9c8475391ea SHA512 8773115d02f5009d92f3cd07beadbc7184e885c114a640008576be74d5507301ae942d4ec0b73b94d83d241dbc47d82f2945e2fa275c87af8ada0acdc8acee79
 MISC metadata.xml 657 BLAKE2B 964e35ceecdb7cb6299ca103520f1c0b67859bbc2a020994f5b9a58d9b48c0457787fc3b73d756074d36b33aa445f266cfc7ce953959378da020c2000c581575 SHA512 436225bf3076aa82432b72103209ad101824d20d3e37be6225a627c15e1cd1e52697b91c77021f83e4009d06e057e8e97dfc05860122764a82e59b356c282bc1
diff --git a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
deleted file mode 100644
index 1aee954135f9..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.34.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Investigate purpose, in relation to shell_extensions too (is it ok to be same USE?)
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Drpm_ostree=false
-		$(meson_use gnome shell_extensions) # Maybe gnome-shell USE?
-		-Dodrs=false
-		-Dwebapps=true
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Dmogwai=false #TODO?
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild b/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
deleted file mode 100644
index 1f902741dd20..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.36.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+firmware gnome gtk-doc packagekit spell udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-glib-0.7.14:0
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	gnome? ( >=gnome-base/gnome-desktop-3.18.0:3= )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_use gnome gnome_desktop) # Honoring of GNOME date format settings. TODO: Really may need gsettings-desktop-schemas, not gnome-desktop - https://gitlab.gnome.org/GNOME/gnome-software/-/issues/945
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		-Dflatpak=false
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=false
-		$(meson_use udev gudev)
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-40.0.ebuild b/gnome-extra/gnome-software/gnome-software-40.0.ebuild
deleted file mode 100644
index c81ec02d2b52..000000000000
--- a/gnome-extra/gnome-software/gnome-software-40.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flatpak +firmware gnome gtk-doc packagekit spell sysprof udev"
-RESTRICT="test" # writes to and deletes files in /var/tmp/self-test/
-
-RDEPEND="
-	>=dev-libs/appstream-0.14.0:0=
-	>=x11-libs/gdk-pixbuf-2.32.0:2
-	>=dev-libs/libxmlb-0.1.7:=
-	net-libs/gnome-online-accounts:=
-	>=x11-libs/gtk+-3.22.4:3
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/json-glib-1.2.0
-	>=net-libs/libsoup-2.52.0:2.4
-	>=gui-libs/libhandy-1.0.2:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
-	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
-	spell? ( app-text/gspell:= )
-	sys-auth/polkit
-	packagekit? ( >=app-admin/packagekit-base-1.1.0 )
-	firmware? ( >=sys-apps/fwupd-1.0.3 )
-	flatpak? (
-		>=sys-apps/flatpak-1.0.4
-		dev-util/ostree
-	)
-	udev? ( dev-libs/libgudev )
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.3 )
-"
-# test? ( dev-util/valgrind )
-
-src_prepare() {
-	xdg_src_prepare
-	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
-	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
-	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
-	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
-	# TODO: Investigate; seems to work outside ebuild .. test/emerge
-	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dtests=false #$(meson_use test tests)
-		$(meson_use spell gspell)
-		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
-		-Dman=true
-		$(meson_use packagekit)
-		# -Dpackagekit_autoremove
-		-Dpolkit=true
-		-Deos_updater=false # Endless OS updater
-		$(meson_use firmware fwupd)
-		$(meson_use flatpak)
-		-Dmalcontent=false
-		-Drpm_ostree=false
-		-Dodrs=false
-		$(meson_use udev gudev)
-		-Dapt=false
-		-Dsnap=false
-		-Dexternal_appstream=false
-		-Dvalgrind=false
-		$(meson_use gtk-doc gtk_doc)
-		-Dhardcoded_popular=true
-		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
-		-Dmogwai=false #TODO?
-		$(meson_feature sysprof)
-	)
-	meson_src_configure
-}
-
-#src_test() {
-#	virtx meson_src_test
-#}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-software/gnome-software-40.1.ebuild b/gnome-extra/gnome-software/gnome-software-40.2-r1.ebuild
index c81ec02d2b52..b3b1497a808e 100644
--- a/gnome-extra/gnome-software/gnome-software-40.1.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-40.2-r1.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	>=dev-libs/json-glib-1.2.0
 	>=net-libs/libsoup-2.52.0:2.4
 	>=gui-libs/libhandy-1.0.2:1=
-	sysprof? ( >=dev-util/sysprof-capture-3.38.1:4 )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
 	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
 	spell? ( app-text/gspell:= )
 	sys-auth/polkit
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index e68e364acad5..18dec2c6c788 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
-EBUILD gnome-tweaks-40.0.ebuild 1227 BLAKE2B 50ce2441e4bd9f6726a398dfbe153119981bc8705a913ebedb98613d13457d867de3d2b6e8fe9483093f1a5553a8c374f1b20a2b4225cacd8e5360f19fbff58b SHA512 57496151b37405d1e8ebccb5914da0867e7d17a12831d82a6c30ea41cd44e9707bea99b9e0f082fdb7d01d9bcba0e8cbf5d7c807f30aad494d44f50d05c9305b
+EBUILD gnome-tweaks-40.0.ebuild 1225 BLAKE2B 4842c9f44b092ba7b1ccf0618f05d824ee592e7a0eb55464cc3b250002e981a70e12c34e63ae1d52ac7fcb42e1b88ac24227c0414e9a1abe6ec33bc5fdade516 SHA512 b06d921525ce418d2917cd5a03110df4bced4ab86753a1bab0cbe6803b6fdb32747e4157cddcbc1686d7cfcb65146cdbf4cd3c4017fdd88d41289da6df353548
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
index 4595dba16af3..fc0744aeb705 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}
 	net-libs/libsoup:2.4[introspection]
 	x11-libs/libnotify[introspection]
 
-	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	>=gnome-base/gsettings-desktop-schemas-40.0
 	>=gnome-base/gnome-shell-3.24
 	x11-wm/mutter
 "
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index fd1120917025..ce6e65c6df3b 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-weather-40.0.tar.xz 938732 BLAKE2B bc46da61e9620278f5abc7964b869520da85837739923618b2ade114c8561fc6125e7dca2f2aef5715fec7dfa0561c693f75278d050900cb948f8d1ea42f58ba SHA512 c4560c1a1535a0c2889c8cd934926217a7caceb1b646fa4bb961c7cbde38b9b545a567f24fb81e47c61a2ac3e456a5432e8979591eb5a169fe5849bbd99d6333
-EBUILD gnome-weather-40.0.ebuild 1364 BLAKE2B efab2f425bca519fee370586a78e3b743eb849f210f52365cf2b7f4f1ff2435ef8a8309e022c64b535f753d9f12f0cf2f83fc4ce042257a5219c56770578d68d SHA512 6074f6b1fc33b676b57a75a9bf09a2d8832ffc4afe812a66355f0c6b582abdbf7f4b4b68691ec93036d9a006a69b97c14d6eb7f5fe0fc9274ba9a5759e0529cc
+EBUILD gnome-weather-40.0.ebuild 1371 BLAKE2B e602d5fd95238b9a88deaf4ce43e3f9de71c76042dce1e6345970549e0de1b68565d96dc637090253e1f83794b65778d30599306d273c5d4e3c2526092e0d306 SHA512 9777853eca87d926a23c0456b04e36e6b264cb4879a999520ebd1076e839a88532011cc2a8b1a2870b503f7014f20c2f8fb955d63e0a7a328f05edd11dfc7e85
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
index 72bdad82ee27..0302c9bd140a 100644
--- a/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-40.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 000ffee9168a..7f030e2f8dfc 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,6 +1,8 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-13.0.7.tar.gz 1919890 BLAKE2B c90b09f2e52b27ea652a32c4a502a57767eb4f4cf5895a61f3a871f1f5fb81c27083938fc9394d2a74881bfd4c23fdf2cdbce2dc07a55cd3a7d9422e6da40ff9 SHA512 9ed3cea9560cfb53af61863b0811a4d62c347e404880154acd47c5e4148d5b5cf3c31a4ad3b8440081e0bc7b33666c6b0fed35c26f8ee9c0a1746d9ed61b19ca
+DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-13.0.7.ebuild 1496 BLAKE2B 12ea9277f7a0f28f9ceeb1faccf80f65c70fca1bd1896b254d5060d179c8ac11a0e636e2ba9bf19bf28d8089db4c40abb05e06c910ad6158514d982d9d678f4a SHA512 3d6269ed657e97cdc9828980911f295940b9381e19ce8cdc0e5cb764dcdfd7b5f76fad844a40ab7026566445a41683f0ab0ee9f3d8d5646315bfae2e09ada179
+EBUILD gucharmap-13.0.7.ebuild 1506 BLAKE2B eceabffc13dd3bf5c5fc3e0b0fec03de5a469a97a79143a5c8de9fd87ee2923b173c73b33bee6e575c4f23ca7f2dde1c430edd02e0b64821a25c821b033acaa2 SHA512 58561877f38ca9d8b66a599cce704e04e04b698f42440266bb52c9c98bbc4da83b2b0e0f855a513cac41c547f71913b3a1d0314b63789a936ae5cbbc25373f34
+EBUILD gucharmap-13.0.8.ebuild 1513 BLAKE2B 0d3d0d81df0c85716f668054639151ca42fc9630751e91615573d74e6eef76353ef3db3da747784f19935461696a3aba02ffdea6249bc6cf2a5884e1cfca4840 SHA512 13f11f8c50781b6043b80e2dc2058e9af45319d832aa71811ef7aa3074bab27647febe44eff2981fd6257b03de0b0ab8c52ea3888e46b35cfbab036c8b9a03fd
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
index 793250c94685..c5ddaa9831f1 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.7.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	gtk-doc? ( >=dev-util/gtk-doc-1 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	$(vala_depend)"
+	vala? ( $(vala_depend) )"
 
 DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
new file mode 100644
index 000000000000..8f491c6b3bff
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
+SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+UNICODE_VERSION="13.0"
+
+IUSE="debug +introspection gtk-doc vala"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	vala? ( $(vala_depend) )"
+
+DEPEND="=app-i18n/unicode-data-${UNICODE_VERSION}*
+	>=dev-libs/glib-2.32:2
+	media-libs/freetype:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/pango-1.42.4-r2[introspection?]"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ducd_path="${EPREFIX}/usr/share/unicode-data"
+		$(meson_use debug dbg)
+		$(meson_use gtk-doc docs)
+		$(meson_use introspection gir)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
new file mode 100644
index 000000000000..e5dcdec2a218
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -0,0 +1,3 @@
+DIST nemo-extensions-5.0.0.tar.gz 533061 BLAKE2B 4ff38064eb839cc13fd1a3610c3a8fda3e79447fc1e7355ba4fa7e13747b45a65ac9e572e02e4c5f4230f3bc089aa98339ef3bb4308a1fe145efede07cfaf587 SHA512 bd52404831960de820b4232b3a01c618e35e9be23dc2877f6c0e9462e377e2e72b5a0e61010f8767548cb6c8f2bbb3b555944f84741678720fb5ee1ae17202f7
+EBUILD nemo-fileroller-5.0.0.ebuild 583 BLAKE2B 1fe17adbdd20bc85cba10ec85fffc6b4bcce2e3919f84207e36f06606bddb54bb4b32a373fa294e8ed4b255f3ce1bbff268e3b9c0119bee1933c9afa5946c9ac SHA512 59326255267514e761438792ab83ccc6ab2fa0f610c950022d49c83cddcdea517ad8ae757de50d3471ecba7e8c3dd61b84ba7099bf801f90b569d6978f8212b4
+MISC metadata.xml 494 BLAKE2B c443c19a81f43a587e71eedce5c4d93b2a456f1ad4456b705f0755fce6180f63ff7e481a73c48468a446d425085c864f59a4fa2d8b4e8c368f368432693f8ba0 SHA512 596634a2a633ee6a2ad503421abd959205dad68505b286f9c7fd9972941f9a342fd67bc35fcbad0ce1b878b5e9b920569c70d5480c544cb33d5ce52b5edfd0cf
diff --git a/gnome-extra/nemo-fileroller/metadata.xml b/gnome-extra/nemo-fileroller/metadata.xml
new file mode 100644
index 000000000000..4d7038feccd1
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>sparky@bluefang-logic.com</email>
+		<name>Matthew Turnbull</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linuxmint/nemo-extensions</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild
new file mode 100644
index 000000000000..7688c682faf5
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-5.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Nemo file-roller integration"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ 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 ~arm64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.14.0
+	>=gnome-extra/nemo-2.0.0
+"
+RDEPEND="
+	${DEPEND}
+	app-arch/file-roller
+"
+
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 50783ea50c57..fbd7c33a194e 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +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-r1.ebuild 1876 BLAKE2B 6e1cb898eb3ebf18dd6d11c11bad78c14f9a961835f2e50195d68aa28b911e8be1ec54769c0b40a056b9520221da11532a7a997b691401bd128a054174223e6b SHA512 f8d3c32fb7a313689475e8b3c3af42c5101a3f9c137d4e5cd84cb3ce29f9e2cb66cd7e48871062aa44bf0c697ccad2d2a1d148270d799cdc041dfd96abca8146
-EBUILD nemo-4.8.4-r1.ebuild 2145 BLAKE2B 9c1d239c87658d0c6ef500471932700e7f66b58522359c147e6ca503adcf3cb25551581d84b38913ab44f8f2d42993efd284b22e4fa008f1866616cca5888792 SHA512 849b4f485952df370f3e81cd6a159b0d9dfe433f6e78dc41ebc417716c99743dda29d5c8e5ee52a407f21ecf4a4b3c545911a6440495b75f79ae397499e9e41d
+DIST nemo-5.0.1.tar.gz 1483815 BLAKE2B b846ec184ce1b516071cf11c88630dfbb78fbe8f29259564fd2928b71f951073cfdbd7199837ff9399ca96e211812e6a5921c41c384bf08c647f612b5de30cfb SHA512 79aeec70b7d167a9b418585af5562dfc3e197708510a8acbb20ef028d0738889a369878c4f8d1daf0f392e419494b327176e5048b16c51d39f832696365edb9b
+EBUILD nemo-4.8.4-r1.ebuild 2143 BLAKE2B cb5a7f52f156f396fede37d330153257c3f577fb4f21395d1025e02ec092a8eadd96fb9cb3d1730603f5d0e4490e5a6c81636414cec465b760f0548047b4cf4a SHA512 6ccd7e6d7b9fd97cca59bdb39dced70ac7f38982b58cb1c2818dc67eb099019513f5131f0be0dca8d58784020c94eff580a37d6fbe0bd7ee1d89763d0ba47256
+EBUILD nemo-5.0.1.ebuild 2557 BLAKE2B 7749c3d5ec32e110bb59e1175c7d146476be168eeefbc843ac7d562e0df8ef668c72f7dd3069009009e5ad95af2baa3b7d312414839f92fa658286c43ad994f7 SHA512 c1ec4367e0c347d033b759e28a6aeb491c9dc634476519d77e89292f421972c00aff793d8f07ea36e877c85f6263ab74e3af770035b910056172ec99f4caa71d
 MISC metadata.xml 579 BLAKE2B 14aee20b1ce0a9a689d0f512aa6e5895f768dbdfc4406cb9260f577fb0ab53639203c5b67e1a9a99b172e2dcb552a82e5f8b1364331969660fba2738f42df2f1 SHA512 8d9ba304e86d06573a5c8c2708f3f990a2869efb118f02a6ea4230a7c6e9b1aae99274869af2518010cd63f09e0c1c3380a3d34ad806e8ac3661464742ba5779
diff --git a/gnome-extra/nemo/nemo-4.6.5-r1.ebuild b/gnome-extra/nemo/nemo-4.6.5-r1.ebuild
deleted file mode 100644
index e6404bafd16a..000000000000
--- a/gnome-extra/nemo/nemo-4.6.5-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson gnome2-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc exif +nls selinux tracker xmp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT=test
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=dev-libs/gobject-introspection-0.6.4:=
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	>=x11-libs/xapps-1.8.0
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	tracker? ( >=app-misc/tracker-2.0:0= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
-	$(python_gen_cond_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-"
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	>=dev-util/gdbus-codegen-2.31.0
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-"
-
-src_prepare() {
-	default
-	python_fix_shebang files/usr/share/nemo/actions install-scripts
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use exif)
-		$(meson_use tracker)
-		$(meson_use xmp)
-		$(meson_use selinux)
-		$(meson_use doc gtk_doc)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild b/gnome-extra/nemo/nemo-4.8.4-r1.ebuild
index 5ef3edba9ff7..f3d71f05f38e 100644
--- a/gnome-extra/nemo/nemo-4.8.4-r1.ebuild
+++ b/gnome-extra/nemo/nemo-4.8.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc exif +nls selinux test tracker xmp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-extra/nemo/nemo-5.0.1.ebuild b/gnome-extra/nemo/nemo-5.0.1.ebuild
new file mode 100644
index 000000000000..983777cfd8bd
--- /dev/null
+++ b/gnome-extra/nemo/nemo-5.0.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-single-r1 readme.gentoo-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-5.0:0=
+	gnome-extra/libgsf
+	>=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.2.0
+
+	exif? ( >=media-libs/libexif-0.6.20:= )
+	selinux? ( sys-libs/libselinux )
+	tracker? ( >=app-misc/tracker-2.0: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-5.0 )
+"
+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 )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+FORCE_PRINT_ELOG="yes"
+DOC_CONTENTS="
+${PN} search capabilities can be extended through external
+helpers. Install any of the following packages to make
+their associated file types searchable.
+
+Image metadata     - media-gfx/exif
+MP3 tags           - media-sound/id3
+OpenDocument files - app-text/odt2txt or app-office/unoconv
+PDF                - app-text/poppler[utils]
+PostScript         - app-text/ghostscript-gpl
+"
+
+src_prepare() {
+	default
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
+}
+
+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_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 8a66af3796bd..746743f2302d 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,7 @@
 DIST pch-session-3.38.4.tar.bz2 3610553 BLAKE2B 68585f7e0ebcd04312bf5f7a60de04a9b5b7412fa3b3aee43409c0c10f074c2f3efd95ecf5e2bcea4ccc5765c556ec6ef6a43737be5bb0e2b470994810f87c40 SHA512 42364f44656be8652e1be0beb592068b727660f17ba573fb35836bf39dc225c19783deb4b488ae450143457ac8236601334150665162294285aadfe7cb9758d0
 DIST pch-session-40.0.tar.bz2 3610342 BLAKE2B 9d82fe4b20e136d5ddef020477ab9526bb920b7e67e3a357ac24c6fba5d83aa8e1735a9c581a156496f7013ce12c6e6c91f7a5b7e3e446503e81ad96070fc884 SHA512 32bb9ebb3127b47482150d11c1e8bb865e2fe34e39767670f07d03965044842526e4194f3130743c8f79a5658dccf858c922f88d1316ea4d065878090a77f128
+DIST pch-session-40.1.tar.bz2 3610463 BLAKE2B 2a2b2beea3643b8f8333484a5d40045d9ecfba9cc2e046cd653da3492a3376b2047c1114e4402ab12a3273d3ecd936975a77c4519df6e86ac9d71e80c0516d44 SHA512 6ead5836109a40defc0608e897d87ea49f2a4b207f4ab13196526df0b7d9b400064067494e320db352bcbe1b7b497f5ec1cf7fcff536e16ec67ada6a674df48d
 EBUILD pch-session-3.38.4.ebuild 1283 BLAKE2B 3e7bd310206f47130864e736d6165d265382af550f6222fa4b4a02e19de5bd7315693a89f876363310bf65e84548df9658636fc035f5802a79a0122254e98725 SHA512 c5861379df9b4d304dc8382ec66d1b8fabe65508db6f94c61e50e5124fcfa6ad97d5bc8178257268b7f6309c3cb3c956f850e787b284d623bc753e27c32acc91
 EBUILD pch-session-40.0.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
+EBUILD pch-session-40.1.ebuild 1240 BLAKE2B 217da8a6f2facb526c52b9b80a8c0724378bbc39f393eb7f57d589b2774ba5bb804030eea38bcefc23d66688c853ca2d89fdea32572f5311ed2d6cab0303c619 SHA512 a6a0ab7991a801f88c2dbe3a10a09df2ffff1b92a0bef2fba9c7f284d577b1bc2142356f4b409a90a6301bdb68c7823fc59646b7955d90fbe06c3e6f3de0e7fc
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/pch-session/pch-session-40.1.ebuild b/gnome-extra/pch-session/pch-session-40.1.ebuild
new file mode 100644
index 000000000000..ad94e877bdb7
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-40.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 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-40
+	>=gnome-extra/gnome-shell-extensions-40
+	>=gnome-extra/gnome-shell-extension-appindicator-37
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-12
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-32
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-43_pre20210510
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-0.17.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-46
+	>=gnome-extra/gnome-tweaks-40.0
+"
+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/sushi/Manifest b/gnome-extra/sushi/Manifest
index 98e961c4b804..593a95829233 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,3 +1,5 @@
 DIST sushi-3.38.0.tar.xz 76500 BLAKE2B 6d4fb4d80fdec2e96d5cf91bfe6f0d859154e45f6bcd4677eae0e4c8bdcb20380e1cabcc6621e0bcdcc590a668798775bdb464b22298fe954c3d290d202c36c7 SHA512 c8d0dd7d9cf9d28496c6c4ac5f327bcf605994f189c476fe891d42c0c225d0368311baf06d7d6092805f729908491590bf719a9822513f96e2afe17e8ab962bd
+DIST sushi-3.38.1.tar.xz 79384 BLAKE2B 7306d375f85cc491fa8819e6857b1d61d158149045069002ed7a9c0f08c021ce0e9ed5ee751404a507dfdffdfa99895288f9c9601001818b4d1bc987f94bd823 SHA512 b999e6892314875725bd4029163ae58813b46f0e5c59e58b62fc4491d611b48fc39459f6c5b5e1a7d75d792cfeb66681f4d3a7057e8cde8f5c3364a2312e0be7
 EBUILD sushi-3.38.0.ebuild 1317 BLAKE2B 51fd57444270d1f6b3399c463b0dabded9d65d987f03fbf5f99c5928dd150882b59e3b2d181d9c4a413bd16dfa0cf648122fd7fb10336d46e9704427ec904415 SHA512 c78410c074abdb857b3aa5850fee943e123677b0ad52d4d85e12fcb88b6ddb59e63632a56d8d59cb577f76ebdc15917850208e805c2defe540928712c57b56a5
+EBUILD sushi-3.38.1.ebuild 1319 BLAKE2B 9d5e227dc819172e1716d4f2c2371131581fa44c62f630496700e8917f5f56e83df2aedb1dea2925bcfdea9b07c5d2dad58b1b5f4909b799d4e4b72ccc5e5ac7 SHA512 a92e2ab5d6dc273b3a91ac4fabf14180fcc8772419c5ebfe7ae27441204211e7ab64c9f732fb35101e15d4815219848e56b0f9ccf26fa2142736ebef93653897
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.38.1.ebuild b/gnome-extra/sushi/sushi-3.38.1.ebuild
new file mode 100644
index 000000000000..16d80f3ec463
--- /dev/null
+++ b/gnome-extra/sushi/sushi-3.38.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86"
+IUSE="office wayland +X"
+REQUIRED_USE="|| ( wayland X )"
+
+# Optional app-office/libreoffice support (OOo to pdf and then preview)
+DEPEND="
+	media-libs/libepoxy
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
+	>=dev-libs/glib-2.29.14:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?]
+	>=x11-libs/gtksourceview-4.0.3:4[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/gobject-introspection-1.54:=
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+	>=dev-libs/gjs-1.40
+"
+RDEPEND="${DEPEND}
+	>=gnome-base/nautilus-3.1.90
+	office? ( app-office/libreoffice )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_feature wayland) \
+		$(meson_feature X X11)
+}
+
+src_compile() {
+	local -x GST_PLUGIN_SYSTEM_PATH_1_0=
+	meson_src_compile
+}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index bd3cd2a5b4f7..3671cef6291e 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
+DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
 EBUILD yelp-xsl-40.0.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
+EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7e4b907e7e42511eb66e10556de94e8f5a86d8fb10204df85685f4714433aed0787c558b92e887c21d6bc54a2e8885e884f73b83f0bed300858688fd9f3ef63 SHA512 362bc0f94b18cd918a69df358281f7eb2a309e6f8a088c87d8d58728cf9f07d59582d9e946c07039be4fcd60878bc17775d4402bdbfa3190165bd5212a710a5e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
new file mode 100644
index 000000000000..fb0b0cda287d
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 0feca2852f24..2130f5232316 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,4 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
+DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
 EBUILD yelp-40.0.ebuild 1214 BLAKE2B e4124caf8f33cd19ef9c0f926909b284618f9239614bfb2e5cd11003698a7db76fae13ba33753838a609c1c8640663fd582e3baffc6bc218b4787211cb604f37 SHA512 74c0a8c23930ff82c0d6d6be556a199f5ac6acd310f8b2832cd631c732433a1b9c83fe44494757741777087ec20f608bd84137160738321f198a3a2f1f44c2e2
+EBUILD yelp-40.2.ebuild 1208 BLAKE2B 4161f42721caf7f10f9f98af2b8f4021c57723b66b9a92f62171c6fbd37be9e98e962210498342f5642f7a9beb6029fbcef7a0f0f113affc2633a0953ae38eea SHA512 749383ebd2412a9adc0bca4e562a2e4c3a678f6a73ad5da823c9b9acbb0b39c1ccf560696f1cdac8f45094f521a76d672ea1679c0524a4bb4ae086e73363d60d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-40.2.ebuild b/gnome-extra/yelp/yelp-40.2.ebuild
new file mode 100644
index 000000000000..ddb5e4d5603f
--- /dev/null
+++ b/gnome-extra/yelp/yelp-40.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-3.27.1
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /gnome-extra
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)