gentoo resync : 08.07.2021

24 files changed, 54 insertions, 391 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 8acf67ed3ad8..aa56699299ec 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index d9dd30bea0bc..3876046c94cb 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-translations-4.8.3.tar.gz 12010514 BLAKE2B a1635f08376ff85a082078e3da64d0f5159d818ba1c57ae79439168553dd8c7e80e2d1aed93361c9df164d790f8be41059e7227c76ebee2285ea53a10df4f9ae SHA512 e7e674be8c542bb34cab9e191f4124b17d0fd932315838be241a7e0fea82aaa72f35e3ecf2d01972def7bd8c4b7a697107a6a14a64ab26c0d1cea4692cf62ff1
 DIST cinnamon-translations-5.0.1.tar.gz 12201535 BLAKE2B 13455216b988a9901e51dca02977c8520225d4b24633557b28c72c97a9d2222ee08d4d311dc8baee64af12a6e778b49e67a43222fce142b0dc53f2239a07f1ba SHA512 3c33d4799ffb44a04d639e82253bbf6968551a8b06b94807d2a8b1b2ea4e982f8d61664bf815fff571a94ed44c60c6d98344604d168e6a602df58306a3e3bf81
-EBUILD cinnamon-translations-4.8.3.ebuild 1331 BLAKE2B b17432dd7e425789c5fbbd2ceb1e7fd00d6a402aa34359ea8faec762e273a9d66821a757e8708bda1f9bbae2d95a53c94f7881097ce7f0e7153f94565f72d00a SHA512 ed2d18fab97233ed88879af1417aa7f42277a2af8a3224d62b6d3b349bfe940e7c97c9f7451f2741bce2d4b5b01ad3c1d3f9d4a2141795b182bae8ed6eb88480
-EBUILD cinnamon-translations-5.0.1.ebuild 1340 BLAKE2B 06f651a1c8b53b047a96bf48d798b2449020a30de4dde6480fa0ac8db70c9e3f9d0e7442d0944dd1ccaa6a553169f423d763fd7c3052f4cbc355fa6c799a5fd5 SHA512 f0f0183f78ac9aaa0fd8019d894c2223079467f801e9230cf881b30b0786f8cad4418c7e77e81a02f48c8dd0a6e3ffc8a62ac122f241cc1b0a9f4e049811b0c6
+EBUILD cinnamon-translations-4.8.3.ebuild 1328 BLAKE2B ea49f6317fc3b79941ec10b429e409f1610678618f8214aafae7603266c5f45060d4bd9ff1d6fe78c1a79e7486384651a19e5433da323cb86fe40a7c3a86b4db SHA512 79f14733848351b0d7408e471753f61c2747b40ff56daffaa7e50961b74810e1b14bfead230549c99007088a48096df4088f100683d1024ecff9e13106769771
+EBUILD cinnamon-translations-5.0.1.ebuild 1337 BLAKE2B 2fb262abdcca614f18961a94006812d6a5eb11bf97a0525c01e47c7bff65541d1f9d5195d3a062c544fa34204d1f80428dfa3055bdf565353ccf17b7281859ee SHA512 cba5f4d502249d460075771738c2249c1461644644f85cd058c3e14ef9987f4ddf71ee93424d72e1f119b9a45743453a18232f8eff595174169b2c87afb8714b
 MISC metadata.xml 500 BLAKE2B b320afe0e72c5d2664e88acd7e4c532ebbe99def2a7bb47c0178c51c41c45f063fee9ffdaffcdfd2e5a0fd4bd4c73bdb924a131b0cb82c77d31442dea30860f3 SHA512 2cd989b1db3b951b3927679591b7f42e0527daaf979fd93175c4cb5ba95fde556aafbdaebc9265cbde6df239253e2c64462aa3fe89e0451653052b5245dba4a4
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
index f7d4dfb914b5..8c96fc799eb9 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.8.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES="af am an ar as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
 
-inherit l10n
+inherit plocale
 
 DESCRIPTION="Translation data for Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
@@ -21,11 +21,11 @@ src_configure() { :; }
 
 src_install() {
 	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+	plocale_find_changes "${S}"/usr/share/locale "" ""
 
 	install_locale() {
 		insinto /usr/share/locale
 		doins -r usr/share/locale/${1}
 	}
-	l10n_for_each_locale_do install_locale
+	plocale_for_each_locale install_locale
 }
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
index 91e11858bec1..bcea7f9c6c14 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-5.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES="af am an ar ary as ast az be be@latin ber bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB en_IE en_NZ en_ZA eo es es_AR et eu fa fi fil fo fr fr_CA frp fur fy ga gd gl gu ha he hi hr hu hy ia id ie ig is it ja jv ka kab kk km kn ko ksw ku ky la li lo lt lv mai mg mi mk ml mn mo mr ms my nap nb nds ne nl nn no nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw szl ta te tg th tk tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi yo zgh zh_CN zh_HK zh_TW zu"
 
-inherit l10n
+inherit plocale
 
 DESCRIPTION="Translation data for Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-translations"
@@ -21,11 +21,11 @@ src_configure() { :; }
 
 src_install() {
 	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
+	plocale_find_changes "${S}"/usr/share/locale "" ""
 
 	install_locale() {
 		insinto /usr/share/locale
 		doins -r usr/share/locale/${1}
 	}
-	l10n_for_each_locale_do install_locale
+	plocale_for_each_locale install_locale
 }
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index e8330d0b2712..3a8fdaba587f 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,6 +1,4 @@
 AUX gnome-shell-extension-bing-wallpaper-34-blur-enable-check.patch 1659 BLAKE2B af3da54697f7b9101fc81f442c5d2d3712866b1da81c56ed24478d21551ca0553d3bf259e54162c04e0a5c2e06cc0c460c23ce0dc47fed493340fb9960fa82b9 SHA512 c5adb0101fb7a834a10316d1bca48a0215cb3cf1c00beb17b9c2c2005c07c9753dbcaa6b4ee5deadae6aa6595b7a3b8cdaef9cd537b2bf236b955b9ac5ef53b2
-DIST gnome-shell-extension-bing-wallpaper-32.tar.gz 4186897 BLAKE2B 2d8d119ef61c426be5e1ad3070fa038fe34f1cedf706a748a9943eaa2ef9bb0ce75a8df99abad38d48fd8f25ae532ae9dd425ca00d7165c06b177580cbed89a3 SHA512 c72473df4b5882ee5964c74fa42d270097526337230e538c1fcfc6e7bee5ab492857ca0f48e019ba7cd3ce6808b22c7751333275dd074b057fa4e09030afb609
 DIST gnome-shell-extension-bing-wallpaper-34.tar.gz 4308799 BLAKE2B 5c14895fbb42fb726e1b6d93924eebfd7b93ccea893075bfd698476579962a88f8e0008d7e935304d56caba1db1f8afc8fee3498f63044e4a9da13f568025e84 SHA512 7e1e26b5494a9e66d74c3d1045827445935d1a0ed20b095cb72b3b06b622ae5fda7980313dcddedf25c5ed3b40717a8e322bc80764f502c5eb7fe7155ec84ca7
-EBUILD gnome-shell-extension-bing-wallpaper-32.ebuild 1103 BLAKE2B 8192d6f5820fe66d719b41aeea459f4a328e74cc605a01d74df1f34d5ca71c0bf2f5beffce00ff62afba9ef41a387c31e9a8802a039a0010d5174f0e78f6a214 SHA512 970b84e8e80e7c34b23f710164bc9ae00972524b83796f361139b00238cd170f249709c81ae245f3b14a0d003563ab82f47a7a348aa0f6123a1425ac31a73d42
 EBUILD gnome-shell-extension-bing-wallpaper-34.ebuild 1230 BLAKE2B 8b539ff6e099f97b6b0352765338667ccf7cb670d2d95c59e603624fbd85058235a1679429eba59423ab74b38277554c7ada57d1c25e05387c214a5ddf543396 SHA512 0627ac6dda7303c0772b24c687618c34398c60bbc32e7ff06ebee13391b4f159404f3ffb22e1bab477483c68afb47a175b30d50bc8eee83ffbf15ed7fef7fab6
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild
deleted file mode 100644
index 015ffb1bd01a..000000000000
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-32.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Changes your wallpaper daily to the bing.com background image"
-HOMEPAGE="https://github.com/neffo/bing-wallpaper-gnome-extension"
-SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.28
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}/bing-wallpaper-gnome-extension-${PV}"
-extension_uuid="BingWallpaper@ineffable-gmail.com"
-
-src_install() {
-	einstalldocs
-	rm -f README.md LICENSE || die
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf schemas
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index d656e7f82784..9c98d7cd853c 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,6 +1,3 @@
-AUX gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch 539 BLAKE2B 0b26d5b929f1f9305912a3dbab1a117a0dd54d2831c7ab9d7054be9b766928243ecf22f2ed4d16ec90e1ca94cb2e19b3054b9a23043cc0bd8f5944380549f784 SHA512 f2cf7681c9629fdd56237f81b9304bca83152764d5201a5d9584ca90466e405aa9b8c1b42ef9833b7c6937fae56e7115cba2fc61948dfafd4303943655a742ec
-DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20201211.tar.gz 15576 BLAKE2B 142cfb895f9adf2163e36a6005e222897c18e5ca347a9e6958664226abe9f4a6dd1a616b917ccee9531d3f1c27a3e8981a1d3335795543b782736a61b115fe67 SHA512 87efd0e222ba5676caabdff5fdb365e4f769ee4ca15a4718739934b40c3616c031283a1c3883d65dfc75ea59fdb63a9eaf3522465740602f987a136de688b19f
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.tar.gz 14863 BLAKE2B 11133a5bf6ea06acd2fce6f215fcc6a37a658857161b9babab51246d6d7d382773e92f395796410fafa903ace656aa664c749a501bcbd4d05ebbd81ea9fd5018 SHA512 06f6329a6a2b2e03cacd305e1dad81768b81d6193782739caeadc51f141da9238d2bff563276235673e492ad7f13977fe7f1eaba73ca940a410b94defbeae5b0
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild 1451 BLAKE2B b24c04f5146dc6ab5293b090fd06c26597580ed370953f6a96d9ec5abb054270e5d42fb720af5714a33ae135cf4e891cd95b98cd2506e8a812396e7a75852548 SHA512 25e5cc00061c94ec4d41d180bfa5617e4a080be76ec4461c11cb537ac31e123bf58d9b3d23252941ebaa7044e4ae3318641a2c4d7f294c5b236fbff373839a04
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20210614.ebuild 1338 BLAKE2B 1a24cb39abe74cc8fb7a7681e327f62bafd8db533e854834d804baa7435c90ab15892d71fa21694fa22d8854edf0c9913357fb103d9f420f1055af477ea64d2c SHA512 d8ad8ff5ee49f55ec35ee425030dcd43a02c2c67a61a2367b46ee030c10ce8eacfb68440e03536c80250ba82d912ee32d669df7c6a17b4472ec3d42eb57dce68
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch
deleted file mode 100644
index 7bafbfeed2fe..000000000000
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/files/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-metadata.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/metadata.json~	2020-12-11 08:57:59.000000000 +0100
-+++ b/metadata.json	2021-05-20 14:14:26.242002668 +0200
-@@ -2,9 +2,7 @@
-   "_generated": "Generated by SweetTooth, do not edit",
-   "description": "Control the Blur Effect On Lock Screen.",
-   "name": "Control Blur Effect On Lock Screen",
--  "shell-version": [
--    "3.36"
--  ],
-+  "shell-version": ["3.36", "3.38", "40"],
-   "url": "https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen",
-   "uuid": "ControlBlurEffectOnLockScreen@pratap.fastmail.fm",
-   "version": 6
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
deleted file mode 100644
index 75851380a14f..000000000000
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Control the blur effect on gnome-shell lock screen"
-HOMEPAGE="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen"
-COMMIT="748b95e931b6b1548b90ceeee7a5883da3e0529f"
-SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.36.4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/Control_Blur_Effect_On_Lock_Screen-${COMMIT}"
-extension_uuid="ControlBlurEffectOnLockScreen@pratap.fastmail.fm"
-
-PATCHES=(
-	# https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/issues/3
-	"${FILESDIR}/${P}-metadata.patch"
-)
-
-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 91a9088c36ef..40ea9dd71f7b 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,9 +1,5 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
-DIST gnome-shell-extension-dash-to-panel-42.tar.gz 21140972 BLAKE2B a4f6dc7a3770753f37cabb6c165f51a455a34456de5fe15cbfde1b3018f4aee32cdc6876286bb6e6671430f18f14f7fb370d2059fe6032d85d93b0adacdb9f48 SHA512 7746098395513cd2b94166358d2315e581248a2ad35dfa0ee685386633a95aed0897cea17335e73c22cdd81a68900de7718ed34e262614358706e560bbdc3bf8
 DIST gnome-shell-extension-dash-to-panel-43.tar.gz 21140181 BLAKE2B cfac79409ae5415bf371b1f45ef1e55bb4d06a8613ef0b0ff481a231edf33ebd44d1dcd9b37dd0bbe78791ea39e66aa914a6741dd5150e9f4eb55ad2b56478eb SHA512 41b2b3553bc75f82c868ee69a411ad3f82f456cde1cfc06792bb602c9fd95e78c9538aecd58752a3500e9aad2e98e17176c2d754da6c77eb3cc453cd0c3b235c
-DIST gnome-shell-extension-dash-to-panel-43_pre20210510.tar.gz 21139555 BLAKE2B 2edd8dc8e16be6186791f7915f75f50abf355455ae54eadf0c9c45bca7b39f035b427027fa06485a004efc07dae37089268e244a911d39d42914619c36e13ced SHA512 db41b1d714a339b24c956805b14484c3be3572b1077c5b5b2f7a91d880a8784e1f02a024d515d40dcc1e65fa2ef60682d029ff6e6891aa2db687382b2b92dfbf
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-42.ebuild 1828 BLAKE2B 09db667d779d1911c1823db8d0fca16f2e9cd7e4830f9ba4a08707783379415444d073924a85f05f391e75d29e6aaa8ebdbd1984c12637e4cbd0164b12a853b1 SHA512 117aec5ea76083a1781013b937029db0434ac92187e0ac05480a35451a83b00b439b636b686b9c005e901a21593fc25d6aacbac3dabef514124ef68837c9ee5d
 EBUILD gnome-shell-extension-dash-to-panel-43.ebuild 1824 BLAKE2B 59fd8b915e1570aaab7fefb4123af35f7443eb141e58f86cfaeb317aee0a1984d986f8e804dd154145da75e1b2c2d39cb0449b5bb8d4e7875b06eca24063b254 SHA512 0d046c9e1f1140db2f52dfff8de0dd2dd4d95fc3c1d61b531d73c2e7cd7cabe19d235ebec499c4dd7481dcd79447163afed3f6623aa03e9620b47d2138ca0eda
-EBUILD gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild 1878 BLAKE2B 5115c3ef3a915854bfb10d6f457d93cc0aeb0179cb11b2058ed2fd7a269cb2559112b0a7efb51d62ae25d0ff2e3e45f952f00ec9192c7bce0fb7aa1770d475e1 SHA512 36a96d7184040ef05f2795ed5be04b626ce79039bdf8a4fe3902a9a588074dcbe24743b599e699c9c78aa12d5f5652b73d04c8085decdb5ffa0884f4305f057d
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild
deleted file mode 100644
index 4d8aad285b73..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-42.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.18.0
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="${PV}"
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto /usr/share/gnome-shell/extensions/dash-to-panel@jderose9.github.com/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-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/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild
deleted file mode 100644
index 5d63d5944f54..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-43_pre20210510.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-MY_PN="${PN/gnome-shell-extension-/}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="An icon taskbar for the Gnome Shell"
-HOMEPAGE="https://github.com/home-sweet-gnome/dash-to-panel"
-COMMIT="3fb7bdb83b69478341ec1568b31ef6829d004715"
-SRC_URI="
-	https://github.com/home-sweet-gnome/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="branding"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-40
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-extension_uuid="dash-to-panel@jderose9.github.com"
-
-src_prepare() {
-	default
-
-	# Set correct version
-	export VERSION="\"${PV}\""
-
-	# Don't install README and COPYING in unwanted locations
-	sed -i -e 's/COPYING//g' -e 's/README.md//g' Makefile || die
-
-	# Provide fancy Gentoo icon when requested
-	use branding && eapply "${FILESDIR}"/${PN}-26-branding.patch
-}
-
-src_install() {
-	default
-	if use branding; then
-		insinto	/usr/share/gnome-shell/extensions/"${extension_uuid}"/img
-		doins "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg"
-	fi
-
-	# Install schemas system-wide
-	dodir /usr/share/glib-2.0/schemas
-	mv "${ED}/usr/share/gnome-shell/extensions/${extension_uuid}"/schemas/ "${ED}/usr/share/glib-2.0" || die
-	rm "${ED}/usr/share/glib-2.0/schemas/gschemas.compiled" || die
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 5fe752fc9c32..b36ae12e3e77 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,5 +1,3 @@
-DIST ding-0.17.0.tar.xz 71596 BLAKE2B 38770f2935c47242a47b377bc18c2599a6a54b9a13a7085c24a13a4b46c007c297adda1515cec9fc11cdf38ceb8d2ecebaedf6c1e64f27351ad6b923d0b02182 SHA512 425da33c45c908bc907ef2440c6d363fa666f460a997ae14ae53c39c398307aa96150b31fba21b7e7d39326dcff6f23951d4cb80937616003c4883c96e44d635
 DIST ding-0.18.0.tar.xz 73584 BLAKE2B 26a98d4b16ce559b710154707a4365df32001e1f3f4a16f427d5d0aa8b22ba6d94db86928297c88a4e31d6df251778ca841946dc5ecd692cfaae38c5d1ce7459 SHA512 2a269d944d283db229247a028c1882ee9eafd1a543840b4309ea3ae87ab0b8753eb19fd0052236c585888d8ef461626326bf41db184527bc2a447e26e3cddb31
-EBUILD gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild 982 BLAKE2B 0e04254e7e6043fc7854c3c7fb3eca59d71fa5a31b37680f3922576d893c89fe52cf98ab665632c60303715807fe548a0c9fe183da139853cb6685f864694f9e SHA512 e8f06a86bef1217a387bdddae31c926c2669a7250eae5bd067b900a318aa4bffd4ee38b394e8a2ca33eb4e22b6a3916bb3505461cb6e89ca2ed548ada85d7412
 EBUILD gnome-shell-extension-desktop-icons-ng-0.18.0.ebuild 1001 BLAKE2B 7ae257dc653e9cfdadc3d261cd89ae38bed022949aec1af6e7f172c3fe6969ceb91dd1bc55b9b07a432cda6af4f02220b04d75dfd09f4f31cb4bd95ab0a86621 SHA512 11755a7aab2f0cf7c48e654de9aa7de4d293c7d98a5c7a812c93b876f3fd00312191b9c79fc64b33343ad012da763abf95a0053c6916cbcb2b8b963c5e1c75d2
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
deleted file mode 100644
index 7952e15af15e..000000000000
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.17.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson
-
-MY_PN="ding"
-MY_P="${MY_PN}-${PV}"
-
-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/a434978b57ec46ad0e35352b27d525c6/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-	>=gnome-base/nautilus-3.38
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-extension_uuid="ding@rastersoft.com"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 3df3858e323d..41e7bf4cc716 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-gsconnect-46.tar.gz 735155 BLAKE2B 86a7288953fe6001cfa15277dcc38feac3dd63fc60b8cca86dd95632b4d022587654393c3e6386a7e2cf7ad3af409efbae2e5ffe49eb36a9093887d0848cb080 SHA512 584348407a0f41f4317f52cddc1cc7e1e622fdd765e3eaa0b8012cc4bf46c09adedc97f9701a8c94aaa63dcd46d20fae35f49bfabe8c0d4abb4b407d8ac2c199
 DIST gnome-shell-extension-gsconnect-47.tar.gz 737392 BLAKE2B d2f09ae4650c17cf9f5ef90c18beb2ff46c3c077d27e4ea11fdb5f41522cb231aea47b168848c5da2c0ae35fbd1df734fa11f13c38abbde2ccab585137b7e116 SHA512 c1e900b225cda8edbcc1b3a16883b58d09a110b67cb503f3e7e71f8e0abafb565081528958cbd44e5685a1de2d7f54cee88a87a8e35f2344571eab8935b80c91
 EBUILD gnome-shell-extension-gsconnect-46.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
-EBUILD gnome-shell-extension-gsconnect-47.ebuild 1615 BLAKE2B 6d38053202c37bfe4014a553b5164b7dd629a67ae061e369d28ef0a47021c58d03af3c57585772aa261d2cd0c466c9ec281e957c239faede5e4b8dc410ee8b2e SHA512 bbf3115839b28690301fdad033d0e004ab4691bbe011032f592f96b85f1800997b9710c64f6b09aefd8ef75c8ef425585f18111f2c4d57143b2c48bbe082b703
+EBUILD gnome-shell-extension-gsconnect-47.ebuild 1613 BLAKE2B edc2b6614b2c3a69f1046b19b8de629b8bd35114cc1950ae2479b71d46d076407c63b96f9239945bda69b25ec6c190313b7d21d44ac5237c841d74adec754fca SHA512 f6485927888161e1ddf82a17941e91947486b96eb80f492bed6928e6771201aaf4985357bb9e22087b8dda402e2f13a72f7f3168eaa1372a48c6da543dcf4441
 MISC metadata.xml 345 BLAKE2B 77e44add98d26f7ad351ad6ba3a11852499b76435ee6e49b6c37f30aabd406fbbf65498463bf668fc5971ff03dcd7226e5f263e2e87fab7c208048f6ce6210e6 SHA512 5402440fca2d10c50ad20eac8225d99df4a0e6f13c3758f4b08a692d11e8b8bfa35a89909777b60a3675f229d2122a19861cc5832510122474be99f5c1addfa1
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild
index c046c64ae00b..bc9f45487557 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-47.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index fc61d53258f3..852950e319a7 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-shell-frippery-40.0.tgz 82308 BLAKE2B 2466880cc04a46a8177640a19fa9ed89d784a34fbaa7a65d6948732d0794f270573df8d108c9a74c78296d2bd1565c4d3493caf4086a6f574e7e17b950eeb7db SHA512 68e2cc452df26a7c806f62b3ed2864ebaf766495ba47991531167e63aa87b2baeb301b83d2f288ad87802e7b2220576108d6962386ac5ee08fb3d89024d8bca2
+DIST gnome-shell-frippery-40.2.tgz 82612 BLAKE2B 9bb92df42ca3702743d4e5a497d1de610e4909dedf7c96ac74eb374d6d9cbcbb13d9aded266602cab10a73bfbc018dee84fc07e1ec44184c2ad89b60c8880d9b SHA512 d6136dbaf798d87a2c4c3e8a1e09875759a877e77904f3f96843e0d86720213453139a9376aafa4c13a3defb0457f0ed6a659e47afed2f30a244e31266c69dda
 EBUILD gnome-shell-frippery-40.0.ebuild 911 BLAKE2B aac80e00006007bf3e3c69ff61f7409d906dfda5399329d15bc022329f2ed376cd985bccea96ab898ea5d0432399caca0759b3052f49843cdbe20edc761e1c8b SHA512 a39fa00e939256af96f0d1412cca2d4cc24ca17423f3d453e9d011f4326291ae7ab4db4040994361773c51272bc8876aa98c1654b2954e9c31c37dde2c874a70
+EBUILD gnome-shell-frippery-40.2.ebuild 913 BLAKE2B e80c51a8e49c3c73bf02367611226be7aea78b6427dde7f01cf7c7a45aaee74105066868737de2a614612d81cfff24cf222e8c466a0015740a10618ac229c748 SHA512 de10cd2e231f852b66875b7fdaf0783a6afac84e96163286e82c07636bc9a784b87309946159499d473d848d0f7cc86734994d5ed7794c85bae460677d7cfdd1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
new file mode 100644
index 000000000000..fc8efefccf22
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-40.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://frippery.org/extensions/index.html"
+SRC_URI="http://frippery.org/extensions/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-eselect/eselect-gnome-shell-extensions
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	gnome-base/gnome-menus:3[introspection]
+	>=gnome-base/gnome-shell-3.38
+	media-libs/clutter:1.0[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND=""
+
+S="${WORKDIR}/.local/share/gnome-shell"
+
+src_install() {
+	insinto /usr/share/gnome-shell/extensions
+	doins -r extensions/*@*
+	dodoc gnome-shell-frippery/{CHANGELOG,README}
+}
+
+pkg_postinst() {
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 7f030e2f8dfc..16eb1ad6dc6b 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -3,6 +3,6 @@ DIST gucharmap-13.0.7.tar.gz 1919890 BLAKE2B c90b09f2e52b27ea652a32c4a502a57767e
 DIST gucharmap-13.0.8.tar.gz 1920107 BLAKE2B 247b6683358e1fcbba02cad8146b8b1e7a4ccd5e56d3f9c6e597b47bcd38d11759a02e60d5635c3f2e26defe166b6e4ded696b5d1f6e1be6564d6139e3ed1ab8 SHA512 15eacbf351c8b2357e59913e5b4cccd279aed7a492351c42101dd26020658f2f4d7aaff2a3b95ca340a73606592f47edf9645c93234afb1a086362ef32904bcf
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-13.0.7.ebuild 1506 BLAKE2B eceabffc13dd3bf5c5fc3e0b0fec03de5a469a97a79143a5c8de9fd87ee2923b173c73b33bee6e575c4f23ca7f2dde1c430edd02e0b64821a25c821b033acaa2 SHA512 58561877f38ca9d8b66a599cce704e04e04b698f42440266bb52c9c98bbc4da83b2b0e0f855a513cac41c547f71913b3a1d0314b63789a936ae5cbbc25373f34
-EBUILD gucharmap-13.0.8.ebuild 1513 BLAKE2B 0d3d0d81df0c85716f668054639151ca42fc9630751e91615573d74e6eef76353ef3db3da747784f19935461696a3aba02ffdea6249bc6cf2a5884e1cfca4840 SHA512 13f11f8c50781b6043b80e2dc2058e9af45319d832aa71811ef7aa3074bab27647febe44eff2981fd6257b03de0b0ab8c52ea3888e46b35cfbab036c8b9a03fd
+EBUILD gucharmap-13.0.8.ebuild 1512 BLAKE2B e16c501d7aba63cfedcd784f1c5165b1a2051444b4a313fd03ce1929105c95f56c052db38a4b779663262b2a3563c7eb4dcc2aace3894566cbfafd0d11086a45 SHA512 900af614e07d3111a5168643585ca895bcc97df6ce22f1e0d723e01e3bf8868b6d084f7a895c4410d1ff2c0459bd5859f5f27449cfafd49403a425cbc58209fb
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
index 8f491c6b3bff..bbc4806a5e90 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 UNICODE_VERSION="13.0"
 
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index f556f56af79f..207cca203ab2 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,3 @@
-DIST pch-session-40.0.tar.bz2 3610342 BLAKE2B 9d82fe4b20e136d5ddef020477ab9526bb920b7e67e3a357ac24c6fba5d83aa8e1735a9c581a156496f7013ce12c6e6c91f7a5b7e3e446503e81ad96070fc884 SHA512 32bb9ebb3127b47482150d11c1e8bb865e2fe34e39767670f07d03965044842526e4194f3130743c8f79a5658dccf858c922f88d1316ea4d065878090a77f128
 DIST pch-session-40.2.tar.bz2 3610529 BLAKE2B 4ae2fa7d152edff0707c5f705c001d601a08f70a7629f3cefa53254b07eac124280d547392c80d9dad76c08fbb80e09aaaefceff06945ebdddfc8f61d31c3426 SHA512 6300e36f5914f8213ac912e1e44652c08ca90a31e3e480b5f6674ce54a798f8b3f1226d781859f7bf9fb4a64186ee11a8bc7d6f8d59017340ec3b65d10948f0b
-EBUILD pch-session-40.0.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 EBUILD pch-session-40.2.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 MISC metadata.xml 240 BLAKE2B 63b29b3fa5f9613689cca20017685c7b8fda461b37bd79b15deb70b8691afdbb1a262dac93cb3520a9d9e9c49ba745f8c797b269bb41933391a5a94667bb1c24 SHA512 2d1e63e0f72d6332021e3c9bdacb1e2b203a31b907c5a93c305e4f7b0eeef0856fb0cca37bc0d7d3d1ba77b08f81c7626f834239e3484e13032cedf59304239e
diff --git a/gnome-extra/pch-session/pch-session-40.0.ebuild b/gnome-extra/pch-session/pch-session-40.0.ebuild
deleted file mode 100644
index 3b5931d3af68..000000000000
--- a/gnome-extra/pch-session/pch-session-40.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils
-
-DESCRIPTION="Unofficial gnome based session with different default settings and extensions"
-HOMEPAGE="https://gitlab.com/pachoramos/pch-session"
-SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/gnome-shell-40
-	>=gnome-extra/gnome-shell-extensions-40
-	>=gnome-extra/gnome-shell-extension-appindicator-37
-	>=gnome-extra/gnome-shell-extension-applications-overview-tooltip-12
-	>=gnome-extra/gnome-shell-extension-bing-wallpaper-32
-	>=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-20
-	>=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20201211-r1
-	>=gnome-extra/gnome-shell-extension-dash-to-panel-43_pre20210510
-	>=gnome-extra/gnome-shell-extension-desktop-icons-ng-0.17.0
-	>=gnome-extra/gnome-shell-extension-gsconnect-46
-	>=gnome-extra/gnome-tweaks-40.0
-"
-BDEPEND=""
-DEPEND=""
-
-pkg_preinst() {
-	gnome2_schemas_update
-}
-
-src_install() {
-	insinto /usr
-	doins -r usr/.
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 3671cef6291e..a79719808b33 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
 DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
 EBUILD yelp-xsl-40.0.ebuild 561 BLAKE2B 4a655fc2d410531316481bd762b2b7f2ee6ca4cbbba77dfb4b5152a9b39a00d669f9aed1aa33b83202ef9d825db7eb2cd9c65662d9f4f09b9ba05b0063fb90e6 SHA512 5cd83a4655215478ad72cbe3f9d38439084dbdcee9ef52d5254c1dadd5e1661bef5e9122dafd3658ff61a03399d2933de50765870126c9ce99cfdcb5f3585c2f
-EBUILD yelp-xsl-40.2.ebuild 568 BLAKE2B b7e4b907e7e42511eb66e10556de94e8f5a86d8fb10204df85685f4714433aed0787c558b92e887c21d6bc54a2e8885e884f73b83f0bed300858688fd9f3ef63 SHA512 362bc0f94b18cd918a69df358281f7eb2a309e6f8a088c87d8d58728cf9f07d59582d9e946c07039be4fcd60878bc17775d4402bdbfa3190165bd5212a710a5e
+EBUILD yelp-xsl-40.2.ebuild 567 BLAKE2B a4f8be2b38351527da6a5b3c5cbc2886ffef95cc1243eeed430133a6dedbbcf7b3fbe70c25da473ee7f47ec33a3b1561af4de743abe92981da4b40f21202e581 SHA512 6ef52ef5eb6bc3e873610401212bb8d133e6496e2ae4fbea092ccfc9ae0384e1d74d1db615388680143a73e95e46eb2cfd6e1a82d8d000824b8594647ba85e62
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
index fb0b0cda287d..c0d2706ae15f 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-40.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=