gentoo resync : 05.02.2020

51 files changed, 50 insertions, 343 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 773e2613debf..e1d945803d42 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index ec4b9ae502f4..23ee88c85c83 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -3,6 +3,6 @@ AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e0
 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.32.0.tar.xz 111700 BLAKE2B 51ac54deafc44a56aa6af1bdc8a89e1002772969881870b196a12f85d5b1a090a334b3088b051e07e085b7fe736e2e51479c17ffcc38a18e682b8238d51671ee SHA512 09ae65ad365947aed24228b94978b290060264e55b443d18a743e943627703c92e16e3a5ca8a0aaf3549f7a1d5aad77bdc285d4c8519db705d3104ec22b111a0
-EBUILD dconf-0.26.1.ebuild 1476 BLAKE2B 2cc966193509f00c2ef23dcb6712f60c0c7894c91aaff397b2d067123c7f7be4ea8a27121bb1578c6a111fe7206406722158538c9458944f41790e462fb77d3c SHA512 f5bb74a43f300ac4b0c1042d67d44f2414fbc9621ab1c753ce68804c0d6ce2b42afe830fcde32d4b683ab05f06723050704bde6c54cac58e54f2b786a3445e2b
-EBUILD dconf-0.32.0-r2.ebuild 2192 BLAKE2B 4c9769473c9ed23e7907836a7fd234428789a616b0fe4c0093644aee078d1c79462c038dc843b5822087b00a6eb3dd72cdf4b2d5bd5113f1fb3e3df8f010a816 SHA512 ebf40ac4807c8174193db99c27170ae654ec078001aa309a39cf17a4149b7bc5606ca09b46892559117d811be170f482ed8de3fe943f4c8f2712364f936c10cc
+EBUILD dconf-0.26.1.ebuild 1477 BLAKE2B 43cdd548ec4fc2811bc835f627dd8f5e2ba82aef4bed616a68785cbb1bd147eb8939d9284e181306609cf7fb0e6ab556ea1d6052822e4585db8acb324d9714e8 SHA512 5927c6691cff778c1439a56cb1020a1bf459f2867ca95c3f963824d941d30ff1f9df9b72b547ff0cfd119ac3772eb1c9f0df4f0392eab716a5a654f2ffeb3575
+EBUILD dconf-0.32.0-r2.ebuild 2193 BLAKE2B efcf10a06cd228012b3431f44989914483003d001cd19f5f21d7c4f4b6a1979da6852e85943d4ba4cd1ddb7b694b1d3711a1852a163e77aa33fe39c2971a79b2 SHA512 9ff59d29ab26458301dff735c4467f38cf0c8b90d4610f6617e2fdfca944cb8f33e5fd9d4b438be78f7543cefad01e0e0e110ce3bed27d21c112ff2aa926f7f3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
index 4f62392857d3..f38544da3eaf 100644
--- a/gnome-base/dconf/dconf-0.26.1.ebuild
+++ b/gnome-base/dconf/dconf-0.26.1.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-base/dconf/dconf-0.32.0-r2.ebuild b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
index 81f78a56367e..af0c7f04f573 100644
--- a/gnome-base/dconf/dconf-0.32.0-r2.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
+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
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 8b39d3ea554b..97599e2e520c 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,5 +4,5 @@ AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515ca
 AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b
 AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
 DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
-EBUILD gconf-3.2.6-r4.ebuild 3646 BLAKE2B c1a98b644e9051be73b4718483ab9bc196b8e2184da0c3e922d998e13d2cedeb68634b915aac2c25625ecdf633db8aa3ac6bd8174313b9e0023469d567ec0324 SHA512 76eca81bf19aaf02a1b5541ebe65aa41004dc8588068b420d9d8eee387ee0c054ab53341b45d13d3e0906a94807090613e0a8ce33ad42e0d95ba2f35c04b6d0f
+EBUILD gconf-3.2.6-r4.ebuild 3647 BLAKE2B 3abdd450e2a80e57adbb730638b4b03fa744357f6ff3c4cdfac9557a1eabd5a9bb8343a79c0e4b112de99cf97ed59139dd5ecc9ba00b15d247b7e5ed21233554 SHA512 c50f2e7fc4c25b2807f4113938d3f1d254b95c5f881dcbceebec27909a1c56f73e5a0068721a660d30ed404fb1bfab8d44c4b6ca4128c5580398ca30fa2c4ef9
 MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index 41c56b56acff..410c24a6095c 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-linux"
 IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
index 383bb0dc85d5..c3b3db7550e2 100644
--- a/gnome-base/gnome-common/Manifest
+++ b/gnome-base/gnome-common/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 601 BLAKE2B 1a54cb8e05a7b36f5b6fcaf3756855c24a005cb97850beffeaafc154925c0d8dce1bfcc0a4ed1ad9f6c0e48dd9afd50ca5c590f00d603416e57ace2f7ec295f4 SHA512 1b7cc48c2aba60215f77edeeb3889f63994c40d5a55315da50031febd71078f33f85560f3f1e1f122ab6f9c71ba3134c8716aa014a1f896a885f282ef5af4e7f
+EBUILD gnome-common-3.18.0-r1.ebuild 602 BLAKE2B bb8c28acb8de171d9b6cfcd80af562896c5ef16115f69c4ffef28e1cccd98248b2f6b4a0edfde3a7cd57948e3ac15dfaedfa93f63e88bf3c315215b62ea08db2 SHA512 163d9cdf8b7ab0ea761661c5d79348c08540d293d4c111171c2c68ee217765254d4f2100ec078cc6feefe978bcdaf6c618708429dc099abc21def8ce8a878066
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
index 2c8b991fccbf..6ddd28353b7f 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index bfd784c06e4b..2a1888dd5a9d 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 5529 BLAKE2B dd4753abfec32ad940f362456b5026041341bb255ba50a4e200e73234da53ae0c3be5ff975384e734b7c1b15ce6b84bfce7f8ac1a12161be85db6840836793b8 SHA512 b3b94bf9475d87e01ea95a8a828f3689589b4b252c5e0293544f8ebd4fb2e24bb8c18112fe1ad74f25249f04b5a3f0677d13cf03f2aa6d24470c4d256c35b259
+EBUILD gnome-control-center-3.32.2.ebuild 5535 BLAKE2B 8ec228c256ef62b163f0f79f2d141c472db54249c8ce6e774d41a30cae21247950b21d2093e61332563b3425c89c5878b744ea887de013cb5d4ca18dbea7019f SHA512 4db12f7131d1b69052a5a91205c4fc315f1e0e61f2349d04c682978b12401280cdc6edcd51bfdd3954a05c4edf6d0ae4403d1e1c6d98e1536eace8e8c046da66
 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 519a34fa4566..cac1b28a4671 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~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 9865e5d5baa7..ef0d2f61617b 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 1523 BLAKE2B 7b087078985ec3ab194be3ba8edd0f8fc73c507c9b7d9b36d2c63ef9b6fd3183d3744e442970706b0d52a73565d6184e2af50a90a5671eb6f93f50dc4120f949 SHA512 8dc532ee2883f7a14ac1c3927a2a7a5e7c55b774ca41fbd4acff34e1429ad94b9dd488d83f2deaa4d88628f10739046bb62e400dcb4eab4e97ae76206ec5e05b
+EBUILD gnome-core-apps-3.32.2.ebuild 1529 BLAKE2B f4d382bc7a1978b71d4660a97799bfe292c91f373d0381754fccb9836b0ba33642a1fd4c4171e5e8afea615421dddff1b5d9aa8e865d430ea05c59f3ba7d5a95 SHA512 d0f2808686914813b27a43ac91d504ae35f991f970c3e66e2217bdd9b5fb5f983956507be41d6c678de7e0fda2156442516800f10344b06cb5296905c76583c9
 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 202622f5be3d..af7e128060db 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ IUSE="+bluetooth cups"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 # gnome-color-manager min version enforced here due to control-center pulling it in
 RDEPEND="
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index b54186d4ac36..3d46a43b051a 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -5,6 +5,6 @@ AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 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 2280 BLAKE2B afbcfbea1a172b979f0a75d8001f73d54209d1a3fc65068839c111176de2dccb22ab354409a6137e350033c8b40a496dc8a5759c3b29d9993ae83e5b4c0988b2 SHA512 1e22d82e37a229e0ce46c6104338e8d82cac2faa1315ac5ea8a0926a15a469cf02211b5a3be22b962d29cdb177212eeeb765b70f0af42fb2678cfa3ad17e5497
+EBUILD gnome-desktop-2.32.1-r2.ebuild 2281 BLAKE2B 9d6a496d5dfb7a9a8d5669223bfa7f676ca691eba55c55c3230cf31a58c8b456b4e4aa3185f2fe97e19ef76bcf8af412c7ab6dda6db59b6ed8a3975b7d2cc737 SHA512 fd7911e424b88f14b554d5c97b223c88fab33a84bff555f4232996850c8bb1c58c807ea0dcf8a71e484f35b4b6b39fa73550f83b59ef8d0dc557e3fd84fefed4
 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 f48d6fa875ab..6e6530f86d3c 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
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="license-docs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index ee5adc71ea1f..aaf45bfba402 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -3,5 +3,5 @@ AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6
 AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5fb0abaffe55b213dd7d86584d03c50bf317fd5e266e540a9fcf454c44468ab4c03808e15702a301ba9388083e0 SHA512 8e90901cfae13793972eb4be903995ff11bde6d78a0c72db4ecde0dcf76b44496d398cd14c60f689d7720d0356abd85b4ccc523a5b57cede3e97cba394d223d8
 AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444
 DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210
-EBUILD gnome-keyring-3.31.91-r1.ebuild 2385 BLAKE2B 6686182c5d3b779fa50ef4d45a8314ee352027e536a5b7ed1e87f596ed1f71bde10016a1be5cd90cafdf6cf5e450dd2010d40a40dc885a292811398b0225678b SHA512 6a2c6af17556cc42ff250d881db33a4ab3097a8568404296cbb062cb4815d08f7920ef89e32f6aa3e9406acde81ffb901da546be7dbffadfc023e22622224b39
+EBUILD gnome-keyring-3.31.91-r1.ebuild 2386 BLAKE2B b0918e68e9cc45d7286b4bda2ebe07f593259829b5f35cf2a570d7c7265dc03d32d167637ad83294bb0e416eed37e95c295971b28efb7dd00febcd15becc6cee SHA512 f472747aa7f226e8e5c318734f529cda8035a96396383d3a2bec78669c0b718a95cd6f7020efa689b7f48b0efabf4005bd956f124b595cb6f98e77dbfefeee9c
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
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 270020127d01..707441b984ac 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
@@ -14,7 +14,7 @@ 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"
+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-menus/Manifest b/gnome-base/gnome-menus/Manifest
index e942b3919892..6d27ed65aadd 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,8 +1,3 @@
-AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0eb60496c87b9634b817ca538793ba14c56a66934e540a315ba82a54fb0412bfc95234c5e3485f1a6210eac2125f4b77d9a9cacd6113 SHA512 6d7b3cb6d3e445355ea4c77a2930ef93792d5ce1ec44e449576700cea00f1f9e0fd2f1445a7d41675ed5a976501b458a8e650fd0c8e1adb0c1b364832d6f0972
-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
 DIST gnome-menus-3.32.0.tar.xz 499680 BLAKE2B ee43c2be29f6d3f5eaf5369c3b3809fc2728564321853a6dd23df1d81138868f9be2f57d0bcd0eb69a509e224f77dc357a8c71afe569bfb1bbdb13ce3b80636f SHA512 8a429e092b1e4a1a794473d7cae611684321e797792e1063911ddcbb496140033838b348bc209b4c0566a13233cfa1144cae7a188a483abf34c5af6feb44a884
-EBUILD gnome-menus-3.13.3-r1.ebuild 1396 BLAKE2B 6e7076bf844a4f47bddd2f2c2cc969f1abffdf120ac87d7efee1302f6e02434c639ecbe7276a47e4cad237b3dc070159a8382eaa277f986fdd0759b04157fb0e SHA512 bd9cbb8790b6d560a96228277af9927cf27910a61d741bc01d504935fae9d9acec43ab03e8147c8a3eecc6a02360be73aec7a707b230bbe3d90d9dbf145e5b59
-EBUILD gnome-menus-3.32.0.ebuild 921 BLAKE2B 7bd6fd9a1397875b749f025161ae03ae1cd9b3b4e9d04117b98c9b30556cec5ba57d6a23c26cb1380272be38ee59b3bb0abe5a58274a01c3c8256151e8c41473 SHA512 7de91c7ffba99579bb96c0b9cd3fbf179ff6e628538a402721254aa7a8fe792abbe4463445c4826e4e4fc4e845bd13b2c88ffdc9bb8394384db182be55d56105
+EBUILD gnome-menus-3.32.0.ebuild 918 BLAKE2B 5f2562536257a3f8eb6c082dcdcf75b753539ac8e108414e7ef50b309371c0016100a47d680b9cfe535b91222144874b52ff10b4334856ff71c9303b3e19826e SHA512 65af5c1750b21b3bc4ff144f1e4d519b24ec2b609fd32967bd2d61880555c08b318856774743ac0648527a2323b00ff2f4c8d1dd8922e80ac1396011535a877f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
deleted file mode 100644
index 8ec7006fce5b..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
-Date: Mon, 27 Oct 2014 18:41:34 +0200
-Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
-
-This is based on glib commit:
-5a5e16e93c4f11e635918ecdb41681f63fd05a39
----
- libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------
- 1 file changed, 52 insertions(+), 58 deletions(-)
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index 326f311..bd4f886 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path)
-     return path;
- }
- 
--static const char *
--get_current_desktop (void)
-+static const gchar * const *
-+get_current_desktops (void)
- {
--  static char *current_desktop = NULL;
-+  static gchar **result;
- 
--  /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
--   * to abuse gnome-menus in non-GNOME desktops. */
--  if (!current_desktop)
-+  if (g_once_init_enter (&result))
-     {
--      const char *desktop;
-+      const gchar *desktops;
-+      gchar **tmp;
- 
--      desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-+      desktops = g_getenv ("XDG_CURRENT_DESKTOP");
- 
--      /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
--       * was not set */
--      if (!desktop || desktop[0] == '\0')
--        current_desktop = g_strdup ("GNOME");
--      else
--        current_desktop = g_strdup (desktop);
--    }
-+      if (desktops)
-+        desktops = "";
- 
--  /* Using "*" means skipping desktop-related checks */
--  if (g_strcmp0 (current_desktop, "*") == 0)
--    return NULL;
-+      tmp = g_strsplit (desktops, ":", 0);
-+
-+      g_once_init_leave (&result, tmp);
-+    }
- 
--  return current_desktop;
-+  return  (const gchar **) result;
- }
- 
- static GIcon *
-@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file)
- static gboolean
- key_file_get_show_in (GKeyFile *key_file)
- {
--  const gchar *current_desktop;
--  gchar **strv;
-+  const gchar * const *current_desktops;
-+  gchar **only_show_in;
-+  gchar **not_show_in;
-   gboolean show_in = TRUE;
--  int i;
--
--  current_desktop = get_current_desktop ();
--  if (!current_desktop)
--    return TRUE;
--
--  strv = g_key_file_get_string_list (key_file,
--                                     DESKTOP_ENTRY_GROUP,
--                                     "OnlyShowIn",
--                                     NULL,
--                                     NULL);
--  if (strv)
-+  gint i;
-+
-+  current_desktops = get_current_desktops ();
-+  only_show_in = g_key_file_get_string_list (key_file,
-+                                             DESKTOP_ENTRY_GROUP,
-+                                             "OnlyShowIn",
-+                                             NULL,
-+                                             NULL);
-+  not_show_in = g_key_file_get_string_list (key_file,
-+                                            DESKTOP_ENTRY_GROUP,
-+                                            "NotShowIn",
-+                                            NULL,
-+                                            NULL);
-+
-+  for (i = 0; current_desktops[i]; i++)
-     {
--      show_in = FALSE;
--      for (i = 0; strv[i]; i++)
-+      gint j;
-+
-+      if (only_show_in)
-         {
--          if (!strcmp (strv[i], current_desktop))
-+          show_in = FALSE;
-+          for (j = 0; only_show_in[j]; j++)
-             {
--              show_in = TRUE;
--              break;
-+              if (g_str_equal (only_show_in[j], current_desktops[i]))
-+                {
-+                  show_in = TRUE;
-+                  goto out;
-+                }
-             }
-         }
--    }
--  else
--    {
--      strv = g_key_file_get_string_list (key_file,
--                                         DESKTOP_ENTRY_GROUP,
--                                         "NotShowIn",
--                                         NULL,
--                                         NULL);
--      if (strv)
-+
-+      if (not_show_in)
-         {
-           show_in = TRUE;
--          for (i = 0; strv[i]; i++)
-+          for (j = 0; not_show_in[j]; j++)
-             {
--              if (!strcmp (strv[i], current_desktop))
-+              if (g_str_equal (not_show_in[j], current_desktops[i]))
-                 {
-                   show_in = FALSE;
-+                  goto out;
-                 }
-             }
-         }
-     }
--  g_strfreev (strv);
-+
-+out:
-+  g_strfreev (only_show_in);
-+  g_strfreev (not_show_in);
- 
-   return show_in;
- }
-@@ -579,14 +580,7 @@ gboolean
- desktop_entry_get_show_in (DesktopEntry *entry)
- {
-   if (entry->type == DESKTOP_ENTRY_DESKTOP)
--    {
--      const char *current_desktop = get_current_desktop ();
--
--      if (current_desktop == NULL)
--        return TRUE;
--      else
--        return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop);
--    }
-+    return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL);
-   return ((DesktopEntryDirectory*)entry)->showin;
- }
- 
--- 
-cgit v0.11.2
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
deleted file mode 100644
index 966b060eac27..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@debian.org>
-Date: Sun, 14 Dec 2014 20:36:36 +0100
-Subject: desktop-entries: fix trivial bug in handling of multiple desktops in
- XDG_CURRENT_DESKTOP.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741505
----
- libmenu/desktop-entries.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index bd4f886..a463d79 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -97,7 +97,7 @@ get_current_desktops (void)
- 
-       desktops = g_getenv ("XDG_CURRENT_DESKTOP");
- 
--      if (desktops)
-+      if (!desktops)
-         desktops = "";
- 
-       tmp = g_strsplit (desktops, ":", 0);
--- 
-cgit v0.11.2
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
deleted file mode 100644
index ab6cb92d7dda..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Mon, 25 Feb 2013 16:36:44 +0330
-Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone
-
----
- layout/gnome-applications.menu | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 9242eff..94ea6d4 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -277,7 +277,19 @@
-       <And>
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
--
-+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+        <Not><Category>X-KDE-settings-components</Category></Not>
-+        <Not><Category>X-KDE-settings-desktop</Category></Not>
-+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+        <Not><Category>X-KDE-settings-network</Category></Not>
-+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+        <Not><Category>X-KDE-settings-hardware</Category></Not>
-+        <Not><Category>X-KDE-settings-power</Category></Not>
-+        <Not><Category>X-KDE-settings-security</Category></Not>
-+        <Not><Category>X-KDE-settings-sound</Category></Not>
-+        <Not><Category>X-KDE-settings-system</Category></Not>
-+        <Not><Category>X-KDE-information</Category></Not>
-         <!-- Really Fedora ??? -->
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
--- 
-1.8.1.2
-
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
deleted file mode 100644
index b569324415cd..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-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
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-
-	# desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
-	# (from 'master')
-	epatch "${FILESDIR}"/${P}-multiple-desktop{,2}.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
index c9f8efffcd41..802b3eff00cf 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+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 )"
diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
index 12b6995e407a..9be05b1553f4 100644
--- a/gnome-base/gnome-mime-data/Manifest
+++ b/gnome-base/gnome-mime-data/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-mime-data-2.18.0.tar.bz2 607012 BLAKE2B 6653e11f04f94035e7bf7d12413870b6e425bb32c50cd0776fae93be05eaea6eb4116f8d068e86c39fca9a3f86148934357d5a1c538a7deaae117151b8f1e466 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5
-EBUILD gnome-mime-data-2.18.0.ebuild 593 BLAKE2B c5e80da1c83ae6ce1302fa6e8a7eb05e2c00b2a8163b0f9d9d977f4d1a464bc39c5b8c29f749699fcf47e1d0f1fc904b8f6102d2bee5df10ea056bb3c02e9038 SHA512 f29f7b3307d9ee8fefe9ad94709a295c586f3de05436d214b4229b9a7ec807472e059e9a28d2b51431806e1a48f0f4f656ee7ae1d31f4a7e707be0a88ca40a47
+EBUILD gnome-mime-data-2.18.0.ebuild 594 BLAKE2B 934ddc7818253cc95bb7fdbf8a1875f2497fae74ca5a827623a0082eaab09795a60b3e1383b0c68fc969a82e167dbfe3e197f27ed278da8b2fa540610dde143e SHA512 9f1f311af1baa49a131b635c811e51e0edee132bf08d4dba9ed57465ec80e2cde4a18ee54c5fe449b42ee0936efee1b50c88dbc8872ec05a7858e5be129a5308
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
index 6373724924e2..26f9fbfd2ae1 100644
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-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=""
 
 RDEPEND=""
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index d7484d8cdfec..8d50f065f58d 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -12,5 +12,5 @@ AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
 AUX gnome-vfs-2.24.4-openssl-1.1.patch 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4200 BLAKE2B 00cb94196fcd6d641c89a66bb16c8fe7f56c2b81827795524ea51e980920379c2ee31fe740145ff5541ad30a8c712b68074b078a43d0c15a6eeae01c7ded3754 SHA512 77ed69bad4dd96839bb88cb6126b7d9197936870e080f8a685bbcf0641a90ca5b2b782e550c9005fc87faa52f9d4ab36c8e5c07f387ab1f138cbf60e008f4636
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4201 BLAKE2B 7a87eb04483858170f8f6c099dbb140261eb40cb864ad882683dfb37757d6a5bd648f5d198ea755c6d8636505394c6545a65895819b017f27e6400eacafdd281 SHA512 5deaad24ef14cde5070f16e36b0357e2689b4988ae8364fd20f05c431be320796d73cea1c066f25a91870b8e2b5eb3e7acb46ee2937cd37b77a070a230cbf60a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 08f7e4ec87d2..7c48b831bdae 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 1434c074f744..2162e00e10a1 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,6 +1,6 @@
 AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec9844843793dc568e3012d3cd80c7a5f7a921e8dcc42406c6e15010fa472edf9cb10b7c86d1f8f69da2f6a3a034b7 SHA512 190129064554a36b56ba308f8dd75a9b8ee5ccfadffc0b5d528b5ba70324bcb3436acab116ad7768f59d316c3c2bd85dad9e8147050cb475b21fce439cb92705
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 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.32.0.ebuild 1018 BLAKE2B 767a9fdee3a3372d6194b37489d02a94b3c5d9433d2f874601b5a16c5f397de96efbae7b928fa08e9665f24516df229e253f3ba061b62be20a0d699438ed4629 SHA512 eed30caf99d333cc42bd90db9b6bfaade1c21ce1b8c63d9d470bb33a370df0d6c266e9888b14116f6ef61c5ca69d58e0bcb7793fce4a7a6dbcdc4bd22a680f2e
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 752 BLAKE2B 724b668d7d6a9db27d843a3195340f2ba0a8182275b9776824c2fbd8774f967b8ba10be4531819705bd678f6a910988c377a690cdaa3cc50890b2b2e0bb75d28 SHA512 a06301cfb3a0219c71fb2a389e23d4cdc549d2f48e15911822cff1fcebeb8c62d237a9fbe8dbc5171028f84a7a7afe82fbde293fe871214b4a4de74867a56eb4
+EBUILD gsettings-desktop-schemas-3.32.0.ebuild 1019 BLAKE2B 10353a53c681042b3e3e887200c1996467ab691faa3f49fd48ce0bb5df7efc8b2e367f77a86b4d66b4809f936fb7415350e4e4855b3398f62cced86fb2bd211c SHA512 d2c2e119b408f3fc0b8ef9a04a1e02fac2b560169b70b8020a2c4c8dfa7a98d5ffa8b373588dda47b0eacad302094a8a2023522390f98f1fc9c978bd250bf67e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index b58a9346233a..6284fe2bb5eb 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.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"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
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 bf9d60db8fe4..b659a75bc170 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 03a7499048eb..bcd8e85b70af 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,4 +1,4 @@
 AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
-EBUILD gvfs-1.40.2.ebuild 3814 BLAKE2B 21fec4dbd80147f4464bb7e7c96b37e77188242aabbe2aec60bddeaea2ccc7c74087ea0f037a14f00c9fcdd8248cec680bf4e4922762eeeedaa1c513cdd38d81 SHA512 91e35d8243b8178ae68c13a7f63714f28f25bed5b675c5fe0e1d012841c60f002bc9e9d446ba7e26d40c24c0751f9b3623bf445531ce668192b96b18128845e9
+EBUILD gvfs-1.40.2.ebuild 3815 BLAKE2B 6adf551100fd62928f57cb3f50ffa0a3de7993d6bf007948412e8e792651ecae6e975c94dc2aed63d93a810a20fdc16d67115576816263a80edf3ed2a441ee56 SHA512 275ebe819e2c70006d0262d3846f7644469265a0c3fba7e2bd0ba464f882adb784c07357130a36c57142207ed1164af1281fbe94e3a64e331c4197a817673c4e
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index dceebc1716b3..c7f770eb9c3d 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
index 9462643bc9b1..2d40bb3734eb 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -1,3 +1,3 @@
 DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716
-EBUILD libbonobo-2.24.3-r1.ebuild 1532 BLAKE2B c4a8fbb2e34c4a272cbcc2e88c0c01468eeb783c8bf24c373baf9c1c10a3ce8126d1de8ce63fb923126c5085c1f15767a6b2792e9daf186b6fd88c84707f9cba SHA512 0d74b06659c1bd5156e86be52dcf51713c706653a13de8cacc7b605e733c3b2613e825b7af5f5a34dc8f49becf4ea73e303cca250b3f90e5f8572779e623661a
+EBUILD libbonobo-2.24.3-r1.ebuild 1533 BLAKE2B ff87d6aa0e6c9a93752368a13d5613b22e27f9651d2e196da3985fdf4bfe6975be59cac6ae1a0f78a48358aa48fbdd620ba868e147c9342b9e940c0df99416db SHA512 e3f944ebe9cf5585895d349f30cfa2b886d9db969f4ab6ac24babd80d6a92daa1d861a5c31cff622e25ab0f17fa027d07498e2fe7ff0281307246f715cc02d2f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
index fb75eb43b8b9..56ef8af2b52d 100644
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonobo/stable/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="debug examples test"
 
 RDEPEND="
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
index da38f0e3eb77..519bae8794be 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 1355 BLAKE2B cc0e2d260f1f0f5be9d90faa8aa05281b97e591f4effe01d03e7946d041f30a4e0ad542d481a27821fd11ff5d361c44736e154407ebcee06c5cd4c824c26544a SHA512 5123b464ae7cf88934ec815fce7aeb8ecd02672e21fe9b6bb9368321835c641370e8c537f0a507011e4d6da3571880cc7daaee010cf4b33ad08a0cc835f559a1
+EBUILD libbonoboui-2.24.5-r1.ebuild 1356 BLAKE2B d72c869c6dc43a661d9212d80a8dfafeac5e1966f6a401d0897fb9df2e1adcfa4994b525b844b9aca0f8e04689e787c110381f3982a1da93952395a0c99a7278 SHA512 b966f1aa0b8a4aa1f4c07da6e890c4931b0bcc14cbf7b11affd6fc431b0def92ac314c5683d95bde15f067fb57b7b96f97688a38746c3aeabb542822bfba32e3
 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 42a59a853994..81b26e2a3fba 100644
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libbonoboui/"
 
 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"
+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 )"
 
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 6398edb9c9e6..5575576b165f 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 2861 BLAKE2B 04a7a9fb572134d39117699031b283ac71d3dec9db794c5fa75d3087aa2028a1d920525ecfde7b9ed8239581e4462e2323fef34ca7a22744a7e3441c34bc806f SHA512 7bf33b9a2a6e0e2aab747dd13b7a6b753dd9330e937104b4bf2384252506223be89eed78721ce6bb1dedc3246eea7a49d70907ff64321859ff31e96cc3e26a88
+EBUILD libglade-2.6.4-r2.ebuild 2862 BLAKE2B afc5edd2b9d11d2907fba5c15ce93c4854e98e1f3f51322547a9d1dcf55dc5d2af9ffe2ba7b60f1dedf05c1ba1f0afda3f4770f38831904979b2704c0cd9a1d7 SHA512 c6d86a3dea07fb276a83d57b62d7129359143b896536cb794cc228d3167947985fe23ca36b6963681c054af62e8714a21dbb974db61888774ccf9c631593a328
 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 77faf7d88c2d..169ff539ffa6 100644
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
 
 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"
+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} )"
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index c01291c85fc5..0c259c013cc7 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 1869 BLAKE2B afa8bf247b64782d9003b7c314704597ff827a7b2890cc76d72c81449746216ff6aff3a9516ab1a1084c3014586671e9a78f51ff90d68f23a3a18f54a68e6f0d SHA512 93e34817fac3dea082ede3cf8c2de622a8ad13fe1a26d8f38c07360f1cee8471ebf0b82189e85857e1a1af432ae62f451d858f5bb45196cbed75409983b57972
+EBUILD libgnome-keyring-3.12.0-r1.ebuild 1870 BLAKE2B 56e5e71f1c7c6cdc380d830f1bc01ba213e5366cd27a59f243c9f9c23bf99d727fa063ef8be5aba6c7bb4479c746ff8a9cea8fc0817b4f5b1a772683b96f3b44 SHA512 923b314aed60c36ceefae7c3c5dc394c8400a99c2c12557bb2a17fb05d3f3862403839186d028eabcdf0fd1cbe9696fcfd9b70e1ba2a9580ec9d78d8a956cbf4
 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 632aedc2150e..d0d234300bc7 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
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 489714b4d024..30c6c418a0f6 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -3,5 +3,5 @@ AUX libgnome-2.28.0-menus-have-icons.patch 538 BLAKE2B e4bca7e5ae5c7fe38d88e1334
 AUX libgnome-2.32.1-utf8-header.patch 930 BLAKE2B 32065fbe8e6d931f6c79209eb8acf11a4eda339832172822c6997a2ed03146d81d38d3ebb8b8238f3da9d62c0d8ad2c0937bb6e787f4889d68145adfbbcee290 SHA512 b72f124358ad66d00d00435cb5087163077361d33082e2b1dd9c06b9dd97203d515943d21214e834d2d0fbeedde7a85414b1a9ce39e734d6e1bf1bdab1664ad3
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 BLAKE2B a4373d291f6813d2d07b78b23f5b5d1e288cb4a979a7b5cbe1351e6432cae2b24c07fa467b08c590a100e22807b3aa77ff085e0b8a9268e5542e81495013928a SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a
 DIST libgnome-2.32.1.tar.bz2 1776006 BLAKE2B 3e9fa78bf1b9a550588374809c90f7cabd7fc3fe17f18d6e1ce0ea463bfb6999279d1e0cfb4d8df1c64571e6d8c6a9c90bbe558ba7cd8c99f2a100bf9fbf83d9 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3
-EBUILD libgnome-2.32.1-r1.ebuild 1767 BLAKE2B 8345279e4ab16816a8593ca8ea8a13a514367f2c451e115b4a599610ec92eb9251257d4c9c8784965df0fe9910ddb93c86e9e78cd57150f9eebb1bdebffc4f0b SHA512 eb309902bbe62dfc52db89a22c2d3c896efe186229e591ef42ea89fb47833f3e93fb9d6d694a1bc90d4b6bd0b7b757e328cda41bf689c39cb7255e571c6276b5
+EBUILD libgnome-2.32.1-r1.ebuild 1768 BLAKE2B e75d3774346b5d63ec18cac09bff940c5ca7f7efb53c320abf19a834b14c35aaf3d66075438bc468acf7a896c78e16b84b8416518a26eccd5dcf13da0a3b07ca SHA512 e366cea772be502b4115a314369efff5c0677f7100fdae4b0a9c4bbe6aef0d70c7e68130507bf289d4041b2d0abfa299f3e676ada8c3c681b60e630cd84b9bf2
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
index 3e036fab858b..2ec21cf52123 100644
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="branding"
 
 SRC_URI="${SRC_URI}
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
index 1c0e79f127d4..465ab5ecb145 100644
--- a/gnome-base/libgnomecanvas/Manifest
+++ b/gnome-base/libgnomecanvas/Manifest
@@ -1,3 +1,3 @@
 DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1676 BLAKE2B fd99123fcbc4fe0a6723078735a07f7a04878755ca44a529f9ec056b5d7c1fd913c92399e9c8377cc34b5236008e89f538e69001062b179eccd14612f6c3fa1f SHA512 fe922f2572d6980771e6e8f109a81cbb4afdfe75a800bc22c44a57a7c31f2960f084c75785dc4b57474bd752a889f8c3fff73eeed2da2ae58a9d779191d7007e
+EBUILD libgnomecanvas-2.30.3-r1.ebuild 1677 BLAKE2B 77c9e4d1cba92e67edc2bd204acbf5fd6061445d4c7aa56b9937c0186c113aa5bb7e62fe6b0a977d02949a4dab6abacb4194936494b3794f78064d92b3198101 SHA512 076697644ec1ee1234fe72cd40727c9041ed85e20d86071a5a762fac89e7d4df468da8bf1effac28b41156b4b12de37dba1ebb9b5bc8e517f48e3704cfd82445
 MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index dd2800efe961..e92f84a7ba37 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="glade"
 
 RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index 4e657c04824a..76f0c6f4b6e3 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 1332 BLAKE2B cbc22b2d6a69e06e3a342271424b65f2dc9700a80058b3aca9d25490ffceefba27928cf85282fab894c9151f4f7e3436ee931f595f2944adf8bdb433aa0b8635 SHA512 4f24217c8edbadb41a5736d0d82ba62bf9b552eda39fc2eba5099ba12988390e3a945e36995daa7268191bf453d098a5da2668f73b5a73944f9688a05350ef29
+EBUILD libgnomeui-2.24.5-r1.ebuild 1333 BLAKE2B 1de85fa4a609103d56c33bba46b4724b2c3a47f57ac54ed4f8513615002ba3b75ce86d77f7e055ab46def790eb972e89e6c03ed47068850bf3ef485519433b06 SHA512 dfa625ed3db76ed6996eeabfcde0fce65e90d09a6feb5f5b88bc3b77913e6857925db3a7efa9730c9529f7bb81b3f00a63b79e889f63359c8f2eb8576afc23d4
 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 54eda929c522..b943456688a5 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 743c97ca1b03..8c417ac8efdb 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,3 +1,3 @@
 DIST libgtop-2.38.0.tar.xz 729700 BLAKE2B 2296741d6c6bd1c9eb17be10e480dabd732e956826c859c176cbc6f8f03259a3b2f2f04d6c55d1c562b082f7e880bb4b7a3f07a66d7f24660085387dce078879 SHA512 96586b7f12a2b63c5ec7f69c51b6e28361a7458f24f20270fc589213bfae43ae99d1e39efb6101d189741bba084c887554f745131e99d8ed90b7db6d53c36e1d
-EBUILD libgtop-2.38.0.ebuild 757 BLAKE2B f4e46123db0e807ffc412d53bbfa967be0cfdcc60a14806349917ce243bb45d847dba2a1db259a6bb083b1299db61f8470dc9b1271dcb4559576b1eec3a43633 SHA512 98bcdb9528c6fe8b3a2601d6fc6f0a8cfe535fd95f0c3b4cdaa306fe94be3c431d6a5b0fd941de1dc856cf8899bc4dea80a69fbdfe11ef15c811f318fd26cd69
+EBUILD libgtop-2.38.0.ebuild 758 BLAKE2B 1f34cb208a28312fbe4fcadd1c2b82d97f173b8a3d0fe6f9fbc1e39332193e404b74cdd477187395362d99bfef8669557fd4382cc2f4666f172d1f7def31e46d SHA512 cb863280bcd41cb4ee196971b9ae57f6ee5e44211f882a618c40210033744ea0250a173b7aa4517a1c83b0906797654ae17ec1e7aee06c20c40a8fc63cc7e249
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.38.0.ebuild b/gnome-base/libgtop/libgtop-2.38.0.ebuild
index ce6ad98ed708..f472a1c51181 100644
--- a/gnome-base/libgtop/libgtop-2.38.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2+"
 SLOT="2/11" # libgtop soname version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index d321b629d526..f354262484b8 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,4 +1,4 @@
 AUX librsvg-2.40.12-gtk-optional.patch 2193 BLAKE2B fcde3effa4cf68e89387ff64638f05006094106a17fdb61b1bf2e6210f42fe91716e7fd21cf40ad5adecfee45b9e1d488249d1befdb48399c5952829c3d01e07 SHA512 bea056ac4d3d19719129dd7379d783a8eb34efbf57186f6ab7113ff97fdd809b0802d60add646ea50c776eb7bc07f5a0f4c0911569a2b1b24dbb1683f111d7c0
 DIST librsvg-2.40.20.tar.xz 1796376 BLAKE2B ec8e7308a0255aa22038262d69019e810bb78b92e3de62662b53ab375110c8186e565e1eb7f5825c61c6d10bed1876ff3f7a06d1073e9676a3d2bb5dfb6b791e SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
-EBUILD librsvg-2.40.20.ebuild 2668 BLAKE2B 258c5ddfeb87442d5548ad6156672277847f5760618867f8ed5faa0b4b850272d92619037dc1c2e37c6e36d5635663230f4282cd67790b4a6e248b7422ecc814 SHA512 44298d635d3927e3757fc07bb78092483cfe5b96d08506679d25282f9f306cc94b8751cab349a6379f15ad6f45d58e4a899f54b4b8f66a9d8b415538516833ac
+EBUILD librsvg-2.40.20.ebuild 2669 BLAKE2B 957a510ca87985882c595fbff7f8dc466922fe97636cf049939ea260b63e27c8a947305a8853ae71f26b1574818654cc2ab6d22136878e2e4ac95eb0be3a21cb SHA512 0ed53a0019845e8f007b16e65267217e654814a870fc04f43a8de7047bcb95e5185b3eb4ad0554656c5c6429b43b0ea62a4e75a155989d3243807fd4ebbe77d6
 MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/librsvg-2.40.20.ebuild b/gnome-base/librsvg/librsvg-2.40.20.ebuild
index 4c596c4cd131..a5298fa36963 100644
--- a/gnome-base/librsvg/librsvg-2.40.20.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection tools +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 2bd3e6d4e2e0..6c23ea5219a1 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 3070 BLAKE2B 0586dae7ae1d3120b423b0466fa6b0b82081218b85e4cdb7db3f1eb49c14f8a7cef2e6e963f9f10309a48c7df5338c196d3a927d49892a0803fd900b8b0bfc2e SHA512 0778427c3cb220a0161bbd7850fb83144543cc615e492ed5126c2b275edb456a1b31cfaa4a45d5a39197c0714a282697790856787f2e899e443b87555981af7b
+EBUILD orbit-2.14.19-r5.ebuild 3071 BLAKE2B 26ccabcacce92ca40bf38943af7c3af55e97365de672648ff5b803447a6998517338a094c62e102e507d7054855c31a84911a42d0346eb05eb7d4aea7a126405 SHA512 a8abb15ed07de96941bb8dbfedd4169f4df9588c8dab6f94d4c55642615cf4a27a4f7c92de5760fe20c412ceead13b18c095232cb0be797eab751045cfb661a5
 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 48a4f1471b05..0a37cd4e49e7 100644
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://projects.gnome.org/ORBit2/"
 
 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"
+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 )"