gentoo resync : 22.12.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-12-22 14:08:05 +0000
commit: 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree: b9791a06ab3284e27b568412c59316c66240c682 /gnome-extra
parent: 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)
53 files changed, 768 insertions, 574 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 1f8b40f19c86..aa8e3ac5ecc7 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 2430322b2cff..52d116ea4553 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,13 +1,7 @@
 AUX 3.36.5-gtk-doc-1.32-compat.patch 1016 BLAKE2B 6458aa6e2bb41ce07bf74910ef36aafab895dec6e85c4262c346bbe518165ca2ca7778e3d97182d4f6c619313ed016a186dc88fd349a9bd1770441afb09f6e01 SHA512 3a43ee8128896eccdc35e65155aba5d38a4311cd8d848f506cba3473248595ea078b748c639b9a5f11842272b5e212a01d714a3177e4cd1e95d15680081feaa5
-AUX 3.42.1-fix-build.patch 808 BLAKE2B f6689127a7b6928a0df948c7476ce8d211349fb6ae5de9abf95354bd7202e8139867b2ff86ffd85363c5bf0679ce7a3a93b162049bb0baca62d9cdf21ad03ebb SHA512 97095930a822cd2747b9bf16d3737369b4b718514be053c3c77610e89c6943de8b5d03394405d383f6fd6867c03713bdaf28fd2ade140611758248b822754818
-AUX 3.42.1-fix-calendar-crash.patch 2615 BLAKE2B 7bba08ded9d8378d1e7eba7219a5c0fa66cbed602ea24469eacaa018b1a870b509bed078fa3e742ee23e8358ed012a14f6ca4efe3378d8f51ff62a41623afdef SHA512 e87afe305e555aea9a4ff3cc7453efeb9ce039715cd17c12ab7864e680d7d7b5cb1df38069a58d501f6b4e1f48ea7f74e774f62f1f8797557984283d16cb5602
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.40.3.tar.xz 4625980 BLAKE2B 7b344c1bb279367c9eca136b9f4689f049ba126b9ffd6ba1a1a819c5f86db66bae4082ebab83c8895831e97a4ed4384bb923584146b6081ffbbc24c327d5f3d4 SHA512 ba5db9850d68c23ddc77e53ccb2500f613dcdc5689234b3365edbc97eb6e73c4f15c13df5dee0b2aab1d0af5a22d543c6aeb814c4abfe1dc652b46712c0e2e79
 DIST evolution-data-server-3.40.4.tar.xz 4622640 BLAKE2B 93a4570da53fb34b496cd471e5daff07fa044ed5c230f7de85276ab9aacd0f2e6c6f749a0d63d076fc192e695f68a0c451a7a6573621ff5092cd5ea6a9302ee2 SHA512 664c2d41b6f212e6ddef554767ca651e4179ce861898cb11ed373f30473c2a1a3a47191ae504be7d38beb0e721782564b70f5f519a3184216a02be1bd89678b5
-DIST evolution-data-server-3.42.0.tar.xz 4614616 BLAKE2B 801e1a71c10af4f7c8b2e8478631ed76269170b01bb30dca296da7b151041981e0f45f9a69fe4873f503d0d38b7e6fdf50c6a7006d001af7d16663478a102b6e SHA512 44e4a45ac7779fd5a336aa84b8e23926cc861c1a3d1ca5629a4997a8783415eca1f6bdcef4fa6ed10e5417a64eef31dbe9edbf027954a653f4c22e25c90f16c1
-DIST evolution-data-server-3.42.1.tar.xz 4621996 BLAKE2B d5d163503b34cad06d03eb7711b3de4d2b0101ac7718f41e060efcc8189a0aa3654d435015a6c06f87e922e320c4032d8e1d31280095989f45d38744e92b85df SHA512 8e0673af07b00e1d658b98b811312a57368e634d7a1e11ece6af02794d8e4743cd496dbd4ea9e6a1f1c8b0b55a242296f36342f5827521e903794814bcaacff8
-EBUILD evolution-data-server-3.40.3.ebuild 4237 BLAKE2B 7f3f06fc021957a494ea0667a42df74aa086a1ff6bbd80ca74e0e5b2dd0eb3082581c9a1af99436e4b42b89210ef1b673c4c0ccc243de89ca55b8f546ec11b5c SHA512 d26011bdd56fa5f51254313d820975aaf93c209bd158f3420e71c450f556da0706a0e999c80684ebaed8a32de9096329bd69938335288b43153fcbe535b7dcae
+DIST evolution-data-server-3.42.2.tar.xz 4622324 BLAKE2B e321302c64317773122701a40f9ac418165e6fa98500481b73e05fcb86f71974de1469ade4d0aa42c6e9a0cae73e570a8abc0f70b846de72fa20305d2296273d SHA512 a0329180bac12d9723efd42938335ae46492cdd774358c411e89de3ef34b4d2cdbdb77fb13d8e1ad27a89f9bf64d2f78f3e25e54fbbaa9076dab2d866705de05
 EBUILD evolution-data-server-3.40.4.ebuild 4327 BLAKE2B a48594fcfc6e193d5e31f3f46c2df1afdd2ab9126db45bc05b4f7143c7aeaff306513e18eace0886a00b675fcb8a47afbeeef477384d54223f112f6f51c52b95 SHA512 289672fb429342cc47d7bf61906658fad63a519d7e8c09433f39d558bc7318c2a5feb427504e5b86eb2c937962ce75e5ff5c06214635601706438c67b840a7f6
-EBUILD evolution-data-server-3.42.0.ebuild 4387 BLAKE2B 1f8c25701df8fd5de3a19d62ce7e9c24fd6cb247145c3df9c40f88348f08688c5e060eabcd20780e653b1322eaddfb59ccb162dc47c9e6a79d445af4d6d3987c SHA512 4440e08b1614e8408f1aaa99299feeb44ec3eda9ee0acdbec963fa9ac7270d5c705637bd4d0412a8b727fffabeb1d1db35d73732df6a0d3dd8fb06f8a6f6a36b
-EBUILD evolution-data-server-3.42.1.ebuild 4509 BLAKE2B 600eccb62fff87e7299c02b5b19fe12ef3f885a51d62a5caa12e0f1c22c4ccf63cbfb728a8233212cd88b2d0d1087427f187f09a666430bbeb1463a9487bc0b4 SHA512 9849157fdd9a82870b3cb489f545edf0559a0675f330c598b6ffa77fe4d6a576e5d78f363d54ec1e91e88dfb4c1f57fa9e617ec74532ad0a60f62cd9f269d867
+EBUILD evolution-data-server-3.42.2.ebuild 4387 BLAKE2B 1f8c25701df8fd5de3a19d62ce7e9c24fd6cb247145c3df9c40f88348f08688c5e060eabcd20780e653b1322eaddfb59ccb162dc47c9e6a79d445af4d6d3987c SHA512 4440e08b1614e8408f1aaa99299feeb44ec3eda9ee0acdbec963fa9ac7270d5c705637bd4d0412a8b727fffabeb1d1db35d73732df6a0d3dd8fb06f8a6f6a36b
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
deleted file mode 100644
index 5219b100f94f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.40.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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-data-server/evolution-data-server-3.42.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
deleted file mode 100644
index d13cfee8d20c..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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/63-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 ~riscv ~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
-# glib-2.70 for build-time optional GPowerProfileMonitor
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.70: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]
-		oauth? ( dev-libs/libgdata[vala] )
-		gnome-online-accounts? ( dev-libs/libgdata[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
-	# From gnome-41 branch:
-	eapply "${FILESDIR}"/${PV}-fix-build.patch
-	eapply "${FILESDIR}"/${PV}-fix-calendar-crash.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-data-server/evolution-data-server-3.42.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
index 42b2525574f3..42b2525574f3 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
deleted file mode 100644
index a0fde022765b..000000000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c802adfdc5e16f3fc210e8e83bb3b972cd8fdc86 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 1 Nov 2021 16:10:13 +0100
-Subject: [PATCH 1/2] I#364 - Camel: Add a missing header include into
- camel-hostname-utils.c
-
-Change suggested by Rainer Herzog.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/364
----
- src/camel/camel-hostname-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/camel/camel-hostname-utils.c b/src/camel/camel-hostname-utils.c
-index 723c81d14..8d8d179e6 100644
---- a/src/camel/camel-hostname-utils.c
-+++ b/src/camel/camel-hostname-utils.c
-@@ -24,6 +24,7 @@
- 
- #include <unicode/uchar.h>
- #include <unicode/uscript.h>
-+#include <unicode/ustring.h>
- 
- #include "camel-string-utils.h"
- #include "camel-hostname-utils.h"
--- 
-2.32.0
-
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
deleted file mode 100644
index 011e8bd0b99a..000000000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7cbcdd3974abf7135617b1e9a230b4a9f5d829c6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 4 Nov 2021 17:00:20 +0100
-Subject: [PATCH 2/2] I#365 - Calendar: Crash on local calandar file change
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/365
----
- src/calendar/backends/file/e-cal-backend-file.c | 1 +
- src/calendar/backends/http/e-cal-backend-http.c | 7 ++++++-
- src/calendar/libecal/e-cal-component.c          | 2 ++
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index f40bf807c..79ae53632 100644
---- a/src/calendar/backends/file/e-cal-backend-file.c
-+++ b/src/calendar/backends/file/e-cal-backend-file.c
-@@ -904,6 +904,7 @@ scan_vcalendar (ECalBackendFile *cbfile)
- 			if (e_cal_component_set_icalcomponent (comp, icomp)) {
- 				/* Thus it's not freed while being used in the 'comp' */
- 				g_object_ref (icomp);
-+				i_cal_object_set_owner (I_CAL_OBJECT (icomp), G_OBJECT (priv->vcalendar));
- 
- 				check_dup_uid (cbfile, comp);
- 
-diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
-index a7e930ca0..bfe9b4554 100644
---- a/src/calendar/backends/http/e-cal-backend-http.c
-+++ b/src/calendar/backends/http/e-cal-backend-http.c
-@@ -477,13 +477,18 @@ ecb_http_get_changes_sync (ECalMetaBackend *meta_backend,
- 	} else {
- 		iter = i_cal_component_begin_component (maincomp, I_CAL_VCALENDAR_COMPONENT);
- 		subcomp = i_cal_comp_iter_deref (iter);
-+		if (subcomp)
-+			i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (maincomp));
- 	}
- 
- 	while (subcomp && success) {
- 		ICalComponent *next_subcomp = NULL;
- 
--		if (iter)
-+		if (iter) {
- 			next_subcomp = i_cal_comp_iter_next (iter);
-+			if (next_subcomp)
-+				i_cal_object_set_owner (I_CAL_OBJECT (next_subcomp), G_OBJECT (maincomp));
-+		}
- 
- 		if (i_cal_component_isa (subcomp) == I_CAL_VCALENDAR_COMPONENT) {
- 			success = e_cal_meta_backend_gather_timezones_sync (meta_backend, subcomp, TRUE, cancellable, error);
-diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
-index a3dddcc8f..c7629813a 100644
---- a/src/calendar/libecal/e-cal-component.c
-+++ b/src/calendar/libecal/e-cal-component.c
-@@ -95,6 +95,8 @@ foreach_subcomponent (ICalComponent *icalcomp,
- 	while (subcomp) {
- 		ICalComponent *next_subcomp;
- 
-+		i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (icalcomp));
-+
- 		next_subcomp = i_cal_comp_iter_next (iter);
- 
- 		if (!func (icalcomp, subcomp, user_data)) {
--- 
-2.32.0
-
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 58193fcd7493..a25b9d43cb29 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-calculator-40.1.tar.xz 1023164 BLAKE2B 977fc227adaa50efa271776035a11ca79166a703c9c8d618c13af477056622a9faa42c3a8876257a117486399e91fceec7a19b930293883078846a645db912fe SHA512 f46acc802ef130ec59e4376a02032ab683e6d166d691d7c5f626e2a978f017f171c0e8ad50991d1828cb325b1bd53f63ef256b9b24860842224fa3dd7e27f4da
-EBUILD gnome-calculator-40.1.ebuild 1695 BLAKE2B 4651ddd557d0734e9a686a1a97dda467528759d0b84a5d710af5e8adaf635d147079a407b45e568ed1a9782737a1dd5817ee6175174c120b9edb5645de8e1e2d SHA512 c8cab7eb96c9ff2ca8f7a08941c8cf92d0635d84c1bf4c5642b02deb43d43df77aa700ab9145cdbb22dd490cd9cc05ad89769516a5a0750d551ad027d20e598d
+DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
+EBUILD gnome-calculator-40.1.ebuild 1722 BLAKE2B 885739e6bcee098222db8154ccf7ac20ca0f43ca1885fe3b1a61f98fa66184cb704f437859ef59960124296cd853f6e5f1f9f68ed9dc4652ec124403fa2cf310 SHA512 b54c2c17f73e221dc60b31adc9aaa60cd1ad4e311bfe4ba6ec4c2887e857eed3f78f122fc39dd33df70cb353cbe551b8fe91394121636af0dcbd92a79dfedcf2
+EBUILD gnome-calculator-41.1.ebuild 1724 BLAKE2B c7de0274e014a1f17d4085717b1bfcd40723d707512a8611347e489888028c0dbcff9e86211feb610ca1e2d22f8a8041c23e35651afc66a8315be64cabd69741 SHA512 b0fda6bffbd15a99d505bcb3120a0e9890c3d6e5b646310066f9bfde05e8cf0e8cd49b58440ef8a7b85509a8522cf18d71af0f55901d2b168c3c518e08e73c17
 MISC metadata.xml 436 BLAKE2B 32bdac72c16828ca6ef52e23f380603787e6f08829abe8576cc7475cc48fa3e2612d39891e7ece1a1cce1eb4b7e45ca53af8e058de5d68cbc1a9ea4e2c62f133 SHA512 04f0795da8fbdcd87eb4a77a70934bec3c7be51876248782b90fb94c0831ae2ba30e619bcbd078196fcca6164225752a84361964e91f2b74a10a22e75d3fd902
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
index d5f2f822d161..b195c51ffa50 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-40.1.ebuild
@@ -39,6 +39,7 @@ BDEPEND="
 	$(vala_depend)
 	net-libs/libsoup:2.4[vala]
 	x11-libs/gtksourceview:4[vala]
+	gui-libs/libhandy:1[vala]
 "
 
 src_prepare() {
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
new file mode 100644
index 000000000000..037952ba22f8
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=x11-libs/gtk+-3.24.1:3
+	>=gui-libs/libhandy-1.0.0:1=
+	>=x11-libs/gtksourceview-4.0.2:4
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	x11-libs/gtksourceview:4[vala]
+	gui-libs/libhandy:1[vala]
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+	# Automagic dep on valadoc - don't bother for now
+	sed -e '/subdir.*doc/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+	)
+	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-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index e7f06401d9fc..6b57b1741660 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
 DIST gnome-calendar-41.0.tar.xz 576612 BLAKE2B b9544e9402edb25fae5b0598621116ac6c3215b2092675ef48b1b686cceebc43422a54b963ad6639b104833e6c07b58e57d86c5c514b7c025da0374d915a13ac SHA512 ba57af23f967a0900fd64399d9358c2dd131be86120e01d68cd4eee436e8a0bac6f4a3b154ffcfbb2d307ae632cfed7de29f79f843e4692cc1a81a82dadc5e4a
 DIST gnome-calendar-41.1.tar.xz 582736 BLAKE2B bccb63eeb4092d5e451cb5e20858ef63c0b79bd381dc0b2982882b716e216e6195fed3cfe418ba191996c21db9048d7cf5d0b29ee92787a3e92558a4f052cd82 SHA512 c17ea429acbaf377036310bb42856f66632f712397a8e38279e7c537d6b4545a48935ada33d4169fd687022ad39ec73a2022b3e2f66c38325e60d45dfe41fcc6
+DIST gnome-calendar-41.2.tar.xz 583584 BLAKE2B ef21836ef87ba19de0c25f5cb73631b73a60352ca97db88dabbc1632097d3ef7e12c257fe946f7d92466f232248e1b27891394b44d73d61a3336521b2bb5d883 SHA512 1540a1e24d54bb157fadabe4201a97f2cae2c9487e267fff98273aa0dfc3715c4f734ba1e459c3c296c470337547a2b303309911ee7762e17738b292c18cc1bb
 EBUILD gnome-calendar-40.2.ebuild 1156 BLAKE2B a47dc8bdc46a5ff301f19df1b29b0cd80f197920a5bde87e533062c727b6fef02b6068f5f2621cce7e9ba6296e48e86edb3d3ca3ac9d3227112fae891ac5d267 SHA512 a87ec1383bcdb7a2be0f4e5bb06d6dc341731a6a55ba005cf270eb46f08a81beea2c85641d8df75370d963a4842b5a36b301c663842e0ada22dae72ceca50b31
 EBUILD gnome-calendar-41.0.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
 EBUILD gnome-calendar-41.1.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
+EBUILD gnome-calendar-41.2.ebuild 1158 BLAKE2B 37d5212888d98a3896fc2e5cfdf3276be1a6aaa441d4a894e1f94dc6aaed404af07ed7707ac611693707bde532484aed68c25767453273b1d3a73b4b5f691315 SHA512 24c472057fb19b6fd6fb30f8b000df3f3481264ab485ed637de7e9ac28e35ca35a38a2f496c32be1d150967fbe7e078593a6557e5f9a3eba98a0ba9abb16fc30
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
new file mode 100644
index 000000000000..ac5e1d4c4c46
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.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 828d984fd0f3..00b02b9404b4 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-characters-40.0.tar.xz 195664 BLAKE2B dc14f80654acb2b00b48ebc0a76d6d9f1236cf9b2d95f2a5fb6e4eee197359f3efadfe6c53eed66746e57d5cde2701967731fcd99e4d24695170937b69cf229e SHA512 cefc4b62b20351739510c901661e94217df4bd6a5b6a2c2f439b80ac31adfd6ba90098bbc9a3169c501d8ada9b54ee615c83ceade2639af440e86e29bce7ee8e
+DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04
 EBUILD gnome-characters-40.0.ebuild 880 BLAKE2B f488ceabc0ea5e449a3d470830e6deadb81af80be4d9dba8bc96c16abcbe1dbf83b819056a4b2683693329db9fa6ecfb2c538ca66685c063934b396d59ebe20b SHA512 1198a6c6e8d2c126aff906e15b05281778a7d0e48c596113de1e8c09e96a04e6d0005fd3c67c715379819d44b98000ffeacce450e67b33fcb9213d332856d045
+EBUILD gnome-characters-41.0.ebuild 882 BLAKE2B abb0ad1ace113f4fbe136493094b3f35280526e957535c692ee001ffb2ce9a7b972f4bdbd431f81c217df377f0bdadd583339111476ae1a7e8fc119c1a87b318 SHA512 3e33c8d5977b4ba99913303e789a44ffd04dbf1ceaf0548881e6dda19f4304d092bd8ede52c248f1a4e95f0623a812b29b0b7728a9adf46dc729110c02937b03
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
new file mode 100644
index 000000000000..7a9d043376a6
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
@@ -0,0 +1,42 @@
+# 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="Unicode character map viewer and library"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
+
+LICENSE="GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/gjs-1.50
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=dev-libs/libunistring-0.9.5:=
+	>=x11-libs/gtk+-3.20:3[introspection]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.36[introspection]
+	gnome-base/gnome-desktop:3[introspection]
+	>=gui-libs/libhandy-1.1:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 2c6ea55c8c1f..a0ea0aee8a41 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-12.tar.gz 27394 BLAKE2B 169460c7063fda0f664688303984c4a5c7fcd8a6b32281c2eb630ebea8143b95e96038f130b09c939371474b5ef27656cf77eec942412fcf3908a5d9fb8ae202 SHA512 4c993256d1f6d7d3a2c72c88f6f88facf7ff8237d489950484f54a68f09741e526f0e0a7c2862251fc2579fd3cdd496c9136bb222374abfacbace1615e263239
 DIST gnome-shell-extension-applications-overview-tooltip-14.tar.gz 27058 BLAKE2B 442e1b144358c40c6132ab2a067bb29439e826ccd540583a6e95d35841bca3eda53ac9b6004285c8ab63006d9e71dbdb46f0fb77310366cf976381bb70b50223 SHA512 6e5805f720e262181e4519ec8a19cf57dae41e3dcff3da4a4a1bc4a132bcc23aae575cc15aa0a0f5f04fe1a25a9ff3e03d5bcacb326c7bbc8d0b28351e0ecbfe
 EBUILD gnome-shell-extension-applications-overview-tooltip-12.ebuild 1226 BLAKE2B 2dc6ac1e429c81175dd32a188b2d4c6a8406f0c99c214c7b1e659e741b35cf66ac9e3200015ac39083c9bafe3d94ebcfbb00b09d1b2ec51ba615047ff3979695 SHA512 22d7d2de2eeea0dbb0135c2970fd37d5730408b197b39912543b1ab079c1eb0bcdee5a0eb132a46433e030953e07392d47d2506c962e97b8b505b56e4d03fb74
-EBUILD gnome-shell-extension-applications-overview-tooltip-14.ebuild 1150 BLAKE2B cac3c948ad67fbec39640d3b2e90a7092297296227a7b720318b796e43fd010d88356292f325c2d309a425b40c2fbf521f857231b2dd0d08e37a2ddf5752ad6b SHA512 a125f5316f23863c538ab75b44c7694ddd139c8ed67e04b5f11fe94d7b37b45acf59c9732bb250df54948110c1208fdcfb28d7671b60f5461c561f02acc388e3
+EBUILD gnome-shell-extension-applications-overview-tooltip-14.ebuild 1148 BLAKE2B 6c41570b1705b7137c62146fd731840f8405c7fdad3faa9165e03d5eeff9d11dec837623d48b15f670631f486bfbbeaf9c34cbac9a7c0ace93cac2eceee914de SHA512 3d1466567c72b19298d2d9cca10ae2b1785492fa244afad59e39625cca35f014b4b5a9805f7b6a261ca3954229c833f85b37a3011f19dfe47f4a816dd669c84a
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-14.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-14.ebuild
index e2390562055f..6d8dca32bf9f 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-14.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index a0b065878640..50b27f0842ad 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,6 +1,5 @@
-AUX gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch 1659 BLAKE2B af3da54697f7b9101fc81f442c5d2d3712866b1da81c56ed24478d21551ca0553d3bf259e54162c04e0a5c2e06cc0c460c23ce0dc47fed493340fb9960fa82b9 SHA512 c5adb0101fb7a834a10316d1bca48a0215cb3cf1c00beb17b9c2c2005c07c9753dbcaa6b4ee5deadae6aa6595b7a3b8cdaef9cd537b2bf236b955b9ac5ef53b2
-DIST gnome-shell-extension-bing-wallpaper-34.tar.gz 4308799 BLAKE2B 5c14895fbb42fb726e1b6d93924eebfd7b93ccea893075bfd698476579962a88f8e0008d7e935304d56caba1db1f8afc8fee3498f63044e4a9da13f568025e84 SHA512 7e1e26b5494a9e66d74c3d1045827445935d1a0ed20b095cb72b3b06b622ae5fda7980313dcddedf25c5ed3b40717a8e322bc80764f502c5eb7fe7155ec84ca7
 DIST gnome-shell-extension-bing-wallpaper-36.tar.gz 6060192 BLAKE2B 0daec2bdc94e25032b8ab04e63a673177edae9fe181ad02bcd9ceee7597d8c3f44187dcdb0bded5477be515dfea3cf81adc08e306a33b8c444e3e2c8295c5fab SHA512 335c1e9f5dd1d93ec60f15eef2d0127be6f0149bb29b98f4751c9ea820fd0b28e119d0d2c9fab4444ace4b8d2a5c0523b06bbbd337093ceafc1421a9d665eaa5
-EBUILD gnome-shell-extension-bing-wallpaper-34.ebuild 1230 BLAKE2B 8b539ff6e099f97b6b0352765338667ccf7cb670d2d95c59e603624fbd85058235a1679429eba59423ab74b38277554c7ada57d1c25e05387c214a5ddf543396 SHA512 0627ac6dda7303c0772b24c687618c34398c60bbc32e7ff06ebee13391b4f159404f3ffb22e1bab477483c68afb47a175b30d50bc8eee83ffbf15ed7fef7fab6
+DIST gnome-shell-extension-bing-wallpaper-37.tar.gz 6798688 BLAKE2B 9dd8e651905f2b90848bd416d222667aa528994d3d06ddc180926efc603670346513270d588be85aefc62b9c85986e5913441d643e399c1384fd6996b1cfdfc2 SHA512 1c75ff6a6068232c9be717018b93a3bc8810e6dd1b446d9dbe4cc77beecb34a35ed3d6a9904f68b3d2d4487f45f2eccee03379f1abe4f8b351642b75411d5adc
 EBUILD gnome-shell-extension-bing-wallpaper-36.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
+EBUILD gnome-shell-extension-bing-wallpaper-37.ebuild 1105 BLAKE2B b2ddde2e0941ac87a810c356113a8a34978f81723537fdcaaf2cc77a264515eb1cc93384cd985212c6384f90d7302ccfa4eab01c9c231ebaf5798b58fba573c4 SHA512 107125fa3c3a883e40797011450364be51720511c9d6a112b0856f7a76987d5adaed2b00a11a218f529380fbaf187c263009bf5da835ca141bbe3ef66d0a12a0
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch b/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch
deleted file mode 100644
index 64f72f388dec..000000000000
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/files/gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d6350119bccb896744e574d0f10e34c1309bc1b1 Mon Sep 17 00:00:00 2001
-From: Michael Carroll <ineffable@gmail.com>
-Date: Wed, 16 Jun 2021 00:11:26 +1000
-Subject: [PATCH] dont reset blur on disable() if never enabled #113
-
----
- blur.js | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/blur.js b/blur.js
-index 613e301..c16af6f 100644
---- a/blur.js
-+++ b/blur.js
-@@ -27,6 +27,7 @@ var blur_strength = 2;
- var blur_brightness = 55;
- var debug = false;
- 
-+let blurEnabled = false;
- var blurMode = whichVersion();
- 
- function log(msg) {
-@@ -63,6 +64,7 @@ var Blur = class Blur {
-         let effect = new Shell.BlurEffect({ brightness: blur_brightness * 0.01, sigma: blur_strength * themeContext.scale_factor / 5 }); // fix me, should this be /5?
-         this._scaleChangedId = themeContext.connect('notify::scale-factor', () => { effect.sigma = blur_strength * themeContext.scale_factor / 5; });
-         widget.add_effect(effect);
-+        blurEnabled = true;
-     }
- 
-     _do_blur_v2(monitorIndex) {
-@@ -74,8 +76,8 @@ var Blur = class Blur {
-                 brightness: blur_brightness * 0.01,
-                 sigma: blur_strength * themeContext.scale_factor,
-             });
--        } 
--    
-+        }
-+        blurEnabled = true;
-     }
- 
-     set_blur_strength(value) {
-@@ -119,6 +121,8 @@ var Blur = class Blur {
-     }
- 
-     _disable() {
-+        if (blurEnabled == false) // nothing to do, don't clash without other extensions that do the same
-+            return;
-         log("_lockscreen_blur_disable() called");
-         if (blurMode == 1) {
-             UnlockDialog.prototype._createBackground = _createBackground;
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-34.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-37.ebuild
index bca374834cfc..3f94681a28bf 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-34.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-37.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit gnome2-utils
 
 DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -24,11 +24,6 @@ BDEPEND=""
 S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
 extension_uuid="BingWallpaper@ineffable-gmail.com"
 
-PATCHES=(
-	# https://github.com/neffo/bing-wallpaper-gnome-extension/issues/113
-	"${FILESDIR}/${P}-blur-enable-check.patch"
-)
-
 src_install() {
 	einstalldocs
 	rm -f README.md LICENSE || die
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index fb9f694e97ae..57fde8e53250 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -5,5 +5,5 @@ DIST gnome-shell-extension-bluetooth-quick-connect-26.tar.gz 22163 BLAKE2B 7a0ab
 EBUILD gnome-shell-extension-bluetooth-quick-connect-20.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
 EBUILD gnome-shell-extension-bluetooth-quick-connect-23.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
 EBUILD gnome-shell-extension-bluetooth-quick-connect-25.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
-EBUILD gnome-shell-extension-bluetooth-quick-connect-26.ebuild 1245 BLAKE2B aa68a2d9dc0f05d7f6471359b6f01d5756b010e547d87b88cccd29f79fa409339a0656cb866a2c0e53b6adb7e5bb12ce7070a3cc62f184f392773c3d1d7d1d23 SHA512 40276148fd360e89a823bb49dc49aa41d236d9dc750fd162c5725dab8cb85c62f0bef571fbcceccabd662b58041170f876779ec4d4cfd61c54fd183ca06edf65
+EBUILD gnome-shell-extension-bluetooth-quick-connect-26.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-26.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-26.ebuild
index dcf84bd1bafc..0924f3a71235 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-26.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-26.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
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 63aed2cfb4bd..a0cfc1ea960d 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,7 +1,9 @@
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.tar.gz 2592 BLAKE2B 205309c4057094301e3469471b0f2da06a6cdf6f36b430b636f5341acde98ae999a537ca3a815a257fd9e3abde8f30bffb9a78f38926224eea3ec29d92548f2b SHA512 d314227588dac2f51b1d6946bac29501607b3e4fa6c3394b4bf56576453d6e6aa5a76fb2b576e216d5e62dabd8994418f11838d95bd90f134d261223fab04dd8
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.tar.gz 2595 BLAKE2B c15c74cd534e571585b1129216fe644d7c8c2b78cf360d26ac48cf1773e3b69e97c3889e13f39355c24b2066168f9cdd2a6e49f830c20f1f6f853aecba6b0ebe SHA512 b3dfa72863972af9ada7803aeff409139708840b795842c32ce6b07cea21e472c06c4ec86eb141b0fd89a31912971d3b97fd96ee4e3d8bc63928f551bf7c9836
+DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.tar.gz 2609 BLAKE2B 17b75fab4c2c01635ef578444ab2d17ef19abad4fe9ef92ac46ea00e6ee7fa5138364e950e75b7ed581249c650e745fb7cb6adfa18a85a42cbba2d9a7d62555e SHA512 ceaf49c034d90d30534b36a0bd47b18e492a052724820887e284f4e5fe7b7faac24baa19581d113f176ce13082ec080de5562555dc2b65481b187543a60da9cc
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild 1338 BLAKE2B 1a24cb39abe74cc8fb7a7681e327f62bafd8db533e854834d804baa7435c90ab15892d71fa21694fa22d8854edf0c9913357fb103d9f420f1055af477ea64d2c SHA512 d8ad8ff5ee49f55ec35ee425030dcd43a02c2c67a61a2367b46ee030c10ce8eacfb68440e03536c80250ba82d912ee32d669df7c6a17b4472ec3d42eb57dce68
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210721.ebuild 1320 BLAKE2B 0e1461f3162ced1368abd886fd0b2e81aa8d729ec4d24b3ff5196d9bca9438993bd091d6656af86d122cdb1629626a82627e7df68c3942e4bdd8ecaa1231ed33 SHA512 67b172d4fc9d7f9a0c098510a1b34c5c7132b5db94236342e4cd6dcab85bb0ada5fff165d84e6491bf4f5102362c13ff64c56a1cd3e9a4a8e5331ab2e392796b
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild 1322 BLAKE2B 7cfdbd5f797817ade27e2bbdf149ab75ce525f86ed157dc2ea04f54c508d6d089fb0dc89929dbe112a06057d02c31edcac914002d47aef6ec3c557280cf1aebd SHA512 2213cae5825163bfa7a7e78b35ffff182693320bd2ba735b4a729ea20f647cc0fdc89edb5da5d69a99eda4388d39ab93e739de0522837c4de94c6d8ee4398931
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild 1320 BLAKE2B c435fec4b1344e1c5675669b67f29e3a540159bdddaa7221de38ab77dd29dbe213064b9932ca3dda3b646a307ceb98f322270e1c64303e1b501285959076d9dc SHA512 501c53f9cd9b5a20555a918fa3bc8b5f68ed5d9ccd453060fb49029b0cbd02e502d6e9678b4aaee32236234ce45f22fa53cac80a5c6676fe77eeb28c7f1f5f07
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild 1317 BLAKE2B 07cb561848382d13b54cd838fe784e2b205e40f2ed67090ebceb761c69173fe6a5dc57384f7b354d1b07dc66fad9af0824c6b5af02366af7f6341223d0697e99 SHA512 3347f16463eae6a4a3dfa458bdb063dedd0be92caca16f5aa2c3ebd84a136f61fd4efa8670351c572a9f239aa03d6a4dfd4b16e1316c3073565d75ee620e291f
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild
index 6c2f4a776282..a1aac1f6a8a3 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
new file mode 100644
index 000000000000..12902d135edb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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="0223e85a5045e9589cb8186376d9258e845789bd"
+SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+	dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+	app-eselect/eselect-gnome-shell-extensions
+	>=gnome-base/gnome-shell-40
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND=""
+
+extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
+S="${WORKDIR}/${PN/gnome-shell-extension-/}-${COMMIT}"
+
+src_compile() { :; }
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/glib-2.0/schemas
+	doins schemas/*.xml
+	rm -rf LICENSE README.md schemas
+	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
+	doins -r *
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index 29d5b4b33f35..7d153a34c414 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -4,6 +4,6 @@ DIST gnome-shell-extension-dash-to-panel-44.tar.gz 21141085 BLAKE2B b9a143f47c17
 DIST gnome-shell-extension-dash-to-panel-45.tar.gz 21158475 BLAKE2B fa44e2c0ae33f39f79584b78ade1091eead28c1158c55f7b7511479ee5ba0c52054d0f447fa0bf7787c89c10254cbc5348abdaef048296ef8782b8a2480b066e SHA512 fa621a23ef6349cd2925069107e3bb4a4f2bdfeca953acee5512a48d78df60304f062348bd80e8c46bbb3a958b9745140aa0a5454b6494f0314cdd40a9c77472
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-43.ebuild 1824 BLAKE2B 59fd8b915e1570aaab7fefb4123af35f7443eb141e58f86cfaeb317aee0a1984d986f8e804dd154145da75e1b2c2d39cb0449b5bb8d4e7875b06eca24063b254 SHA512 0d046c9e1f1140db2f52dfff8de0dd2dd4d95fc3c1d61b531d73c2e7cd7cabe19d235ebec499c4dd7481dcd79447163afed3f6623aa03e9620b47d2138ca0eda
-EBUILD gnome-shell-extension-dash-to-panel-44.ebuild 1826 BLAKE2B 8f24b6ca1fb1a820deb29d90d3549ba71b4c863e174904c1fd910dd49ac331ab930c0c8cdc5f721615545fb2e2811bc8c4d18aa201d542b04b29cb307e4ab63a SHA512 78503ef147d76c129821e870f42e9c2706fa3b099b730b6f0cf2f16f53e62c467f6bb0f011adc2478e10745bac9af4ac8f03f2d220b818290a6786b746dc53dd
+EBUILD gnome-shell-extension-dash-to-panel-44.ebuild 1824 BLAKE2B f1d0d91acbd8bf962c5de8b7650ff91f4e832bd55063126283fc1b8757006c6a83c614c74744326274b14bddddfd585852515d1bbf72247b2f77892da3e0b294 SHA512 e467a07059be06c15b52d9316c2c815b22039113a4a150b8354364df7072823140b3486928088c5107f8dec612417eb8bf2e25c42ac8836c2eb54b5fbe0f8bf7
 EBUILD gnome-shell-extension-dash-to-panel-45.ebuild 1826 BLAKE2B cdcc4bdc87b09663a109e15bf1847c3ea01e594bafbc8ba85d71783b9abd2ce38a3fa3b42bcb5aa4d33236cf8af7e954ad38489f6589de8989a9c3c24649ce81 SHA512 a8c276efa8554a820a0597756e59a8b95e024411fb138f66c72776af884b039640bc9967c5e9dfc29af3f00b2a1f0af9cd88650825200274037baf8c18967b7b
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild
index 2f3313f3f6d5..afbdfe9cfb22 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-44.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index d396e6a3029e..52ad29d6b7e3 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,5 +1,7 @@
 DIST ding-0.20.0.tar.xz 82000 BLAKE2B 56bdd067985281daa836b34b2969a487314e056f0eb2d60014122f4a3ee8eff159948c4b6cce20b327e7189d88a3cc0311720171f7b407b6b82928b4c1a03cfc SHA512 71cef5993c177f393c77889676b5e593de9beec936f42dbc4d5cac0f415706517598f73fc6aee0a0786eb77f3140852b791cac9a2dd5d01545ba8955a02f4a9c
 DIST ding-0.24.0.tar.xz 101020 BLAKE2B a0f6b276cf41113dbee92ee6e34da3ffbf8f614765874b1185c226ddd350a2b63f369bdb40f71677444694a4083b34765f63eda09761bd3690355d5df6f97173 SHA512 0d066abb3e25cc2dacf593a1f05b14937394a89254bc541311c32f5206782e1d80be82cd1eee567809aee9bc0e3e80206eeae81119e72d444b965a2daf341493
+DIST ding-33.0.tar.xz 106484 BLAKE2B ca1126eb61bc41bbe50938c17ffa8611886aa4656902969270e00fd1e783497bc47f16215d641f74f96cb21763dff134508304e13063bf8cbaea2e3ae584a1c0 SHA512 27bccb7fbea8044fadd9c9732a0f557424af30a3b8d88aa3fe5354ce507f2ae4219fce785ff31dd5f102db1cdd9ced25f733a5a0c5cb39b453e9fcede6815734
 EBUILD gnome-shell-extension-desktop-icons-ng-0.20.0.ebuild 1001 BLAKE2B 22fd91c4ae8117c7b54641cfd83b0826fad684a74b0edaf540d7a63025e240cfd77b8b5804640c8a716349bc434a49e36e0d192f654fb3016a7aae8ddd1c3a97 SHA512 b606ba2878f0eab8935210398aae0fddbc5e91c834cc71e28b06ab0e0ace2829aac8aeab95055d2c59ca6911415b585d1beeac4fa0055b97999d6ed8a241bc61
-EBUILD gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild 1003 BLAKE2B a82618ba7cf9f79911cacf41b0ef81973483f7b618e17bad333f9af8173c9eae5a1e9e80a1da5a65454bf484faa341b86a44eebab0886f254be52e005072423d SHA512 de7d414ce9682ecda209cdb35d2885daf7a080130e30d63c71d7c4a97aee3ce20ca2aa06039d231a6e90313b977866407343828b6f242bbb2deb425bcf6d89b2
+EBUILD gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild 1001 BLAKE2B 40bd684e478a1136a284a2da08222cfe99eeeb06835989d6a1882d55239c2ffba030f38e593388c316c1c25c7beffbb53296760f29b0d9ba2840e6454b3be28a SHA512 01032de352d6ab9f3354cde22b4d0c90b4df3f6971085b4e493ef0fd54878fc586329d19c2e7fb36264462c65bed62b8ef6b3f65644c9bc108001108e5dbf74a
+EBUILD gnome-shell-extension-desktop-icons-ng-33.0.ebuild 1003 BLAKE2B 199768a7802a288358a0b3ccf58f68d36c0dfa66170644caebf1411af8a5588539e27e671af602fec4249ebd50b2f4f0c5cffabdf8c7077583fbf68d58bbdd76 SHA512 690768eaba9d8e5d8ba9f6dfe122bf1615a9d1a01284de200b768e253b8850c334e1b733d362ffb4c3e7e0dc55e81177bf15d3f122c67e1ad527c54c6ce20fea
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild
index b72a4ecad7ac..e055f65a8ed4 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
new file mode 100644
index 000000000000..210bf6fcb7b5
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-33.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2-utils meson
+
+MY_PN="ding"
+MY_P="${MY_PN}-${PV}"
+COMMIT="af3dc1568f069d145722920017474829"
+
+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-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 22950c4cb306..4f758d76d451 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -1,9 +1,7 @@
-AUX 40.3-drive-menu-hide-items.patch 1756 BLAKE2B 9eba68c0d09b066ea3f06a59a15df2ea310ce0f4168b6851e0bfd51784e124bdaac40078ba0d7be24f7515dcb09a1ca93eb994fb8f668382e5b27c63d094c0b8 SHA512 39694a61045baf0c1675db62cd2cfa4900c45a6fae483353e519c4b1098d5f9f8292ee1cadcaf9db5d884c42d939b5971bfcb32bc1feed3c5bc9ef40bcf3b1a4
-AUX 40.3-drive-menu-indicator-visibility.patch 1132 BLAKE2B 2b8580182ace34e99fece58e20fc4b01bf08b988592743c7e4c844cc4713cee3df7dfafe8d6ab2bd318d453b039dfeec04511ad81ab1533cd4c8cdae8c6581ec SHA512 fb74eb7796a06e5bbd103d7c0806845364fc35da6b933af287b68efeaec1e5f73699d98f38fca764aab9f44eb23e7e4365dc0f1e1e8514d9d5bbb709a110c478
-DIST gnome-shell-extensions-40.3.tar.xz 218108 BLAKE2B 33174ef4c80caf375d48f11b7678ec78bfbe60a9d4456e21856b09a0a83e99ee7b68598c719a6913a29d9686317015fbc8d8bfae856e433414889e59e82e5ca3 SHA512 3773b0a5ec81b6663a3b2c5f5d1f8e7619fdba49ce67b25ee0f5555d17ea7c9740c3698b7a4e4f7fa78241c8738663c602cb5ed1ff9874b8ad2321fec0dbc737
 DIST gnome-shell-extensions-40.4.tar.xz 218088 BLAKE2B f992c98fa5ceec84c774881468e0c9736d24f1834b9d6976f7cddc2dce455393fad0ad055c1e02b308135914029874c4d87d3a09733a7b4686308e9052cef21a SHA512 79f087c9fbc7764241751441190819b3e768530257ffe3a7b39b1004f8997de9c8ea381338ec0544a39b8cc6866137d315e56f3f058c9b66a9ed566ec40712ef
 DIST gnome-shell-extensions-41.0.tar.xz 219664 BLAKE2B 1d73d9f1255f93740d2effad48420b2992872b89df12e0baaf99c3344c356de5f92f76300c30cac32230c7a97a4a9ce6bb74308078fb6844fa3051f24594eaf7 SHA512 4332821044029020404c0ed5d040b7d5e5548a67447517424a54ed4c586bad3461ab1e25f0dcb37c24ea2a1496d1cbf2b95f24de0eda79f0c6921b6b1f085f83
-EBUILD gnome-shell-extensions-40.3-r1.ebuild 1868 BLAKE2B d2b5894c719e76dcc05fef97ef9115058ee80924c2c35125f97614897658f6b11729721c2f7e0e460f26019791b182b6dea8b702774921ab2b91f39a22e28c94 SHA512 adada7db70e8ef7b36d45c257a1b04ef427f63723d64e3788aa0fa907fbb794a1898b9215ba752c37188a780bbc0bf5b4e21d778be80cd0ea08cf1cbced4eb0c
+DIST gnome-shell-extensions-41.1.tar.xz 219848 BLAKE2B 31da29fa8f804b1568677a9a875ac6efcb1906588f239a34c360d5dcc1947d4c99200dc1b63ca6d17b257ccc5c22d6eed9401fba625eda1bded57aac0d83c22f SHA512 2cbcd1ff384254545645cf4cd6a6f887e4fb42088bcff3fbb4179fd3400f1eb62ebeb87ccb25cd327bdb01060d1994c5dec1c26103bc968366ac521f7eaa8cde
 EBUILD gnome-shell-extensions-40.4-r1.ebuild 1745 BLAKE2B 6a307a1b0c01e33df542b3f6261faf7c3c4157429629f8a182c74a50cef451087b6092fbb023ae438547f3c7c34757b6f8591c753aa58a5b2cf591557197b507 SHA512 63329ec042c5fee18948bc8ab6cf00963ba71c046bc030ab074608f71d78321033b6a50ce2c68a9f82403b46cf51acd1b3717002f816a87750478c16b1515c10
 EBUILD gnome-shell-extensions-41.0.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
+EBUILD gnome-shell-extensions-41.1.ebuild 1763 BLAKE2B 28cf1f4d8fa43e655954d5e32a72ef7d546b1e1645e8c026430380e0c0553bc2aa439076bf6602b3df0878c005b8c8b3cd2613e7fa49d16a5223baffec443740 SHA512 88dfc426ac303d7fc2da7e4db185219b006a55db9978d4da81403e6425ae1ca11ce206998b6305b3c35bcc7efafbf5b3fb959bc72720aba5cb849801e9561da1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
deleted file mode 100644
index c69dd5fd3577..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-hide-items.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From d421bbfa609426032f07f27934eefb214d59012f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:54:21 +0200
-Subject: [PATCH] drive-menu: Hide items initially
-
-Now that the check for network mounts is non-blocking, the initial
-sync doesn't take effect immediately. We don't want hidden items
-to briefly flash the indicator, so create them initially hidden.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 6c6fd76..f60dab7 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -41,6 +41,8 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
-         ejectButton.connect('clicked', this._eject.bind(this));
-         this.add(ejectButton);
- 
-+        this.hide();
-+
-         this._changedId = mount.connect('changed', this._syncVisibility.bind(this));
-         this._syncVisibility();
-     }
-@@ -155,10 +157,8 @@ class DriveMenu extends PanelMenu.Button {
-         this.add_child(icon);
- 
-         this._monitor = Gio.VolumeMonitor.get();
--        this._addedId = this._monitor.connect('mount-added', (monitor, mount) => {
--            this._addMount(mount);
--            this._updateMenuVisibility();
--        });
-+        this._addedId = this._monitor.connect('mount-added',
-+            (monitor, mount) => this._addMount(mount));
-         this._removedId = this._monitor.connect('mount-removed', (monitor, mount) => {
-             this._removeMount(mount);
-             this._updateMenuVisibility();
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch b/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
deleted file mode 100644
index f76335d4596e..000000000000
--- a/gnome-extra/gnome-shell-extensions/files/40.3-drive-menu-indicator-visibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3539ce113907ffda813e1a990891b0911c9702ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Tue, 13 Jul 2021 11:40:31 +0200
-Subject: [PATCH] drive-menu: Fix indicator visibility
-
-Commit 519269be9d made the check for network mounts non-blocking, and
-we now update the indicator's visibility before a newly-added network
-mount is hidden.
-
-Address this by monitoring the item itself for visibility changes.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/176>
----
- extensions/drive-menu/extension.js | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
-index 3fac236..6c6fd76 100644
---- a/extensions/drive-menu/extension.js
-+++ b/extensions/drive-menu/extension.js
-@@ -189,6 +189,8 @@ class DriveMenu extends PanelMenu.Button {
-         let item = new MountMenuItem(mount);
-         this._mounts.unshift(item);
-         this.menu.addMenuItem(item, 0);
-+
-+        item.connect('notify::visible', () => this._updateMenuVisibility());
-     }
- 
-     _removeMount(mount) {
--- 
-GitLab
-
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
index 114c39cad749..d9aef6246858 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-40.3-r1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
 	dev-libs/gobject-introspection:=
 	dev-libs/atk[introspection]
 	gnome-base/gnome-menus:3[introspection]
-	=gnome-base/gnome-shell-$(ver_cut 1-2)*
+	=gnome-base/gnome-shell-$(ver_cut 1)*
 	media-libs/clutter:1.0[introspection]
 	net-libs/telepathy-glib[introspection]
 	x11-libs/gdk-pixbuf:2[introspection]
@@ -41,14 +41,10 @@ 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."
-
-PATCHES=(
-	"${FILESDIR}/${PV}-drive-menu-indicator-visibility.patch"
-	"${FILESDIR}/${PV}-drive-menu-hide-items.patch"
-)
+you can use the gnome-extensions-app (included with gnome-shell),
+https://extensions.gnome.org/ web interface, or modify the
+org.gnome.shell enabled-extensions gsettings key from the command
+line or a script."
 
 src_configure() {
 	meson_src_configure \
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index bced63d816a2..5b8124eff6f0 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-system-monitor-40.1.tar.xz 763720 BLAKE2B 50d69ed95173301a566078d5bf32c48c011eb297a7fcb598dad1c515ee2900731362c9637dbf7793bb95d31a5584f7f84192b1c726b1a8362dc364b695f54263 SHA512 a6c870ae4e58c5fabdc87c290e10326b051398b3408f7ff159c854eef5c7940371e83766f37c6a713631d49ee5ee7b2670f441a462e2453fa849cba2f3255be4
+DIST gnome-system-monitor-41.0.tar.xz 774644 BLAKE2B 9aafaaf77b414435301eebd8bc84f04faa171139a7d9e6e71ad9bae8f097eaf6d637502ab64f0868636f7964a2b76353364ad27ee2b56c3d8f9131e0a7ee1df2 SHA512 1eecddc479f0d9e986f1821a8c4b72246a6995f7853a6b35c8435d1aaa1afd7bc1df0cc0b9748785e4581563985652be19beb12b193ee17439ba4564febf5d20
 EBUILD gnome-system-monitor-40.1.ebuild 1219 BLAKE2B 6a6ea5297b2d78b5d663c84c62d93aa0f8e47c63d28ae2027d6d0ef77da19c790d6443daa483028e7b9bfc196d2837dc76734f64192479128a1493c53b2cbc61 SHA512 9e3ae1b4fcf6c2beecc3e15ee76b6e9dfc3bb8f9ae2009bd40951c4dc192aa5263fd6b1aa3b8c1ee23ebd3b1dfd9ab149a89b7f443ac270a3dd074c2a0d90292
+EBUILD gnome-system-monitor-41.0.ebuild 1221 BLAKE2B 60d5de799d0ebd0da1986916454dcb8cd481ae519e4e5f0755fb4a2477b04c1fe81aeceb08fc989c971988d8869cbbf642fa0bd8a98c785bce6ff18f644e75ba SHA512 ab2ed8af09bacfa15949ea76b030e5dbc42e4e551787ba2697d3d9f751fb29e3a29b9397986dae2315952631e3aff85779bf327b647f2bdeec278ef502c51bc9
 MISC metadata.xml 379 BLAKE2B 6427637b2adc503ee411ddf8897458780db85a500e2cf7ec23c96640cb01ba718a2adba649cd112fae3e8405ba89539dc712d4d955f5e36f0b1719ce4afdada1 SHA512 0b64ee41da44fb823f9e34f2571e26c04d901709ca2b1242e27daae3ca7c7767e5df8f809f20316a135a72debd81bc629a0c218860d3288e4636bc3e3681d248
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
new file mode 100644
index 000000000000..3b074de77b55
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
@@ -0,0 +1,54 @@
+# 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="The Gnome System Monitor"
+HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="systemd X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.22:3[X(+)]
+	>=dev-cpp/gtkmm-3.3.18:3.0
+	>=dev-cpp/atkmm-2.28:0
+	>=gnome-base/libgtop-2.37.2:2=
+	>=gui-libs/libhandy-1.0.0:1=
+	>=gnome-base/librsvg-2.35:2
+	>=dev-libs/libxml2-2.0:2
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
+	systemd? ( >=sys-apps/systemd-44:0= )
+"
+# eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=sys-auth/polkit-0.114
+" # polkit needed at buildtime for ITS rules of policy files, first available in 0.114
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use X wnck)
+		$(meson_use systemd)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index ccf85acddcee..3fde15298fed 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-user-docs-40.3.tar.xz 9141728 BLAKE2B 9634dfa526d7e781400563e0800f25fc8aa520d97fe0e02f3a06a1f82bb0019ff28e9bf0c8a2698c7d081d7b54a1d53be4475db6615d40c3407b632252cc8aae SHA512 e96f4535761c902999b210060f9bbf19384151752315abc7cf20f8b0ef1f599fe132f398db61318ea24eab8e3dc65812fc05a5ed549e4cedabaf809af39f515b
 DIST gnome-user-docs-40.4.tar.xz 9195696 BLAKE2B 438f52d72a8975125b758acedfbc8c08a36397af6bb0dff01d0c73d517cee67999724e9e29d2731344fbc822309510f36f367052eeff3ba4e1dc36554eb76ffe SHA512 50c8df61a02eaa077ad3faa18d622ead97c7a8926717b2b85d6a9fb86f93e0adb3c9f212f0fbfb4781a35135fc0251d664f793665343b7daaf41a390b10fe868
 DIST gnome-user-docs-40.5.tar.xz 9210512 BLAKE2B 0fe638636377d1c392d208c55016cdc346fa1ec64d327ab9ded9b58744d115c74d5a03927836138cb2d58c9df735d8bc032da4a7ff3ef3ffa53a1a59b88a3006 SHA512 dbef51c262862b211304158fd9aa7bf75ab20bbf21ed0bebe0a1c547cb53e580d32062a6f362f0750a8fbe1e93e8987593c80fa7fbb758c1a61827256db69d52
+DIST gnome-user-docs-41.1.tar.xz 9402668 BLAKE2B 952f2c117df9a9e35ae9fab13e5da402f804bce8d4fc96c07355d99e10debeb7b214f72b976826d016ae9f8d8c8a1b558d9a06f8f20e37ddd56404b6a794925a SHA512 49e08947b87ff551cfcf7de9e791de664d32f5628e1e7b4dbcf4b03e38d3e09edda602239dc52bef22a3711c437b669f8a092a33a385531e15311a0c858e78b1
 EBUILD gnome-user-docs-40.3.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
 EBUILD gnome-user-docs-40.4.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
 EBUILD gnome-user-docs-40.5.ebuild 936 BLAKE2B 5ed71e6738ceff62527e672a8934fbd2250be68a276f340be725cb6d0adcb78028c47b02e50552c157180ec27a39950fdb44fd887c665e1e9d48980a3e2aa65f SHA512 765e271a48d49b2047f1e1c5968c9570dac6c6c876d1d10284e7a7de57db0db36cbbf0a080224a64c1a4eb500cde9f5c29bdd99898ba06142c2eac8add2f7e24
+EBUILD gnome-user-docs-41.1.ebuild 938 BLAKE2B 399a4f043a4a19513de8674eb2ff7715d05b99ec703800b5bf92f7cd8320065df980bf63bd7d426621e7f36b7718210419cf98633397ea11ea33910da65d10c8 SHA512 6fdf644c671bdd9c51836670e6029021060b3f45af749abb5d641d8c3ef201c0e9d57a69cc87e75bc94081a735689c7f725b55398147fba1c6d5e39a113a70f7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild
new file mode 100644
index 000000000000..aef106ecb64f
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-41.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="GNOME end user documentation"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
+
+LICENSE="CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+BDEPEND="test? ( dev-libs/libxml2 )"
+# eautoreconf requires:
+#	app-text/yelp-tools
+# rebuilding translations requires:
+#	app-text/yelp-tools
+#	dev-util/gettext
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip
+	!test? ( test )"
+
+src_configure() {
+	# itstool is only needed for rebuilding translations
+	# xmllint is only needed for tests
+	gnome2_src_configure \
+		$(usex test "" XMLLINT=$(type -P true)) \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
+	# which can take > 2 hours on a Core i7.
+	return
+}
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 01f3784ec28e..476abaa39e7e 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-weather-40.0.tar.xz 938732 BLAKE2B bc46da61e9620278f5abc7964b869520da85837739923618b2ade114c8561fc6125e7dca2f2aef5715fec7dfa0561c693f75278d050900cb948f8d1ea42f58ba SHA512 c4560c1a1535a0c2889c8cd934926217a7caceb1b646fa4bb961c7cbde38b9b545a567f24fb81e47c61a2ac3e456a5432e8979591eb5a169fe5849bbd99d6333
 DIST gnome-weather-40.1.tar.xz 941636 BLAKE2B 110b972eb3eb6319632d00592f9bf50220bb6976bb27f814606758fd6ce98ad9dfdfabcb0e2d4a68f8005aa3cb92538e4820c8add8f7f8cb94a96f7df9453cf8 SHA512 47086225a2f0212665e53f053d46b54792d4daebff841bb751a7ed8ca7e2e1d60f0247d890011a03cab4104b0461b71316ff9b6eaea671c68bc1713c38e447dc
+DIST gnome-weather-41.0.tar.xz 943500 BLAKE2B a349360f001bc8a3246227fcdad51bdb115db382650ead36e9768c002f0d7892296610320bf90bb569915c72c48492002268f8aa049055ebc687dc08052d6170 SHA512 f625a83ecfffe1ad58aa268b6ab3009504f839f3d56e52c642bc23ee32c0b51638888de17a1b4bc0990b2fd6718a7266fe5cd79230594a06ae58a816308b2b99
 EBUILD gnome-weather-40.0.ebuild 1371 BLAKE2B e602d5fd95238b9a88deaf4ce43e3f9de71c76042dce1e6345970549e0de1b68565d96dc637090253e1f83794b65778d30599306d273c5d4e3c2526092e0d306 SHA512 9777853eca87d926a23c0456b04e36e6b264cb4879a999520ebd1076e839a88532011cc2a8b1a2870b503f7014f20c2f8fb955d63e0a7a328f05edd11dfc7e85
 EBUILD gnome-weather-40.1.ebuild 1371 BLAKE2B 0b44742ad803ff856f973ccddb9cf8d0fa95546bb485b88eb7cbccb127887d63e321aa922f0ed6172597489bc45a9b65e8e797bdbe951ad3603081b12df1a0d7 SHA512 05efa37eb207d20ac68884449fb2f0cc50bffbed0b1a1ff670662c6c2115919e18ea01b5c424972c536a76164da8612f9874f76c6b3b238521d0ffc77ad11c02
+EBUILD gnome-weather-41.0.ebuild 1373 BLAKE2B 2b6f0eda96f706c54f16a656f8e554f35f69393ddced7f92fd7dcb225e8153fbe9e905d53271f879edd5e8947168a85d1891050cf8a748c19f326ee79ad5378f SHA512 55b4f742f13e4c4eaa4793ce860348fe1807bfec38a90ad683192d15e7255903da17af9852b53c49b7cd8e7c073781b51eda80d1b51925fe91c923ef56998acd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
new file mode 100644
index 000000000000..ddc78bc521b6
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-41.0.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 gnome2-utils meson xdg
+
+DESCRIPTION="A weather application for GNOME"
+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 ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-1.56:=
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/gjs-1.50
+	>=app-misc/geoclue-2.3.1:2.0
+	>=dev-libs/libgweather-40.0:=
+	>=gui-libs/libhandy-1.1.90:1=
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# Tests have a lot of issues, starting with reliance on a system installation,
+# accessing the network and other intermittent failures with network-sandbox disabled
+# https://gitlab.gnome.org/GNOME/gnome-weather/issues/67 (and rest not filed)
+# test dep: $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]')
+# With 3.34, this is now behind a dogtail option we can pass (and have data validation)
+
+src_configure() {
+	meson_src_configure -Dprofile=default -Ddogtail=false
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index f05065a57de9..59e01fb631a9 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.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
+DIST gucharmap-14.0.1.tar.gz 1925102 BLAKE2B 134d48703efb27d5eb3a19e8d90031d6feb8f0fa7321596efc1209377653590fe5f4191af739f012c1dee15df75e2d70ca2ed8850d30b57cc87b97343716de85 SHA512 5a79afe1a7e9f2a54f7499a578a34db690853f096a9374b335786abd3439812f511222792447f6cc603c2611490d3514d6a179844dd03fbf7f289133e29cf015
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-13.0.8.ebuild 1513 BLAKE2B b2d035506c04b189660dd7cf90e13adcadee5f01090fed944600be4eb067307e1a5767f5980b155b7d6c43858f8753c8a596216d055f43ca0af55df5d0890d97 SHA512 4d0e19912ebca1fec4906730bd520d41c4d08db5ced4da9323616f80aa90010cf3b1c7a9a789d415c78a42faddde04dd1180f744d674faec7abebefacfdd5e7f
+EBUILD gucharmap-14.0.1.ebuild 1480 BLAKE2B 70d51350fb8ad7d0c76a5bd453dd12113c8adb9e715fdc51adc040e668cf7a01d7da757b1dcfa977981d9c5ad6bc08bd3a8a8c4c9d1006ef942d4b0292e4fda4 SHA512 7dac7d9a481e280feb875c91f4004a671cde113d2b45a54b0f6363526e5d7a9bce319902cf2ea711197fca90a058d2b5a351eb59f26eac2568afa1b908ea3398
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild
new file mode 100644
index 000000000000..c3f9b85f6609
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-14.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~riscv ~sparc ~x86"
+
+UNICODE_VERSION="14.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
+	>=dev-libs/libpcre2-10.21:=
+	>=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
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index d00b89d1493b..d503e2479ff6 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,5 @@
 DIST network-manager-applet-1.22.0.tar.xz 1901680 BLAKE2B e1597d5ee332000082e2939745af10f5f5d5e9177b388f67fdb9822636226502a4c96f4f97187f01ae8de5bd1b4d853670e94dc9058e9b31cf9cadf11fe6a64b SHA512 80c9a8df750f1253a66aea254f30278a934ed4e11fecff03cfa50a31da9efcff5c8892caef672a4d62d8c5c473770358c35344b49a9f3d7956ad76063b794cac
+DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
 EBUILD nm-applet-1.22.0-r1.ebuild 1223 BLAKE2B 0dff6055d849a1c8dbd45ed5d6f65881f8204e25daa8463ba7ca5b6b6cf6d70147b3c913f709cce638c621a3ce4577975f1452148a6517d11b8d3f71707a852f SHA512 53725fca8fecf6df0975ead5fb686454659d06f8602c309d42f0ec659766e11840bfdcd34f6431edc379d98dbcab8e939f7a4cba02a529cdfcd0f3a5cb4565c1
+EBUILD nm-applet-1.24.0.ebuild 1228 BLAKE2B 0d216d8f8323b3a2c76083ad697381c665a1b12361cbe2f9b34b19ffba2b248bd1942a128ceca129170b01fba0efb81d87d9e685adcd196170ed95f18f560b63 SHA512 863bca4a333fc007412f82e673ed07cd01056d825078fc15e9a5dbc6b994d9a12e2f362e7d461e2840663949370bbb39d81c95fb70dddb28c5a131e7a5bcc4b2
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
new file mode 100644
index 000000000000..769fc0bab392
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome.org meson xdg
+
+DESCRIPTION="NetworkManager connection editor and applet"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="appindicator modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	>=app-crypt/libsecret-0.18
+	>=net-libs/libnma-1.8.27
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libgudev-147:=
+	>=x11-libs/libnotify-0.7.0
+	>=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
+	appindicator? (
+		dev-libs/libappindicator:3
+		>=dev-libs/libdbusmenu-16.04.0
+	)
+	modemmanager? ( net-misc/modemmanager )
+	selinux? ( sys-libs/libselinux )
+	teamd? ( >=dev-libs/jansson-2.7:= )
+
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dappindicator=$(usex appindicator ubuntu no)
+		$(meson_use modemmanager wwan)
+		$(meson_use selinux)
+		$(meson_use teamd team)
+		-Dmore_asserts=0
+		-Dld_gc=false
+	)
+	meson_src_configure
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index b6ff57337b71..f1b9aa74be4d 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,3 +1,5 @@
 DIST pch-session-40.2.tar.bz2 3610529 BLAKE2B 4ae2fa7d152edff0707c5f705c001d601a08f70a7629f3cefa53254b07eac124280d547392c80d9dad76c08fbb80e09aaaefceff06945ebdddfc8f61d31c3426 SHA512 6300e36f5914f8213ac912e1e44652c08ca90a31e3e480b5f6674ce54a798f8b3f1226d781859f7bf9fb4a64186ee11a8bc7d6f8d59017340ec3b65d10948f0b
+DIST pch-session-41.0.tar.bz2 3610621 BLAKE2B 65c6cca06b95ca6a3770867972f613cc0c064d6622dd16e86b177b5a52b8db7b8385a8f8e5202f535e7c8f254c9c5b921553c8a04418639dcefb2adf2c37f325 SHA512 b4911c865aebf9969fc5a95c4865c5a6bab3cd3bac2d70c59ef4e6b44f6b83a4cbc77877c5412c58ba99a688510b5ea9d1b213887cd5e6b2a7011c1f1c398b5a
 EBUILD pch-session-40.2.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
+EBUILD pch-session-41.0.ebuild 1225 BLAKE2B 5fc14b6d417a928b6fb2e3bdaa276fd452f54d48b5d195f04852851bce0631aa3c27cc81977ed71b29905d7d77c033f81a7268438cb5c91d1e4c86cb75642edb SHA512 0e48e29a139b764e9d8922553e4884198d4caf9e8ce2a4e2fe1d6fdd9575045aa3e27c73083719371b39fe8f5261b2dbab2e81e6953e72b368248c4f481756bb
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/pch-session/pch-session-41.0.ebuild b/gnome-extra/pch-session/pch-session-41.0.ebuild
new file mode 100644
index 000000000000..478c7693aebd
--- /dev/null
+++ b/gnome-extra/pch-session/pch-session-41.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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-41
+	>=gnome-extra/gnome-shell-extensions-41
+	>=gnome-extra/gnome-shell-extension-appindicator-41
+	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-14
+	>=gnome-extra/gnome-shell-extension-bing-wallpaper-36
+	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-23
+	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111
+	>=gnome-extra/gnome-shell-extension-dash-to-panel-45
+	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
+	>=gnome-extra/gnome-shell-extension-gsconnect-48
+	>=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 75dfa2e8fcf1..cd51b5d271b7 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,3 +1,5 @@
 DIST sushi-3.38.1.tar.xz 79384 BLAKE2B 7306d375f85cc491fa8819e6857b1d61d158149045069002ed7a9c0f08c021ce0e9ed5ee751404a507dfdffdfa99895288f9c9601001818b4d1bc987f94bd823 SHA512 b999e6892314875725bd4029163ae58813b46f0e5c59e58b62fc4491d611b48fc39459f6c5b5e1a7d75d792cfeb66681f4d3a7057e8cde8f5c3364a2312e0be7
+DIST sushi-41.0.tar.xz 80940 BLAKE2B 211fb0c96ac0a911809007ed2e79659cc90a32be23d61137d85cc4502beb995d2131f62bbbb9a66f8da9328a4bf7d83b0c05f93e8913c8390be5cf22baaaeb00 SHA512 690018b846b23b3b21db244ae6e1f373870cc8cdb374dee2f4ba7eebf65af5d33a3366d37476b5f4556daf196c3f9cf8bf44903193831340f23ad33eef3ed484
 EBUILD sushi-3.38.1.ebuild 1324 BLAKE2B 82f4e9004950823abed357e188a4f90e51af15f560e46fe370333d4dd4d78d7d74523894bd7b71101cb0ef0ceb9c82e91ebcc842d8fbd57f32af6530735c708b SHA512 d3d46b3141563662982104e08a651a156d9a9bfda449a90854e77f929c19161d672b87c3f63efbf8fc651fd32e3963d84dd5842f632fe0506beef1a04e329b11
+EBUILD sushi-41.0.ebuild 1306 BLAKE2B 0bb737a6bf6a09419fa1d1cfe4ea79c6be06fbbbc8f371fd89459cb1204c5d6f5b696a96aa2a132632379ba390b4377554dd05cca7734a810f148cac36b5ab6b SHA512 96682a1475b696510c35e922c9a6cc73be19ce793c49c85fce2839eefdd3a9245286f796d886b25a1a195f5b1d92a878903708d4dd76e13e0bf1308f86b816e8
 MISC metadata.xml 385 BLAKE2B 8b38e81530f0280af7c0d773ae60a0cf4144d3a7d876b30574da186bafb023da5da9abd75471543d528f0e6aa9664ba787aeb45bc46dab64077f3a1a0c8bc932 SHA512 d5d35182551e497f3ac5a89734387a1a6e03848ce02f017c6982d5261edbdc72ee342ec7ccc9304f08918f3bc81548bbc26039d7c88a397a627c4a37215808e0
diff --git a/gnome-extra/sushi/sushi-41.0.ebuild b/gnome-extra/sushi/sushi-41.0.ebuild
new file mode 100644
index 000000000000..0ce63af012ee
--- /dev/null
+++ b/gnome-extra/sushi/sushi-41.0.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 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 ~riscv ~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:=
+	>=net-libs/webkit-gtk-2.34: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 9a692ef20bba..099872f5832d 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
+DIST yelp-xsl-41.1.tar.xz 661572 BLAKE2B d7a0ab809722d7159d587a0fa761f69c0c73c7336caabad85e685a79e541d87b9aec9cabc474376f55596f92dc0dbbb146fcbe885dbc0377641312549d8eb5a3 SHA512 1ffdf2feb5ca69824efdb86c3e290ebbe639c41f3cef7bd5af3550ddf1667e9e347ecc20d66cbd6f5860ae9245ba34d359d1fdaf53fa3944fd578d9ac5652a59
 EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7ff5cc343c6aecb3947cf50b198acefc6f0954211b64cb3a6d65e959f80720e54f1fc6a19ad0f259ac7447e998147e4620faf4de92ea75b337b556a7b31a972 SHA512 f83159a3674d363019e0dbb80cb50222b3d0cee8da2dc3560fbe7ebe8e32cdef8cbc730fd2f73dfa29571eac59ba46ad4f9280169ded9b5145cbaf82b6759ce3
+EBUILD yelp-xsl-41.1.ebuild 577 BLAKE2B be2a166c7dd32886bc9079957bac57b345b0d532760e0d1b553b7ab2cccc1674206be3bdfc1696d1b0a1a29325f0e223361367df2a650bb0dca911f52a5af005 SHA512 ce4f83a92d16b0225a6d2136c58553ecc845a9a7137977d2e9514f01de0c75f9a8040dddf4259695c91daaf27f23aca02a62410965e2a755152ecfb8950d5399
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
new file mode 100644
index 000000000000..54fb45cb2f9a
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=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 f475e983ab5c..68ef55735f65 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1,6 +1,6 @@
 AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
 DIST yelp-40.3.tar.xz 1506144 BLAKE2B e9cb9f2e1390fca1c3cf144a1c0278e6ad8506f6177b84c6966fa4a1088ba316afc3eec2e5292e49878c45bacedeb06c1980e4f16d7ec1c8bd22d8fb10ba07fe SHA512 d043273884daf1b9ea45065deaf6839b776cece48fcd0bee6b81d9d7d384422f98005340adee2f00a6013e09cf5455a340ac5b9a40fc02b58b163352be907c28
-EBUILD yelp-40.2.ebuild 1206 BLAKE2B a2ae94a13c94fc2efae9792aaa3f0ee50060a0beebb2fb4dc46175c66af89d59621b59fa8e989e536e16c5c1050797cffb88373c2dd8aaa87d94b26bf90633df SHA512 b2e09bce0909db5a998c88f5d28e89e59dcebc43bc71b342263c83808cc7b5f1591249b551f29a3576c8391c0f75006a744b6f337db2eb6b4ce42aad63c9db83
+DIST yelp-41.2.tar.xz 1531228 BLAKE2B 310bb73b8b841ed72e40530fe7d94fa2b223003fea40530cddb774cff059ce47cb613693ff3e45d2e9fb6beb2130c30d8d0b760e61c749b5d7e02143d17c2efd SHA512 171020b258531d26d1ab6193222b1b31bbde0be7da87524911e38143a606f38b29f9d76cb600cffc71da63d81274f656c426e79101acfa64caaf29e1a44020bf
 EBUILD yelp-40.3.ebuild 1218 BLAKE2B a399bce01c389b27dbb36aa83b72c38600121e6eb46d78e1382a22dcbdc89f32a8e34cf3a3a73c9a060b6ea7dbd298571491106522a2fe7904184cf617186c0f SHA512 bf83d4afc4463213ef2d99780f8f87fa891d265b26bf9a9cccb028e383b9ce862eb0cce9b15bfac2db75b8d75580c650741823e23558e58b8d3e14247873c1c5
+EBUILD yelp-41.2.ebuild 1246 BLAKE2B 52e0bf89e07523142845c1a00f77a35edf804c83f1624a847a58f6cc8f4c53297bb86bbc847ff50fba5caf4d31958dd2a4e623b7e298d1b7de9add5e7f6af889 SHA512 535e5a00d3a9473b3deb74fd9f4cf063e4b623002c48b111adbe1843ddd81e0b5b7bc27cdd9244bba93578856d1cb45c119376c265befb12976582f2569faf18
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp/yelp-40.2.ebuild b/gnome-extra/yelp/yelp-41.2.ebuild
index e608985f62a0..70fe29b08280 100644
--- a/gnome-extra/yelp/yelp-40.2.ebuild
+++ b/gnome-extra/yelp/yelp-41.2.ebuild
@@ -11,16 +11,16 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~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/glib-2.67.4:2
 	>=dev-libs/libxml2-2.6.5:2
 	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.27.1
+	>=gnome-extra/yelp-xsl-41.0
 	>=net-libs/webkit-gtk-2.19.2:4
 	>=x11-libs/gtk+-3.13.3:3
 	x11-themes/adwaita-icon-theme
@@ -44,6 +44,7 @@ PATCHES=(
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
+		--with-webkit2gtk-4-0 \
 		--enable-bz2 \
 		--enable-lzma \
 		APPSTREAM_UTIL=$(type -P true)
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index b70469d94266..920ea9cb2ff7 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,5 @@
 DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
+DIST zenity-3.41.0.tar.xz 3093244 BLAKE2B 582a2e935331120c47ef997d100c28943694a9b8b35c70673c8dca6e129bf39d9a32c92cf6504602513ad6eb223239be584c56ef44fe609f8af320f27713ca4a SHA512 b198ae68fda77f74c9f6deba683759612067c4ee28551a667c96500296db89313f3f2330fcaa53b6e4840ee3367d438e766be8ba7c006952872aebe93684b307
 EBUILD zenity-3.32.0.ebuild 1080 BLAKE2B 499a9885dac700e56cc7caf7f7cf533e84a11a5299adce53f5421abbab6c7d2b17b99d76ae196ab69b46794de95b959bfa47024d2ad5b1c92341dea4931d3817 SHA512 e80d877a4847f4fa99eaefc7c87b05e0133f728540ad52922f9155faeee703a37a9890d11983be8900b6ce7b297dac2051c2d48aef9a0518404f77e90d25f48e
+EBUILD zenity-3.41.0.ebuild 1178 BLAKE2B 2df2ba2c0d69e8bc73fc945d706be641872321dbf2ab2e309c49b6cbe3fbd16afc8be459db3e4c91f796b3f334c0a0908d4840b2deaede6aacaed0ddad7fd90a SHA512 b2afa157e76a26427aef9e58ac7dff6a5d192b4749dc7b4c71e93fd91d3b34a3add1906b1d191e031e981f393e73f67f004367380ba012d58cea7b8db8c48463
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/zenity/zenity-3.41.0.ebuild b/gnome-extra/zenity/zenity-3.41.0.ebuild
new file mode 100644
index 000000000000..2bfa70251944
--- /dev/null
+++ b/gnome-extra/zenity/zenity-3.41.0.ebuild
@@ -0,0 +1,56 @@
+# 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="Tool to display dialogs from the commandline and shell scripts"
+HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libnotify webkit"
+
+# TODO: X11 dependency is automagically enabled
+RDEPEND="
+	>=x11-libs/gtk+-3.16.0:3[X]
+	>=dev-libs/glib-2.43.4:2
+	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+	x11-libs/libX11
+
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use libnotify)
+		$(meson_use webkit webkitgtk)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Not really needed and prevent us from needing perl
+	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
author	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-12-22 14:08:05 +0000
commit	93a93e9a3b53c1a73142a305ea1f8136846942ee (patch)
tree	b9791a06ab3284e27b568412c59316c66240c682 /gnome-extra
parent	2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff)