gentoo resync : 15.12.2019

55 files changed, 181 insertions, 48 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 11695076e8f5..fe56d3b8e511 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 0643a8a6822f..c2483b9f0e3b 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1,5 +1,5 @@
 DIST dconf-editor-3.30.2.tar.xz 447060 BLAKE2B 4cd8ab7200afaa402d6915a94be12b32a58fdf11ed77d4b833e3734b94de99bf7182d3564d1e0b42935d4364b2c973c296d773de402942af8e66f4ccbe6026be SHA512 c9fe4393e9c75ad19c56670a50199493a32ed55f3135ada599aef5efb4582320a23648da1906ce1a1b64918987fd3684f00bfc749a21a6fd2806066d760418c8
 DIST dconf-editor-3.34.2.tar.xz 560308 BLAKE2B 9172a4dd77765d067228c6652b004bd6811c71a83bb4191a71ef70181a5e0aa1c3bca6d655c76eb032793eb5c39364ece23337fa86d1a6e31e59391a3554933e SHA512 6c2d89d2d62a768b669ca49e0298bddf4f4151358f0fc0314431c7f926df2323ac3b61540f2a3c95c7b5a88e4e2f08dae4d00f601506c9610a0edee4b00ba499
 EBUILD dconf-editor-3.30.2.ebuild 886 BLAKE2B ee774ea1520e6b9609c9a3b522202a31eacbf7111338bdd602b323269128d086de0f8aede730644f8bb084641a42bf8b9ba395daa1345860bac81c802d54c02d SHA512 df719bc9d729170c77a15d5a717820eb041927960a0a1c5373003b60da9001cef36b74443ba3ffb07732588f4528f87bf6d80673ad4d442dd2c9656fc127a509
-EBUILD dconf-editor-3.34.2.ebuild 819 BLAKE2B 4da54b481777929075589efe70cebf3ad582a13e0c5186e1cfc322a3da8ff58f60f568c7466200a452038053ed56e0e8c5ff2215e3705d9fd4ceeab62e4e3fc8 SHA512 9a72b0e5ccc8be60f1254878d651f5f9f6080ad3833220d0b5d6834b049e46ef5ea61ccd23cfa0836aa9be54e7080d2219eec7d3ef7f5cf9809cba3ff87206e5
+EBUILD dconf-editor-3.34.2.ebuild 817 BLAKE2B 098901e2cfe74c2ac41d84b3e33c476bb14c7f79df824b05caa1b7499892ec0a012f2389001909501a5ad7621c75dc554b2fd32f7006f5f94c21a74597586663 SHA512 6dcc2a9aa8bbd35e309c1ae5ddc3fc747a92937b8b2a3539c6eb2e6ee5a2daaee79d42a12bf766c9990dbe5333a227ff331d3a01282082b0222ec183871f2744
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
index ab376da8bc88..4eecd4fb57d9 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.34.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
 LICENSE="GPL-3+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-linux"
 
 RDEPEND="
 	>=gnome-base/dconf-0.26.1
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 88252470b4e2..c51031926b60 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,9 +1,11 @@
 AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
-AUX 0.32.0-drop-vapigen-dep.patch 1113 BLAKE2B 17bc1da864e0a706aee7574115604e8bd8fa3048febdc2daa8bc0792a0ebd676d3ad3d334d1af86a4441d13074bf9dbf1a66c832d36c036b4909736f2c166aef SHA512 bca6484acb0a7cba34c16c3ac841970a93f4da3f439c7352824049641f256164588b7f184781b77e2d85e0906750b55573bcbd0a8819247f64bc702bf95e5231
+AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
+AUX 0.32.0-meson-0.52-compat.patch 1148 BLAKE2B d33127e2e765f3f19282b33852b00b8a08f4977c856a94321b616e5135b3618477a44812a7429148018c915d716f35c6296e3c72c247970adedc9331af7bfdc6 SHA512 a4b9a1c6b6f16a4f5ea7a250d0a2949c1906813cefc985706575865abc03dc715f6d283887b081bc906a7a439fff0ef4fac57b3de3a4ea40ba2dc19e51db4664
 DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
 DIST dconf-0.30.1.tar.xz 104376 BLAKE2B c5a90c092b6e028dafbc9aee2f29f622dc4a696e815266355de4a056fe507b0cca9eaa9b10753501ee44f74ee57d0095fd55aafc7205ffea1f0321ed705dbe0b SHA512 f7d136aec7cb75b64c7d9446d520f4c4af368e6d22346b7bb8ad66c08afaa03a72aacd44016dae7690e37b7d0deb9a16187445db176427a12a8b3cd3885c9e03
 DIST dconf-0.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
 EBUILD dconf-0.26.1.ebuild 1476 BLAKE2B 2cc966193509f00c2ef23dcb6712f60c0c7894c91aaff397b2d067123c7f7be4ea8a27121bb1578c6a111fe7206406722158538c9458944f41790e462fb77d3c SHA512 f5bb74a43f300ac4b0c1042d67d44f2414fbc9621ab1c753ce68804c0d6ce2b42afe830fcde32d4b683ab05f06723050704bde6c54cac58e54f2b786a3445e2b
 EBUILD dconf-0.30.1.ebuild 1906 BLAKE2B 4a9e6b53080395b0449bce434beb1b8b2efd61a1bd4cdefe6ff8a380288451d3cc60a87eb3591c465b25ee70a2416c2b486b041894a52e7d1fa98bb05dfdf5c9 SHA512 4d0372ba27f1e088b17973fe00f042a57f1dc07989f15216c79a7884ad5ca8239d7b8b67d73d3ff32aac953ad492cc540e01fd169a8d6c18aeb7369d845fa1b8
 EBUILD dconf-0.32.0-r1.ebuild 2204 BLAKE2B 027128c7dee3ce99a765f57e792e7c290ac965be8675b3aa41ba2e9f2f33812a24298808b88440081a6f343be95c037cedda9c679846913cd3f679b127436f9b SHA512 d1073cefd7de8def9618dd7c15794e8e77a82a52746260cfbaef68a8f46b065c10ca7143b0473774ef1271a7a951afcd35902fab1a20fd11d92f4907d050ccb1
+EBUILD dconf-0.32.0-r2.ebuild 2194 BLAKE2B 98733409e9df5f8dc82352603de66d0c63a40d779d80042adbfd8bfe4d12247843a4a2fdfbd2b08c878e31a18aeb1326ba3a62b0c095be09b71d3c26fb081505 SHA512 7b522e025d8c97a9f329668017b4cf341f934f7a68f2356e614f642929dcc0b948d6996aff5c97d7d8ef78719013c7afb65934a4db4badaf85ab805ef54d1754
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
new file mode 100644
index 000000000000..a036e7103d2a
--- /dev/null
+++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Simple low-level configuration system"
+HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
+IUSE="gtk-doc"
+RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	sys-apps/dbus
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.15 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.30.1-bash-completion-dir.patch
+	"${FILESDIR}"/${PV}-drop-vapigen-dep.patch # .vapi/.deps are pregenerated, just install them without a vala dep
+	"${FILESDIR}"/${PV}-meson-0.52-compat.patch # https://gitlab.gnome.org/GNOME/dconf/issues/59
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dvapi=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# GSettings backend may be one of: memory, gconf, dconf
+	# Only dconf is really considered functional by upstream
+	# must have it enabled over gconf if both are installed
+	# This snippet can't be removed until gconf package is
+	# ensured to not install a /etc/env.d/50gconf and then
+	# still consider the CONFIG_PROTECT_MASK bit.
+	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
+	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
+	doenvd 51dconf
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_giomodule_cache_update
+
+	# Kill existing dconf-service processes as recommended by upstream due to
+	# possible changes in the dconf private dbus API.
+	# dconf-service will be dbus-activated on next use.
+	pids=$(pgrep -x dconf-service)
+	if [[ $? == 0 ]]; then
+		ebegin "Stopping dconf-service; it will automatically restart on demand"
+		kill ${pids}
+		eend $?
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
index 55959a7febf0..0dcb72358bde 100644
--- a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
+++ b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
@@ -34,7 +34,7 @@ index f3b7122..7dbca97 100644
 +      define_variable: ['datadir', dconf_datadir]
    )
 +  else
-+    vapi_dir = dconf_datadir / 'vala' / 'vapi'
++    vapi_dir = join_paths(dconf_datadir, 'vala', 'vapi')
 +  endif
  
    install_data(
diff --git a/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
new file mode 100644
index 000000000000..7b5d8c5aefc0
--- /dev/null
+++ b/gnome-base/dconf/files/0.32.0-meson-0.52-compat.patch
@@ -0,0 +1,35 @@
+From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <diegoe@gnome.org>
+Date: Thu, 31 Oct 2019 05:51:22 -0500
+Subject: [PATCH] build: Update use of link_whole for meson-0.52
+
+A regression in meson-0.52 caused uses of link_whole to expose scenarios
+where duplicate symbols issues could appear. In particular
+libdconf_client_dep was being link_whole'd to itself, which recursively
+already included libdconf_common which was also a link_whole.
+
+This change does not modify the available symbols in libdconf.so, and is
+compatible with meson-0.52 and 0.51.
+
+See: https://github.com/mesonbuild/meson/pull/6030
+Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
+---
+ client/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/meson.build b/client/meson.build
+index f3b7122..de6387e 100644
+--- a/client/meson.build
++++ b/client/meson.build
+@@ -28,7 +28,7 @@ libdconf_client = static_library(
+ 
+ libdconf_client_dep = declare_dependency(
+   dependencies: gio_dep,
+-  link_whole: libdconf_client,
++  link_with: libdconf_client,
+ )
+ 
+ libdconf = shared_library(
+-- 
+2.20.1
+
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 99557cdf80f2..97596fa36e26 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -10,6 +10,6 @@ AUX pam-elogind.patch 835 BLAKE2B 1db26b690d631c152ae7fd84149c7ff3222e8bd258bff7
 DIST gdm-3.30.3.tar.xz 1261224 BLAKE2B 338f946a24d2a7e4b3cf34ac6accff01f8e7ce5032ee4ce79a96b1a755693e09788c6225e45de9a91ae4afea595a0562511104a467e561ec179c3ad61810468f SHA512 17aed5bf7d27b07553703873cda28a711d6135497d36e4c241bcf1ab3552b31007cc241dab394dccf8a4f1daccf7d55ba39edf91f4b22bdea5c2aa1ea17404b8
 DIST gdm-3.32.0.tar.xz 1262344 BLAKE2B bbc580f788fe2ce8783f044eb8109ce0086b1bb078bafaeb6efd833689848ef6570bb0fd0e6e260a388e7c1a6d3cdccb36264a640151e9b6e5d81ca9c35f3be3 SHA512 88016d0f800030a561e0360c63fdcb8499a605126f99a5a9f89606e086d7a934afc091843b2acd9091c1c643e7468ee31ae9a5b6264ae38064618ad577ef7ac0
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.30.3-r3.ebuild 7785 BLAKE2B 93ea897e035790ef200767a453eab985fd3184e8243d05a11ad69ed0942b592ba20a8b8eefa328c76bcc5ce70a1384b6f3ebf97c6acdcdb74bc3a46d3cfd81d5 SHA512 add94d28f86af1802fe4965905907f8f40593d9ec5191432a96c0e26a3a6452b4631442589ec92a68428f2f440de51cc1ca484abcb657565378402c6cb1ec351
-EBUILD gdm-3.32.0.ebuild 7673 BLAKE2B 3bd4f098b0ffe69cf7e38bea552c8576dc754c8ae2b4fb74f0646cf633bdf83908502043f4d101bff48e13ef7ab7349e9b5107cc441bb2f814e336759843feea SHA512 5739b68e9cc69e6fe1b5b989ba170246ee64b9ccb2c6bddf7a7a1ef8b1017bb7d5daff2692377fbe450b3d6826edafed48664aebfbb85d994541e46a9fb66eb2
+EBUILD gdm-3.30.3-r3.ebuild 7812 BLAKE2B 46666b52d11813d2e4bdf2b9a28962318736c207c17f41c9c6e7174aeeb7a4693889af01d36f208d09273a1993db577a758a73a6de479fff83a41258c0bec3ce SHA512 093db9dbe9ee56b833e33d7dcae61cebf9a351bef555d450ad67ec77166c9dc3d3b7d13d05127679f402644efa46ff0c802bbc236681b5bff34ac8c48dc4862d
+EBUILD gdm-3.32.0.ebuild 7698 BLAKE2B b765057dca3b0f0d883ff0fc14f5367cf6f19e2f9dadcc4bb3beae99b34293173cefd9f53e38ea421910085b57e01e63e3bdab9656d7b69876d00504a77c8917 SHA512 a41b16c81cefbc62b2afa5e6971c90872472bce3187352efb5fd1f3a01cda074ba2abc763a68f0fee47c85160d7ceb2c89e58037f561b72b61bf7586f688886c
 MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.30.3-r3.ebuild b/gnome-base/gdm/gdm-3.30.3-r3.ebuild
index ffe2b15b7151..2f4a5cbe291b 100644
--- a/gnome-base/gdm/gdm-3.30.3-r3.ebuild
+++ b/gnome-base/gdm/gdm-3.30.3-r3.ebuild
@@ -22,6 +22,7 @@ LICENSE="
 SLOT="0"
 
 IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86"
diff --git a/gnome-base/gdm/gdm-3.32.0.ebuild b/gnome-base/gdm/gdm-3.32.0.ebuild
index 9ee9ae70dc7c..9512c3a85340 100644
--- a/gnome-base/gdm/gdm-3.32.0.ebuild
+++ b/gnome-base/gdm/gdm-3.32.0.ebuild
@@ -22,9 +22,10 @@ LICENSE="
 SLOT="0"
 
 IUSE="accessibility audit bluetooth-sound branding elogind fprint +introspection ipv6 plymouth selinux smartcard systemd tcpd test wayland xinerama"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 9f264f7451c0..bfd784c06e4b 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -4,5 +4,5 @@ DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f1
 DIST gnome-control-center-3.32.2-patchset.tar.xz 62920 BLAKE2B 0268c048317c0ef267b1606b5eb85a40bff4f59a0baa8876cf1c893b96513c51708edeeb965933d54fe345bbce3e255e889c45eef98147b32d3d1208bf049fc9 SHA512 458ea50c1e95e2e005a1dbeb3c1d1a82d3399909a1367ad827ee3c5cef14cd3ecdfe27bc17bf24d6b037e1eae00df3235a75d0154178203b177b05b8d0688e6c
 DIST gnome-control-center-3.32.2.tar.xz 5953072 BLAKE2B 98206c6c7fd8fdca8bb6ba7c1178eacaa6e3364380c6faf7b1e98c0819c440e16d35f4299d323c27db8271a161be84e4e7520a4b8b03c4d654d195b25c93cdc6 SHA512 6f69f72e15d901935bd2fba90e0a598e6c6463d4b0f914d2a9c330c77378a461c8da86f198408045c07de370d3c1558046323a4c23a97ceed96602597e167c78
 EBUILD gnome-control-center-3.30.3-r1.ebuild 5835 BLAKE2B ec578aab0ddd1222a17109cde630aa2232c8f2ec549ada32423fec8bff8e75fe1c5f316816e6054b334e08f2df54e91233924eaddb5937b7a6d602a2ea60cb83 SHA512 15f9f0bf0dbc5cdd94a7fd3be253f404b35754d49d4112421a76f2d79d03592c3103a385a07e0cbbec864c78e1712e02db73b5439ea4d340f25ea3388f28f991
-EBUILD gnome-control-center-3.32.2.ebuild 5512 BLAKE2B d1941d0d614850bd50c5c79a1a550f07802f4615744602aedd648f0a0d5ed007142d3a9ed8e767533d8cac6c7c9639b0aa8132fc34ba7b0be3cbd0368851fa26 SHA512 b5019f7f513bff5d3b2e1ba9497d80af062c457b4fe6e7932a541100a162509c752d0a9fac7ff5524ba18cd3db7e7c9ee7ee058a4be7a3cb91e3335db994b57c
+EBUILD gnome-control-center-3.32.2.ebuild 5529 BLAKE2B dd4753abfec32ad940f362456b5026041341bb255ba50a4e200e73234da53ae0c3be5ff975384e734b7c1b15ce6b84bfce7f8ac1a12161be85db6840836793b8 SHA512 b3b94bf9475d87e01ea95a8a828f3689589b4b252c5e0293544f8ebd4fb2e24bb8c18112fe1ad74f25249f04b5a3f0677d13cf03f2aa6d24470c4d256c35b259
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
index 35a0b6acb5d8..519a34fa4566 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	flickr? ( gnome-online-accounts )
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 # kerberos unfortunately means mit-krb5; build fails with heimdal
 # display panel requires colord and gnome-settings-daemon[colord]
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
index c2a69a73ab23..9865e5d5baa7 100644
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-core-apps-3.30.2.ebuild 1523 BLAKE2B cd87224b828663c02dcf7689c0379e15d8de30b7dd4a9fac7a44ded840eab6fa032b9c59bc3225a490243f456f9050a97dff88ff04621b6fd58e82a403dcebf5 SHA512 8e80a3a07929e94863d8e4a69cdaa707b839a6b7f52e03ba0765cca51689f1eda492078bbecaa956fe55a5124ffc2e059f38ac829f9f2df6981215419865dd2f
-EBUILD gnome-core-apps-3.32.2.ebuild 1501 BLAKE2B 39686e88a2f22e0e68b0133f05058f0f6915f1b8d42c5a9b535673d667df7bf0274a5c5a4f944a799e243847684dff1b0b5d779e4798680b751476cdde72d1a2 SHA512 818b5496e635a10788d02444dac78744a62fa217b27f2973b1d7b81b0d249f92ad644af8a17dbf6a150ec02744fd49bde7871f8d35aba347cacf95cfa21d11a8
+EBUILD gnome-core-apps-3.32.2.ebuild 1523 BLAKE2B 7b087078985ec3ab194be3ba8edd0f8fc73c507c9b7d9b36d2c63ef9b6fd3183d3744e442970706b0d52a73565d6184e2af50a90a5671eb6f93f50dc4120f949 SHA512 8dc532ee2883f7a14ac1c3927a2a7a5e7c55b774ca41fbd4acff34e1429ad94b9dd488d83f2deaa4d88628f10739046bb62e400dcb4eab4e97ae76206ec5e05b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
index 6b6dc0458da5..202622f5be3d 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.32.2.ebuild
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
 RDEPEND="
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 38595270c635..24cc2c921a1e 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-core-libs-3.30.2.ebuild 1153 BLAKE2B 33d95d463dd035be5025a64f4cad3760b29fed14d53af7b1ce02ed4e272f4542ec7522bd0df9deec24a0ab1b0a67da270578f336b3fdd246cb53198118d4152a SHA512 cf220028cf5c89287955faa0d06d4e6592d31ef3824d85a3c3d262c2a056bd537d674ea3a260643a9d5eaf87deaa6438d0d5448d29f6cf27a4dfce6ab59ef7f2
-EBUILD gnome-core-libs-3.32.2.ebuild 1166 BLAKE2B 7c627259c1d9a44b07b9b561bbad19372c963639be937116cd2f8d3aced61df9bc9d86170e647df858e0d7f3fab58d39facc0ccbb09d28aac2f11c0c0503c222 SHA512 9ce3a671364c45aa559b6fc3c9625c9d3cc5446b57252504c2396e8699a64dffd8f62f57d8f7e1cfb360214667a11f2bc16c639161c3c41215290c83b1e1510d
+EBUILD gnome-core-libs-3.32.2.ebuild 1164 BLAKE2B d5e1183c0833343da129516cf03526e106799a6c3635fd6f380b119c76ee6257c7aa22a58f2747e5ef4ec1289dbc72f95b4b6d47b15a0bb1a0139e519c1f3d8a SHA512 4c6b60fef6903517ee674ea1353473a433651235d0ccb91a194e5d7f0737298149ff13d18f0c97cfb78556a334bdbb96eea02220a504b3ac6e877765d034beaa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
index 5fdcc803674c..29579ea32bbb 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
@@ -11,7 +11,7 @@ IUSE="cups python"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Note to developers:
 # This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 1483539b770e..fc5a5a338d89 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -7,7 +7,7 @@ DIST gnome-desktop-3.30.2.3-patchset.tar.xz 3568 BLAKE2B 20d13d7e396d7cddcfb6f76
 DIST gnome-desktop-3.30.2.3.tar.xz 1164500 BLAKE2B e78256bc3319ea9794b4666c82eb466a0c884fd43c3c776fd08aaf789905893ff93acec35a1fb6903c0049b3a169afe5b43a71ac1e93e8c63c013682c3316fa8 SHA512 36303de8fa70e65c40aeb7862156fa404b965d1724171ec5bb0a00cb1049efbfba79cdcff76278f53e4e27199f1ef9dcb574b0f465b0f4e04bb46c50d516ad0f
 DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da
 DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99
-EBUILD gnome-desktop-2.32.1-r2.ebuild 2286 BLAKE2B 3e5c049ee0cfcd0bce0d229398534d00b49d915674b97d1c6f45f691fa6a7e59f608ddcd66e979493882680c05aa7a49c4fac7affd0c07332b5c91c68ea8dca4 SHA512 c3d27e1efcb6006ffb4d3c3bb9e1f54796d9ec55f1ab4d8446ed1d5dad995a1935c5f13e8b95479c3fa89834fc4582badd9afcebbf54f50d367a7200314091c5
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2280 BLAKE2B afbcfbea1a172b979f0a75d8001f73d54209d1a3fc65068839c111176de2dccb22ab354409a6137e350033c8b40a496dc8a5759c3b29d9993ae83e5b4c0988b2 SHA512 1e22d82e37a229e0ce46c6104338e8d82cac2faa1315ac5ea8a0926a15a469cf02211b5a3be22b962d29cdb177212eeeb765b70f0af42fb2678cfa3ad17e5497
 EBUILD gnome-desktop-3.30.2.3.ebuild 1994 BLAKE2B e09092e0d3cf0da0eff86def5ba4ebcc44f5cc6184166cc7b2b697a059fdb9b9a3692a21439966db1a20b35c7bb0cd695d7c50b0d3bb3a6089c7de6c39441871 SHA512 454cb2ede06237150b80f289657bb1d85fe0e99e8d3e660915d68d8753eabf39ac3032d42a191a366c830039557b74430db88fb66f4e2771f4d82a2ce0d82cd3
-EBUILD gnome-desktop-3.32.2.ebuild 2264 BLAKE2B 03398d2c3614840d2fc8e3c9d254e4b115dbf5a803d5e16c406944f7bacdace4253df91659079d1759eb9c0fdf432e454a025f511dce4b8011b5b14da5d9e5a7 SHA512 e1d0e1d003add1d04e2c060c3ca4ad9dd3cc128c93e5aff6f58cbe5f61696de433f018f44a69154e2b643308d69f3318e9da45ba46aa53f7d40d6ae3bf236efe
+EBUILD gnome-desktop-3.32.2.ebuild 2261 BLAKE2B 5c6b7386f6c18eb1b84da612019de9130dc2bc1e6f3bfbd74a210638f8a681bea72166c5076d6b02b36d39da58f9829e46980a9042cd90b6ff6dfc06224eac48 SHA512 9b2dd6a07c468d6402976a70da0605f2694f73f65b904605783027d2ce21bef6f417554f080f3a954a0915260837e584273a1baf3c68c70b924ab4d97807cd2d
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
index 595d61ff0bd0..f48d6fa875ab 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 }
 
 src_configure() {
-	python_export_best
+	python_setup
 	gnome2_src_configure \
 		--with-gnome-distributor=Gentoo \
 		--disable-scrollkeeper \
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
index 7e9e3fe09c13..f678ef39697c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/17" # subslot = libgnome-desktop-3 soname version
 IUSE="debug gtk-doc +introspection seccomp udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # cairo[X] needed for gnome-bg
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index dcf8d5b857cd..80e926335ad9 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-extra-apps-3.30.2.ebuild 2473 BLAKE2B 90a3c87bd618580b0aa7063e072ff353fdd58952a0586efbe272f6e6aee48dbd46d6acf0f99b7c181ec266e2265162a2f87f482509f6f81368b462f592e0d3c0 SHA512 5e0563253a44e8d906bf1ba2ca919a211e3ab7f4dd4e503aad92925e5c829e9a752079e2084033857e570c24f054424ba6be55f0cbea6cf032fdbf5c14b9c626
-EBUILD gnome-extra-apps-3.32.2.ebuild 2477 BLAKE2B 9dbbbf8d0f738dbadf500de67fa008c52e9c089a513071bc2cc1289c94d7483c4738ef3c61e0a769a8fa7ac1bed809e191ad83739850530ed1774b76e9653471 SHA512 04262c98804dea4b7ec4af5a84257d793311fdcb4e824542521bae5f42be8d52c2634cb5d6bb6d1faac5076de534101db632ae0dae7fc685831d4b7311dd52bc
+EBUILD gnome-extra-apps-3.32.2.ebuild 2487 BLAKE2B a8feb735675c94dd442b7a241e48d246f5f4f955e53fd092ac5f5df93ab8fac004ffbbb695a2c6dc833b8926628de9523888a974b6acfae0002c2f73d28c47ce SHA512 b4f3168d5a54cd4bbfb858a742d1ec818e0fac127a64acfb771db05f20b5f75c32b4301a47012e1a3b7533d061afc6060d6f828bdbfcdfacec105dc7805be59e
 MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
index a14d5a66acb9..c1c043271c2f 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.32.2.ebuild
@@ -9,7 +9,7 @@ LICENSE="metapackage"
 SLOT="3.0"
 IUSE="+games share +shotwell +tracker"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 97014f0f09db..610d1c695a2e 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -4,6 +4,6 @@ AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5f
 AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444
 DIST gnome-keyring-3.28.2.tar.xz 1322108 BLAKE2B 416697befb7670c3b854ff8d70626d495f5ba77691a062f854360e25a76766f5023e998b86114d36965023a5efefc2eb0ab1dca9aa03d73351eafebaa4920784 SHA512 a51bc9d6bc9203b86febe99bdbf893d3ba0eeaad976ece2bd49efc3869bd1d15f440a01999ce969f845f8336538de22e9f1161da990d707cbadb99d5cc3549bc
 DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210
-EBUILD gnome-keyring-3.28.2.ebuild 2130 BLAKE2B b58bd21f01abf5f982f41e60b528e118232cc581023f07d0b5d93a83f106c3f747ed05f3cfe16b63c91b26d85e7b542f5fffa82af261158376c0efe92ffb54c5 SHA512 d8c1d9e0aad5f0d30c28fab75ddabc3eb4e9c289f16ac54c590eb6a88411c2bb40c3bafdd8ea72c026bed9bf97d1dade2561789956277f529a5a0e6979f58857
-EBUILD gnome-keyring-3.31.91-r1.ebuild 2367 BLAKE2B 7138d717cab205582d8057f88eede2658ebffd835ed25563548bc3452a83a32c82e527269acade6cddff69f07c222bb371680a2d5eb2b3dbacb2cde7d323260b SHA512 3c56c37265890f3d3b15a94cf9f339fbb6f0332eb25a6c2cf4c3dc322ee99b9b7964a3f990029c8d01a71eabcde526fdb4388f618868929edd1bd0ea83f6e9e0
+EBUILD gnome-keyring-3.28.2.ebuild 2157 BLAKE2B 23843287da57241b3db0e5d127d6c594664118e0f87c0708dfa5d8f35feeb6f9e6f1f142fd26b5bf044250a3c983dba6f15eda1b7a0943e65bd6f8b71476b589 SHA512 c7c6f0346fdaefb1d2a5589d03309e1f20b5d7456cf3d51533e5727c10dba530ef50973a381a67bc5e89caf5d7b3c775f9e1914d41dd7d2fcf5ed2981cac71e5
+EBUILD gnome-keyring-3.31.91-r1.ebuild 2387 BLAKE2B 44a5a953771315409988721d70df3a8250eb21490afa517a303fad45a40db7a439d2378dfedaafdce1aeabfef62edef6da8b027552e295c7adf9d4fc3e51523e SHA512 61de8aa04adddbd0275c249915a88e20ac5d2a164b8dfc60a6cf5b14e14a72e2fd5353c5f38d997684366a6a18e6a5fd8e6c4149cea859b532e6674da4c9d903
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
index d9ad273fc78a..42e5bc533053 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.28.2.ebuild
@@ -13,6 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
+RESTRICT="!test? ( test )"
 KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
index e15406304ac3..5b4c89f63339 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
@@ -13,7 +13,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+RESTRICT="!test? ( test )"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 59139ba37991..45215478bb82 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,5 +1,5 @@
 EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
 EBUILD gnome-light-3.26.2.ebuild 1692 BLAKE2B 559111105e792c0f3af9dc66ba6ed8560845e9d8c4dd41af29b39fea2f38c3dd5b0f6552f46ecc9ca6f6c8b0262ecea07620101b2a7bd0426a5de9679244445f SHA512 f9bb9fc468fe5c73a508286c69468888897d449958bc06cd8e4a46730a362cc5f738d7212c0fa7ea9e81aadfef245b71271eba0587119809068876d217bb3e16
 EBUILD gnome-light-3.30.2.ebuild 1805 BLAKE2B 4c1838ffb4e0d820328d74699fd38bdd63341d29df9f2d163aa268dec57c6027a518a1a79e1e5e29440b15e2eb90b6f1a325039b60a3f330e7a5a085c08c4bea SHA512 d02216e925d09e40bb04d9eb3007a3d64377e0496aec4ecaea3f0e2d768f2170705a79058b7ec2286034ca46113a22919ed41acc158e39f5d8428c0ee4f407cd
-EBUILD gnome-light-3.32.2.ebuild 1797 BLAKE2B a7740cd9b017ffa0a2641e08ce6dd57d6181bf1f3086a69b2c57ba736f820f1a0dd3b2e7339cbe80aef110ae3c788771ecb05391285ed6c4d3e35e36e3a33742 SHA512 3f3c7c31e4a5cfcf91c6ac531e30c5c06d08f2c111b16112d46c4752257f892dd690b98722651c1f530a7768e70ded1ed895c1e2cedf5f094c87ac69add13b1a
+EBUILD gnome-light-3.32.2.ebuild 1807 BLAKE2B 7dc337abb97898a74c633c0abd0031a8531650533ff1b3f726bddf4b7edae168025f74f7b165bced43929664b25d31161b160dec183ec5b34eb892c0cd391c7f SHA512 afafedc5973de843d62e0b4421a60d2b2cedf4c9984968ce1fbcfde5b8a202cafbcf027bad199458e49bbdb0debb9c59a0341f9fb2ea160debbf5d453ad77546
 MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.32.2.ebuild b/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
index 75acc391dae2..289fc899c3cd 100644
--- a/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.32.2.ebuild
@@ -13,7 +13,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 74d57cbc7c92..e61454049da9 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -2,5 +2,5 @@ AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0
 AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 BLAKE2B 2da46999a7943a61b0032c77e863b201f9a46598dc5da385b5529afa62d3f826373d315132cd1580ef1e63f264e7cc61ca51757ae2bd509e409b4408f3e9cae9 SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d
 AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 BLAKE2B 97e21c328c44620d7cacfd302907d846d0d58c86c4e2709231f94318bde97825f59f85616c47d475ec5c1fec969a8d46301532deeb03ab910df2f9cec5692a5e SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0
 DIST gnome-menus-3.13.3.tar.xz 404664 BLAKE2B 7772c817317b4af86e740aeea3095f51ff210f73e53160ca2359d45a017236c82fe787956c04a9e0001e2511671438d4955f0bf7947cdfa8649d78fe931d6d79 SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2
-EBUILD gnome-menus-3.13.3-r1.ebuild 1372 BLAKE2B 25d790a2185c89e520dbd212b309a14de2457de629c231a122c14d958a5bd62f403362022d90fc8136351ee0e93ba6f89d36168f2433c6ae74ece3f72e1ebae1 SHA512 07e444a58ae18fb1c36e4e12dbedcb95b55f3b39e0688b72a4e9978662a7cce01a204398b893f10856bc00a69c59b616b8e1f4232368a3fd7e433dd2829baa7f
+EBUILD gnome-menus-3.13.3-r1.ebuild 1396 BLAKE2B 6e7076bf844a4f47bddd2f2c2cc969f1abffdf120ac87d7efee1302f6e02434c639ecbe7276a47e4cad237b3dc070159a8382eaa277f986fdd0759b04157fb0e SHA512 bd9cbb8790b6d560a96228277af9927cf27910a61d741bc01d504935fae9d9acec43ab03e8147c8a3eecc6a02360be73aec7a707b230bbe3d90d9dbf145e5b59
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
index 44fe31b2cc9c..b569324415cd 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -14,6 +14,7 @@ SLOT="3"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.15:2
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 997c07439982..3da5e32e297e 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -7,5 +7,5 @@ AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe
 DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a
 DIST gnome-session-3.32.0.tar.xz 485916 BLAKE2B f9c36fbc56adb5c18b674be31ebfc0236f4a0e125d82fb1ddf8277d599eada2b57bbb06d9e538dc3b101d942472628fe80e10f57be1cbf326ff7acc24cd445f2 SHA512 53d5f84ba8ddbac5cfe0e4e3115c76008a3571779cad62a5fe064a409a507497a9ab93a46d6ba7ee4238ac0efb2f2c1379647855ac8058a945350c88400daf34
 EBUILD gnome-session-3.30.1-r1.ebuild 3903 BLAKE2B 41c30a4bd1d3705d51374c61cd495e1d93b95f253e0ed59fc1af012b79a35fc63de99ae7a3cf587d38aa8e11e74503294e149df4b33183012d92105ebabc7c13 SHA512 1e39c11680eff0b127f7cfdc56132dfa5fcf8c00125cf65c83ea11060f7b0311e891b260bb246df2c93c665697ed0fc3fc5b8c991f699387d9291805f0d08eb6
-EBUILD gnome-session-3.32.0.ebuild 3877 BLAKE2B 3f5ea4bf48cc4e61a14d58c5b682c4c1a0939a83291355bf8d0a08e724faa094b9bf0e16f52b43f5cd2f83b0f4a1d07a0594c7f6febdd8fe212499606d7eabf0 SHA512 05dce2909717426d71bdd71e6ed85ac39c46d288289a213034fccfc6dd980d286e5aa6a25a0ac7013af5f36dc5eb7c84bca7d1c19b226598990396b3c89203c4
+EBUILD gnome-session-3.32.0.ebuild 3875 BLAKE2B b354a2541dbcd4d888688f0a32273e897e3aa76e0285a40b91c26b741388ed857078c66bdb85fa6bc2c964d846f02db4810545a0987a2ec1714cc49beb964d25 SHA512 70a125ca433deb7af966136c792cec3e0b72bb18a9138fcf5867d41a1a42ba6881803495e22ae9674c8a2769f73496be4232faa32a2c3bf983ae98608427ec2b
 MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
diff --git a/gnome-base/gnome-session/gnome-session-3.32.0.ebuild b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
index 67d00960e131..0e214ba21673 100644
--- a/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-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"
 IUSE="consolekit doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 # consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 11133482e379..68a3f6fc549f 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,5 +4,5 @@ DIST gnome-settings-daemon-3.30.2.tar.xz 1376776 BLAKE2B a7cf276c5a802b7d9a6f738
 DIST gnome-settings-daemon-3.32.1-patchset.tar.xz 9840 BLAKE2B 0b0249b6335fc64c111cfd4c221b408460105bd544527ca29a32b2ceb82d39c1ca8c9813916cde9afdac1cf146c1286ed937dadb07eb0263b5ab3ada2a95e0aa SHA512 175f4d0200b88b696b73fc7e7b10065b3e6f046e48955408cc438499fdc6464483420b4801dbb77b5ae819cb52a131e2594a628b9731eaa167b802b5b2cbe855
 DIST gnome-settings-daemon-3.32.1.tar.xz 1372968 BLAKE2B ba0596d9f2019f2ecff32b70c03d962dd7966c282d1fb0ea94c38fc895b7ef788d9dd179a037b74a319ca520811e985465578a725bf14d1eff92846f188445ea SHA512 8d6aca1041cbd50d7dda67dc711269a51c4a5148d55dc63969f47c21bf309126f5d5cb13c1e6fa9e6498fbb30dc70fa7a049fead7d32c6a20d550da0ce8828c3
 EBUILD gnome-settings-daemon-3.30.2-r1.ebuild 3876 BLAKE2B 527a6232fba4202c429853ba33b429e8cfd0a5820c0ae8082c11bdfcf73a7e0c6890cf9f7073ba73a7833a2832b48ce7fb5f1c2286fd5f4aaec7f5eae68b7dba SHA512 0f3a41c824b3f20d504ca52f439a243d902ed5f2d64ff4df2ae000defb95da152f598b1787063348674f5b1f00115fffe081485b185852b322d6cd4d94425774
-EBUILD gnome-settings-daemon-3.32.1.ebuild 3840 BLAKE2B f46ef2fb0f547baf79dc460beefb200b12a77cdc01e6132805fa4d5be7f7c28c5a3a40f8647d1dd3c7a1a55490ef2077e95c4eaaec810da61e9013ce933e6d79 SHA512 3272075b9e63769581a1a8b1909756d641cbe56f83420d3ebde4ed10d9c84be36995498d2649065b313f5fc373c800325ad628f2efca225b09c2b611b8f908cf
+EBUILD gnome-settings-daemon-3.32.1.ebuild 3838 BLAKE2B fcd33f88b6e0552e105c65f893090433a8e846ae0ea1591b35d37d3c5857f13e10c40a474235532f50b9403af2fc74cbdcb9c9135e8778a55b4a9e0fa0c23dc3 SHA512 7648a1d933d88f5fa051829ffcafd40604402488b49201322bd7fa1ee47e082f05c2ccf56c7d3d662da8df7be67f6b369d9929f94eaf3ddfb72d4f21e141fc78
 MISC metadata.xml 454 BLAKE2B 271588e1f1a6a9799ba121f1da6f69ea1b5ba4c006f11c3a997833eac097143ba19bfe445759f17b7269414892af5efeb04eaaa752c0c330e1238c66004f30ed SHA512 ada9cf6a61a63bd96807bd1c4840a19ed2e59b7889d54af7796ec07af6b8250ce03953d907545c92aa75c59d2bee3ecb4120c571f1830a5c2b06e4ebf7005eee
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
index 60fa4ba9b526..254b5af0fcf5 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.32.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-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"
 
 # >=polkit-0.114 for ITS translation rules of .policy files
 COMMON_DEPEND="
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 178dc5d48a2d..eb1a6668ee44 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -10,5 +10,5 @@ DIST gnome-shell-3.32.2-patchset.tar.xz 23540 BLAKE2B 363989a630faa7538ccbf9765a
 DIST gnome-shell-3.32.2.tar.xz 1454372 BLAKE2B 9da7e17d4e47e187fa2285c6cf942cc8dc955e388179d2ad1fe8036c2908e217fc47d8b1515fc3cf6973e2083de8c350b55912782b9adbcf1b6cc37c7a3a9ae2 SHA512 7d8b25aa75149f096033a8b44d7f6f8d17ddadfcd8f5bb1915652423fe9d9db14902e674508f16fe5c6e7cbe956cde8349ec779c24c46f32b0a346755876bc46
 EBUILD gnome-shell-3.26.2-r4.ebuild 6619 BLAKE2B 7cc3d4d3c2d17e346ad23ec782d767807412f239a8967b37774b778e02598a933cb53ef44482877683109bb561369db5db461dc76acab9d3913b6296eee3ec3f SHA512 af24928be65b87b78b1442ef7f26551f7ed163388ea27edf35046e4e73ab454440af692d9c1bcb2a37e5366000d1988173225d68af3c19f0721255bdba2a2cfa
 EBUILD gnome-shell-3.30.2-r2.ebuild 6508 BLAKE2B 13e62512e73230a914f333b73cfb3be82f0672b49c1b72c8ff37ec9f82299c30bc84ad5c63722062a15e80412588b31f9090253986f14b7d909a365f11005196 SHA512 f7f4c841e65f5ebcb57774f2d2e511d6bbd16d15fd5562c3fa934ea9cba749330ebaf3c2dcdbab0347614e10c823ffe5416aab041eafcaf3cb2685c92bf71fe6
-EBUILD gnome-shell-3.32.2.ebuild 6360 BLAKE2B 59d9e8f6968430670ec4ca04b6abae0fb0b1f04347bafd9468a72bd660ae8e9b559b9353ddf7fb2e2f724c4a8ece557085c5397ad75d4d90d734ac0cca41d7f3 SHA512 1f7943aa2acb8b81c37732d94e39b73575e59e46d85528f169a918474122e18cb6b030bbd9a502e6170daff0da967f5ea56a364dcf11a20bb5ca9c872e269ed6
+EBUILD gnome-shell-3.32.2.ebuild 6358 BLAKE2B b18c6f41fd9f24abe0f7b27761d2929a167e3b376c52b4544c013c58290aa6c085bf8918eadc84f1603644301dcf85c3640c5a8e536071085b6cfed3fcc444f4 SHA512 79a0b5fe1446fb519cee9197a500a5e9d044265f9d7e748e83aed67e6c8465494de3fe0a0c19b197f30992b6bf8125e12f88a134722ab40615294319993d5852
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
index 52c198b7fd66..af8b5d90b813 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.32.2.ebuild
@@ -16,7 +16,7 @@ IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager system
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index f2b43b4b16c4..ffd0f2bc00d7 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,3 +1,3 @@
 EBUILD gnome-3.30.2.ebuild 1394 BLAKE2B 984b4036cba5dd30db49df29c7813645a5b5db95bd1bc9ded13233adbd25b9a785d2d48f8c2998407c27e878556840eadd643435d9cc845a800c2d2be3876709 SHA512 c45a6f211f76dbb97c4956322ece238a4a375ceffb05df9292f293cf5dad4402324b724d8ce01bff63ea7d236ce53a6050753f4bce14e5dabc88d1ff91a69cd3
-EBUILD gnome-3.32.2.ebuild 1380 BLAKE2B af3e67007cc84a70767957f903ab03f73cee2acf07e642e6a7531f48797a4df4d8afa2f90688cedfc6c6708fa3e09a41eae630ab80cf65f6f32c011512b21a8e SHA512 4f14966fbe2defab26bce6015e9bdcb00e38a8a0f73330a423958c048f2df60b7e7332f7629b92289e855e7beeba982bf011397ebed8cb956b9a0ac2c951c0b9
+EBUILD gnome-3.32.2.ebuild 1402 BLAKE2B d2075e97c2e340536238d68362b2182b1cfd8a3c88dfae8640531a283e54e5b9ee9c1b3c2c1cc64965fc0511acc2626f43f884a4e18faab1b9af0b2e8a5304ff SHA512 a2901d72cda5f0ec73ca7879423d04bef5c7dec200702316f6a167b010a3110a0fc53a60b7b3af6ec5f06f2e46800c4c54b69649635c034d10b770e7e88d8d5f
 MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.32.2.ebuild b/gnome-base/gnome/gnome-3.32.2.ebuild
index 51d620967882..f3d4fddd8a2f 100644
--- a/gnome-base/gnome/gnome-3.32.2.ebuild
+++ b/gnome-base/gnome/gnome-3.32.2.ebuild
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="accessibility +bluetooth +classic cups +extras"
 
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 679d6bd5e78c..5e6f352c8475 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -4,5 +4,5 @@ DIST gsettings-desktop-schemas-3.28.1.tar.xz 652416 BLAKE2B a9ddf44153a83fa188f8
 DIST gsettings-desktop-schemas-3.32.0.tar.xz 628888 BLAKE2B 7d675597d861ee8ee8258f037d06d6f728e9705c7e121508a811bbad000b1ef10a7e2ef23066cec01c34865648f4f0a204716306643db1a4cbd505801ce939c1 SHA512 cf1d78a8f9f1697e20c995286b50d556c2ecc83bf4b28be19b3258a724494a2827fb9567cabf29cda1c590488fd2645e905072e08321766c8bdddd22ac3710dc
 EBUILD gsettings-desktop-schemas-3.24.1.ebuild 751 BLAKE2B 4dd144290423aa5a7f058c4385c79dd1efe9bdd606facf101c4c2984dcbca39bc3bc7004beae2258d5abc92dc854133d9ec49ea54976b424e17213875674bb07 SHA512 e44ce2486801708c826ed30bf5204263d0415b71814391d0ad8ed3391cb24e24189c52576fc386ba3dfda602303d4a0479e4d0802fa8d519ae2bf017495d56e4
 EBUILD gsettings-desktop-schemas-3.28.1.ebuild 752 BLAKE2B aeeace0a6ec1a6d14d262d3904d294bfadffa5bad429d2be7c9da9b4265a3df0b7061ca945aa5681659ec1cbe7262e35e71c61bdf735e7010df61376613710a4 SHA512 a889be4a1d9a703d12f73814aba2d621750657348528c4b42deb373a7b2f10af16ef6df0a28353d6c667ab0cf8ed686d58679df7df309940f49f256994a7c42b
-EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1029 BLAKE2B 1dffaf6584fb0b28595b4045f37d279fd3926af2be53a29bfacba40792fbb1668abd989bfdc1e04870517be93d6e27d331924d1d76e1e880b9d2805b1e92ac8f SHA512 7ad191a866d66845c6c0548ecaa549039e7cb0a2061e390199f6ef21681af0eda195af7aab01168b0a24d54ef6d0735d1d40c8963a90533e9eda3312d780860f
+EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1021 BLAKE2B 60b5ae3f22bc9b44a4979706096f548b6f8c7d3682540d6d8d857f8a3896f561666f7cbc735a2f8dfcb774335d7afaa65c9f8be37a8f3ded399f1f0cf6c834f8 SHA512 16a1491207bd6b38eddf04bbcd2e28bd66329a93ca16989dbf8e5b21772e4f1f85f442826a7d7e3ad93180675c8bed81025ae57cce61e8f309eb8f81150ac43e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
index 5e1c2cba5a01..2d1062d2c2cf 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 DEPEND="!<gnome-base/gdm-3.8"
 RDEPEND="${DEPEND}"
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index e8728f604306..a7bdae0353fd 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -6,6 +6,6 @@ DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909
 DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
 EBUILD gvfs-1.32.2.ebuild 3796 BLAKE2B 74cc69a5d735f3c28d565727020bf56bec85734d3a0c22ba7b84fd6e3c422e971cd477c685e3bfa02fe31bb181a0df9eee3bb37ab4127c6c32d7abb626069175 SHA512 c1b5d293de4333a27af132c203904ba878d7e74ec07713eea56ebba822a4b9f4deb8d62ddc5ff7cef800efa11f67c11fc51800c5364fde170fbe39c7fb9ba242
-EBUILD gvfs-1.38.3.ebuild 3754 BLAKE2B 176641d2e50b699b92a7f6addb491888e822650b20dd7c73d73856cefc18bb20bdc3191a6f3d716b3b04224f0589265fbeb6308ceaef037bd3143f9b5cf5318b SHA512 4b799572e8e176241f43cb967ca16f5458b72a6722dde61c46f56ac77aa33816311b731d025c3a675c9cdf7dd02bffcd09bf27cb393d5d40bd16577163e0c958
-EBUILD gvfs-1.40.2.ebuild 3788 BLAKE2B 48429d616e1c67c8e9dd311f13d1de0a9874af63a895b33fb56f08f11310239521b3107f0397f9bd8780ae3937ea711360dc49c92a8e57cd4a08b42edd6bf902 SHA512 608aad41c7621abe444a2624efaba01617f5b6eae0d81a8f43eca87f4627bfef988bbe8dd0c68c64cfe9ee19f78a0dd1fd31f71ed913c107e28622517111694a
+EBUILD gvfs-1.38.3.ebuild 3781 BLAKE2B 66fae9248f9a6af8d83f47cdce6d032869720d7e07b71e62c532744864793bf00f6097b99eb32bd5fe5d5ea8fd60c8c6414057310fcacf2ed7c93f14b91f98b7 SHA512 4b39e655d21457b515a707c32ffb20f36d403f86fc1869a0eaabbfb7f7ace501af97f3a8016284dc88a81f0fee5bf7235183bc155e7806497f2379637b870975
+EBUILD gvfs-1.40.2.ebuild 3815 BLAKE2B f82ff072ee8722bd68fa9ccf21d689c421098252ca1a98a01408b1e68d8c85ea0aba6c3b580c2fc208f6e0715ef75ec54ad7d715a97ebf21cf875532c19a6acf SHA512 c96827626528e6e0717fc00e77da3dd1677138e9c9384ae114beff629a90658b8f9abb51bb4b6d4a43d404b57c52288bf282cf0e214e51b86cd4a00f98184474
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
index 65dbe146f6b0..5cd798af7346 100644
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.38.3.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 
 IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
 # elogind/systemd only relevant to udisks (in v1.38.1)
 REQUIRED_USE="
 	?? ( elogind systemd )
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index b6dca3188ebf..e86efb195624 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 
 IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
 # elogind/systemd only relevant to udisks (in v1.38.1)
 REQUIRED_USE="
 	?? ( elogind systemd )
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
index ca869cc30884..da38f0e3eb77 100644
--- a/gnome-base/libbonoboui/Manifest
+++ b/gnome-base/libbonoboui/Manifest
@@ -1,3 +1,3 @@
 DIST libbonoboui-2.24.5.tar.bz2 976250 BLAKE2B b8847b23479ba1c13ee41ebc67031c94572f9f9e5ae88b067da78bac2c78d6c52c6a5bd408246328fb71fa2d1722ce69acaa517c90520cd9fe5e81828988d6ea SHA512 163a8f39d9dad7fc3f1afc55b1a779961d285abe2988ff74bfcad4376e9dbfb91bb3e8212f96f48f91c54a6aff749ba6e00ea2d9add10c76b650f3072b875100
-EBUILD libbonoboui-2.24.5-r1.ebuild 1331 BLAKE2B d67c3cdd1b3fa51986d066b38acd943668eda931f3a13f6e680cecc463bd4e5c5feb05f750db8624cb12cb09fb518f0594cadbc653f07898c4ef9c546c771b75 SHA512 2c5fb9a0167c540c2dcfe23e8ee7e7db541fd95eb32ee5dcb9ac79d8251111c547f38c56479a25c715f158ed0156472ae2164b43d7a56d8a9f73b63653db3ea3
+EBUILD libbonoboui-2.24.5-r1.ebuild 1355 BLAKE2B cc0e2d260f1f0f5be9d90faa8aa05281b97e591f4effe01d03e7946d041f30a4e0ad542d481a27821fd11ff5d361c44736e154407ebcee06c5cd4c824c26544a SHA512 5123b464ae7cf88934ec815fce7aeb8ecd02672e21fe9b6bb9368321835c641370e8c537f0a507011e4d6da3571880cc7daaee010cf4b33ad08a0cc835f559a1
 MISC metadata.xml 744 BLAKE2B 9b0f0bd7470f3486c1e2dc90ef701db7a4d55afd42092904326842651f6b29b02e35a136c69b7e252d6bd458f5f2b4eea384a27bcc69067ef6b9deeeb3e6dd2e SHA512 0f23ea97d68a4c46220dd395343aa63ed8351222f0c8aeeeefe9d9410a397522d7866f4600023653ac683513754480d92c7fffcd551d5f7987b2100ca2b5c370
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
index 4ffc7b9fecd1..42a59a853994 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,6 +15,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 # GTK+ dep due to bug #126565
 RDEPEND="
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 4f97d5d551f1..aaaa8e8a259e 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,5 +3,5 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf
 AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
 DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2839 BLAKE2B 11ce26a0eee48504cd9a446e24c5d82f47f97823b93eb6e314e4298574fb8228e4c17a7b804632ee4e78391451011f15f8f0b7ff7897c6c84d9a6f5a11bb3e6a SHA512 5e794bd0abb82fe8633c4877e53e1f4268087935243acdfc6e5f00a3729da0fd76a503cb12789e02d6ae5238aa6c36a5835ae02f0aa8da318bdd73c5fb5196af
+EBUILD libglade-2.6.4-r2.ebuild 2866 BLAKE2B 812bce708b13475cadae88d4ecfae780e1a681f0a250344800416352fbee59077d3b1b9c55c1ca07f6a32b17b1ea062e24aac40b5f0cfa46dbd8c0c8bc42cb61 SHA512 7d4ba49d5d5e3bf3e694225c2afdd1818729bb7636e176ea81f583108293f6baba6d11d89b5d041f60cb7f3a8b527716f37a83aa74429b13c77bd11f5f362e41
 MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
index d70b6e70bcf2..fd0c16d5fdd6 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -19,6 +19,7 @@ LICENSE="LGPL-2"
 SLOT="2.0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs test tools"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 75cf9abc4ec2..c01291c85fc5 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,4 +1,4 @@
 AUX 3.12.0-vala-0.42-compat.patch 811 BLAKE2B 1f50e441d0483d3748db1ed7d18e581df2887160a16afe7bb8a47890e162349cd5611070ea11ceef1273c8d4865b7f5ead6bfad14a171ca5d21d32d7a8811468 SHA512 12e16ca43044ca96a4f5abdd3d982bfd705e17df2630505154ad1592dbb8ce1bad66c4624a992084a1533d58fd96c178a5d4c147c79a5074183ceaaf54dde998
 DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1842 BLAKE2B 6e21c17b37b15032a901010cba48f5d5d45472b4fe03699392c5a18fca95ef35ea3bf13a6f93fb4f53b88e00eb3af9b55364dafa63a12d9dca44d34375bdfd99 SHA512 75ed17ac41ec43f6d57f9e7275be336a3486d31510205b421f334f1f863190d61264210b98e09c51ab87d561884901ad31f3cee68faf02a65eb74398104f7c97
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1869 BLAKE2B afa8bf247b64782d9003b7c314704597ff827a7b2890cc76d72c81449746216ff6aff3a9516ab1a1084c3014586671e9a78f51ff90d68f23a3a18f54a68e6f0d SHA512 93e34817fac3dea082ede3cf8c2de622a8ad13fe1a26d8f38c07360f1cee8471ebf0b82189e85857e1a1af432ae62f451d858f5bb45196cbed75409983b57972
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
index d5269092cc48..632aedc2150e 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
 IUSE="debug +introspection test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 2d1c252313d7..a628d0385e3b 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
-EBUILD libgnomekbd-3.26.1.ebuild 777 BLAKE2B c9b701c89515ca459e22863296d67a8309a08cbec534f9cb17e7383f7618166fafa168e4355b140a8f278730c6c39eaf5c8419c712abd8e8e7fd663f6ea87f01 SHA512 b7951a534d36c6c2fdb9468c5bb7489928ddb2365f5aabad00e6da123d89b21b3c9d45b69edb1bbe565aef98bebba5b6ddc90b35143bd5f575b9153977e0eea8
+EBUILD libgnomekbd-3.26.1.ebuild 804 BLAKE2B dd9622f8f0e64df4140957ddd5105a58860bd322d78322ef23729dcc8d09812aff0e0413b370b87adeb7b1e1445596dfbc6b94996582fa9dc395ae7ec31eca10 SHA512 3d74cc4309dca2696f499b5f9db3f1c5dccae0022bc6fdef8fe9b6b065785f99ca21f78a6010d493b915e4b4b3e78ec6934dc4e7cc156ed9520af1cd6b9f78b7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index fabd4ad7b2c4..0fb48653b8da 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -12,6 +12,7 @@ LICENSE="LGPL-2+"
 SLOT="0/8"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.18:2
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index d83138bca7dd..4e657c04824a 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomeui-2.24.5.tar.bz2 1440172 BLAKE2B 3ffe1942b993fbd112029637cfe7eca031b500dac526c88cf1b28ed6d9f17232fd6e6d4220d455c852f73cd1ff6b074c47d30fd926b677ec426f1351def525b4 SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5
-EBUILD libgnomeui-2.24.5-r1.ebuild 1308 BLAKE2B 34ebba66044c53aa36321eb17f4a7e6cd18662e00f5d07ab019172d5bfe98a49595d8807e68aa022111432616b59468aed16e5b7e1b55563bbc70d03090f8d54 SHA512 12a5620fcf1d4db5d7d045c452eacb8b2f845e195806764d7073bfe4743e69c5909af2250ed88e77cbaed3bca983019c184d4b6412bf97998a7554157e3d34cb
+EBUILD libgnomeui-2.24.5-r1.ebuild 1332 BLAKE2B cbc22b2d6a69e06e3a342271424b65f2dc9700a80058b3aca9d25490ffceefba27928cf85282fab894c9151f4f7e3436ee931f595f2944adf8bdb433aa0b8635 SHA512 4f24217c8edbadb41a5736d0d82ba62bf9b552eda39fc2eba5099ba12988390e3a945e36995daa7268191bf453d098a5da2668f73b5a73944f9688a05350ef29
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
index beaff76d872e..54eda929c522 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,6 +15,7 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
 RDEPEND="
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a7b46f0d349a..895278f83457 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -7,5 +7,5 @@ AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd0
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
 DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
 EBUILD nautilus-3.30.5-r1.ebuild 2812 BLAKE2B 3f0057267cfea02f9c6d8db52363a24efc52836f932130c23ec64363899ece863590655aa87ffe323667033987c7999a1eac5cef897696688245e078f755c9f1 SHA512 481cde050147e497327d95d0cf1793653cf79b25b4ed74a9452e62e368330aa42f62e3056e16db54fba8bf681befef1dc1b7c61a38b6e43db3c914761c126361
-EBUILD nautilus-3.32.3.ebuild 3068 BLAKE2B 374cda29507c72db2a4685f616f1182e4313cfed13e20dbd7f50de6777d1c6bc7d186b7e4f1cdb55cd772f89747aa21bf6ce89072441ab226505773b0dd4dca6 SHA512 382a40f8b3a208b4b02887ad2ce3e113482c9e45b84bf7d415a546008398862ccde7891826f4278fb0eee89e40ab12d9b75cab7efef21e3eddc7303e36a4c4f8
+EBUILD nautilus-3.32.3.ebuild 3065 BLAKE2B 3ddac42a49839e562e6b6f19a7f2c89a3cb3b89f63dde602eb8ea77eb246d8195544d7d3ac9237292b2274dcc5ec09736ad631a8b4a427369efb30c78c43c498 SHA512 21cf025cd1c3be04bbf2c4875926c160d8ca99e54d15fab41bab9d6f59ae8162ed2a19ed3230dea7afae19443e1ae29b6c9baabe28f16bbf0c234325617ee987
 MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
index 0b50759cd36c..e7b391d15436 100644
--- a/gnome-base/nautilus/nautilus-3.32.3.ebuild
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.58.1:2
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 0725ba99decd..2bd3e6d4e2e0 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -4,5 +4,5 @@ AUX orbit-2.14.19-fPIC.patch 1650 BLAKE2B a6a28a41ef14e633d472142183722d881061ec
 AUX orbit-2.14.19-link_protocol_is_local.patch 1006 BLAKE2B 927492b912c5f8e557a3d4bb922b8250206c7359907cd330d0f55ac30d9955dc93c110018b55f0d093191396b694c46553c8b5a0d227a3bb805c03c8e09d38f3 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8
 AUX orbit-2.14.19-parallel-build.patch 963 BLAKE2B 578f51e904cbaaa40d27b9c1a512958b34edb63ae0936edf1abaf25e29142c92250bb9b56d22583a28a6aad8266947f788b430bb869a57a82e4a1349a0fa312f SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187
 DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e
-EBUILD orbit-2.14.19-r5.ebuild 3043 BLAKE2B f25fbebfdace4c2ddeeb4baa15c397f2cb89efa67b30a3e8920376b37db2699488d190c824f05e3f2692551a285f638a2310040ac3d11d3983bf992d427a7f71 SHA512 813fd64737cf36b7755004f6dbee5f40e5f9d5a50aa863356fc0839cf728e2a7e8856c71a76d0996854369b70e9543a365eb15c8ac08b2efa642915181b7be52
+EBUILD orbit-2.14.19-r5.ebuild 3070 BLAKE2B 0586dae7ae1d3120b423b0466fa6b0b82081218b85e4cdb7db3f1eb49c14f8a7cef2e6e963f9f10309a48c7df5338c196d3a927d49892a0803fd900b8b0bfc2e SHA512 0778427c3cb220a0161bbd7850fb83144543cc615e492ed5126c2b275edb456a1b31cfaa4a45d5a39197c0714a282697790856787f2e899e443b87555981af7b
 MISC metadata.xml 359 BLAKE2B e60465ce144792058da10587759ba4c1ca3d754b29aa0be28b12efe72eb0616f5b25969f1102612ff37cbe296e0093e0fab0417800ee1efaef6fdf6941800f1f SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
index 9c20ea842bf6..48a4f1471b05 100644
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="pic static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( debug )"
 
 RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]