gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /gnome-extra
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
81 files changed, 286 insertions, 353 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 4213365d61cf..63ee5c7ba93a 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 585aa62c6e4d..7320b651a3d2 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -4,6 +4,8 @@ AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.30.5.tar.xz 4582264 BLAKE2B 96303da0fcd285dffc2a56bab0828b2011238a0970dc50df005f690a76c432abad27afd74569b1cc6ff2ddc56f1dbde003241d53609b0222a474941724e46910 SHA512 b841b23343745afdc59f42ee384911ae24be6b1518095d52099ce5b657def17e5b4e1fe1e61fc1e03e4856b0d26c6a1abac3d9ee5530da84c645d07c69b8d859
 DIST evolution-data-server-3.32.4.tar.xz 4585396 BLAKE2B d89b71beaf24deb89e510e318050a8a3146b8a6804c148c62d4cb2c0cfb3b50a3767cfc213db05b44c6b5b99e578a24d3c272daccadb4e950b2d103639ce9797 SHA512 fccbad5989e6366840c50dacf2e81510f65c8640c9309ca0446c1b236df99f43a310fcadd377e205d0a94f0e3f9b53b83c41c042c3244e05bfda0d6df090d0c7
+DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
 EBUILD evolution-data-server-3.30.5-r1.ebuild 4375 BLAKE2B a8a00e60109901b1b840bca847433c6f21745819aed7f259ef3241fec7b7179f2c699afe1375656158b5807c5ebfe8c43a314f9c0dc724d11f901958309a92de SHA512 3328e7a55cccc41383a01531aa59b9649cab6712914aa40a18194936ff54ad7b6987041cf048c425cb5744ac20678cfdb869348769cbc2c91fffba1f8f6a7899
-EBUILD evolution-data-server-3.32.4.ebuild 4363 BLAKE2B 3eb7059bdc2f279a7ed74e338dadcefafe8155f0ac1a2eb7d62699f303991006dddcec710e46a27571388a5fdd992114a6d2a1d5263e988ab48add714ac891f8 SHA512 b7bff4f74d9bfc1e1abb1950ac1e5544ea62129801a83de7470bcabfd8495f161e1bb92776929baf7046396e2c19da2926d4b6502a88ed8667856dc97bb6dcbd
+EBUILD evolution-data-server-3.32.4.ebuild 4361 BLAKE2B 7fb8013c42191ec5dc88dad69804dfcc8e321765104643ca84f46d2f29c93d9020e48f8a317f3f6fe0e591b0db47c8a155a9bbf27297889e003cb6be66521d74 SHA512 388396dde9017402a9e30d7f7de63e188057ee9301004578d603cb532ffd7a50c15a141f36349ebe90bc8ad89b858c9bb5c8da3a759ada1db1d4849dab03cbd6
+EBUILD evolution-data-server-3.32.5.ebuild 4364 BLAKE2B ca0122517213ba37faf9cfc1d0582a2eaf1a255a065da54989b449d0eaf8d607dac78eabf3398248a5c63b1c95b47f1b7166fd683bf08cc6a15c4c2f7bcf3f48 SHA512 b566d1e38b9c529a9833996b146c75c8c03bd68a9e64a7beeba7c3d223f33820e46ae6a381213696eb2ffe3f4045c40a0d5ffa02049b8ccfe1ca27a6166a9bf5
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
index b92e1fc0d91a..1a27333dba64 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.4.ebuild
@@ -17,7 +17,7 @@ SLOT="0/62-24" # subslot = libcamel-1.2/libedataserver-1.2 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"
+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
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
new file mode 100644
index 000000000000..500e3bd8e884
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+VALA_USE_DEPEND="vapigen"
+
+inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 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-24" # subslot = libcamel-1.2/libedataserver-1.2 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
+# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend
+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.46:2
+	>=dev-libs/libical-3.0.2:=
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.42: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.10:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.11.91: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}
+	${PYTHON_DEPS}
+	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
+	vala? ( $(vala_depend) )
+"
+
+# 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 )"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	eapply "${FILESDIR}"/3.32.4-gtk-doc-fix{1,2}.patch
+	use vala && vala_src_prepare
+	cmake-utils_src_prepare
+	gnome2_src_prepare
+
+	# 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-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	virtx cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index c2c502cbbd0d..7fb9bd890120 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -2,5 +2,5 @@ DIST evolution-ews-3.30.5-certificate-validation.patch.xz 6928 BLAKE2B eb1f07079
 DIST evolution-ews-3.30.5.tar.xz 525252 BLAKE2B 510666cdf6bdb95e73799256daa9b4c753ed70de71798d3acb73eb55c30158a7b6b56fe7617150ec0a1f5ce20676da8a3ab4608fca06f009ea16fbc234770736 SHA512 6b17fd73b461e0ddd725ee87c854fca45fbc14f10922a60aff5a9a25b56728f1f16a0d3196b4bc3cba83e75655c15244c3bf2442fa17449c7466ab95371e93d7
 DIST evolution-ews-3.32.2.tar.xz 534056 BLAKE2B 2f935910cba44d69b2d8bcc3021709502c1a129ef29d18a847bccd14837d0c18c9700a97f978decb36f9c28242df81a9021dfc536e31f3d8f7793a0dc4c6b680 SHA512 5696ea660d0b52c0083664ad203eaed372fb9653399152ccbca0f6360a3e0c4503b5dacf4f9bf5650b1b64696c0fe06e2383bb408bed604ea0312660b4639388
 EBUILD evolution-ews-3.30.5-r1.ebuild 1499 BLAKE2B 5164332cda7bf860bb5abc8299c55dea3d1c8dc1d46d2ebd8d4f007f1aa068dcf2d42f46080062c599fa019078882094d8edad35e4ea83deb7eb0d77675dc9b7 SHA512 cc9331a17d6efaedea8a14e6f00c0438a27f45d40a3c42f5ff06eafd941ce70972ee94755134aa06c7beee9ff0efb3aacc350f8e5b0fceb536821fc7842227d1
-EBUILD evolution-ews-3.32.2.ebuild 1318 BLAKE2B 36f7fbee2b2e16457de035c104d83e7f86412018ed528def4face1962a8c7f24339f87ae9a549b2569ab75cbe34a6c1e1d994d95ac7316479cef8e33a4e43548 SHA512 42ead93114a58792efcd9d0d84e084a340f61e167f53f3f8a9c8956d5507a2718c8b3d943b6616e911d7232cbaf81b5f31a4ed201c9d9bcb781d374f92275920
+EBUILD evolution-ews-3.32.2.ebuild 1316 BLAKE2B e1837daf5fbfd3c1ba4f292501c98de34203a0556f01595dc5f762105da5bd67628b336e8fea0f03697ced436628fd9f2eb4c053175144c7fd73a93798747e83 SHA512 83f59bca21904024ff9c1032f8c5703ead325262ccfcd177453fedf9d9ed01fe246359df124f0dd0d0378f741f1bf2578f2889d64981db85ebf47de4f2967a1f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
index 403bd52ea196..ca6e53c82a1d 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 58f06116e072..d46f0e48f9eb 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calculator-3.30.1.tar.xz 1070308 BLAKE2B dca8e16f754d7ae7ac3371dbe65fcaacf51c251d377cc696c7c9a9ca6b4d9c0f6431acd06c3091e3d3e0f468cc599953452cbbe4de33473e365425ca3add602f SHA512 4c909f36d1e6ff594b9ab76419a6b50962cf4b5de606c4996d311e5ef6511a20d5c3b310919b271b1a0120ed6a0794644faf5a390d94b71ec6bb89883d498565
 DIST gnome-calculator-3.32.2.tar.xz 947096 BLAKE2B 7c511e4d22971b008587aaa9ee7a44bfa663b663ebaddd6b5d4426f673e0f8975506c3b6aaba2781e3ccbe9ab7b9eb9b9d876c1b8acae9e14b195bfbeb207c42 SHA512 ef30ddad8b68367f71c2b894f041affe2b88c8aa90ad40d6128d03e0dc4871fd57d632809a365b14bac0b53dad37a73df564d237b8f45d4c42c38e118cb26de1
 EBUILD gnome-calculator-3.30.1.ebuild 1110 BLAKE2B ec77940f70f395a0b28a588aec3d6554bb917753a24236e281e7b45e47b3764955d9e4957df25d101b506d85dbedfb2730aec07b21e0dff2613b21503903b1e3 SHA512 7bb1942065cc8553056efafb789fb469fc3a589b390e9a564111c1b6eb71bb1489c1a4a4ad5d0e3286941a3d1b2f7b32c7384107835f6af9791ae709c9ee7ca7
-EBUILD gnome-calculator-3.32.2.ebuild 1131 BLAKE2B ddcca90288231151aee90be30bc6809df2434f01fde9c3fb9083bde607b04df9e8f6de451d235e6786f095971dd09e01e7ac3066bb65f2cb358d5be12a862721 SHA512 6aaa02c21ef283a43da182d0ab42c450850e7630974983bfea76db57645990658f747552b6d90889b0c3bf6125e24c82dc86cfb0ca306948b11c7ba122c57bfa
+EBUILD gnome-calculator-3.32.2.ebuild 1129 BLAKE2B 5d2a5e5682fb3242a7d63b30d0f32d412932e69feaca81872bc8e79f0d81efc060afe0252e46b436c4622b51a2547bc6e7ff0a1e2fd4e943e0bf3863e734d959 SHA512 a8dea111b7603c252ddf9e9c0b0b1d15bda57c532907e6adaae001099a3c4323d098e09d8ac97cbe10f7dedee5bf5a8446eb9970ab7118b21985e0d2bb8224ef
 MISC metadata.xml 435 BLAKE2B f9ee442cf41d13599b2ac8bbe73a3f69961b5bce68e82544e8d1e5f886c97301b92675ccd38607d5bad961c910ec8ed9ae30a12ca9028e3d9cd92a2ac3bd8681 SHA512 4af60d7bd9142bc3293176d47ff239dbbc10d86493801244e9766bddd556a9c3b34b188f76d250074b3f337e88dc3d97c803ce244e15503c7380015772a9228c
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
index 94ee7af829fd..c9031578e5f4 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.32.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~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]
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 4f36f9be6a9b..cd61b538e033 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-calendar-3.30.1.tar.xz 2443936 BLAKE2B 1826488ee03742a9350e589954723264318450d50fa7175955deee8fb3b3bbf2a29fbc6106644bccc062dd45bd9a16e7f40e2928c488bc333ba35d00f2411f25 SHA512 acb428f123fe716b41c4e828213b1106296731b5aa99607838219b8e6c802b22d3481eaa91429cfb34bc3d098344f406ea86c5e2f794f26414ba05bf0189fe29
 DIST gnome-calendar-3.32.2.tar.xz 695416 BLAKE2B bf5b2b5bd8ea5934075d00614a3888208a06926b8587fc39724850c0fccb7e34920bb650f45a241074f5ea383acb80edf91884936c7b432e0a7f9e672e457b8a SHA512 6a1ee1b41080d7814e9a49b3a95689fb01325c9ac5eb1314b11e7097c3b8b120c7ca45b05c806c3dbac284a70474beaf419773ab185a7cdde96303fcc7cd3915
 EBUILD gnome-calendar-3.30.1.ebuild 1338 BLAKE2B 8fcff691e41e5aa16929ecc12cc18f2f1750009700df7c2441b7bea9c7698c90e531ae250f4e1f918f54db54d3ed4c5003ef13174d8a0c6ab6fc22b3075f4221 SHA512 900e2506a5c771c4071e2ad948513cd1157c2f90dc8695c9075feafdbd0bd5779afc4be7a8a3516739a26ac2f8fed50482e89e5ab3151e0b000e2bb4800c24cb
-EBUILD gnome-calendar-3.32.2.ebuild 1309 BLAKE2B c80923244eef4a4338555f36718bd3c5d09578c93d4407d7ae79d90fede7758ee48087be3124fe525e983c1192aac1283f6981881f72692c9d1c5789853f7561 SHA512 ce56950619156e7bc7d8cfd79c27ad214178030b861298975350c9158fec5080b4481e0eef7d01c5d7a2fdffd42f4cb09d971d4707118d63d1e4573b61b26f36
+EBUILD gnome-calendar-3.32.2.ebuild 1307 BLAKE2B dc319dd983394c939e6a70034960c2dd937f81a84be595ac3eba132b388b9e1354b87f3611e1233ead4c20529f7bbe61ad121287942da885120bd33a2ddee056 SHA512 eab7fe0d541b3b758f70e3ded47c81d2fa121c86cc61765e9fdacaf831ec5c2d1e215fbd57fd2c255950096882cebf56ac027f7d4ccb1f1911fb27483d813266
 MISC metadata.xml 522 BLAKE2B 24cb41757041daedf83e72cd8620bef49d2bced678ede42c1a071c3cf99f2f157b086acc393953b42a612dd5c4d622b0a869934f89661c28be742370cd4688c2 SHA512 f595d013522df745a86b01e6696ea5fe6dafa55d55e3fe22adf469fef56507846194f24c2ec5cd13382c69a494ca530438d12c69a6bec41247da1783fc78eef8
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
index 2ecfeb3cbce8..609ef28cfc8e 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.32.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gtk-doc"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index 4856daa13661..8d392373fe2d 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-characters-3.30.0.tar.xz 974068 BLAKE2B 294b401e410e4383120deaa4ef3adad485c27e59879ff412d9eb282678f07faba6fb5a93e01c0aebaac7dbac7abd5c19876a0b84403ad92ffc24211daec961bd SHA512 390536e0e5891497c5bd2374c70085beb5bc7c730f51d889e4147895f24999c5c3e9a0bc466a3d4c5652922f1cd7ce1f8f1a98e61007df59d682c230bc99acd2
 DIST gnome-characters-3.32.1.tar.xz 186516 BLAKE2B f6c6b95fbaab9f2e2e6454256bff87b243629927b1806161de2294a8b497cc1f601da747252f14dc8c232bbbaa581140b513a4db0c9993ee05295a82e294787b SHA512 d2c18b136da6ab35938de4adf74ee6c3841f5f8e46f3b1ed2bbb8f9d0e953bba1dc43e105ae2aafc880f3cba37b75a55d274e6776d2bc17a5e30364f5d625537
 EBUILD gnome-characters-3.30.0.ebuild 831 BLAKE2B 2c7a3d745e38006f95d350c549b29d1a78fdd043f06fecbba560ddf1897515f235b70bfc0dcdee35e29bb017effebbaf1b9d1293605ef82bc1a4b750f3b66c80 SHA512 4e9d12e5bfaa39bb8b58e82f43566f3ec582ed858ab1e46c65e966b4f35d5169032eeb9215e6e98665277a095535faf84d150243c7d4a2536b815d79f6975d5a
-EBUILD gnome-characters-3.32.1.ebuild 833 BLAKE2B 83826f708477da56d3772e975f620c27ea11f1f05d81b38e7599e90314b2a99542c7761b9edf09c0b228e23e2cec8eb7e516f1f40352409b942b5eb1c64f1ec8 SHA512 b51f2c147b2a1aa016f27217c504658e3f290b034c99365922fd3588d7b18c0083f51d546ec52360649f37a00d5987e2f6364baf59b4d058f9013aaa849ad363
+EBUILD gnome-characters-3.32.1.ebuild 831 BLAKE2B 2c7a3d745e38006f95d350c549b29d1a78fdd043f06fecbba560ddf1897515f235b70bfc0dcdee35e29bb017effebbaf1b9d1293605ef82bc1a4b750f3b66c80 SHA512 4e9d12e5bfaa39bb8b58e82f43566f3ec582ed858ab1e46c65e966b4f35d5169032eeb9215e6e98665277a095535faf84d150243c7d4a2536b815d79f6975d5a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
index c2308713264d..8569891bf153 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index ff1de5985ed0..6f07a1144608 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-3.30.1.tar.xz 798904 BLAKE2B 58ffb56191cfb07912c1575291f752aadb5549ae5e369cb4c8904756d1ab5e666591ead6756992090921741abbfcf751e2d3ff76ed82d688caf135c7c091c888 SHA512 62fc817a3ea3155b650865f6d5056ba3370da319389206d921e315be878159ff26d0b3063a2c31c85af7447ead10c5fb62bf1dfe4613e2bfac1d01b0ca7b8b3c
 DIST gnome-clocks-3.32.0.tar.xz 505368 BLAKE2B 54952a9c0340d30e042ac4b947e6a0a8dac9823d8df2c7cb5871a6dca1e259d18a9e212d37d46901b41f1f1e41ce09fa86fb02d9ea90f23bc23bc8d9f159e994 SHA512 061d867cffd3d8fcd09e125f8d053b847f2b197a4354f330e8b6c43d7aa5e0cf2bb51b342545c79c352f9dfbddd1667f3e64a40c1e117e6fc63f54289cf7cd2f
 EBUILD gnome-clocks-3.30.1.ebuild 829 BLAKE2B 57774fe99460ce92ad84ebc89b3f059ccc393cd2ab27890ca987e9dbd87136d38b2d11084f34520113738a3c7bfd084ded7e8797be1e12780f0881c851823a7b SHA512 947ec1a49c49d74b54e4765111bdafaf54c978069663a2a8538f12e5d6b5292a75236630562966699ca9ae90422a4ee04f964ec8cd9de4a21c095e0f9a6dcaec
-EBUILD gnome-clocks-3.32.0.ebuild 944 BLAKE2B 73e26ac8b9c937f99e4ab4eb3176c9d010f8ecafe254a222ec4ca70f2dbe76d42af813bd985f37f8f3afb5383d2944d618f15554708d626faa4542d9848b3965 SHA512 b99813a315359d1cff6afa50dc449e8dea480aeb6f4f4a4bce2f08135abfaec3531c044ba10cc7a975a6f7312004b861f95c05798a994a0fd9d9ffb65d08786c
+EBUILD gnome-clocks-3.32.0.ebuild 942 BLAKE2B e6776b51df2deb0833be9211eb5323998151796c8425751cf27ac94674faa7b6377206b2f49a1d336a59777921f8f118f2a947ffa1712ad06c60d295f399ff9b SHA512 0c4e73a50dbeb5d002dffe0c1dc689823e811ea81b4bdfce6971557859e509ea9827e96d8946315826ae1ec2eca420683b7b4aeff2bfca183c57f4d5bd24717d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
index ecafd9e7f217..cc0d5a4eedaa 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
index 1382d97e8580..93b877751e73 100644
--- a/gnome-extra/gnome-color-manager/Manifest
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -2,6 +2,6 @@ AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b19
 AUX gnome-color-manager-3.24.0-exiv2-0.27.patch 1179 BLAKE2B 10c0163f9a3f904dd925e3ee56c8bffa12810b691d883fd7c722ab44d5c34f03325d10d511a7df79f014c12ab5a45265bd7d8091b99804530f57637e5caf55d2 SHA512 a499ac862c6ec5090e88733ddd560c0f4d351ffacfab14f96a5534c6889ed03e8e13e643519a86aaca0a95b25a08617b0a0ab73b8714989b65350c86a3b9003a
 DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc
 DIST gnome-color-manager-3.32.0.tar.xz 2602104 BLAKE2B 6219c3b7dd31ba49c671ef1f330d8ce561b7d8716a5cf5ef393dcf827c6bbc4e82b95c082e9297a27be7652d958a92c397fbafa8bd68f2c48b32533a3fe14483 SHA512 e5b0c6a39f9202fde79af1e966be65ef3d770fe4de777a281398ee68feef6c57dee95a1fcba496512f163bf561528ece840480b3c8612b5c3af2b7f550335f38
-EBUILD gnome-color-manager-3.30.0-r1.ebuild 1939 BLAKE2B 9ac76d479163e748b3daef96c60c3c03f4d10670485f4c644cef75f6fc831f1c748f93fa3ece66c1ad85443b7ee12ba8d367faca2886441eb7935c81958e5cfe SHA512 cd8fccf9da201beebfdad36259693da32eb5a863476dcfe074e40cc3bb5b04341a778b82596d13833913cd918265897d9dabb8b8eca7a47e57846856c3a12592
-EBUILD gnome-color-manager-3.32.0.ebuild 1819 BLAKE2B e23a189fd2d10d7f3585ccad71cf2105c1521aa751d726b69200550176fd8750b338232e4d6407835ef05b90385b5ef7814dc5b542271e605174997b7230870e SHA512 215dc1c55440ed5c9375115b7ff1d850e0f8241e6e7cb41f416d870ace4b148ddb155f0aa0fb8346b1d54820d184772785b1ab71e8278a2fed51fbc4ed20f6a1
+EBUILD gnome-color-manager-3.30.0-r1.ebuild 1966 BLAKE2B de85be47080002284ce50c0ea7dbc88b1e52ed546a098d71c5176d6c6c3c75e8842afbfd57e6f94541effd9a70bde25840a3821a02aa2835c0390a6d8739c32b SHA512 d4a0162da5022473b75938aeec7f2f3c140cce07e6bddb3389111027320d19d1d97a3547eff36a1b3479bc8722fb3dab5df852ef77eea8b8f855cc4a0c93c858
+EBUILD gnome-color-manager-3.32.0.ebuild 1844 BLAKE2B 50be2919d7e59c1a8c8425e4fa25d13ef7261b63c71ec2822a5aa948f9d9d4350e88b8438c877a225afc067d8e1408db2b230d665f38909b95e8501b97d57649 SHA512 b77ceb55414a7172c80ba68e49cdb508c6c57765a8675dbbedc7aa3798884110e689bbe856841d7d8d81ce39030501ad84a47ae52181d7929fe4553f5851bb30
 MISC metadata.xml 546 BLAKE2B f85181a094ce55d8384761d521c8148f348723a18184a5043d534a329e27c98e0e9afc5064ea1abea0f9fd37b7f590c1006ad58e29d06a469f7a419695422a81 SHA512 1a3c426f2c39eab5f91d48200fe04f00d4a2148eee55c3605a46a5fb6991cec2d05de4a954ffd02f1f9cf2df3de134790ff229d1f3917008302cf19842dc3495
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
index abdfde583dac..67ba9af2b318 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="packagekit raw test"
+RESTRICT="!test? ( test )"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
 # vte could be made optional
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
index 49d9ce3beab0..def430c26486 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.32.0.ebuild
@@ -9,8 +9,9 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-color-manager/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="packagekit raw test"
+RESTRICT="!test? ( test )"
 
 # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
 # vte could be made optional
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
index ac62fe8e3fec..fe12b533f769 100644
--- a/gnome-extra/gnome-commander/Manifest
+++ b/gnome-extra/gnome-commander/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-commander-1.10.0-exiv2-0.27.1-missing-header.patch 832 BLAKE2B f4f730badc7ee5392091e5bce78d7389dd7d5c8612e1747e05d59983252b6e1ca13b27428055166b494d910fe672762b50877c37ac2de6d67d3175a3bda92e2f SHA512 0e3c3643949ad9d2e7bea7ee7b2a688ab2b64c8804220752e21f77573c20daf9259f8001fef9214755387568220f61a5d17ef6f3a374ba6cd07258a409e43087
 DIST gnome-commander-1.10.0.tar.xz 7421328 BLAKE2B 4cfb6a5d445217de10007d4371cd5cce95319dd68a6e7f071def2258cd965cfbeab671c6016e624ef474501608214f309c56360216cc53c83a1660b38dbe77d9 SHA512 76e2cca3af7e11ae7f327fa25bb175ad28d36d8b71c4908ce8b91533ed53a444a30d861a24cf94ee34dd7954d1f9dd0a14d26c2214854424b80f8e7c107db60d
 DIST gnome-commander-1.10.1.tar.xz 7424500 BLAKE2B 6abddf8dae4bc0a1d740ffee49ccc7d816d783bdb5c2b90c9d0681c1db5fa3f42700e65a780881400c1af038d7dfe7f458a98cf2f8f1c1b0fc6f93a3d58dc069 SHA512 b5bc548444149e00f29e6e3b7f785c99a08d27a0a2642cf78c203411a8d2937341a76685b09172047162afe3e0fc92ff13c82bdbd8105281d360c1df44b4702d
-EBUILD gnome-commander-1.10.0.ebuild 1668 BLAKE2B f1fdb58b4851d43fd8c61a723e2e0c098be69a9a6ea0d09cc00e15e13c8dcdd7e494f559c3760d4d9d27eb33048f5efcbb92b0fae0327e15f81424d023e0ad45 SHA512 c145196cfd3bd938a66709acde9d51282ab81bdcc7ae2fd8a9e88f9ffee9be3dbbf271afad149e1ce26d8420cfc9a9b4c732a266375131a9a11136ebd7053d6b
-EBUILD gnome-commander-1.10.1.ebuild 1688 BLAKE2B 2bdb6d08851149dcaf422ad18a3e600b45612f4ecf766587a99428c6bb587a82707ce3a1ebfcd11fd968362989c85b7dc71e6a5b7cea3de30031f850328af2c9 SHA512 70e6924474ba6e79d6fd2288cc4de024017e1e9f47f9053180fe52ea4b7937a0659360337cf0b0e8bc6dbf9607f7934d805f7163f3bd0e58437ca90ff9b1f87a
+EBUILD gnome-commander-1.10.0.ebuild 1695 BLAKE2B 7b9ede3cd802a7eb6582c4fd60694fd5fe1941a5a0226a5e936eaa9c5567e02eb52f2b6d81bf9868112712cf8e38fcc8a578fc03e07c7090cad06626ce74cedd SHA512 b67b77112f488e8b2642f908bded2e38f59249203b3c04c571b8dfb936553b741296d514398c648fc46637acc040bcf846da000ed6c53b5050a6b4545ae4c583
+EBUILD gnome-commander-1.10.1.ebuild 1715 BLAKE2B 14b9293f21ba40f2c199895b23c7d243f7ff9e64e9b036e920f07a364113c27aaa358832e2da1c1f71ae704a54a80147c665b92e4f90ce13a216d6625db43934 SHA512 c65bcdcf1362acea5903de785f1b48e278005d18386a96229d5e9f5718928a7813890965bdbd1e7238dccbbb785e4f474555270788e1d49f60807673ef04282c
 MISC metadata.xml 1119 BLAKE2B 0b7dcdf724e6f9b2041aea2da4468c081e6d14b2fc698424e7e8c6edd0675eb07f904813a3f07a512beb6cace17977f6d234442c6eb5155d2da4e74cf8eb48f1 SHA512 05354f8bc13305c98d1e7ac7590db2e3ba47fbb9e60d099d989c8790d3807ce5568b080bd6f6d2a582693fd056b2654d7ad7992b4b1961b54d982b761c369fb6
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
index f09cc0c24af2..b145aee0dcb2 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="chm exif gsf pdf taglib samba test +unique"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/yelp-tools
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
index 06cd772cfedb..5087c582cc0f 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.10.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="chm exif gsf pdf taglib samba test +unique"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/yelp-tools
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index 1a6876a6e9f9..e6cb655af869 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.1-libhandy-0.0.10-compat.patch 918 BLAKE2B 53fceb62485c109623815a408774
 DIST gnome-contacts-3.30.2.tar.xz 368476 BLAKE2B 502170e327eb63a6d026af94a09949f6b973dba0c59079a23c7f37dfde2a391ffa13d905452741c403ada8e6f1101f7a5620ad9b59eb4c5341e96d357d8fe99b SHA512 cf6ab33ef6147bceb5a4681b83830828fd4caa47d83fa9f71e01db3caf710f7f09fe60d2956565a2b9bd124356e100b31d6372ac4d4d231718230915a135e79d
 DIST gnome-contacts-3.32.1.tar.xz 358800 BLAKE2B a3cdc58948b994868a18e74dd2ab1a1ffea04b84da95347f19b79b49a7eb9363589e08e11e8fa2f588c5833592be3149ea435b6036a376d4c9e1477d0d308e96 SHA512 25fc4835c61bd5f195512fd304955058e1178cbafaff09a6bbfffc58840876f514ebc3119247925266a9c10f8fc452511a055d84aa1e815571188aba7212fe71
 EBUILD gnome-contacts-3.30.2.ebuild 1535 BLAKE2B 83ec57595fce94b72e7b27698b1b61741fe7d4d146d1d1e0b46db1d135f495c82f4bb42d19a35889e8cbf2a155f1c27415b860eb9598d8e6f4c4695d257ccdac SHA512 361f2b124cff1fab69565045246465c69191003911bae74e33ddf46b362c9eb8e9d108a35d9e13fed41f149fdac9b4964792e2814ccccd13eba44aaff2821582
-EBUILD gnome-contacts-3.32.1.ebuild 1674 BLAKE2B 74ab5e27d47ea95f64df9f43cc4f0242e43f56b0786c97e602c596ef90d8d22a7ccd407f43245135b9449a38cb9207e788acfdb15fdc6cd19602b3595047fef7 SHA512 747e5d47f91929e5922f48ca8d9367d53616f1d3f1a0ce9ac9156584e27c0e0ce3731d9bcc6d50f9c2fbc52c35a6cfff5eeddd59e57be6c42f3ac15d5c6f882f
+EBUILD gnome-contacts-3.32.1.ebuild 1696 BLAKE2B 5084721c8335ebc1849944a5f93686df374a58458a24771e4fa2507d384929eb3d447ecc66cdd2e02d58665a53efcd52b8ca5ed761eddf79c41e7fbdc5baac35 SHA512 94d4c75f0ccf86fffd2c9de1c3a3f6e1c6b588fd83f41f9fd0e7173ff511b98359c9c072e568ff4be7b72c98ec9712c15cef5b9c64ecba4f5690ecc61b0e8051
 MISC metadata.xml 325 BLAKE2B f00835a4dbd2fafbc578f1d36cd3101da6ccbd9236b6a874c862f6e584fe856c7fc1585e0d9da7c3c6a243cc1ea271fc281a127c2f330ba91495873baea0ac6b SHA512 5c6da9fcb4666a80a2fcdaeaa0263feee21140932084683dec7257bbb9e686a08d7d2b476684800216c13f3c851a92416267d5415c25643200250edd8d6041f5
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
index 4cb92176461c..2536630c39c4 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.32.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy v4l"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
index 0078c284d813..80d0627957c8 100644
--- a/gnome-extra/gnome-directory-thumbnailer/Manifest
+++ b/gnome-extra/gnome-directory-thumbnailer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-directory-thumbnailer-0.1.10.tar.xz 277524 BLAKE2B 3ecff07a7984b1edebf07d5e0199110bfb7e841a5da03d0d8aa55c0029c6e1fa6b6409bbb3294f02187d14ff55580159863f36cff5ce6157f23f1949a0e10661 SHA512 0e6a2874f633bfa32f0028f99c8535b3da0b44b3c89cf1e20a8dd23c8cf2e0e7bf7204af04587c4cf3a9614d9111814a8c6474bb43229178447cb3143672f0fc
 DIST gnome-directory-thumbnailer-0.1.11.tar.xz 278788 BLAKE2B 3e46f3daba581fc6e0e247521a3542207da61e6c8b7912b913ac3637427b8dde802876c1fdda79956b29036dbf08d7247c8452ac2edd7e0f13d6f35e9390692b SHA512 e66ec9855a2de58887425da1ab4f611471cb3f09418d43c24d1b47f4c05180688e37c6670c3c96b53478d7ed3c6a036b669fb129766870bad7fbca90cb726ff8
 EBUILD gnome-directory-thumbnailer-0.1.10.ebuild 496 BLAKE2B 183cac210a7897aafda4772c734dfd99d2a31b766b506264931f44e8aaccd85f80b49e54d06a0288e3d3bd2443d4c95fe50d0f4364729f53a9744c96f89d0acb SHA512 4501b8e8d2ac36bb2651104c502ba957c50a7626d6bdc80c842a8ab9d392ecbb8776f3451b8270ccc73d81dc725818b3ed8fa1d47301d6eafa62e67005e1501e
-EBUILD gnome-directory-thumbnailer-0.1.11.ebuild 495 BLAKE2B 40552782ff5c66d148902f6d993f5adc63a93fdeaafd8ac053d0af75ed076d051b8dc956abe988ae636c2fa93ffabb02e4cbe489fffa53803ebea4b91fd6d055 SHA512 942eefa3b279be4bc2f8922e903b756d105362f96846a6e8a2a0480054225cb5bc21db04fe664b0abe8a6600e8248faba432270ffdae195c2061b6cfb31b94df
+EBUILD gnome-directory-thumbnailer-0.1.11.ebuild 493 BLAKE2B 5f27e89c10d2cee065e0506c1d6d00077c0f008f25f3fa8d3a56296b3daab70752dbc645c7eb5188e5889ca21eb315bdfa43750038e3cb3acd5bf5da137fe7b5 SHA512 8d6d4c46dcc1a30a687f8b400476ca95a65a7940b64c55323f570eee43a2fb32135c849ab22d93b3ebfa7dc1f9d06ca80a12ad4afaeb830bcf74258cdd99c420
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
index c1bb640db2df..c040bc6b4468 100644
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.35:2
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
index 3dc49afcfe7a..45d927c2b1ae 100644
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-getting-started-docs-3.30.0.tar.xz 110244480 BLAKE2B 91acfa8731a60bb98c88ffb23bf46ba5bc83feee51ed8a6ae7ffff5d5e7c7c5695db9fe715d54ffaa7b1cbe2fbc9c0dcae86b577f81deec6acb7bb57d92f788f SHA512 15d7db0aba5c4ce056700ff6f1d5c23ad5cad5c113ed9c83aa0e569262d6c489bb48eedc697d25e25d3cfae7df3b8da039b84c612b9eba9346b4b4c2b4494952
 DIST gnome-getting-started-docs-3.32.2.tar.xz 110300936 BLAKE2B 214e9896c0b3c3a4886cf24cbd5448d27a47cc14f0729e7c790eedd8a1edb3bd11dacae76b16f7b940bed81b74168927a0d708f6ab9e74ceab1c22dc22a7c651 SHA512 19b9c8fa9f03799287989c7cffb74bdb17b12d7045a61dd9d3d2921e8f06071f5f01b2d9ec956cede159208fd7ca4f367e11ef9820224e9a5f611100962c21fc
 EBUILD gnome-getting-started-docs-3.30.0.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
-EBUILD gnome-getting-started-docs-3.32.2.ebuild 420 BLAKE2B b02a101a2acebe0a46fb0dd94f733b1fe193bd61f133cde5a3af18b69d758a9abba5274ef4933f46c6364367960c77dc324b15af649b544e2a7088288f36ff13 SHA512 51cd03fa61e0497c044523202ccd7cd50f35cd35b91ab4f6b468429e38976fb9c1e3100a6b5e90ba8c6c1fa804e941b594a53bc69a45bff0f48cebca2de8b539
+EBUILD gnome-getting-started-docs-3.32.2.ebuild 418 BLAKE2B 1ea6ff77e0e9975a9da971bf844cbf67cd2d395ad1f0010966990b20570fffd94ea84446873390445e701163b6f25467e93895534f7708af6531989e43567924 SHA512 76e9dfb8cae83455ce77f4c62603d99543010c3e2bf91649de5a9fedab74f3b6536848869f7af30e2b01d922dc55fb7b80a3b9d39a277c405822def4d9562ecb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
index 43fe7ff7f4c6..11df07c435b9 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.32.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://help.gnome.org/"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index ccb9e4c34b4c..4b003319ca8b 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
 DIST gnome-packagekit-3.30.0.tar.xz 1744188 BLAKE2B e346d76a835a84a0b8be46da7af1dba63ef96826e978d06e38490aa44485a010f76b2ed44cde310b8128150f5cf7461cde8007ee5ef7603221f9b947c0e48185 SHA512 69416ccb61effca112ef62ee7a7ba29c262ce768ee41a8bd24a064b66a7106f5e968dc01c6cc3d30d270bd9ebf8cf353044531ad3a19d63b174f097c67edfe9f
-EBUILD gnome-packagekit-3.24.0.ebuild 2239 BLAKE2B 051b7fa32f25dee942510f0be252ef7f09ba0fe9228f1271baafdcd84cdaee714b5fa63f1b937f69fbb36abc5ef5d523218a01fe3104989855abfee0897a817f SHA512 1e3ada32e470514d149b6c09c7352520c29e2a3e86335873e30ee98dc3ea349ab0f6d526c61f6bd3c47f4c109be600717a973600af5272fe2051330051d0cf63
-EBUILD gnome-packagekit-3.30.0.ebuild 1227 BLAKE2B 2b2a2c8a670777d444c171a0c8b83c70d819be2dbe6e488c6fe47e312655379581553100d9726f52852cb2ee88d7479ac641fde32cea4546ff9f2d9b54c8336a SHA512 a3cbf23853102a3fd086f228f56015705513dc121b4089b3ebbee1db58628399944c214b07aad3b004e325efb40314ab44835dbffe8670cd64c253c990feda13
+EBUILD gnome-packagekit-3.24.0.ebuild 2266 BLAKE2B d7912c0de18a313ac7ef4205e795287aad317c76f6d0308661904e857761cb1e1afeb24f09d6f00d11448139ff8e41ea9e912eeee2a88c7b34df311e41401915 SHA512 f263dfcf1e526b6b5ca66baac4b14dfdd855035feb947f1f4c28ab5f7e23beea2e0f72be9223e05d8c9dbeaf1691dad2616fe74eaa01912d8843edc968012175
+EBUILD gnome-packagekit-3.30.0.ebuild 1254 BLAKE2B 421aa9937f80541bb262ce51c1669351604ecfabe3320130774c5e208f11ad643e8dc0b0d70ed5d0f332f2ddeb233f2df300ac452ddf928ff7b10ee040c68701 SHA512 e37a02488c75304ee93837eb5a15fcbdfb39d31724dca6ff6b6a2b905ec0364ebb891d2daa94e708e962e1b3cf5cc1c7fbeb731faf3abb6676cbff2e45428cb4
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
index 7c88ff7e92c7..b57e3b9ceb8f 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="systemd udev" # test
+RESTRICT="!test? ( test )"
 
 # XXX: test, upstream managed to break gpk-self-test beyond repair
 # gdk-pixbuf used in gpk-animated-icon
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
index 078f468963e7..f95e27f607e0 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="systemd test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 4fc4109f9d13..e8f17901dad7 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
-EBUILD gnome-power-manager-3.30.0.ebuild 1067 BLAKE2B 34d2ef92be226173ba09075de0e6b0abd776d96b5066f7460577df262549fa6ba730d7fae2e55c089ca0db58bfed6af88e4aefc8716b1c28e64c49c5f0d33f85 SHA512 a310a02b981ad5e8dc1a8679713f3c4e8ee6b650ea7c58ae40f3f06da2216d14461332ec479e277b10143406202522cf0c215164889faed606eba146f1b23635
+EBUILD gnome-power-manager-3.30.0.ebuild 1094 BLAKE2B dc026aee1e73ff75549bf0f4dff27303ff4e11f039f65684b9cb812b8f04d0e7db920b0507872924b714152855cfdff3ef5e1b34bb6246608e82893a85626ffa SHA512 99d2492bda2450d55244196fcc63eaf814cb110eac13f1bffb058860ce481e2d0fc7daf5fd5be4f200acb115466c6ef0770c4101ce904ad8603609efe14795b7
 MISC metadata.xml 600 BLAKE2B 31046c118a172aa788bcafc57e5a2615d22a9ddbcd56886607a6b07a496adb950f3e05067470ea3b85298acf9ee045fba5fa315e9fe7eb7e72dc3fc9511f5dd3 SHA512 05290535ed07687c59013dbf7b3e527063a48f99da84fc6603ee48b4548d08e0ffe4a2f5836a100786f0ed87bdc43a68cca707c5f5f0c36a8126f53822561ef2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild
index 4b5cc70dc715..861c8bf944e9 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.30.0.ebuild
@@ -10,6 +10,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index a65d951b4d82..2fa59ce00aad 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-shell-extension-applications-overview-tooltip-5.tar.gz 79336 BLAKE2B 789e1c91b25ea810ff6575be5c5a83e51800feb9deaf488105593dc36c93c06a16624d4d7704da9de516b1fae053b0108c2e85eef8f0228fc46bc33589328970 SHA512 bde1870b873e8e9aa8d3395414cddf05a3014196e2d860f7ff8fec1dab49f9dbb694420efb89096e498f03a79c76fc7ec3229fab0253dc9b0b31466cfd48d124
 DIST gnome-shell-extension-applications-overview-tooltip-6.tar.gz 79354 BLAKE2B f9e6aee73c742a080ad82434c3741087a2db1d9ad91ed377d380267edaadc4754a7e2621f228ebcac7c3eed1fcdd83960bbc949f38b07e38dfffeac4452f3a9e SHA512 1c12434944e8803dfd6e5e95fd932386345c4632214059070c56d1640a7c13a88240f225fdf6efe2fd1deb0c8d0a07009e01dedd4f56f029303fbd5e33faa116
-EBUILD gnome-shell-extension-applications-overview-tooltip-5.ebuild 1257 BLAKE2B 10d0f9276023a390dcf219620e7047fcf5439dd3b2c0dc7495303578c78eab7a5bfc6e2ec1909de96eabb9c3258593aea4e0e21955f9ec190ff23779deb4efcd SHA512 ac19312f3e552bd867eab9dd192a9140c891016423a1f40d14b35935961348959c1fb60ad278ede23c38b3afcc95e7a4a8e7a6f9c533cdf8ef7ac04e390d85a4
-EBUILD gnome-shell-extension-applications-overview-tooltip-6.ebuild 1259 BLAKE2B 3d174c537ca8c190193c7841777829038b3b6ec77b6d4d48d1a6537ff2eb7fba9d5bcfc45b29cd5e532a71ea606f1f356a9278c6fd88859881b80e194fce6202 SHA512 0b6e1efae53adbf819c4b3a4b7569f782444dadd41a3f669cb5ee04ea7685339f9226e848b8771fdad1f520de16681b4945b8874c939959b21cf5a0b688362ea
+EBUILD gnome-shell-extension-applications-overview-tooltip-6.ebuild 1257 BLAKE2B 10d0f9276023a390dcf219620e7047fcf5439dd3b2c0dc7495303578c78eab7a5bfc6e2ec1909de96eabb9c3258593aea4e0e21955f9ec190ff23779deb4efcd SHA512 ac19312f3e552bd867eab9dd192a9140c891016423a1f40d14b35935961348959c1fb60ad278ede23c38b3afcc95e7a4a8e7a6f9c533cdf8ef7ac04e390d85a4
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild
deleted file mode 100644
index 597e36988d0f..000000000000
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Workaround until https://bugzilla.gnome.org/show_bug.cgi?id=663725 is fixed
-DESCRIPTION="Show tooltip with full name and description"
-HOMEPAGE="https://github.com/RaphaelRochet/applications-overview-tooltip"
-SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
-LICENSE="public-domain"
-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.20
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/gnome-shell-extension-}"
-
-src_install() {
-	einstalldocs
-	rm -f README.md || die
-	insinto /usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet
-	doins -r *
-	glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/applications-overview-tooltip@RaphaelRochet/schemas || die
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild
index 053787731d20..597e36988d0f 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-6.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=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index c855e4e02618..21a787dc26ee 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -1,8 +1,6 @@
 AUX gnome-shell-extension-dash-to-panel-26-branding.patch 637 BLAKE2B 1e124561143b577413090e16c7ad0c8cbb66911b079ae5844da9cf04e0197aab15fc4f746d3020ab7d4e6756b8a35befa773967c223d29289e13c6b3ffd70234 SHA512 8c176972ff10e87e957cfdda23e86a3e434dc050e8a954e7c2257942301daa5aa7c5b788188768f13c5b009d842fca8b14819a255a6a561dac8fa60e355ec211
 AUX gnome-shell-extension-dash-to-panel-26-opacity.patch 578 BLAKE2B 64feaf9d1acba25d991d52e10c78741dbe9f948639c951e9b11dfbc1ebb7e83c854ffcb4ac2b3661b5482868bf9de8d91b661775f3eb1f6a762ff36e9b737a0b SHA512 0c09afaabcbbe6c10c930dfc9acb72fabf2c458486bc9f62661aab41bbb2b3fd2fbb430e31c36915dd2233c28486597aba5ccd9fb25c9e7945c10cd856b6e26d
-DIST gnome-shell-extension-dash-to-panel-23.tar.gz 21075058 BLAKE2B 66a48a2ca1379fb423fbd55e68b13dc8e649aceb89676d80893b56e6bda860937946bc981bca110634c975c8712378e5dbdc67f5749a4f5aa70622b75304b71b SHA512 0f8ea1b5b92213046195e88cd6433f15cf05d73712c88def4ffcfe43e75e8fad11df5a25a2b4e2ace9ac0e4b56c151e20931cfa233c39589ee33d1fec1a8499a
 DIST gnome-shell-extension-dash-to-panel-26.tar.gz 21100594 BLAKE2B da90d4f496e10c14c554edb74065c95bf211f6778c097e3b81d863a46d0d3477f281cebac72f334b461f28b998284a861363b27d6c17ef5b1d47947a1f44bf01 SHA512 45bc148d2419db5943d0c2170ea3739a36c5a928c39d070501c5dfbec3910ba08058af1926c42f75d6b3e5918d8c30aef4f38db0af14115c11027520fa582a2f
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gnome-shell-extension-dash-to-panel-23.ebuild 1112 BLAKE2B bdaf9d18f2b067a30b5d19fbe832e7401d15760034761dd071a4a8d2c6cc3c24a406e7d978ad2cb45db716529494ee940207d7df04f2a73522ddca209d9c4822 SHA512 9c3d8319ea56944f7ebf9746570db3099d9726d3254659293a5c22f66656a4148d3819a6a2f7a07ceb2db25ed12b1aaf34995125b15a4753d8c535fffc7aa88e
-EBUILD gnome-shell-extension-dash-to-panel-26.ebuild 1702 BLAKE2B 488517e093cd658c7174d3c3cdf78887bbb544d87cd89d4ebec86a53fa8c43d339a5d656f51906b2ce7f0398636b26c03d15ea2fcaf9db6e6c0b9a376a586c46 SHA512 7f18fdfaef29f4f942d31ff71b45608a1aa3c785e0e57c0e90d76f33c952209e0cc1fb5bea9fb6f566f33d8f64aac09a64308ed844efc85be01a30523ed1fcd4
+EBUILD gnome-shell-extension-dash-to-panel-26.ebuild 1700 BLAKE2B a205c07d88a99441a2f2d21c94746bdb555bd9892e15e0d7ec4d2ef1e7676915b54bb01fbd253a9e040c820c4fd952326d23c6be71c46fd21f234dc6d8b7e870 SHA512 121b9e2446e6484876c1412e7f3032d31fe1a2c1e507c8b4156faea89ca8a73607a79999933e47a3fe3139023b55ec866392604b54cfd37b28d9e0dc2042ee83
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
deleted file mode 100644
index 16b1aa3ba6b0..000000000000
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 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"
-
-LICENSE="GPL-2+"
-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.18.0
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}
-
-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-26.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild
index 48736876ea00..95c0064c85d4 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-26.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-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 202cbcd441f7..10f5bfac1bd0 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -1,5 +1,4 @@
-DIST gnome-shell-extension-gsconnect-26.tar.gz 303823 BLAKE2B 7fd112c032d717e87c7189a5f06b97a246216fa1895bb3d837c8b53c3312eed9a6999c20db3e98112cdacc309d56021920b78ebb387c55335fba1965b86c117f SHA512 c32469bf9c1b3903979b1e354d6c214807158f35d4824b60597639084064d23d194bda91a3a1cd5a99d7fdaf2bea48ad7f4c9aad3befb55e59694d195b7d8a9a
+AUX gnome-shell-extension-gsconnect-28-silent-flag.patch 1637 BLAKE2B 9f02424b134f0cd77c00cc9dd9fae774826bcc40750a8fb053edef6b2a75d3dc92c7ef53a89abb3d2db3e6787066c7971198e909cf2d52fccb7388fae4341c2e SHA512 05a23e0aab06108e778a07ab8ed780115a157496c5c08a4676ec4d6a58bb4ecc6860682e3cae37f1b5734a8757f1e7bd3148d246518357ed85295e00a5c0c4d8
 DIST gnome-shell-extension-gsconnect-28.tar.gz 312814 BLAKE2B 217e32e799c6300764f23245c0d474b025918f78808c026175fd3262b4c463b913969290156782151828cdcb15647002e7c7b8bff926337960a78d6d98a16c77 SHA512 a806f6532e68544832dac47da1fdf23edb7625c6cac4ad7f1c1a1b0a5d69af159397bc6f2bb63a74907669db5ea192343b7d2fc8eb2992bcc6a1834cffe1fbba
-EBUILD gnome-shell-extension-gsconnect-26.ebuild 1566 BLAKE2B 565e814bf9e7a25bfe3adf4553bcac0f13fb8d19c44a3e726aff344edb2ab9a8d7b128059ad86ad446f2d52a02280d7bbf452eb8a2bb2300ef4432b78685122b SHA512 6f5e7d6d338efb0b8ef565310af1f4584bc255fbc205ccb09bf448725f4b4b410b3ef31877f0e2a5042e77b29e93108d899a402acea0cb51d3b7101453aeb7d1
-EBUILD gnome-shell-extension-gsconnect-28.ebuild 1602 BLAKE2B 9ac21cb155d7ea5d9e46cee652aa630bb9555caae64918f1ac01c74c8b8ec6dda0820f87b0b8db3bf48603de6162df29346969cd4d2fa3c2e7e6efa69b8e369c SHA512 60b58cf9ef25549bb73c44ed628e6c91bc152329c489b5b3ea6ab39630a44e447fc3a5c0f300e058e94dcfd340dca9d14b69ef95b9bf468f1e91e6818817f76a
+EBUILD gnome-shell-extension-gsconnect-28-r1.ebuild 1755 BLAKE2B ccb6adf109422ac08ad98687c0cd2be59867c71da65bd8fced4108183427704ccdcc8f385eb99effd93185a43c9c2bde67f3c7a7793779b6d1ffa73c28e879e5 SHA512 177bc30496d31b870394d8de33ed59dc60944f580ca3060538be71411817cdff6fe873aea396d833b27c36dd40af20203e2f7030252663ff4000cf8e42affce0
 MISC metadata.xml 321 BLAKE2B daf09efc56bcbf90c8a190e25127a11d12fa7935ee49fbbb5881f1aa3e552485e63ffd9dd8e4099260b504ebdf2a7342a868328cd591b8f4ea1dde173292a882 SHA512 f8b184239c05241cac2b86acfab2f265297cee49a7fe254633181208ec7d29b875582091f34ccc0d8fed2fa41bc4488509a913d96efc9ca8155cbed5f362683f
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
new file mode 100644
index 000000000000..444642ee3c72
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-gsconnect/files/gnome-shell-extension-gsconnect-28-silent-flag.patch
@@ -0,0 +1,39 @@
+From 1811528ca72a2b83924bc717c424f1301bf17c30 Mon Sep 17 00:00:00 2001
+From: Andy Holmes <andrew.g.r.holmes@gmail.com>
+Date: Sun, 1 Dec 2019 16:39:41 -0800
+Subject: [PATCH] Notification Plugin: ignore the `silent` flag entirely
+
+Upstream kdeconnect-android is tagging many notifications as `silent`,
+causing them to never be shown. Since we already handle duplicates in
+the Shell, we ignore that flag for now.
+
+closes #720
+---
+ src/service/plugins/notification.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/service/plugins/notification.js b/src/service/plugins/notification.js
+index b31a828ba..45ed2050c 100644
+--- a/src/service/plugins/notification.js
++++ b/src/service/plugins/notification.js
+@@ -135,16 +135,16 @@ var Plugin = GObject.registerClass({
+ 
+     /**
+      * Handle an incoming notification or closed report.
++     *
++     * FIXME: upstream kdeconnect-android is tagging many notifications as
++     *        `silent`, causing them to never be shown. Since we already handle
++     *        duplicates in the Shell, we ignore that flag for now.
+      */
+     _handleNotification(packet) {
+         // A report that a remote notification has been dismissed
+         if (packet.body.hasOwnProperty('isCancel')) {
+             this.device.hideNotification(packet.body.id);
+ 
+-        // A silent notification; silence it by aborting the icon transfer
+-        } else if (packet.body.hasOwnProperty('silent') && packet.body.silent) {
+-            this.device.rejectTransfer(packet);
+-
+         // A normal, remote notification
+         } else {
+             this.receiveNotification(packet);
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
deleted file mode 100644
index 07ce36aab439..000000000000
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2-utils meson readme.gentoo-r1
-
-DESCRIPTION="KDE Connect implementation for Gnome Shell"
-HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect"
-SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nautilus"
-
-COMMON_DEPEND="dev-libs/glib:2"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.48
-	>=gnome-base/gnome-shell-3.28
-	gnome-base/gvfs
-	|| ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks )
-	|| ( media-libs/libcanberra media-libs/gsound )
-	nautilus? (
-		dev-python/nautilus-python
-		gnome-base/nautilus[introspection] )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="For knowing more about how to do the setup, please visit:
-https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
-
-src_configure() {
-	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
-	meson_src_configure \
-		-Dnemo=false \
-		$(meson_use nautilus)
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
index 00b71ce55d36..1f8bf0739bf0 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
@@ -35,6 +35,11 @@ DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="For knowing more about how to do the setup, please visit:
 https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation"
 
+PATCHES=(
+	# Fix WhastApp notifications, https://github.com/andyholmes/gnome-shell-extension-gsconnect/issues/720
+	"${FILESDIR}/${P}-silent-flag.patch"
+)
+
 src_configure() {
 	# nemo support relies on nemo-python from https://github.com/linuxmint/nemo-extensions
 	# https://bugs.gentoo.org/694388
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index daab0f685708..7ae9746922a0 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.1-leak-fix.patch 1262 BLAKE2B f50fa74524b820416135f9037046006aadb262edc
 DIST gnome-shell-extensions-3.30.1.tar.xz 198652 BLAKE2B d65ae90f6acf607aa1fe2eacfdcd22800b2dfcfee71240b600dd8a2e9e0320ed972a434a68a7020eafcfa6a0eec84572dc9f80258dc96fc205978882fe0c85c8 SHA512 492d99bac6345cc0c9e1a8a067859d2ff6d7b1b620277cac43429573e2e952af1a2ad3d94cc2fb5db3978fd15226c7f2231eb4d11fbcf1da39fe07afd58ee7b3
 DIST gnome-shell-extensions-3.32.1.tar.xz 198320 BLAKE2B 416f77ea37431f8b806b8373f9a18091374f4b40b734375edfff2f673af50c073c3e3091e2b9b4be4241ebfa647b7f44b0f0f6e69460876feb7f90901e499a29 SHA512 e587a17eace87e05211bd4a0b8101a731054c99ba708051f6549c5e19974ccfeff75b0802d190d327f5ee8b4595c20e747d492f82c86aa76e0fc1cf3d20f0e4e
 EBUILD gnome-shell-extensions-3.30.1.ebuild 2154 BLAKE2B d2bc2cd3cdac6db0d492fc47b6b6a26f351da43dd690f704ed46183fb91826c44c1b96da5f7e67f19d60631b4541163cde0caaa493f8ac8a9a10c2fde182b947 SHA512 3459288c9daf2e860f2cd3e129e1987d2fb77b052c68e965c117665877b2f7c45c9e6eabfd60e4485b60fefbeb20351c140ae3092b26948881e16d9a7c6bb59e
-EBUILD gnome-shell-extensions-3.32.1.ebuild 1962 BLAKE2B 8b3436a998db01410263e2ae80b34d817ae7513e73fb60e262ba6942b4c1ebd32a038bfdf1f254ba6039e6f627a5f4720a6bb47f2382f9907198061ffddbc223 SHA512 78812f74746404e1057b77131ee3a6896b3bf758818a6cc009a66cbf5fdb79150c6c46ea974f5afa69ad4f6064b3fbc12aa8ee9ef66fbacef32815b0fd2e6b1f
+EBUILD gnome-shell-extensions-3.32.1.ebuild 1960 BLAKE2B c189c89c27c37f439f7df7980c4ffeb87aa9d9ce21a8fa00d9752bfc8deca8e2ba91f1abc97eca9ae8b6af56b05618d00d61e6cf2cb50f2f5fc7ac739e967d5e SHA512 ced19c5f346bf6e75d81b2ce5441b6fd76e46b42addd5388b0430bfe39332ea3377778e17b346853b42893b15a6ac35a26c96acaa5a88eb192d32724ab10a0e6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
index 876b7d4873df..8a1b1285470b 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index 8f6f7f5ce061..48788407d25a 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-frippery-3.30.2.tgz 87885 BLAKE2B d79d27c1b9faa5c5f6351fee1f9ee7afe5c7eeaaaab5de94988aee0fdbe283d74eb4175606f70668b4297b295c325f569cb3bc02d26728985ca3d3075eb0c5cf SHA512 a33bc69ddc9ee16b944e456ca537b07b30cab3f010910b0b32a4a5b7ce64d0e766438587f2949a43bd9829ed36ebcdb3f236ea40ec3596a539e06d3fc1f9e6f5
 DIST gnome-shell-frippery-3.32.1.tgz 87307 BLAKE2B 06226a084be2587db1114d69d5f5c04a28682d3bb98e72c4d6d9ab34e8c4173c0e57c8cfc6a8b204b6d53a8ba3b5dccc9ff2db8681012176364eb20f2c6851fa SHA512 56604c7b47778454e61839e4c81445232357c5f6243974643cfc5f0524eecf8109dfba7af425ec0430aeb4c2845f58bcc9c0710087e6032b0b438e7db8be87aa
 EBUILD gnome-shell-frippery-3.30.2.ebuild 941 BLAKE2B a68eaeb55200fa34466e88edf3bcc5bedcd791eaa3e1b1a5bab912e38bf02518fbca47c9043e9d96f838a17989c8253537c7d1edb2848302edbf1ea2668a9142 SHA512 de23072cb8a342b98312859ed0bc3bb4c98e2ab8ee000d217a81af0c823ddfdab325748ed3937048e4d4210a691b1290f060714a98373590af266173f4d42116
-EBUILD gnome-shell-frippery-3.32.1.ebuild 913 BLAKE2B 9cad84c757d0db40d78c1015b6569e75e1ca9f2c25ee98c2784c056840f9e840a3b9523b25b57d8edb22ee2cb16273582ccf3587446b59376332c4acb6382ea2 SHA512 14da336819bc0053667ebd4acbc27f432d854b36478f5b2eab51ea5d0c3e6a11c1f191db6089e34060cb70410c4d1cc6948229e16387d1f2fe849b48ebbfa0e5
+EBUILD gnome-shell-frippery-3.32.1.ebuild 911 BLAKE2B 518cdda9c7364f603a1df07142206664fca30d4d7cf0ba5d8427396c70acaf27ec61e689fb721cb88d37e35d73b85199af28330639cc3b1756b37526dd0edbf4 SHA512 77181aea64f07696764dc3216fbdbcfb6cbb31214b5a9acc801b994e63aa59feabf4a90dd12f2e6ba00a3d5359c283478141e6757db568de85b95ac9eca92897
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
index 0b26bdbc79d9..6b3f4c69b7c7 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.32.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index e81e81647209..d1821227937a 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-software-3.30.6.tar.xz 5217384 BLAKE2B 6a9478aa7752ea62c391545b5f84191a22c839802bd1ac2118696b9dd954a19003477a688d9f36868a617dbf3dd186fc36a054ce0eac8ba8c7a5eee834732ce4 SHA512 dd98e9e61469fc5566ab569f09bdc06ccb5812a236e305185b911c70364e2983f257e939aed0bb61778163084fb5628d63ff6bd5f056d4a7626a2e771ad6426a
-EBUILD gnome-software-3.30.6.ebuild 2504 BLAKE2B f6df94946b8e1d0b535ae53d8d9422512dfec52585b5251f2c66b0c63c5a7c2885b01965ef2586dfec1d26d03618186005563515f3e6b069bb44fe64920c3718 SHA512 317c18d9a97cd6ca7791d2cf2dc7a47433468da0531c56f4a7635bbaa2fb3a1f77d5ff1de636d1c5451d9ef1d34d74fad3ac3d1a78e7c50e84dd888a203ff3ca
+EBUILD gnome-software-3.30.6.ebuild 2531 BLAKE2B dbbf3176ecaed83bb3310531ed437afe91793c1ccbd1b788ac9ff05af8fb5342d0c147b0eeca9e94cd3e8637df8aac12324ced104c2c5416680bd8960cb6ca3b SHA512 53a36a9d2dcf7f75d73f56eeb75d6a6fe785984f3dbbc0df87ea965f53ba30c04b1a8839a77ab455649930834507dd04ef31d63f92d0963dfa91f50c8b797855
 MISC metadata.xml 443 BLAKE2B 5f060a298a752150f4b06545c328985c5e55a6e32afb45382b419e33beb27c7ac965d59465dc02e23e4214fd9b995b44894a666b2b4ff55bbca469d3992d12f8 SHA512 aff64504d9b2df32113844e86e05c393314ba247ae0742bbd140b2212771d8a3c76856c79426aca11908a8a8f5e881f6ad8a9a4d298d11fc4f9990bd1fe454f7
diff --git a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
index 452c5fea8fac..abaabc99d6ed 100644
--- a/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.30.6.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+firmware gnome gtk-doc packagekit spell test udev"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/appstream-glib-0.7.14:0
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index 8eb8d46cd25e..c58aed73d508 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-3.30.0.tar.xz 762004 BLAKE2B cf0ef6dde12a34f537e632dca6b45fc16ab49e92aaf49d2e945dded25b5cfbd855506368b82a0f840808760ce563f54fd8683f5a35652a5e10cdb4972ea61864 SHA512 c33dc510b15019de745a88d3eef12b5a2b19048bda22878988f22c4482f6a26ab20f5913f3104f2cb1b9566f7148a08b53d4e548f71345363273c51840fa2c8a
 DIST gnome-system-monitor-3.32.1.tar.xz 676936 BLAKE2B 815c677f637919966868b454b47f9633f130155573f7895e0c70025a59978818051bf8d087761d15416ccb0470c7341365dd95fdeabcdd0711802f828eddfa37 SHA512 badfb98e4508096336bba4be79ce359cf4363649e97c1da534ed96a04de4bc57e12b84ed75bfa9086e00b61b6558ee4af25eee14f0d2636d3ee0b62956122cbd
 EBUILD gnome-system-monitor-3.30.0.ebuild 1147 BLAKE2B c94f55af67e7fe12ff64e4c9de07a9dadf28e28eafc87f8e8ea0257b5f58f033fa810dde76fe34ff18ef72d8a816c077cdd797824a6b477c965ffbea5c520ba7 SHA512 317dd102159c6bca3804bd9f9202e254ee531da4c67aaa4bc289b997c0d65f971b888d12ed0e7380c5bacef2622403d579f500fa6c7a3f985b2121419f1b02ad
-EBUILD gnome-system-monitor-3.32.1.ebuild 1160 BLAKE2B 161d5b90274a8ea22df5d6d72dd015e55f3641b302c7a5ad5b0ac4a018a991c7832dff692576b97d5211b4e4eb47ca689cac74adbe85180a132a15e51e904824 SHA512 2be0e80cc65246a35dc68ce3e96748157bf372f06d4ff8abb97b48eca97bcb7f8ee0882b55d801c5a56ded7467fecd6a34c1f446ff12b786772acf910698c71f
+EBUILD gnome-system-monitor-3.32.1.ebuild 1158 BLAKE2B d734f3eb0a4447210fc213ae71f94fd5b796d1c31728e79591b6ee1d3d9f0774ff6f226f9030e26b4d7caa20ca2a4cf704d4ad20000e70aa87defef2c52d2d9e SHA512 62ec004d8732b0195258c7a2b3aaffa6b91fd954cf2292fa3c521e7bc01b3bfa02698b0599f81e1826d642a097c59afc7a47c417b620240a80bd1f66e8791246
 MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
index 9d90af4a1614..2a5ec8b1ed59 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.32.1.ebuild
@@ -10,7 +10,7 @@ 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 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 21fa4c2a775e..e9fee46cdc06 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -2,5 +2,5 @@ AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332
 DIST gnome-tweaks-3.30.2.tar.xz 281820 BLAKE2B cd980f77a05d74f556fe461f1dc35122efb23ab0885b84ddb71c873dd6cb424d4ae213d393b7555f8baed8eb5fb3df8afa7d9b4cb92d772ba9eed59892871bfe SHA512 183df35e8051aa1fba54ca45aca64d665f28d92c56879ff6fa60adf3809a05676db15d97d7023bf5ffb9bac33df259eb62742bee3cebeb87d8ffa39679b2c078
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
 EBUILD gnome-tweaks-3.30.2.ebuild 1189 BLAKE2B 359f73adc1a74e8739ab1c1c7abe35320dbb149a7dbd3120dc7683904f9f7604ad2715f872864609348b42829f829b4fc2e5e7faea8ce6c2c4ce06139249eff7 SHA512 87471cd3e49470556d089fb000f54bf7373de8183fa7ad7331296659da247aa1dbc0e1347c1e15617475fc561fdb1f83e267b66b7ecc72f83e12a122947c2269
-EBUILD gnome-tweaks-3.32.0.ebuild 1201 BLAKE2B 238df760740f155b1917e327fe61a200dc488e833f36cfa6411701ff3a7ff47c1136850653265b19677d8fb8d38bc4e49dc4dfc4b1eeae2e3b496e6da8c1733e SHA512 1db14b633defd0b02cf1c882a516d698f2e466c82a85b8c4107e2d2025bf046e0bb22ab744d7bb26ce43d9c178e31f3a4d26fa4034348ae2252743afc5dcc5b9
+EBUILD gnome-tweaks-3.32.0.ebuild 1199 BLAKE2B 9ffe4240fe9bd5a27a9dd8b3ee78a78bb294f9bb08f616727f59e5b1b52b8c511304a44545d6b4779557b8281aab2bb68d4e550e3e78fa5c84bfd988fd28c859 SHA512 39214eab5c2aaad856c47eb245cbd5ddfe2f8f337088d7c2d8bdcf2e9c12a930b1616cf9106fe8dc3850c97e8f00872734e927227fe496585a5173a6e9f7a92e
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
index d1198e1233ea..79e291ecf8d0 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index dc6d001fb2fc..b2877905b4ec 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-3.30.2.tar.xz 15707236 BLAKE2B 4a0f83078c8a0360719a89f8a2a0d79d564452fe65e7037479288730c5155be1b26901c10863e9b35727c23458b7015ade326db6a6f78fa95b8f541b3dc5b361 SHA512 43f2d12a1f5ca03e5af24f599f688f1ed849d8466cb12f4b67c36601a1b6e236bd98e505ebcde677ae80be8cca71b32996bcb87715fa50c30cc5729ffc957b33
 DIST gnome-user-docs-3.32.3.tar.xz 15861776 BLAKE2B cc4a73319ced02d7e087d2e9e1a70db22fbac3f9bebc34deb029c913573b34b58977007fe274841c6b61d05c3e169f959425c28846f1c741944f61c1c01b53a2 SHA512 4b62be1812ae67283281ec9d5dfd7e694dd01c04ede949cef76ab42dde72b74f90a67bc359e86700f515ddff920fb81a40e91acef56c85b40b49ce0505c1f7ed
-EBUILD gnome-user-docs-3.30.2.ebuild 930 BLAKE2B 1bf22125881391ec7a293af9af56e2b331f63a7b01c4d9b98bf80e42a9e92af0556a49e47752fe936c8f96b2a8c9c48c11c1bac21c52a6690d867794a01c0a35 SHA512 f4857e7b4dd465d76bf6716d77f5d3f510d5a65f9b4492a3cdaf96753eda70c558c33f1ccf17a11a751086f2de6090f9f703ab922a55cc1452693f61aa3463d2
-EBUILD gnome-user-docs-3.32.3.ebuild 932 BLAKE2B eb1e2e68e6d88fd519e0793762d41b51d3a3b84cf3c64d5a25a72c0ca045ba7fe8edf459255584425150a1e3c94aa22f34b3753d0ed6faa59d403a624411c402 SHA512 459ba44df9997faf8b9ef9dc30042172e7027eec5dc8f5efb6f7de4911a945191f80ebaff4d5db8771c6a8b9d8a126b94cc5d6d17b2b1a17a4811f12a68051dc
+EBUILD gnome-user-docs-3.30.2.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
+EBUILD gnome-user-docs-3.32.3.ebuild 947 BLAKE2B 8d88a8466d0e57c214d2606592fd5489c6fbf7a5afb00954ae6af8c6514a0a6c2f6c05e9ea154665390c330676051c283328a6ae56d71917c37ac542e6a99889 SHA512 b9367999d5ab3aca4a6084f99147ad0bbdb9c755de27e9ee22563bba83f0799c24dc233fb4972368f1d3ff0586f6a9034c8532f902335a8df5bcd73405854916
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild
index 62f9f25f0601..359d9f28abed 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.30.2.ebuild
@@ -23,7 +23,8 @@ DEPEND="
 #	dev-util/gettext
 
 # This ebuild does not install any binaries
-RESTRICT="binchecks strip"
+RESTRICT="binchecks strip
+	!test? ( test )"
 
 src_configure() {
 	# itstool is only needed for rebuilding translations
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
index 1b3b568e7019..359d9f28abed 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.32.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND=""
@@ -23,7 +23,8 @@ DEPEND="
 #	dev-util/gettext
 
 # This ebuild does not install any binaries
-RESTRICT="binchecks strip"
+RESTRICT="binchecks strip
+	!test? ( test )"
 
 src_configure() {
 	# itstool is only needed for rebuilding translations
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index ad571e6d2fa3..2c86e9ee207f 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -2,5 +2,5 @@ AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6
 DIST gnome-user-share-3.28.0.tar.xz 393516 BLAKE2B f17efe9b763b14bb67837d65973f1125ac2bd9d49dabc359aca6fa040cb32d656d71236e306b4e97b39e49e07198aff4b3f456d62937baeff01b50d1a5ccfb67 SHA512 1b7ca604fec69402312f801d5b7117d99cb82bca674a4e4d279bda8ba9ca96c70dfd2c815d571094c1a95eb0e9084cd560445257dce194f6050d68c17ae4bb1d
 DIST gnome-user-share-3.32.0.1.tar.xz 439696 BLAKE2B 278e46adfdb2a24a2b9d8d76e38bb9a6cb1b5ee85c820fbc38aa1ebbed2481537dc8686dccef3d213c0c83bb236f1431a9706b3d6cceace78172d93798534d76 SHA512 d644aaf0c0b593188936505391b1927d883234ffa5acd6d04675575fc68409512b416d87ca6d0a7960187b433a874f2da6ec2d304eccbab8846446f89df8297e
 EBUILD gnome-user-share-3.28.0.ebuild 1361 BLAKE2B 750ea44f8f4b96625e1c30b0e11d968925f7adf668f8510084f00eda5dd0fa982d024060e1c7cbf0f634c19fc09a0982cb5bc9e71483d28a74b7474561fec9c2 SHA512 e2c577b6c2ee9a9386f3b4dd5574421fcf90aabb6d08c05b188c3558dc2e5ae9881e48738988acc42bf57442bf654f9e6c20b1716a8bfde88c95cfc3a6b67250
-EBUILD gnome-user-share-3.32.0.1.ebuild 1304 BLAKE2B ef43c1d7eb584c5a7f1991ac659431726fb9c700e815ddf8f1dd3e5b21e49107c357cd5f507536fad7997b15dc47420c7bf55d6a66292496ad687d3b4633312f SHA512 d029c6d5540cb54037c84fa7030e9041fa8d631b296eedd399a24d8e4d5fb02d3b7fc0eb8e729f8e58438d360a7dc13eafbd68e4f01b62dbb9aecc94d4b41b90
+EBUILD gnome-user-share-3.32.0.1.ebuild 1302 BLAKE2B 47f30955ce9feb450b618ebdd019283627d038dee881551d29fef3c8a62a5ec454d136747d3cf39e16aacdc1af959c9fd5a8e3c0329c6688b96c06d660307f63 SHA512 ffe2f8a27ed53c321d68ed04c17e1d47bff42cc51322429268bd557c4980c9714bca3c850495805dea27ab7ebe4a491be5f981af915dc949ea456f0fce8ff241
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
index 1b435e852738..ad0151207037 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.32.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index bfbec8ae2ff3..5ca6a8a65c0c 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-weather-3.26.0.tar.xz 5362056 BLAKE2B 0a427f8be6f8b79346d106430f6673961d03ca6770940f92eb866859907c7dc2e11805091bd9715e922176acad5c971114c9df33e6551c8992051e6ef873a298 SHA512 adb5400ca2674142132e499880793f9c4fafaa9a4459b2718eb24180480f8e4e1edb81aad947283208c3fe32f1c662d380421efa1b6b57968268ca64318a33ff
 DIST gnome-weather-3.32.2.tar.xz 5952300 BLAKE2B 536cac87066eb714bba15db0e662d9e9a0260caf67f3b9d7f2c8677deb3dc514d50768754bab46db1df9dc11367d1cf07690888b93031804d7a37a3898a1a689 SHA512 22f2de0f6d4355a44fef332d47a49b995d647d3d8d10c06a77c182d0efd6ea33f62e055f047a665710024ba02c90912ffefe67c8b299da6bb47d899d1d7a3825
-EBUILD gnome-weather-3.26.0.ebuild 1150 BLAKE2B 7b1cb3709a379e1131e23f577667ca0c0910dd74a44b150ffd1f0deb96171069ab039b1a1edc7e383d3db245e9934416f51e01c8db4c54bcb84fcd51bce26f66 SHA512 20a17b0ef63fa3e2060f93823548f8e0a05210b38fb3548cbedeb4f8c80a689f03d7b81dec03dbc3ac8b6ccc0b0920814513470dbb61adc6d441533c26652609
-EBUILD gnome-weather-3.32.2.ebuild 1247 BLAKE2B 2ed1000388eb101cb69a518335ecb7a30c3eabc9dd524c33571c7234372f317d800bc2192af42dbb78b9d9dd878a676b4f7adb150465e051a84c21a1826a18a6 SHA512 93a9e0e8580c7a943353e574bba53eee233f1658b237dfd452beecd99448a5839ceae70d752c9b1e4ad006ca6caee0e3e671ae64071f2cbd0cbef72fd3905e68
+EBUILD gnome-weather-3.26.0.ebuild 1177 BLAKE2B 20381e7294ecb91ca995ab31244fd46921d7c3ebddbf7a68c4fc963bf16f2acc470b321f59dd3ff45994dc5c3044f323e950de1489bdd5d7d4dae93e74741454 SHA512 a38bcb26cf7139329854b1ebd5880f3d2d3ffa2a6b230070840f96d3259401e22f4e9fc48b52fc6200358085c1eb2795849ac49763def919e82ae6e6e54f450a
+EBUILD gnome-weather-3.32.2.ebuild 1245 BLAKE2B b8568a1990fd9f366784171f02b555c75a51ec9127fb0571d5aa60a67d9242c0081fb9dc2de57857daa3c415e24fe2ec59d795c86669dd5f3d9d1c7b768d8b56 SHA512 5fa1e70740f4d33d27db6e063df07b2c8fb691e5acc98247ad91e6e748271fe3ae48b554b4548512eb0c1a5a1ad531cbde99c1582ed8c9fc072b40a0f4c1369c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
index a7ca1ec3787c..1505a4345824 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.26.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-misc/geoclue-2.3.1:2.0
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
index df53c28f533c..9f8cc535792e 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index c0a754e725a7..87cbd1e26654 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,6 +1,6 @@
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
 DIST gucharmap-12.0.1.tar.xz 1678524 BLAKE2B 90923dcb85f132f607007b272f56d091cd51f14d6818fc01fdedc594d736cc1047e4d3165f4ba3cede96ee2c0db4973890e1fde60c294fb848ffb3918988178f SHA512 989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-EBUILD gucharmap-12.0.1.ebuild 1716 BLAKE2B 00052444ad65be06a77871580815e6e0be503074c454d2ed9a7b7c387b4bbb91909c864aeba7aadcef5c9b044f1b9dff5f2cb5c3b59d0adabf2e61bb3e820ad4 SHA512 1d7e820bca245f1234f8b4f13ae53e1580a30beb0def4bea3ed65e7bf667b146f1fad7137fe8f41441e39a80ed36855c64b8bd5a47f4084d6d9f712eb406453f
+EBUILD gucharmap-12.0.1.ebuild 1743 BLAKE2B d32908f89398ca2e431fb6c26d040d9a99484b7b5353139b4314aeeb32083fd316df613bc47935171a9378d868cd4d1b732341e72bcb92c8b0431cb2529aa1ff SHA512 0b1c91710a0af739b8daa4036519469055fce379f53387bb362f4315e4d7a74a67e49ddc5a12cddc2666987dc7b8397f112a1e1e18741a97cc9507d75d6273e8
 EBUILD gucharmap-3.0.1-r200.ebuild 1481 BLAKE2B 35630bb7577ecc88f2cfa93cd754a7dc1082bf4d6726828becc109c7db3333d868ea3e5aba74cbda37d5c4fc3167a6a1b0d6bb60127d151033fbdc9cbb74985d SHA512 971ae267bab2fde297703a2fce132ca46da5554e8a0bd37f7b46090de2364fe3d6398d7d716ea30385c0d56d0a0e4530f5e4e623728dace2355cc1bf799dd63c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
index 96022cd545b9..0d1ac85b6d49 100644
--- a/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-12.0.1.ebuild
@@ -14,6 +14,7 @@ SLOT="2.90"
 KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 ~sh sparc x86"
 
 IUSE="debug +introspection test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
 UNICODE_VERSION=$(ver_cut 1-2)
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index c98cebe8676f..0f8be59cce4a 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -2,6 +2,6 @@ DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7
 DIST libgsf-1.14.45.tar.xz 618476 BLAKE2B f577859578de6ca359a7377dcced424e95779d3fd155cdbeb1c2874f7a0d0c7a09a2322d2538452b48798ea979e8260be77215140f298dc58ee32a0b9ead0e47 SHA512 2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd
 DIST libgsf-1.14.46.tar.xz 689360 BLAKE2B d5d66e96dc74fa68111781ce9bcbfaed2b8a99f9d2bcb16e32a650e103716633b5def7c93f133538449a3b6d9299e4709ba29bc6a520d5c7fe144bcbf78d3ae1 SHA512 130331f63d48455cc2ce60756e2ac703f8a7f5fa8f1243d9d9321fb87e01bf1d616d085d100a3e5d1cf34fb851ffb77bc642aff6c674ace167b9aa117f4fb1b0
 EBUILD libgsf-1.14.43.ebuild 990 BLAKE2B 6e3ee69f2a1fafd74d478f3c0e1d57306d8d43ca09374378334fa23ab581adfbebf1d7c0913f029bb751c4b29fd4764118e562bf3f3f841229c666dc60a34d25 SHA512 37cb2f2bf5560b7125cee0a7cc2749101580a1e5b96d7bd7d92dfa32ca587a240d3243a679643eea23a96930d3e0a2452b05a14eb14b9fcdbe78a3791dfcd695
-EBUILD libgsf-1.14.45.ebuild 992 BLAKE2B bbca4ed8a40e4ee72dec65176f091b10683b32fd4229b8e0fd42904bd2731d4ab05ba72fb2316d6cb0f11ba1503600cbc3dec877f91054597f049cf3dbbf4476 SHA512 9e4d6c6cd4d8542342a13b7030d2c4f78b4c438af3e544c3f5a9e4e264a553897c8338799b2149c353ae25c87fd8fb25a71c699dedc2af3b95200a2121803ca4
+EBUILD libgsf-1.14.45.ebuild 991 BLAKE2B 7dd006712af212e06cbe10a897483b81e6ebc894abb95d931d70658d81bbe9e1a88aefd1c7804e8a69ce9a4152ff030de8a516bb8e83f2ee5e7515375e8376d5 SHA512 e42718bab319b74dab00e31ef96bdb1498ddcfb717db5b183d4bf887398db71e6d87c886a01032422ac5631a0446b7c5c65efdb801c788feb2188cb757cbcb97
 EBUILD libgsf-1.14.46.ebuild 1000 BLAKE2B 050b8e91952c3da2690ba442a109b88d8c3ddd430208c5c3526fa546868998a5db6ae46bfacd623c99214dd2579416220f589a0d47e3f0f7a312ef0f6cc2a4bc SHA512 2e293446446d8f556d05cb764960bcaf0bcd5fc4e8c5264393e55dca5e16f6eb995a00a9fe82abfae80febaa4dd6233105e1f042ea35997c9eac08f5054a5426
 MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.45.ebuild b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
index 40dec8292a79..4d2e27fffa0f 100644
--- a/gnome-extra/libgsf/libgsf-1.14.45.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.45.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection"
 
 RDEPEND="
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
index 84b17303c04f..427020c86727 100644
--- a/gnome-extra/mousetweaks/Manifest
+++ b/gnome-extra/mousetweaks/Manifest
@@ -1,5 +1,5 @@
 DIST mousetweaks-3.12.0.tar.xz 287236 BLAKE2B e0036131b3f6066b0fdb8dfb92531d1e1c1c1366c14f6016a8c41333892d85b6c7f11a754d82d0f3227b57b80d7bb72f3e0f0264c422fcda5451205ee3fc75a8 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0
 DIST mousetweaks-3.32.0.tar.xz 372088 BLAKE2B 59e6dbafe9d8ec2cd0578cd1a01ff9e7d575fdac2381998653f1a91ab4493e02a0cf99a187a47b39bd277726df912e32d5572a39df27858de0929fa3999a699e SHA512 3711c2aa1bc40f80a75857bf8a35dbe24443f8040cf8131e32818c797da44f2bb54d58f804ec8df7a95f66ff2e5db8c48067fca97c16ffa59239ecdf101c4a52
 EBUILD mousetweaks-3.12.0.ebuild 642 BLAKE2B eda36c466c7598a60345c427381b3401562d07351b2fb93601428fd5eed18a188bb2b3ca112815535e4efec393a1018f2fe273ef0d8909be0615fc6738dc1bb4 SHA512 d8dfddc9ae5e4a73a542d4f02b50887437cf45e2618359cb746eef082fadc2d8d830dbac47d09ecfb787b0dc7845c3759f507efece54c8434e3956daedaf496b
-EBUILD mousetweaks-3.32.0.ebuild 627 BLAKE2B 3b746eb1d2d35ca344b8c8585d98aecca002d097b97da97d2ab57f2d2921999a2e12ca6d1553dabf157d54f8f40d00857486c0b492c5fff73878f54817684610 SHA512 469842e38dd67160ad9add8eecac52db934c1f6507be3f0811579231b96a9c6aefab080d9a71b095647d1f0e68481da3375de5e7160ff56d651c44aade686e2d
+EBUILD mousetweaks-3.32.0.ebuild 625 BLAKE2B 9c8d34cd2642564f9b7a0a9e652cef0df1bbff89bcd2675f239f79bbc05dbf8cdb085b1da1d030ffe039c8fd19e196502b9ac1e33925635fc73fbdaf2f28b977 SHA512 bf6b3af2fa71f97df6fa2605b9e26c2e24dd118f3bcefc92a46ff06cc37a264fc3a0bfbfdd7e9574237578bbce3551650d8294db0c87a55ebe6e324dfb728194
 MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
index f12093f2c3f9..966577077e13 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Mousetweaks"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
index fec599d546fa..019460fb9427 100644
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -1,4 +1,4 @@
 AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
 DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2151 BLAKE2B d46812b55e47b3f7a3b94816cb44782ca7fc8c97dd577aaffe1044717a4aa025c6d0e0a8ef8965ff8fbae8836f37db0709c24b0bfc59323efd91641fbd7c9dae SHA512 d173c45b3b1e6a69f4c908da25aa217cc65f381621b4c1cd039e719131ecdf0e34955453dde9d50d062a78c44022d1d80ba2db33b8217464b33f3c4baee9a7f7
+EBUILD nautilus-dropbox-1.6.2.ebuild 2145 BLAKE2B 5073b2aeb1adaf28f185a4f1b3ac6be6d80d24aec701dc05b5435f757d1e695947130e39927d2bc5bfeeb9fa2710adfe272fd8854224998fbda26871c359bdf3 SHA512 b23269bb118f4029f242a2437fd5c8ea3f1d6db5cde512a668e0871216353c079e824d9a924e7c7a8de8c12f42c76963115bedab36aeb19a1a640015cf107a77
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
index 1419c0468b89..ba29db204a63 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
@@ -42,7 +42,7 @@ pkg_setup () {
 		plugin to the group 'dropbox'. You need to setup a drobox account
 		before using this plugin. Visit ${HOMEPAGE} for more information."
 
-	python_export_best
+	python_setup
 }
 
 src_prepare() {
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index ff05a2866afe..66c60c20bd3b 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,3 @@
-DIST network-manager-applet-1.8.22.tar.xz 2058500 BLAKE2B e4b31ea3dfe91f07a61b7dd4c34521bc4fc2d7a1b7e5649690336cce0c425d57128ff8011b18a6505893982bfd81170eb8239b9e83de6f91afa11190cfac3b4d SHA512 d2f679a67b79b011762f9249798c5a4ccad3d0fdd01d8d45956a65ab75398ccc07167fc5452748a12294315f729b10115edcb9f11e05475bb0b15b2ade638dd3
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
-EBUILD nm-applet-1.8.22.ebuild 1651 BLAKE2B 5775ee2a4ab5271e6a927496d77f11d489882b729ad124040e5c430e2259708657058ae7593e1aeaf5e17d63e81dbc1f1f0bf100c068660266a2d14e10d6f999 SHA512 366bb5359be295d427684b45c25196b8fdd172b8b56eb58464d0581efe2fbc5f7e1da0b0412d4b0eaa9ae172eaee75cf49276994b0045317598badca5575ab7e
-EBUILD nm-applet-1.8.24.ebuild 1677 BLAKE2B baa5498b3ea737bc455891319bef9958690feaeb7cebd40c8a1fdff74444d4d45ae3caeec683774b2cce381adbb4206d5186257c9fb8944641485bd62775cd67 SHA512 f96b338ae51ef4966db2aaad054de14db1c178a5abc4c513d0a9557f49e798ca83004b4c72e8f4e9cc8efc3b50c0bc0e19f0a31a56fa3092c0e4da543fbc46e2
+EBUILD nm-applet-1.8.24.ebuild 1675 BLAKE2B 16a0b46709993444273c759a2ae8caafd530c00417f0eacf32be414922aebef821c287ef19527ee0e57a970321da6dff1ce24588d0baf6d1506ae510d8658fe0 SHA512 f36c05b6a7f1a47f848c41cb6b017e2bf7824c524375ac57cd4b5fe4dec03d449f8c954519779a03cadd2cd3d9e7f57c9a7a17986282ff9d8ec686f00d919688
 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
deleted file mode 100644
index 04d040c037cd..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.22.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	dev-libs/libgudev:=
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	ayatana? (
-		dev-libs/libappindicator:3
-		>=dev-libs/libdbusmenu-16.04.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--with-appindicator=$(usex ayatana ubuntu no)
-		--with-libnm-gtk
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index b94abdfa5bf1..bbb71b02dbcd 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="ayatana +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-crypt/libsecret-0.18
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 369f28186bbf..46b502c1d74a 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1,5 +1,5 @@
 DIST pch-session-3.30.0.2.tar.bz2 8925 BLAKE2B 0dc3440d42f7507a0f73ad24cbcd94d106a836b2c9abb74e3d85272ed1dd0660ff85c60b7a3e824687916817f513aed321e92b4d2406e1d5f1ace3aad5bc8456 SHA512 3e8ae7db254c0489c57fb1aadffbd3dfff6ba992c5ce51f993ac5f8a2704b59aab39e65bd36768ffd3fc47eec24bfa9c34046fbd01819976bbb9eedcf84d4e89
 DIST pch-session-3.32.0.tar.bz2 8940 BLAKE2B f7b96486fda4b38e0c548b950d60cafc7f150dc8c3f1e671f04d070b937e6f9ae753db6bfc5a81061c107483dbec752ebc85515133f8a62235b3c68c51091474 SHA512 32d6393ef74cea1a7eff3e5361732f3ac47ef1ae993c33bd17a3629f1491c129ea043688dbce11dfa331d4cbe89395966b98f58c1806502a9ffcdaa62c303e91
 EBUILD pch-session-3.30.0.2.ebuild 995 BLAKE2B e07cc151c9446081f89891021c411ec215fb467b188aae96dbcb6bce35cb4542e909fd091647db4f8c81cf638fc58d91f4fed9ae3ae40b58527be5a2c84669f3 SHA512 f5c3dddca83c868451bb11b4784b689ebf417ee302f9c10d6185f54c1ff5e73b56427c481a67e6ab3b924ae7a8f736ce6fd18b92862f13d5654f8a1d903ea9b6
-EBUILD pch-session-3.32.0.ebuild 1020 BLAKE2B 917f85bdf0a14261481ec5b6a5065f2b28033e2cf008548db7590d2f66a7e17d72d2e4c92b21354e75066a655dcc788f0a166463a60b584157072bdc75d79983 SHA512 17a4cd7bed75ba2525cca8376832056fb6d7f72ac2a7684bd8e71c778ce79a4663f07820b7c31adf07536105b0decf2b8aa97137625029ba764b3230c368fafd
+EBUILD pch-session-3.32.0.ebuild 1018 BLAKE2B 82975d0d263a93903ef9cdfcb05b9d104539f7dc03bd70ddf05f7e23e1b22df412d2ef0ef2707bbde4d193ade09eaca422cb725ba76a9b0c65d63ff87f15169a SHA512 47468c1b2931034e968c37e757aaedaba5d0401ef7c94114ba6af53eb80569f75052d5ddd571f48b7022dc9b79fe169c621ff028dc73f5f0aa27e3098bf8c7bb
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/pch-session/pch-session-3.32.0.ebuild b/gnome-extra/pch-session/pch-session-3.32.0.ebuild
index b1270a5a1ab9..962ec1801ae7 100644
--- a/gnome-extra/pch-session/pch-session-3.32.0.ebuild
+++ b/gnome-extra/pch-session/pch-session-3.32.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # gnome-extra/gnome-tweaks to configure extensions easily
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index 7f9301b94844..0685f2b6917a 100644
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -1,4 +1,3 @@
 DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r1.ebuild 1076 BLAKE2B 71656222dd1d59dd53b8064f5cfcb9d3d87115112f1327291df25d64e992e29de69236bfb59283e46e6918bf1edf8ae5a6de773a17a70f72b487e0f0f541cc0c SHA512 deaa0228efe4c0b449ab9e187d23b004404ee73f2899f0ff03262ddb700cab36de05cfdc4e6fdf8c6c4eeb91d9cfa70411770392a78ca5de9581d1fdd176ec7a
-EBUILD polkit-gnome-0.105-r2.ebuild 1093 BLAKE2B eec86330b8b73da781738776685d54d404d84f95d48299dcc77192cb36f67cbc74525f1730a780939bcc3c6d7c5d59fbd7bea13e7477d57ace6c435580e11112 SHA512 2fb695c1bff2e40f501b0020e70a44bfac10daadc0a06a26e0d99e07ca6f7ddb65f5fa17173931785e2c463c6b698c5d959d5177ab237d2e08eb65c2e47e70af
+EBUILD polkit-gnome-0.105-r2.ebuild 1061 BLAKE2B dd8ce1e6bd4eaeed74ba9a662d8a1ee34e1cc80c29b5189b0fbf9d1819b4819b967a4929db08af71c4fd1f78245fb284451b82c1961d16204823f202246e9c6f SHA512 7dc65a74869aa75b37c24f308955ee7a57703c8308533bf8bf3993ccae44f70688c832d15aaa8bd4581f3a9e7d09d51f44741819af026d13d436cac15abcee55
 MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
deleted file mode 100644
index 24ef170d41b8..000000000000
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome.org
-
-DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30
-	>=sys-auth/polkit-0.102
-	x11-libs/gtk+:3
-	!lxde-base/lxpolkit"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS HACKING NEWS README TODO )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/polkit-gnome-authentication-agent-1.desktop
-	[Desktop Entry]
-	Name=PolicyKit Authentication Agent
-	Comment=PolicyKit Authentication Agent
-	Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-	Terminal=false
-	Type=Application
-	Categories=
-	NoDisplay=true
-	NotShowIn=MATE;KDE;
-	AutostartCondition=GNOME3 if-session gnome-fallback
-	EOF
-
-	insinto /etc/xdg/autostart
-	doins "${T}"/polkit-gnome-authentication-agent-1.desktop
-}
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
index cb6785fa8f27..5fd3c492b717 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit gnome.org
 
 DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
+HOMEPAGE="https://gitlab.freedesktop.org/polkit/polkit/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/glib-2.30
 	>=sys-auth/polkit-0.102
 	x11-libs/gtk+:3"
-RDEPEND="${DEPEND}
-	!lxde-base/lxpolkit"
+RDEPEND="${DEPEND}"
 BDEPEND="dev-util/intltool
 	virtual/pkgconfig
 	sys-devel/gettext"
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 6940829fb9b9..46f2f9aa6a1a 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,5 +1,5 @@
 DIST sushi-3.30.0.tar.xz 296940 BLAKE2B ff8617aabab16d41c9b072f8cf9774e4f5ce59e0dada05dcad23ba6929005c963d86a1beb5c2a3adc5e8cbaf8a6ce769b48ff53f4979db9f1853bbed0f80fb2d SHA512 48d2b960c2ebe86cdfbd0043968acdd6864162368941b921f25e137e6aeb2a2513738ad4d8c6ef5d5c6d2863e6ace5d2819e0a5dfc487efd20a1914a7cbcc40e
 DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
 EBUILD sushi-3.30.0.ebuild 1422 BLAKE2B 2da3acda8e006e0128e2ffb7c4c0c34dd808bc96f079d6f184e80aa4904ea31b28726e13ce4ff41c6a1e4ea42f7e8a03bd07680008d5833b1bb419fd22d4d2b7 SHA512 3150b6e904569b47803a8a7ce26060948e494c8e9ebea06558483b7be0e7d094ecadd6f90340c7b71d09e432ac91770049ec2002564fc4ab6ba342dc8c644c89
-EBUILD sushi-3.32.1.ebuild 1351 BLAKE2B dbe773241453d5fca762d0bce00cd0af4b5f639708bd1e3c84ac8d5a659e2154470f9fe51604484d3994d22b8aacc83a3852a1d65fcf390ceadc8c7d55a8d09c SHA512 b783bb9ced929d2662a8e3b93eb12a94609ceec8015f8f0fbc1fdd85e8f7e0fb89578d50bcba064ad5446a2a8f0a97defda926f6e9cd8a593b266240742320bd
+EBUILD sushi-3.32.1.ebuild 1349 BLAKE2B 318a284fe3895586ddb9ff4a2069704f2b8d5060926cb288b5065a7bd192cf3a26965dd943a493beeda75c02b23f46cf6c42db7616979ee6d13c6467518815d6 SHA512 69c401e1fad00f18d7d5396e0d217b7be7f35db0e303944e7ac4545c68d0422c7be5d4bc78744f9a9bcf18ac82a506e6a069c9b13dff9a5d7a993215c39e87db
 MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/sushi-3.32.1.ebuild b/gnome-extra/sushi/sushi-3.32.1.ebuild
index 60bf8a759dbd..bcfac9734eab 100644
--- a/gnome-extra/sushi/sushi-3.32.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.32.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="office"
 
 # Optional app-office/libreoffice support (OOo to pdf and then preview)
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 1bf74d49ecf1..cbd88361a564 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -3,5 +3,5 @@ DIST yelp-xsl-3.30.1.tar.xz 518444 BLAKE2B 013dc16b04129c714c1938a0cb02f9f833a5a
 DIST yelp-xsl-3.32.1.tar.xz 528412 BLAKE2B 0e35757b8bd4139ebf436f69c6254cb26ba92f13d6ce345093b023151d3127f70a866572e6d42c9c93d2faf85abd6dc0ef2720955f5defab3c3415605eaf9152 SHA512 05a03e045c8278faaf39604d6cbccb449130d2c85e3231c8c9737e344fc249cd2949011fb1a0e4fb6085dc21374e7804fc7fa4161f51607d93b301cbcf5453be
 EBUILD yelp-xsl-3.20.1.ebuild 579 BLAKE2B 9f4b14a79c2a09f5edddb932f601bf4c8aa52397d2881811d92e35be3444c407732aa84c10ae6318e39e298f4ec7dadf02c3cf8f839a4711e38d8bc0027bb4d9 SHA512 a3bddbca44c628c86be56f0e4dc7c8013d04c279e46639419e4baa4dddbf443286c9fab01d6fe6138ecfb746f8c315e900eee788b5dd72fece8cbfaba2758a07
 EBUILD yelp-xsl-3.30.1.ebuild 577 BLAKE2B f5177955301184a67d402f2b3cd0eb0f8c78fbee539b0b2489ddfe82bf9eb5c6ba5b47b16390198be77c4fd36a6e18bf0a904f59d0ee83fb56627a8af1945c12 SHA512 fb6326a45bf8c3e470e7484f0ec681d6a386a57de47753e29fa001871da45a28e4076942fbc89ee1f1f1b14fb7906c44f97b23ba6d83ef256bb302cae4ffcc5e
-EBUILD yelp-xsl-3.32.1.ebuild 587 BLAKE2B 5049daf2b5c82ff50a6edc6cbbed09b5e0dcfa3440642f042b2a9009b3334fa92c26fc6b231b832e89c4ab13042d4296c42511befd4c13771ff22cfb51d554bb SHA512 bee053a415607552b2db95508772484a5f71c9bf65936cbd39b83ee49cdb5fb2918e18d1c7b693300e12049efeaed4870fa663f3e360e12cb3c76b8187fda147
+EBUILD yelp-xsl-3.32.1.ebuild 579 BLAKE2B 106e176fbe4cb06b9cbada66fffe3a402451865ff7a6486b1c34c5094476b8c576e87dba1da9bdf9518512633a74a6f4d72651347c40232c1a7c39996c76c16d SHA512 4fc7dd00f6e60e8c68ddff1d6b70e1a0b6e0f72000a7e55774d0119e30081f609a8588b1780b05bdd457846c37b8bceb148145fda907d3e97768e375a36e1f55
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
index 02fe26186c4a..2090fca6b649 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.32.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 07a2c449f919..db363487bbf9 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -2,5 +2,5 @@ AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc
 DIST yelp-3.30.0.tar.xz 1393176 BLAKE2B a00277f7a2498d2a6c51c8375fc52293a40f111ab441bf00e25fbfa054914e4752a65b8fcb5eace74393c61431a0e5c9bcebe8b35dc8b00f96d3a3c362079f77 SHA512 fd6da1731e55bd796593f0ed4d566b380996d21ca0264033a5b6afaf0ba8d445a2b04a9fcbe0a1091f2244a6ee2c92814bbb86db8de59b2c230b746dbd0df564
 DIST yelp-3.32.2.tar.xz 1538964 BLAKE2B f4d7947f29b40bc033e2d3e010c39f8ff43de765bc4a2c446f02beab4888ded287681db2c140951f19aa9075aceff6f08658d0f434b5cd9d39e7e53e6cc00c31 SHA512 be0e2a7919ba8aef8eeb13e4d195e745afcd113350b32bad5ccf204f544107bebcadee364508402ad7906dd5484b9f21288ae13edcaab47a02b54e31f3379cfd
 EBUILD yelp-3.30.0.ebuild 1267 BLAKE2B 313237ba752c3a7b3037a435e3971ccfb6818342cfb9634ddd594b82fa290c1132ef4add7c357d94a9dcbe015ffde3bd6f6db13f5c0fa0fa1ab8826ef02e58a9 SHA512 aa1c5a067f186a37b97f02f43bdd4e0509cdc9c4722bde4117a19dbe477b7a186d2155dddd01b7d1748770316b4c078ac16563e93ebbd23947c674f5c1d4e9ab
-EBUILD yelp-3.32.2.ebuild 1243 BLAKE2B 0d29c9b611e8639d0f29518dd4ac83030d8f3d756690fccd88dc1888eb2049c707a890633746f0f077a2c20b79729a38f81b42d8cdf30e7f0bc0b80a3dd59818 SHA512 ca6630e2af34aa5e99938d7cf37c8de28941c9e554ae74e2e6c5a7ccd9e1f0e0ed0d34b6350bbb890b4e4f4d1006610cffc7c9d8a273517df71bb7fe8c46a0a2
+EBUILD yelp-3.32.2.ebuild 1241 BLAKE2B dc6aababbafbf7451396d75235317cb82578e015c7c40d4da7ddd265f6e1ea94bf5b2e459c855b433c2231673aa0cd8758d6ea23fc20e6ca3fa17a4a24305816 SHA512 052135b016b3ad439c9b653b50a42123383ef7183c7200cb77540c4c02fd4bfdffeea4f79ed13da2bc00afdac4cb1ea980592fae84ff839f199e7e27f414f492
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/yelp-3.32.2.ebuild b/gnome-extra/yelp/yelp-3.32.2.ebuild
index 0f9ebb4f2a18..b0f547681cb8 100644
--- a/gnome-extra/yelp/yelp-3.32.2.ebuild
+++ b/gnome-extra/yelp/yelp-3.32.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /gnome-extra
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)